[Wikitty-commits] r1358 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty

25 Jan 2012

Author: echatellier
Date: 2012-01-25 10:07:21 +0100 (Wed, 25 Jan 2012)
New Revision: 1358

Url: http://nuiton.org/repositories/revision/wikitty/1358

Log:
Fix assert count with default data count set with @Before methods

Modified:
   trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java
   trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java

Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java
===================================================================

--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java	2012-01-24 17:56:29 UTC (rev 1357)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java	2012-01-25 09:07:21 UTC (rev 1358)
@@ -112,14 +112,24 @@
 
     /**
      * Clear all data and add some test data for all tests.
+     * 
+     * After data init, there is in wikitty storage:
+     * <ul>
+     * <li>5 categories
+     * <li>4 books
+     * <li>6 catalog node
+     * <li>3 movies
+     * <li>total = 18 wikitties
+     * </ul>
+     * 
      * @throws ParseException 
      */
     @Before
     public void setUpTestData() throws ParseException {
         wikittyClient = getWikittyClient();
         wikittyClient.clear();
-        addTestDataInClient(wikittyClient);
-        addManualExtension(wikittyClient);
+        addTestDataInClient(wikittyClient); // add 15
+        addManualExtension(wikittyClient); // add 3
     }
 
     /**
@@ -227,11 +237,11 @@
         dnrMovie.addToField("Movies", "author", "Nolan");
         dnrMovie.addToField("Movies", "year", "2012");
 
-        client.store(dieHardMovie, edgarMovie);
+        client.store(dieHardMovie, edgarMovie, dnrMovie);
     }
 
     /**
-     * Import books from csv files.
+     * Import books from csv files (13 books)
      * 
      * @throws IOException 
      */

Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java	2012-01-24 17:56:29 UTC (rev 1357)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java	2012-01-25 09:07:21 UTC (rev 1358)
@@ -136,7 +136,7 @@
     public void testFindQueryOnMovies() {
         // The Dark Knight Rises
         // Die hard 4
-        WikittyQuery query = new WikittyQueryMaker().eq("Movies.name", "*ar*").end();
+        WikittyQuery query = new WikittyQueryMaker().eq("Movies.name", "*ar?*").end();
         WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(2, results.getAll().size());
     }
@@ -387,11 +387,13 @@
      */
     @Test
     public void testQueryMakerNeq() {
+        // 18 wikitty in init
+        // only one with price == 42
         // test strict equals
         WikittyQuery query = new WikittyQueryMaker().ne(Product.FQ_FIELD_PRODUCT_PRICE, 42).end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(3, results.getTotalResult());
-        Assert.assertEquals(3, results.getAll().size());
+        Assert.assertEquals(17, results.getTotalResult());
+        Assert.assertEquals(17, results.getAll().size());
     }
 
     /**
@@ -506,34 +508,42 @@
 
     @Test
     public void testQueryMakerIdneq() throws IOException {
-        importBooks(); // 4 + 13 importé = 17
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -1 avec cet id
         WikittyQuery query = new WikittyQueryMaker().idne("db9dc782-e650-4fd4-83ac-3c1c5c136cde").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(16, results.getTotalResult()); // 17 livre en base
+        Assert.assertEquals(30, results.getTotalResult());
     }
     
     @Test
     public void testQueryParserIdneq() throws IOException {
-        importBooks(); // 4 + 13 importé = 17
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -1 avec cet id
         WikittyQuery query = WikittyQueryParser.parse("id!=db9dc782-e650-4fd4-83ac-3c1c5c136cde");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(16, results.getTotalResult()); // 17 livre en base
+        Assert.assertEquals(30, results.getTotalResult());
     }
     
     @Test
     public void testQueryMakerUnlike() throws IOException {
-        importBooks(); // 4 + 13 importé = 17
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -6 HP
         WikittyQuery query = new WikittyQueryMaker().unlike(Product.ELEMENT_FIELD_PRODUCT_NAME, "*Potter*").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(25, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
     public void testQueryParserUnlike() throws IOException {
-        importBooks(); // 4 + 13 importé = 17
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name UNLIKE *Potter*");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(25, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
@@ -570,38 +580,46 @@
 
     @Test
     public void testQueryMakerNotsw() throws IOException {
-        importBooks();
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -6 HP
         WikittyQuery query = new WikittyQueryMaker().notsw(Product.ELEMENT_FIELD_PRODUCT_NAME, "Harry").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(25, results.getTotalResult());
     }
 
     @Test
     public void testQueryParserNotsw() throws IOException {
-        importBooks();
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=Harry*");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(25, results.getTotalResult());
     }
 
     @Test
     public void testQueryMakerNotew() throws IOException {
-        importBooks();
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -1 sorciers
         WikittyQuery query = new WikittyQueryMaker().notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorciers").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult());
+        Assert.assertEquals(30, results.getTotalResult());
     }
 
     @Test
     public void testQueryParserNotew() throws IOException {
-        importBooks();
+        // + 18 in init db
+        importBooks(); // 13 importé = 31
+        // -1 sorciers
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=*sorciers");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(16, results.getTotalResult());
+        Assert.assertEquals(30, results.getTotalResult());
     }
 
     @Test
-    public void testQuerymakerKeyword() throws IOException {
+    public void testQueryMakerKeyword() throws IOException {
         importBooks();
         WikittyQuery query = new WikittyQueryMaker().keyword("potter").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
@@ -665,16 +683,18 @@
     
     @Test
     public void testQueryMakerTrue() {
+        // 18 in init db
         WikittyQuery query = new WikittyQueryMaker().rTrue().end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(4, results.getTotalResult());
+        Assert.assertEquals(18, results.getTotalResult());
     }
 
     @Test
     public void testQueryParseTrue() {
+        // 18 in init db
         WikittyQuery query = WikittyQueryParser.parse("TRUE");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(4, results.getTotalResult());
+        Assert.assertEquals(18, results.getTotalResult());
     }
     
     @Test
@@ -722,9 +742,10 @@
 
     @Test
     public void testQueryMakerNot() {
+        // 18 in db (4 products)
         WikittyQuery query = new WikittyQueryMaker().not().exteq(Product.EXT_PRODUCT).end();
         WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
-        Assert.assertEquals(13, results.getTotalResult());
+        Assert.assertEquals(14, results.getTotalResult());
     }
 
     /**

    

[Wikitty-commits] r1358 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty

echatellier＠users.nuiton.org