Author: echatellier Date: 2012-01-30 11:00:29 +0100 (Mon, 30 Jan 2012) New Revision: 1386 Url: http://nuiton.org/repositories/revision/wikitty/1386 Log: Mise a jour du jeu de test de donn?\195?\169es pour que les wikitty soit ratach?\195?\169 dans un arbre. 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-27 15:27:38 UTC (rev 1385) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-01-30 10:00:29 UTC (rev 1386) @@ -140,21 +140,39 @@ public void setUpTestData() throws ParseException { wikittyClient = getWikittyClient(); wikittyClient.clear(); - addTestDataInClient(wikittyClient); // add 15 - addManualExtension(wikittyClient); // add 3 + addTestDataInClient(wikittyClient); // add 21 } + /** Manual extension name : media. */ + protected static final String MEDIA_EXTENSION_NAME = "Media"; + /** Manual extension media. */ + protected static final WikittyExtension MEDIA_EXTENSION = ExtensionFactory.create(MEDIA_EXTENSION_NAME, "6.0") + .addField("type", WikittyTypes.STRING) + .extension(); + protected static final String MOVIE_EXTENSION_NAME = "Movies"; + /** Manual extension movies. */ + protected static final WikittyExtension MOVIE_EXTENSION = ExtensionFactory.create(MOVIE_EXTENSION_NAME, "2.0", MEDIA_EXTENSION_NAME) + .addField("name", WikittyTypes.STRING) + .addField("authors", WikittyTypes.STRING).maxOccur(Integer.MAX_VALUE) + .addField("category", WikittyTypes.WIKITTY) + .addField("date", WikittyTypes.DATE) + .extension(); + /** * Add some wikitty in client. * - * In test case, product are books. + * In test case, product are books, movies structured in a media library. * * @param wikittyClient wikitty client * @throws ParseException */ protected void addTestDataInClient(WikittyClient client) throws ParseException { - // Categories + // ########################### + // add some business wikitties + // ########################### + + // Categories (5) Category sf = new CategoryImpl("sf", "science fiction"); Category history = new CategoryImpl("history", "history"); Category society = new CategoryImpl("society", "société"); @@ -162,8 +180,9 @@ Category fantaisie = new CategoryImpl("hf", "heroique/fantaisie"); client.store(sf, society, fantastic, fantaisie, history); - // Product (multiple inheritance) + // Product (multiple inheritance) (4) Product book42 = new ProductImpl("Answer to life the universe and everything"); + book42.setWikittyVersion("2.0"); book42.setPrice(4200); book42.setPicturePrice(420); book42.setPriceFromProduct(42); @@ -189,6 +208,7 @@ bookLotr.addColors("red", "blue"); Product bookLan = new ProductImpl("Lanfeust"); + bookLan.setWikittyVersion("3.0"); bookLan.setPrice(0); bookLan.setPicturePrice(5); bookLan.setPriceFromProduct(13); @@ -197,49 +217,12 @@ bookLan.setDate(df.parse("January 12, 2002")); client.store(book42, bookIndignez, bookLotr, bookLan); - // some tree nodes - CatalogNode rootNode = new CatalogNodeImpl("rootnode"); - CatalogNode livreNode = new CatalogNodeImpl("Livres"); - livreNode.setParent(rootNode.getWikittyId()); - CatalogNode bdNode = new CatalogNodeImpl("Bande dessinées"); - bdNode.setParent(livreNode.getWikittyId()); - bdNode.addAttachment(bookLan.getWikittyId()); - CatalogNode newsNode = new CatalogNodeImpl("Nouvelles"); - newsNode.setParent(livreNode.getWikittyId()); - newsNode.addAttachment(bookIndignez.getWikittyId()); - CatalogNode romanNode = new CatalogNodeImpl("Roman"); - romanNode.setParent(livreNode.getWikittyId()); - romanNode.addAttachment(book42.getWikittyId(), bookLotr.getWikittyId()); - CatalogNode otherNode = new CatalogNodeImpl("Everything else"); - otherNode.setParent(rootNode.getWikittyId()); - client.store(rootNode, livreNode, bdNode, newsNode, romanNode, otherNode); - } - - /** Manual extension name : media. */ - protected static final String MEDIA_EXTENSION_NAME = "Media"; - /** Manual extension media. */ - protected static final WikittyExtension MEDIA_EXTENSION = ExtensionFactory.create(MEDIA_EXTENSION_NAME, "6.0") - .addField("type", WikittyTypes.STRING) - .extension(); - protected static final String MOVIE_EXTENSION_NAME = "Movies"; - /** Manual extension movies. */ - protected static final WikittyExtension MOVIE_EXTENSION = ExtensionFactory.create(MOVIE_EXTENSION_NAME, "2.0", MEDIA_EXTENSION_NAME) - .addField("name", WikittyTypes.STRING) - .addField("authors", WikittyTypes.STRING).maxOccur(Integer.MAX_VALUE) - .addField("category", WikittyTypes.WIKITTY) - .addField("date", WikittyTypes.DATE) - .extension(); - - /** - * Create new "movies" extension. - * - * @param wikittyClient client - */ - protected void addManualExtension(WikittyClient client) { - + // ######################### + // add some manual wikitties + // ######################### client.storeExtension(MOVIE_EXTENSION); - // create wikitty movies + // create wikitty movies (3) Wikitty dieHardMovie = new WikittyImpl(); dieHardMovie.addExtension(MEDIA_EXTENSION); dieHardMovie.addExtension(MOVIE_EXTENSION); @@ -262,6 +245,47 @@ dnrMovie.setField(MOVIE_EXTENSION_NAME, "date", "13/03/2012"); client.store(dieHardMovie, edgarMovie, dnrMovie); + + + // ######################################################## + // build tree node with previous wikitties attached into it + // ######################################################## + + // Create tree as following : (9) + // Catalog + // |_ Media + // | |_ Books + // | | |_ Bande dessinées (1) + // | | |_ Nouvelles (1) + // | | |_ Roman (2) + // | |_ Movies + // | | |_ Action (2) + // | | |_ Biopic (1) + // |_ Everything else + CatalogNode catalogNode = new CatalogNodeImpl("Catalog"); + CatalogNode bookNode = new CatalogNodeImpl("Books"); + bookNode.setParent(catalogNode.getWikittyId()); + CatalogNode bdNode = new CatalogNodeImpl("Bande dessinées"); + bdNode.setParent(bookNode.getWikittyId()); + bdNode.addAttachment(bookLan.getWikittyId()); + CatalogNode newsNode = new CatalogNodeImpl("Nouvelles"); + newsNode.setParent(bookNode.getWikittyId()); + newsNode.addAttachment(bookIndignez.getWikittyId()); + CatalogNode romanNode = new CatalogNodeImpl("Roman"); + romanNode.setParent(bookNode.getWikittyId()); + romanNode.addAttachment(book42.getWikittyId(), bookLotr.getWikittyId()); + CatalogNode moviesNode = new CatalogNodeImpl("Movies"); + moviesNode.setParent(catalogNode.getWikittyId()); + CatalogNode actionNode = new CatalogNodeImpl("Action"); + actionNode.setParent(moviesNode.getWikittyId()); + actionNode.addAttachment(dieHardMovie.getId(), dnrMovie.getId()); + CatalogNode biopicNode = new CatalogNodeImpl("Biopic"); + biopicNode.setParent(moviesNode.getWikittyId()); + 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); } /** 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-27 15:27:38 UTC (rev 1385) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-30 10:00:29 UTC (rev 1386) @@ -69,12 +69,10 @@ import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.query.conditions.Aggregate; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; +import org.nuiton.wikitty.test.ProductImpl; /** * Wikitty client test to test for client use. @@ -740,7 +738,7 @@ // extension definition is present in xml export Assert.assertTrue(xmlExport.contains("<extension name='WikittyTreeNode' version='2.0'>")); // some data too - Assert.assertTrue(xmlExport.contains("<WikittyTreeNode.name>Livres</WikittyTreeNode.name>")); + Assert.assertTrue(xmlExport.contains("<WikittyTreeNode.name>Books</WikittyTreeNode.name>")); Assert.assertTrue(xmlExport.contains("extensions='WikittyTreeNode[2.0],CatalogNode[2.0]'")); Assert.assertTrue(xmlExport.contains("<WikittyTreeNode.attachment>")); } @@ -783,8 +781,8 @@ Assert.assertTrue(csvExport.startsWith("\"Wikitty.Id\",\"Wikitty.Ext\",\"WikittyTreeNode.attachment\",\"WikittyTreeNode.name\",\"WikittyTreeNode.parent\"")); // some data too Assert.assertTrue(csvExport.contains("\"WikittyTreeNode,CatalogNode\",,\"Everything else\"")); - Assert.assertTrue(csvExport.contains("\"WikittyTreeNode,CatalogNode\",,\"rootnode\"")); - Assert.assertTrue(csvExport.contains("\"WikittyTreeNode,CatalogNode\",,\"Livres\"")); + Assert.assertTrue(csvExport.contains("\"WikittyTreeNode,CatalogNode\",,\"Catalog\"")); + Assert.assertTrue(csvExport.contains("\"WikittyTreeNode,CatalogNode\",,\"Books\"")); Assert.assertTrue(csvExport.contains("Nouvelles")); } @@ -1003,8 +1001,8 @@ // 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(17, results.getTotalResult()); - Assert.assertEquals(17, results.getAll().size()); + Assert.assertEquals(20, results.getTotalResult()); + Assert.assertEquals(20, results.getAll().size()); } /** @@ -1119,22 +1117,22 @@ @Test public void testQueryMakerIdneq() throws IOException { - // + 18 in init db + // + 21 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(30, results.getTotalResult()); + Assert.assertEquals(33, results.getTotalResult()); } @Test public void testQueryParserIdneq() throws IOException { - // + 18 in init db + // + 21 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(30, results.getTotalResult()); + Assert.assertEquals(33, results.getTotalResult()); } @Test @@ -1142,12 +1140,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(25, results.getTotalResult()); // -6 HP = 11 + Assert.assertEquals(28, results.getTotalResult()); // -6 HP = 11 } @Test @@ -1155,12 +1153,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(25, results.getTotalResult()); // -6 HP = 11 + Assert.assertEquals(28, results.getTotalResult()); // -6 HP = 11 } @Test @@ -1200,12 +1198,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(25, results.getTotalResult()); + Assert.assertEquals(28, results.getTotalResult()); } @Test @@ -1213,12 +1211,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(25, results.getTotalResult()); + Assert.assertEquals(28, results.getTotalResult()); } @Test @@ -1226,12 +1224,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(30, results.getTotalResult()); + Assert.assertEquals(33, results.getTotalResult()); } @Test @@ -1239,12 +1237,12 @@ // FIXME echatellier 20120125 should work assumeTrueSearchEngineCanRunTest(); - // + 18 in init db + // + 21 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(30, results.getTotalResult()); + Assert.assertEquals(33, results.getTotalResult()); } @Test @@ -1312,18 +1310,18 @@ @Test public void testQueryMakerTrue() { - // 18 in init db + // 21 in init db WikittyQuery query = new WikittyQueryMaker().rTrue().end(); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); - Assert.assertEquals(18, results.getTotalResult()); + Assert.assertEquals(21, results.getTotalResult()); } @Test public void testQueryParseTrue() { - // 18 in init db + // 21 in init db WikittyQuery query = WikittyQueryParser.parse("TRUE"); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); - Assert.assertEquals(18, results.getTotalResult()); + Assert.assertEquals(21, results.getTotalResult()); } @Test @@ -1371,10 +1369,10 @@ @Test public void testQueryMakerNot() { - // 18 in db (4 products) + // 21 in db (4 products) WikittyQuery query = new WikittyQueryMaker().not().exteq(Product.EXT_PRODUCT).end(); WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query); - Assert.assertEquals(14, results.getTotalResult()); + Assert.assertEquals(17, results.getTotalResult()); } /** @@ -2093,7 +2091,7 @@ .keyword("*a*").end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); System.out.println(result.getAll()); - Assert.assertEquals(3, result.getTotalResult()); + Assert.assertEquals(2, result.getTotalResult()); } }
participants (1)
-
echatellier＠users.nuiton.org