[Wikitty-commits] r1396 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/query test/java/org/nuiton/wikitty

31 Jan 2012

Author: echatellier
Date: 2012-02-01 00:00:17 +0100 (Wed, 01 Feb 2012)
New Revision: 1396

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

Log:
Fix tests

Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java
   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/main/java/org/nuiton/wikitty/query/WikittyQuery.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java	2012-01-31 16:31:51 UTC (rev 1395)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java	2012-01-31 23:00:17 UTC (rev 1396)
@@ -92,7 +92,7 @@
     /**
      * if true facet is done on extension name. Extention facet can be found
      * in {@link WikittyQueryResult#getFacets()} with key
-     * {@link Element.EXTENSION.getValue()}
+     * {@link Element.EXTENSION#getValue()}
      */
     protected boolean facetExtension = false;
 

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-31 16:31:51 UTC (rev 1395)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java	2012-01-31 23:00:17 UTC (rev 1396)
@@ -129,9 +129,9 @@
      * <ul>
      * <li>5 categories
      * <li>4 books
-     * <li>6 catalog node
+     * <li>10 catalog node
      * <li>3 movies
-     * <li>total = 18 wikitties
+     * <li>total = 22 wikitties
      * </ul>
      * 
      * @throws ParseException 
@@ -251,7 +251,7 @@
         // build tree node with previous wikitties attached into it
         // ########################################################
         
-        // Create tree as following : (9)
+        // Create tree as following : (10)
         // Catalog
         // |_ Media
         // |  |_ Books
@@ -263,8 +263,10 @@
         // |  |  |_ Biopic (1)
         // |_ Everything else
         CatalogNode catalogNode = new CatalogNodeImpl("Catalog");
+        CatalogNode mediaNode = new CatalogNodeImpl("Media");
+        mediaNode.setParent(catalogNode.getWikittyId());
         CatalogNode bookNode = new CatalogNodeImpl("Books");
-        bookNode.setParent(catalogNode.getWikittyId());
+        bookNode.setParent(mediaNode.getWikittyId());
         CatalogNode bdNode = new CatalogNodeImpl("Bande dessinées");
         bdNode.setParent(bookNode.getWikittyId());
         bdNode.addAttachment(bookLan.getWikittyId());
@@ -275,7 +277,7 @@
         romanNode.setParent(bookNode.getWikittyId());
         romanNode.addAttachment(book42.getWikittyId(), bookLotr.getWikittyId());
         CatalogNode moviesNode = new CatalogNodeImpl("Movies");
-        moviesNode.setParent(catalogNode.getWikittyId());
+        moviesNode.setParent(mediaNode.getWikittyId());
         CatalogNode actionNode = new CatalogNodeImpl("Action");
         actionNode.setParent(moviesNode.getWikittyId());
         actionNode.addAttachment(dieHardMovie.getId(), dnrMovie.getId());
@@ -284,8 +286,8 @@
         biopicNode.addAttachment(edgarMovie.getId());
         CatalogNode otherNode = new CatalogNodeImpl("Everything else");
         otherNode.setParent(catalogNode.getWikittyId());
-        client.store(catalogNode, bookNode, bdNode, newsNode, romanNode,
-                moviesNode, actionNode, biopicNode, otherNode);
+        client.store(catalogNode, mediaNode, bookNode, bdNode, newsNode,
+                romanNode, moviesNode, actionNode, biopicNode, otherNode);
     }
 
     /**

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-31 16:31:51 UTC (rev 1395)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java	2012-01-31 23:00:17 UTC (rev 1396)
@@ -224,9 +224,10 @@
         Assert.assertEquals(id, w.getId());
     }
 
-    @Test(expected=WikittyException.class)
+    @Test
     public void testStorageRestoreNull() throws Exception {
-        wikittyClient.store((Wikitty)null);
+        Wikitty result = wikittyClient.store((Wikitty)null);
+        Assert.assertNull(result);
     }
 
     @Test
@@ -997,13 +998,13 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // 18 wikitty in init
+        // 22 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(20, results.getTotalResult());
-        Assert.assertEquals(20, results.getAll().size());
+        Assert.assertEquals(21, results.getTotalResult());
+        Assert.assertEquals(21, results.getAll().size());
     }
 
     /**
@@ -1117,22 +1118,22 @@
 
     @Test
     public void testQueryMakerIdneq() throws IOException {
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -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(33, results.getTotalResult());
+        Assert.assertEquals(34, results.getTotalResult());
     }
     
     @Test
     public void testQueryParserIdneq() throws IOException {
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -1 avec cet id
         WikittyQuery query = WikittyQueryParser.parse("id!=db9dc782-e650-4fd4-83ac-3c1c5c136cde");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(33, results.getTotalResult());
+        Assert.assertEquals(34, results.getTotalResult());
     }
     
     @Test
@@ -1140,12 +1141,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = new WikittyQueryMaker().unlike(Product.ELEMENT_FIELD_PRODUCT_NAME, "*Potter*").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(28, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(29, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
@@ -1153,12 +1154,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name UNLIKE *Potter*");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(28, results.getTotalResult()); // -6 HP = 11
+        Assert.assertEquals(29, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
@@ -1198,12 +1199,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = new WikittyQueryMaker().notsw(Product.ELEMENT_FIELD_PRODUCT_NAME, "Harry").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(28, results.getTotalResult());
+        Assert.assertEquals(29, results.getTotalResult());
     }
 
     @Test
@@ -1211,12 +1212,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=Harry*");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(28, results.getTotalResult());
+        Assert.assertEquals(29, results.getTotalResult());
     }
 
     @Test
@@ -1224,12 +1225,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -1 sorciers
         WikittyQuery query = new WikittyQueryMaker().notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorciers").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(33, results.getTotalResult());
+        Assert.assertEquals(34, results.getTotalResult());
     }
 
     @Test
@@ -1237,12 +1238,12 @@
         // FIXME echatellier 20120125 should work
         assumeTrueSearchEngineCanRunTest();
 
-        // + 21 in init db
-        importBooks(); // 13 importé = 31
+        // + 22 in init db
+        importBooks(); // 13 importé = 35
         // -1 sorciers
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=*sorciers");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(33, results.getTotalResult());
+        Assert.assertEquals(34, results.getTotalResult());
     }
 
     @Test
@@ -1310,18 +1311,18 @@
     
     @Test
     public void testQueryMakerTrue() {
-        // 21 in init db
+        // 22 in init db
         WikittyQuery query = new WikittyQueryMaker().rTrue().end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(21, results.getTotalResult());
+        Assert.assertEquals(22, results.getTotalResult());
     }
 
     @Test
     public void testQueryParseTrue() {
-        // 21 in init db
+        // 22 in init db
         WikittyQuery query = WikittyQueryParser.parse("TRUE");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(21, results.getTotalResult());
+        Assert.assertEquals(22, results.getTotalResult());
     }
     
     @Test
@@ -1369,10 +1370,10 @@
 
     @Test
     public void testQueryMakerNot() {
-        // 21 in db (4 products)
+        // 22 in db (4 products)
         WikittyQuery query = new WikittyQueryMaker().not().exteq(Product.EXT_PRODUCT).end();
         WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
-        Assert.assertEquals(17, results.getTotalResult());
+        Assert.assertEquals(18, results.getTotalResult());
     }
 
     /**
@@ -1529,7 +1530,7 @@
         WikittyQuery query1 = WikittyQueryParser.parse("*.name=*");
         query1.setSortAscending(new ElementField("*.name"));
         WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1);
-        Assert.assertEquals(14, results1.getTotalResult());
+        Assert.assertEquals(15, results1.getTotalResult());
     }
     
     /**
@@ -1664,12 +1665,11 @@
         // 17 books, but only 11 differents prices ?
         Assert.assertEquals(11, results1.getTotalResult());
         Assert.assertEquals(2, results1.getAll().size());
-        // FIXME echatellier 20120125 fails because of "13" != "13.0" (integer in test)
-        Assert.assertEquals(13, results1.get(0));
+        Assert.assertEquals("13.0", results1.get(0));
 
         // second
         query1.setFirst(0);
-        query1.setLimit(-1);
+        query1.setLimit(WikittyQuery.MAX);
         results1 = wikittyClient.findAllByQuery(query1);
         Assert.assertEquals(17, results1.getTotalResult());
         Assert.assertEquals(17, results1.getAll().size());
@@ -1745,7 +1745,7 @@
             WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.AVG).end();
             WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q);
             System.out.println("q: " + result);
-            Assert.assertEquals("3.0", result.peek());
+            Assert.assertEquals("3", result.peek());
         }
         {
             WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.COUNT).end();
@@ -1783,7 +1783,7 @@
             WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.SUM).end();
             WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q);
             System.out.println("q: " + result);
-            Assert.assertEquals("12.0", result.peek());
+            Assert.assertEquals("12", result.peek());
         }
 
     }
@@ -2258,12 +2258,12 @@
         CatalogNode bdNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
         query = new WikittyQueryMaker().and()
                 .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE)
-                .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Nouvelles").end();
-        CatalogNode newsNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
+                .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Roman").end();
+        CatalogNode romanNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
 
         WikittyQueryResultTreeNode<String> treeNodeResult =
                 wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null);
-        Assert.assertEquals(9, treeNodeResult.getAttCount());
+        Assert.assertEquals(7, treeNodeResult.getAttCount());
 
         WikittyQueryResultTreeNode<String> children =
                 wikittyClient.findAllIdTreeNode(bookNode.getWikittyId(), 1, true, null);
@@ -2272,8 +2272,8 @@
         }
 
         Assert.assertEquals(3, children.getChildCount());
-        Assert.assertEquals(2, children.getChild(bdNode.getWikittyId()).getAttCount());
-        Assert.assertEquals(1, children.getChild(newsNode.getWikittyId()).getAttCount());
+        Assert.assertEquals(1, children.getChild(bdNode.getWikittyId()).getAttCount());
+        Assert.assertEquals(2, children.getChild(romanNode.getWikittyId()).getAttCount());
     }
     
     /**
@@ -2293,7 +2293,7 @@
 
         WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(),
                 0, true, filter);
-        // parmis les 9 du test precedent, seulement 1 dans la category society
+        // parmis les 7 du test precedent, seulement 1 dans la category society
         Assert.assertEquals(1, treeNodeResult.getAttCount()); 
     }
     
@@ -2306,7 +2306,7 @@
         // delete Lanfeust book, attached to tree
         WikittyQuery query = new WikittyQueryMaker().and()
                 .exteq(Product.EXT_PRODUCT)
-                .eq(Product.FIELD_PRODUCT_NAME, "Lanfeust").end();
+                .eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end();
         String bookId = wikittyClient.findByQuery(query);
         wikittyClient.delete(bookId);
 
@@ -2316,7 +2316,7 @@
         CatalogNode catalogNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
         WikittyQueryResultTreeNode<String> treeNodeResult =
                 wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null);
-        Assert.assertEquals(8, treeNodeResult.getAttCount()); // one deletion
+        Assert.assertEquals(6, treeNodeResult.getAttCount()); // one deletion
     }
     
     /**
@@ -2344,7 +2344,7 @@
         actionNode.addAttachment("584adc1e-726d-4348-9a57-77153d245b34");
         eeNode.addAttachment("db9dc782-e650-4fd4-83ac-3c1c5c136cde");
         eeNode.addAttachment("584adc1e-726d-4348-9a57-77153d245b34");
-        
+        wikittyClient.store(actionNode, eeNode);
 
         query = new WikittyQueryMaker().and()
                 .exteq(CatalogNode.EXT_CATALOGNODE)
@@ -2352,7 +2352,7 @@
         CatalogNode catalogNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
         WikittyQueryResultTreeNode<String> treeNodeResult =
                 wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null);
-        Assert.assertEquals(11, treeNodeResult.getAttCount()); // 9 + 2 nouveaux
+        Assert.assertEquals(9, treeNodeResult.getAttCount()); // 7 + 2 nouveaux
     }
     
     /**
@@ -2384,7 +2384,7 @@
         CatalogNode mediaNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek();
         WikittyQueryResultTreeNode<String> treeNodeResult =
                 wikittyClient.findAllIdTreeNode(mediaNode.getWikittyId(), 0, true, null);
-        Assert.assertEquals(7, treeNodeResult.getAttCount()); // 9 before move
+        Assert.assertEquals(5, treeNodeResult.getAttCount()); // 7 before move
 
         treeNodeResult = wikittyClient.findAllIdTreeNode(eeNode.getWikittyId(), 0, true, null);
         Assert.assertEquals(2, treeNodeResult.getAttCount()); // 0 before move

    

[Wikitty-commits] r1396 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/query test/java/org/nuiton/wikitty

echatellier＠users.nuiton.org