[Wikitty-commits] r1341 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/addons wikitty-api/src/test/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-api/src/test/java/org/nuiton/wikitty/test wikitty-api/src/test/xmi wikitty-generators/src/main/java/org/nuiton/wikitty/generator

Author: echatellier Date: 2012-01-19 17:10:34 +0100 (Thu, 19 Jan 2012) New Revision: 1341 Url: http://nuiton.org/repositories/revision/wikitty/1341 Log: Update tests Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CatalogNodeImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ProductImpl.java Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java trunk/wikitty-api/src/test/xmi/multiinheritance.zargo trunk/wikitty-api/src/test/xmi/wikittytest.zargo trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2012-01-19 16:09:43 UTC (rev 1340) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -233,6 +233,7 @@ String jobId = UUID.randomUUID().toString(); File file = new File(exportDirectory, jobId); + file.getParentFile().mkdirs(); String url = exportPublicURL + jobId; Writer result = new FileWriter(file); ExportQueryTask task = new ExportQueryTask(client, format, query, result); @@ -286,6 +287,7 @@ String jobId = UUID.randomUUID().toString(); File file = new File(exportDirectory, jobId); + file.getParentFile().mkdirs(); String url = exportPublicURL + jobId; Writer result = new FileWriter(file); ExportTask task = new ExportTask(client.getSecurityToken(), 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-19 16:09:43 UTC (rev 1340) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -25,23 +25,30 @@ package org.nuiton.wikitty; -import java.util.ArrayList; -import java.util.List; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Locale; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.addons.WikittyImportExportService; +import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryParser; +import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.services.WikittyServiceInMemory; -import org.nuiton.wikitty.test.Pegasus; -import org.nuiton.wikitty.test.PegasusImpl; +import org.nuiton.wikitty.test.CatalogNode; +import org.nuiton.wikitty.test.CatalogNodeImpl; +import org.nuiton.wikitty.test.Category; +import org.nuiton.wikitty.test.CategoryImpl; +import org.nuiton.wikitty.test.Product; +import org.nuiton.wikitty.test.ProductImpl; /** * Wikitty client test to test for client use. @@ -61,6 +68,8 @@ protected WikittyClient wikittyClient; + protected static DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); + /** * Init {@link ApplicationConfig} class. */ @@ -85,9 +94,10 @@ /** * Clear all data and add some test data for all tests. + * @throws ParseException */ @Before - public void setUpTestData() { + public void setUpTestData() throws ParseException { wikittyClient = getWikittyClient(); wikittyClient.clear(); addTestDataInClient(wikittyClient); @@ -96,26 +106,71 @@ /** * Add some wikitty in client. * + * In test case, product are books. + * * @param wikittyClient wikitty client + * @throws ParseException */ - protected void addTestDataInClient(WikittyClient wikittyClient) { - // some tree nodes - WikittyTreeNode rootNode = new WikittyTreeNodeImpl(); - rootNode.setName("rootnode"); - WikittyTreeNode subNode = new WikittyTreeNodeImpl(); - subNode.setName("subnode"); + protected void addTestDataInClient(WikittyClient wikittyClient) throws ParseException { - List<WikittyTreeNode> allNodes = new ArrayList<WikittyTreeNode>(); - allNodes.add(rootNode); - allNodes.add(subNode); - wikittyClient.store(allNodes); + // Categories + Category sf = new CategoryImpl("science fiction"); + Category society = new CategoryImpl("société"); + Category fantastic = new CategoryImpl("fantastique"); + Category fantaisie = new CategoryImpl("heroique/fantaisie"); + wikittyClient.store(sf, society, fantastic, fantaisie); - // Pegasus (multiple inheritance) - Pegasus pegasus = new PegasusImpl(); - pegasus.setFly(2); - pegasus.setColor("black"); - pegasus.setColorFromBird("white"); - wikittyClient.store(pegasus); + // Product (multiple inheritance) + Product book42 = new ProductImpl("Answer to life the universe and everything"); + book42.setPrice(4200); + book42.setPicturePrice(420); + book42.setPriceFromProduct(42); + book42.addColors("white", "black"); + book42.setDate(df.parse("December 25, 1983")); + book42.setCategory(sf.getWikittyId()); + + Product bookIndignez = new ProductImpl("Indignez-vous !"); + bookIndignez.setPrice(1); + bookIndignez.setPicturePrice(2); + bookIndignez.setPriceFromProduct(15); + bookIndignez.setCategory(sf.getWikittyId()); + bookIndignez.addColors("white"); + bookIndignez.setDate(df.parse("April 12, 2011")); + bookIndignez.setCategory(society.getWikittyId()); + + Product bookLotr = new ProductImpl("Le seigneur des anneaux"); + bookLotr.setPrice(11); + bookLotr.setPicturePrice(12); + bookLotr.setPriceFromProduct(100); + bookLotr.setCategory(sf.getWikittyId()); + bookLotr.setDate(df.parse("July 9, 1953")); + bookLotr.addColors("red", "blue"); + + Product bookLan = new ProductImpl("Lanfeust"); + bookLan.setPrice(0); + bookLan.setPicturePrice(5); + bookLan.setPriceFromProduct(14); + bookLan.setCategory(fantastic.getWikittyId()); + bookLan.addColors("red", "yellow"); + bookLan.setDate(df.parse("January 12, 2002")); + wikittyClient.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()); + wikittyClient.store(rootNode, livreNode, bdNode, newsNode, romanNode, otherNode); } /** @@ -124,22 +179,72 @@ @Test public void testFindByQueryMaker() { WikittyQuery query = new WikittyQueryMaker().and() - .eq(Pegasus.ELEMENT_FIELD_HORSE_COLOR, "black") - .eq(Pegasus.ELEMENT_FIELD_BIRD_COLOR, "white") + .like(Product.ELEMENT_FIELD_PRODUCT_NAME, "*universe*") .end(); - Pegasus pegasus = wikittyClient.findByQuery(Pegasus.class, query); - Assert.assertEquals("[Pegasus]black/white", pegasus.getReference()); + Product product = wikittyClient.findByQuery(Product.class, query); + Assert.assertEquals(4662, product.totalPrice()); } /** + * Test a query with query maker without result. + */ + @Test + public void testFindByQueryMakerNoneFound() { + WikittyQuery query = new WikittyQueryMaker().and() + .like(Element.ALL_FIELD, "toto") + .end(); + + Product product = wikittyClient.findByQuery(Product.class, query); + Assert.assertNull(product); + } + + /** + * Test a query with query maker multiple. + */ + @Test + public void testFindByQueryMakerMuliple() { + WikittyQuery query = new WikittyQueryMaker().and() + .like(Element.ALL_FIELD, "*everything*") + .end(); + query.setLimit(0); // just count + + WikittyQueryResult results = wikittyClient.findAllByQuery(query); + Assert.assertEquals(2, results.getTotalResult()); + Assert.assertTrue(results.getAll().isEmpty()); + } + + /** * Test a query with query parser. */ @Test public void testFindQueryParser() { WikittyQuery query = WikittyQueryParser.parse( - "Horse.color=black Bird.color=white"); - Pegasus pegasus = wikittyClient.findByQuery(Pegasus.class, query); - Assert.assertEquals(2, pegasus.getFly()); + "ProductPicture.price=420"); + Product product = wikittyClient.findByQuery(Product.class, query); + Assert.assertEquals(420, product.getPicturePrice()); } + + /** + * Test a query with query parser multiples. + */ + @Test + public void testFindQueryParserMuliple() { + WikittyQuery query = WikittyQueryParser.parse( + "Product.price=[0 TO 99] Product.colors!=red"); + WikittyQueryResult<String> product = wikittyClient.findAllByQuery(query); + Assert.assertEquals(2, product.getTotalResult()); + } + + /** + * Test le resultat attendu d'un export XML. + */ + @Test + public void testExport() { + WikittyImportExportService ieService = new WikittyImportExportService(wikittyClient); + WikittyQuery query = new WikittyQueryMaker().eq(Element.EXTENSION, WikittyTreeNode.EXT_WIKITTYTREENODE).end(); + String xmlExport = ieService.syncExportAllByQuery(FORMAT.XML, query); + System.out.println(xmlExport); + + } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2012-01-19 16:09:43 UTC (rev 1340) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -29,16 +29,17 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.test.CategoryEntity; -import org.nuiton.wikitty.test.CategoryEntityImpl; +import org.nuiton.wikitty.test.Category; +import org.nuiton.wikitty.test.CategoryImpl; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.test.ProductEntity; -import org.nuiton.wikitty.test.ProductEntityImpl; +import org.nuiton.wikitty.test.Product; +import org.nuiton.wikitty.test.ProductImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -83,7 +84,7 @@ // CREATE EXTENSIONS NEEDED FOR TESTS // /////////////////////////////////////////////////////////////////////// - //Create product extension + /*//Create product extension WikittyExtension product = ExtensionFactory.create(EXT_PRODUCT, VERSION) .addField(PRODUCT_PRICE, WikittyTypes.NUMERIC) .addField(PRODUCT_NAME, WikittyTypes.STRING) @@ -96,14 +97,14 @@ WikittyExtension category = ExtensionFactory.create(EXT_CATEGORY, VERSION) .addField(CATEGORY_NAME, WikittyTypes.STRING) .extension(); - proxy.storeExtension(category); + proxy.storeExtension(category);*/ /////////////////////////////////////////////////////////////////////// // CREATE CATEGORIES // /////////////////////////////////////////////////////////////////////// //Create wikitty category named "Hardware" - Wikitty category1 = new WikittyImpl(); + /*Wikitty category1 = new WikittyImpl(); category1.addExtension(category); category1.setField(EXT_CATEGORY, CATEGORY_NAME, "HardWare"); proxy.store(category1); @@ -123,81 +124,81 @@ product1.addExtension(product); product1.setField(EXT_PRODUCT, PRODUCT_NAME, "Paint"); product1.setField(EXT_PRODUCT, PRODUCT_PRICE, 20); - product1.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category1.getId()); + product1.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category1.getId());*/ Set<String> colors1 = new HashSet<String>(); colors1.add("Blue"); colors1.add("Black"); - product1.setField(EXT_PRODUCT, PRODUCT_COLOR, colors1); - proxy.store(product1); + /*product1.setField(EXT_PRODUCT, PRODUCT_COLOR, colors1); + proxy.store(product1);*/ //Create product named Screwdriver, price is 3, category is category2 - Wikitty product2 = new WikittyImpl(); + /*Wikitty product2 = new WikittyImpl(); product2.addExtension(product); product2.setField(EXT_PRODUCT, PRODUCT_NAME, "Screwdriver"); product2.setField(EXT_PRODUCT, PRODUCT_PRICE, 3); - product2.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId()); + product2.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId());*/ Set<String> colors2 = new HashSet<String>(); colors2.add("Red"); colors2.add("Black"); - product2.setField(EXT_PRODUCT, PRODUCT_COLOR, colors2); - proxy.store(product2); + /*product2.setField(EXT_PRODUCT, PRODUCT_COLOR, colors2); + proxy.store(product2);*/ //Create product named Paint Blue, price is 22, category is category2 - Wikitty product3 = new WikittyImpl(); + /*Wikitty product3 = new WikittyImpl(); product3.addExtension(product); product3.setField(EXT_PRODUCT, PRODUCT_NAME, "Paint Blue"); product3.setField(EXT_PRODUCT, PRODUCT_PRICE, 22); - product3.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId()); + product3.setField(EXT_PRODUCT, PRODUCT_CATEGORY, category2.getId());*/ Set<String> colors3 = new HashSet<String>(); colors3.add("Blue"); - product3.setField(EXT_PRODUCT, PRODUCT_COLOR, colors3); - proxy.store(product3); + /*product3.setField(EXT_PRODUCT, PRODUCT_COLOR, colors3); + proxy.store(product3);*/ - W_ID = product3.getId(); + /*W_ID = product3.getId();*/ /////////////////////////////////////////////////////////////////////// // CREATE CATEGORIES ENTITIES // /////////////////////////////////////////////////////////////////////// //Create wikitty category named "Hardware" - CategoryEntity categoryEntity1 = new CategoryEntityImpl(); - categoryEntity1.setName("HardWare"); - proxy.store(categoryEntity1); + Category Category1 = new CategoryImpl(); + Category1.setName("HardWare"); + proxy.store(Category1); //Create wikitty category named "Wrong category" - CategoryEntity categoryEntity2 = new CategoryEntityImpl(); - categoryEntity2.setName("Wrong category"); - proxy.store(categoryEntity2); + Category Category2 = new CategoryImpl(); + Category2.setName("Wrong category"); + proxy.store(Category2); /////////////////////////////////////////////////////////////////////// // CREATE PRODUCTS ENTITIES // /////////////////////////////////////////////////////////////////////// //Create product named Paint, price is 20 category is category1 - ProductEntity productEntity1 = new ProductEntityImpl(); - productEntity1.setName("Paint"); - productEntity1.setPrice(20); - productEntity1.setCategoryEntity(categoryEntity1.getWikittyId()); - productEntity1.setColors(colors1); - proxy.store(productEntity1); + Product Product1 = new ProductImpl(); + Product1.setName("Paint"); + Product1.setPriceFromProduct(20); + Product1.setCategory(Category1.getWikittyId()); + Product1.setColors(colors1); + proxy.store(Product1); //Create product named Screwdriver, price is 3, category is category2 - ProductEntity productEntity2 = new ProductEntityImpl(); - productEntity2.setName("Screwdriver"); - productEntity2.setPrice(3); - productEntity2.setCategoryEntity(categoryEntity2.getWikittyId()); - productEntity2.setColors(colors2); - proxy.store(productEntity2); + Product Product2 = new ProductImpl(); + Product2.setName("Screwdriver"); + Product2.setPriceFromProduct(3); + Product2.setCategory(Category2.getWikittyId()); + Product2.setColors(colors2); + proxy.store(Product2); //Create product named Paint Blue, price is 22, category is category2 - ProductEntity productEntity3 = new ProductEntityImpl(); - productEntity3.setName("Paint Blue"); - productEntity3.setPrice(22); - productEntity3.setCategoryEntity(categoryEntity2.getWikittyId()); - productEntity3.setColors(colors3); - proxy.store(productEntity3); + Product Product3 = new ProductImpl(); + Product3.setName("Paint Blue"); + Product3.setPriceFromProduct(22); + Product3.setCategory(Category2.getWikittyId()); + Product3.setColors(colors3); + proxy.store(Product3); - W_ENTITY_ID = productEntity3.getWikittyId(); + W_ENTITY_ID = Product3.getWikittyId(); } @@ -264,47 +265,47 @@ @Test public void testEntitiesEq() throws Exception { - Search query = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + Search query = Search.query().eq(Product.FQ_FIELD_PRODUCT_PRICE, "3"); Criteria eqCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, eqCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, eqCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); //Test using pattern matching - Search query2 = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + Search query2 = Search.query().eq(Product.FQ_FIELD_PRODUCT_NAME, "*dri*"); Criteria eqCriteria2 = query2.criteria(); - PagedResult<ProductEntity> results2 = proxy.findAllByCriteria(ProductEntity.class, eqCriteria2); + PagedResult<Product> results2 = proxy.findAllByCriteria(Product.class, eqCriteria2); assertPagedResultSizeEquals(1, results2); - ProductEntity resultW2 = results.getFirst(); + Product resultW2 = results.getFirst(); Assert.assertEquals("Screwdriver", resultW2.getName()); - Assert.assertEquals(3, resultW2.getPrice()); + Assert.assertEquals(3, resultW2.getPriceFromProduct()); //Test using pattern matching - Search query3 = Search.query().eq(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri?er"); + Search query3 = Search.query().eq(Product.FQ_FIELD_PRODUCT_NAME, "*dri?er"); Criteria eqCriteria3 = query3.criteria(); - PagedResult<ProductEntity> results3 = proxy.findAllByCriteria(ProductEntity.class, eqCriteria3); + PagedResult<Product> results3 = proxy.findAllByCriteria(Product.class, eqCriteria3); assertPagedResultSizeEquals(1, results3); - ProductEntity resultW3 = results.getFirst(); + Product resultW3 = results.getFirst(); Assert.assertEquals("Screwdriver", resultW3.getName()); - Assert.assertEquals(3, resultW3.getPrice()); + Assert.assertEquals(3, resultW3.getPriceFromProduct()); } @Test @@ -321,11 +322,11 @@ @Test public void testEntitiesNeq() throws Exception { - Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).neq(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + Search query = Search.query().exteq(Product.EXT_PRODUCT).neq(Product.FQ_FIELD_PRODUCT_PRICE, "3"); Criteria neqCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, neqCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, neqCriteria); assertPagedResultSizeEquals(2, results); @@ -353,18 +354,18 @@ @Test public void testEntitiesBw() throws Exception { - Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3", "5"); + Search query = Search.query().bw(Product.FQ_FIELD_PRODUCT_PRICE, "3", "5"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); } @Test @@ -390,18 +391,18 @@ @Test public void testEntitiesLt() throws Exception { - Search query = Search.query().lt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + Search query = Search.query().lt(Product.FQ_FIELD_PRODUCT_PRICE, "20"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); } @@ -420,11 +421,11 @@ @Test public void testEntitiesLe() throws Exception { - Search query = Search.query().le(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + Search query = Search.query().le(Product.FQ_FIELD_PRODUCT_PRICE, "20"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(2, results); } @@ -452,18 +453,18 @@ @Test public void testEntitiesGt() throws Exception { - Search query = Search.query().gt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + Search query = Search.query().gt(Product.FQ_FIELD_PRODUCT_PRICE, "20"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Paint Blue", resultW.getName()); - Assert.assertEquals(22, resultW.getPrice()); + Assert.assertEquals(22, resultW.getPriceFromProduct()); } @@ -483,11 +484,11 @@ @Test public void testEntitiesGe() throws Exception { - Search query = Search.query().ge(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + Search query = Search.query().ge(Product.FQ_FIELD_PRODUCT_PRICE, "20"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(2, results); @@ -518,18 +519,18 @@ @Test public void testEntitiesContains() throws Exception { - Search query = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "3"); + Search query = Search.query().contains(Product.FQ_FIELD_PRODUCT_PRICE, "3"); Criteria inCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, inCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, inCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); //TODO JC-07-04-2011 do a test with multi-valued field @@ -557,18 +558,18 @@ @Test public void testEntitiesIn() throws Exception { - Search query = Search.query().in(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "1", "2", "3", "4", "5"); + Search query = Search.query().in(Product.FQ_FIELD_PRODUCT_PRICE, "1", "2", "3", "4", "5"); Criteria inCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, inCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, inCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); } @Test @@ -584,11 +585,11 @@ @Test public void testEntitiesExteq() throws Exception { - Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + Search query = Search.query().exteq(Product.EXT_PRODUCT); Criteria exteqCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, exteqCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, exteqCriteria); assertPagedResultSizeEquals(3, results); } @@ -630,14 +631,14 @@ Criteria ideqCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, ideqCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, ideqCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Paint Blue", resultW.getName()); - Assert.assertEquals(22, resultW.getPrice()); + Assert.assertEquals(22, resultW.getPriceFromProduct()); } @@ -660,7 +661,7 @@ Criteria idneqCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, idneqCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, idneqCriteria); assertPagedResultSizeEquals(2, results); } @@ -686,11 +687,11 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); - Search query = Search.query().unlike(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + Search query = Search.query().unlike(Product.FQ_FIELD_PRODUCT_NAME, "*dri*"); Criteria likeCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, likeCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, likeCriteria); assertPagedResultSizeEquals(2, results); } @@ -716,11 +717,11 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); - Search query = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*dri*"); + Search query = Search.query().like(Product.FQ_FIELD_PRODUCT_NAME, "*dri*"); Criteria likeCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, likeCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, likeCriteria); assertPagedResultSizeEquals(1, results); } @@ -746,18 +747,18 @@ @Test public void testEntitiesSw() throws Exception { - Search query = Search.query().sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Scre"); + Search query = Search.query().sw(Product.FQ_FIELD_PRODUCT_NAME, "Scre"); Criteria swCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, swCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, swCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); } @@ -776,11 +777,11 @@ @Test public void testEntitiesNsw() throws Exception { - Search query = Search.query().nsw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Scre"); + Search query = Search.query().nsw(Product.FQ_FIELD_PRODUCT_NAME, "Scre"); Criteria nswCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, nswCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, nswCriteria); assertPagedResultSizeEquals(2, results); } @@ -808,18 +809,18 @@ @Test public void testEntitiesEw() throws Exception { - Search query = Search.query().ew(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "ver"); + Search query = Search.query().ew(Product.FQ_FIELD_PRODUCT_NAME, "ver"); Criteria ewCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, ewCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, ewCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Screwdriver", resultW.getName()); - Assert.assertEquals(3, resultW.getPrice()); + Assert.assertEquals(3, resultW.getPriceFromProduct()); } @@ -839,11 +840,11 @@ @Test public void testEntitiesNotew() throws Exception { - Search query = Search.query().notew(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "ver"); + Search query = Search.query().notew(Product.FQ_FIELD_PRODUCT_NAME, "ver"); Criteria notewCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, notewCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, notewCriteria); assertPagedResultSizeEquals(2, results); @@ -865,11 +866,11 @@ @Test public void testEntitiesKeyword() throws Exception { - Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).keyword("Paint"); + Search query = Search.query().exteq(Product.EXT_PRODUCT).keyword("Paint"); Criteria keywordCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, keywordCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, keywordCriteria); assertPagedResultSizeEquals(2, results); @@ -891,11 +892,11 @@ @Test public void testEntitiesIsNull() throws Exception { - Search query = Search.query().isNull(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + Search query = Search.query().isNull(Product.FQ_FIELD_PRODUCT_NAME); Criteria isNull = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, isNull); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, isNull); assertPagedResultSizeEquals(0, results); @@ -917,11 +918,11 @@ @Test public void testEntitiesIsNotNull() throws Exception { - Search query = Search.query().isNotNull(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + Search query = Search.query().isNotNull(Product.FQ_FIELD_PRODUCT_NAME); Criteria isNotNull = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, isNotNull); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, isNotNull); assertPagedResultSizeEquals(3, results); @@ -947,7 +948,7 @@ Criteria rFalse = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, rFalse); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, rFalse); assertPagedResultSizeEquals(0, results); @@ -969,11 +970,11 @@ @Test public void testEntitiesTrue() throws Exception { - Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY).rTrue(); + Search query = Search.query().exteq(Product.EXT_PRODUCT).rTrue(); Criteria rTrue = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, rTrue); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, rTrue); assertPagedResultSizeEquals(3, results); @@ -996,12 +997,12 @@ @Test public void testEntitiesAnd() throws Exception { - Search query = Search.query().and().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") - .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + Search query = Search.query().and().bw(Product.FQ_FIELD_PRODUCT_PRICE, "15", "25") + .sw(Product.FQ_FIELD_PRODUCT_NAME, "Paint"); Criteria andCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, andCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, andCriteria); assertPagedResultSizeEquals(2, results); @@ -1027,11 +1028,11 @@ Search query = Search.query(); - query.or().gt(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20").sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Screw"); + query.or().gt(Product.FQ_FIELD_PRODUCT_PRICE, "20").sw(Product.FQ_FIELD_PRODUCT_NAME, "Screw"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(2, results); @@ -1056,11 +1057,11 @@ Search query = Search.query(); - query.exteq(ProductEntity.EXT_PRODUCTENTITY).not().ge(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "20"); + query.exteq(Product.EXT_PRODUCT).not().ge(Product.FQ_FIELD_PRODUCT_PRICE, "20"); Criteria bwCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, bwCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, bwCriteria); assertPagedResultSizeEquals(1, results); } @@ -1110,29 +1111,29 @@ * and with an associated category which name is 'Hardware' */ - Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") - .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint").associated(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY) - .eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare"); + Search query = Search.query().bw(Product.FQ_FIELD_PRODUCT_PRICE, "15", "25") + .sw(Product.FQ_FIELD_PRODUCT_NAME, "Paint").associated(Product.FQ_FIELD_PRODUCT_CATEGORY) + .eq(Category.FQ_FIELD_CATEGORY_NAME, "HardWare"); Criteria associatedCriteria = query.criteria(); - PagedResult<ProductEntity> results = proxy.findAllByCriteria(ProductEntity.class, associatedCriteria); + PagedResult<Product> results = proxy.findAllByCriteria(Product.class, associatedCriteria); assertPagedResultSizeEquals(1, results); - ProductEntity resultW = results.getFirst(); + Product resultW = results.getFirst(); Assert.assertEquals("Paint", resultW.getName()); - Assert.assertEquals(20, resultW.getPrice()); + Assert.assertEquals(20, resultW.getPriceFromProduct()); //Test with an associated search that returns nothing - query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") - .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint").associated(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY) - .eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "don't return anything"); + query = Search.query().bw(Product.FQ_FIELD_PRODUCT_PRICE, "15", "25") + .sw(Product.FQ_FIELD_PRODUCT_NAME, "Paint").associated(Product.FQ_FIELD_PRODUCT_CATEGORY) + .eq(Category.FQ_FIELD_CATEGORY_NAME, "don't return anything"); associatedCriteria = query.criteria(); - results = proxy.findAllByCriteria(ProductEntity.class, associatedCriteria); + results = proxy.findAllByCriteria(Product.class, associatedCriteria); assertPagedResultSizeEquals(0, results); } @@ -1180,23 +1181,23 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); { - Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().eq(Category.FQ_FIELD_CATEGORY_NAME, "HardWare").criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().eq("*.name", "HardWare").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().eq(Category.FQ_FIELD_CATEGORY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } } @@ -1244,23 +1245,23 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); { - Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS, "Red").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + Criteria criteria = Search.query().contains(Product.FQ_FIELD_PRODUCT_COLORS, "Red").criteria(); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().contains("*.colors", "Red").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + Criteria criteria = Search.query().contains(Product.FQ_FIELD_PRODUCT_COLORS + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } } @@ -1308,23 +1309,23 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); { - Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "*Blue").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + Criteria criteria = Search.query().like(Product.FQ_FIELD_PRODUCT_NAME, "*Blue").criteria(); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().like("*.name", "*Blue").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + Criteria criteria = Search.query().like(Product.FQ_FIELD_PRODUCT_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); - PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); + PagedResult<Product> pagedResult = proxy.findAllByCriteria(Product.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } } @@ -1370,33 +1371,33 @@ // FIXME implement it in memory assumeNotYetImplementedInMemory(); { - Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().eq(Category.FQ_FIELD_CATEGORY_NAME, "HardWare").criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware").criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().eq(Category.FQ_FIELD_CATEGORY_NAME, "hardware").criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(0, pagedResult); } { - Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare", Like.SearchAs.ToLowerCase).criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().like(Category.FQ_FIELD_CATEGORY_NAME, "HardWare", Like.SearchAs.ToLowerCase).criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware", Like.SearchAs.ToLowerCase).criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().like(Category.FQ_FIELD_CATEGORY_NAME, "hardware", Like.SearchAs.ToLowerCase).criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "HardWare", Like.SearchAs.AsText).criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().like(Category.FQ_FIELD_CATEGORY_NAME, "HardWare", Like.SearchAs.AsText).criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME, "hardware", Like.SearchAs.AsText).criteria(); - PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); + Criteria criteria = Search.query().like(Category.FQ_FIELD_CATEGORY_NAME, "hardware", Like.SearchAs.AsText).criteria(); + PagedResult<Category> pagedResult = proxy.findAllByCriteria(Category.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } } @@ -1480,21 +1481,21 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); - Search query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") - .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + Search query = Search.query().bw(Product.FQ_FIELD_PRODUCT_PRICE, "15", "25") + .sw(Product.FQ_FIELD_PRODUCT_NAME, "Paint"); Criteria selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_CATEGORY); - PagedResult<CategoryEntity> results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + PagedResult<Category> results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPagedResultSizeEquals(2, results); //Test with an associated search that returns nothing - query = Search.query().bw(ProductEntity.FQ_FIELD_PRODUCTENTITY_PRICE, "15", "25") - .sw(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME, "Paint"); + query = Search.query().bw(Product.FQ_FIELD_PRODUCT_PRICE, "15", "25") + .sw(Product.FQ_FIELD_PRODUCT_NAME, "Paint"); selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_NAME); - results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPagedResultSizeEquals(0, results); } @@ -1550,41 +1551,41 @@ // FIXME sletellier 20110504 : Not yet implemented inMemorySearchTest, assuming assumeNotYetImplementedInMemory(); - Search query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + Search query = Search.query().exteq(Product.EXT_PRODUCT); Criteria selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_CATEGORY); selectCriteria.setFirstIndex(1); selectCriteria.setEndIndex(1); - PagedResult<CategoryEntity> results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + PagedResult<Category> results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPaginedPagedResultSizeEquals(1, 2, results); - query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + query = Search.query().exteq(Product.EXT_PRODUCT); selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_CATEGORY); selectCriteria.setFirstIndex(0); // No limit selectCriteria.setEndIndex(-1); - results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPaginedPagedResultSizeEquals(2, 2, results); - query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + query = Search.query().exteq(Product.EXT_PRODUCT); selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_CATEGORY); selectCriteria.setFirstIndex(0); selectCriteria.setEndIndex(0); - results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPaginedPagedResultSizeEquals(1, 2, results); - query = Search.query().exteq(ProductEntity.EXT_PRODUCTENTITY); + query = Search.query().exteq(Product.EXT_PRODUCT); selectCriteria = query.criteria(); - selectCriteria.setSelect(ProductEntity.FQ_FIELD_PRODUCTENTITY_CATEGORYENTITY); + selectCriteria.setSelect(Product.FQ_FIELD_PRODUCT_CATEGORY); selectCriteria.setFirstIndex(0); selectCriteria.setEndIndex(1); - results = proxy.findAllByCriteria(CategoryEntity.class, selectCriteria); + results = proxy.findAllByCriteria(Category.class, selectCriteria); assertPaginedPagedResultSizeEquals(2, 2, results); } Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CatalogNodeImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CatalogNodeImpl.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CatalogNodeImpl.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -0,0 +1,61 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.test; + +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * Catalog node implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CatalogNodeImpl extends CatalogNodeAbstract { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6885467605011821870L; + + public CatalogNodeImpl() { + + } + + public CatalogNodeImpl(String name) { + this(); + setName(name); + } + + public CatalogNodeImpl(Wikitty wikitty) { + super(wikitty); + } + + public CatalogNodeImpl(BusinessEntityImpl businessEntityImpl) { + super(businessEntityImpl.getWikitty()); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CatalogNodeImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -0,0 +1,36 @@ +package org.nuiton.wikitty.test; + +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * Category entity implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CategoryImpl extends CategoryAbstract { + + private static final long serialVersionUID = 7003155914532532322L; + + public CategoryImpl() { + + } + + public CategoryImpl(String name) { + this(); + setName(name); + } + + public CategoryImpl(Wikitty wikitty) { + super(wikitty); + } + + public CategoryImpl(BusinessEntityImpl businessEntityImpl) { + super(businessEntityImpl.getWikitty()); + } + +} //CategoryEntityImpl Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java 2012-01-19 16:09:43 UTC (rev 1340) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -1,61 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.test; - -import org.nuiton.wikitty.entities.BusinessEntityImpl; -import org.nuiton.wikitty.entities.Wikitty; - -/** - * TODO add comment here. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class PegasusImpl extends PegasusAbstract { - - public PegasusImpl() { - super(); - } - - public PegasusImpl(Wikitty wikitty) { - super(wikitty); - } - - public PegasusImpl(BusinessEntityImpl businessEntityImpl) { - super(businessEntityImpl.getWikitty()); - } - - /* - * @see org.nuiton.wikitty.test.Pegasus#getReference() - */ - @Override - public String getReference() { - return "[Pegasus]" + getColor() + "/" + getColorFromBird(); - } -} Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ProductImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ProductImpl.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ProductImpl.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -0,0 +1,83 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.test; + +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * Product entity implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ProductImpl extends ProductAbstract { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3876446488053147070L; + + /** + * Empty constructor. + */ + public ProductImpl() { + + } + + /** + * Constructor with name. + * + * @param name name + */ + public ProductImpl(String name) { + this(); + setName(name); + } + + /** + * @param businessEntityImpl + */ + public ProductImpl(BusinessEntityImpl businessEntityImpl) { + super(businessEntityImpl); + } + + /** + * @param wikitty + */ + public ProductImpl(Wikitty wikitty) { + super(wikitty); + } + + /* + * @see org.nuiton.wikitty.test.ProductEntity#totalPrice() + */ + @Override + public int totalPrice() { + return getPrice() + getPicturePrice() + getPriceFromProduct(); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ProductImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/test/xmi/multiinheritance.zargo =================================================================== (Binary files differ) Modified: trunk/wikitty-api/src/test/xmi/wikittytest.zargo =================================================================== (Binary files differ) Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-19 16:09:43 UTC (rev 1340) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-19 16:10:34 UTC (rev 1341) @@ -44,7 +44,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; /*{generator option: writeString = }*/ @@ -328,7 +327,15 @@ attributeName = attribute.getName(); } - addOperationWithName(businessEntity, abstractClass, attribute, attributeName, helperClassName, attributeName); + // le nom du getter peut avoir été renommé pour toute la hierarchie + String helperGetterSetterName; + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + helperGetterSetterName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } else { + helperGetterSetterName = attribute.getName(); + } + + addOperationWithName(businessEntity, abstractClass, attribute, attributeName, helperClassName, helperGetterSetterName); } } }