Author: echatellier Date: 2012-01-30 11:35:14 +0100 (Mon, 30 Jan 2012) New Revision: 1387 Url: http://nuiton.org/repositories/revision/wikitty/1387 Log: Use test tree node for attachement count Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 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-30 10:00:29 UTC (rev 1386) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-30 10:35:14 UTC (rev 1387) @@ -70,6 +70,7 @@ import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.query.conditions.Aggregate; import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.test.CatalogNode; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; import org.nuiton.wikitty.test.ProductImpl; @@ -1085,7 +1086,6 @@ importBooks(); // add 13 livres WikittyQuery query = WikittyQueryParser.parse("Product.colors={white, black}"); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); - // FIXME mais la doc de [] correspond a contains one Assert.assertEquals(9, results.getTotalResult()); Assert.assertEquals(9, results.getAll().size()); } @@ -2100,95 +2100,36 @@ */ @Test public void testCountAttachment() { - List<Wikitty> toStore = new ArrayList<Wikitty>(); - WikittyImpl w1 = new WikittyImpl("at1"); - WikittyImpl w2 = new WikittyImpl("at2"); - WikittyImpl w3 = new WikittyImpl("at3"); + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Catalog").end(); + CatalogNode catalogNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + query = new WikittyQueryMaker().and() + .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Books").end(); + CatalogNode bookNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + query = new WikittyQueryMaker().and() + .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Bande dessinées").end(); + 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(); - WikittyImpl root = new WikittyImpl("the-root"); - WikittyTreeNodeImpl n = new WikittyTreeNodeImpl(root); - n.addAttachment(w1.getId()); - n.addAttachment(w2.getId()); - n.addAttachment(w3.getId()); - - toStore.add(w1); - toStore.add(w2); - toStore.add(w3); - toStore.add(root); - - wikittyClient.storeWikitty(toStore); - toStore.clear(); - - WikittyImpl w11 = new WikittyImpl("at11"); - WikittyImpl w12 = new WikittyImpl("at12"); - WikittyImpl w13 = new WikittyImpl("at13"); - - WikittyImpl node1 = new WikittyImpl("node1"); - n = new WikittyTreeNodeImpl(node1); - n.setParent(root.getId()); - n.addAttachment(w11.getId()); - n.addAttachment(w12.getId()); - n.addAttachment(w13.getId()); - - toStore.add(w11); - toStore.add(w12); - toStore.add(w13); - toStore.add(node1); - - wikittyClient.storeWikitty(toStore); - toStore.clear(); - - WikittyImpl w21 = new WikittyImpl("at21"); - WikittyImpl w22 = new WikittyImpl("at22"); - WikittyImpl w23 = new WikittyImpl("at23"); - WikittyImpl w24 = new WikittyImpl("at24"); - - WikittyImpl node2 = new WikittyImpl("node2"); - n = new WikittyTreeNodeImpl(node2); - n.setParent(root.getId()); - n.addAttachment(w21.getId()); - n.addAttachment(w22.getId()); - n.addAttachment(w23.getId()); - n.addAttachment(w24.getId()); - - toStore.add(w21); - toStore.add(w22); - toStore.add(w23); - toStore.add(w24); - toStore.add(node2); - - wikittyClient.storeWikitty(toStore); - toStore.clear(); - - WikittyImpl w111 = new WikittyImpl("at111"); - WikittyImpl w112 = new WikittyImpl("at112"); - - WikittyImpl node11 = new WikittyImpl("node11"); - n = new WikittyTreeNodeImpl(node11); - n.setParent(node1.getId()); - n.addAttachment(w111.getId()); - n.addAttachment(w112.getId()); - - toStore.add(w111); - toStore.add(w112); - toStore.add(node11); - - wikittyClient.storeWikitty(toStore); - toStore.clear(); - - WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(root.getId(), 0, true, null); + WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null); int val = treeNodeResult.getAttCount(); - Assert.assertEquals(12, val); + Assert.assertEquals(9, val); - WikittyQueryResultTreeNode<String> children = wikittyClient.findAllIdTreeNode(root.getId(), 1, true, null); + WikittyQueryResultTreeNode<String> children = wikittyClient.findAllIdTreeNode(bookNode.getWikittyId(), 1, true, null); if (log.isDebugEnabled()) { log.debug("Children : " + children); } - Assert.assertEquals(2, children.getChildCount()); - Assert.assertEquals(5, children.getChild(node1.getId()).getAttCount()); - Assert.assertEquals(4, children.getChild(node2.getId()).getAttCount()); + Assert.assertEquals(3, children.getChildCount()); + Assert.assertEquals(2, children.getChild(bdNode.getWikittyId()).getAttCount()); + Assert.assertEquals(1, children.getChild(newsNode.getWikittyId()).getAttCount()); } /**