January 2012 - Wikitty-commits - mailman.cloud.codelutin.com

r1389 - in trunk: wikitty-api/src/test/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 30 Jan '12

30 Jan '12

Author: echatellier Date: 2012-01-30 12:23:24 +0100 (Mon, 30 Jan 2012) New Revision: 1389 Url: http://nuiton.org/repositories/revision/wikitty/1389 Log: En test refactoring (remove all useless conform test classes) Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 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:55:42 UTC (rev 1388) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-30 11:23:24 UTC (rev 1389) @@ -2263,8 +2263,7 @@ WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null); - int val = treeNodeResult.getAttCount(); - Assert.assertEquals(9, val); + Assert.assertEquals(9, treeNodeResult.getAttCount()); WikittyQueryResultTreeNode<String> children = wikittyClient.findAllIdTreeNode(bookNode.getWikittyId(), 1, true, null); @@ -2285,7 +2284,7 @@ public void testSearchEngineCountAttachmentFiltered() { WikittyQuery query = new WikittyQueryMaker().and() - .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .exteq(CatalogNode.EXT_CATALOGNODE) .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Catalog").end(); CatalogNode catalogNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); @@ -2294,8 +2293,100 @@ WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, filter); - int val = treeNodeResult.getAttCount(); // parmis les 9 du test precedent, seulement 1 dans la category society - Assert.assertEquals(1, val); + Assert.assertEquals(1, treeNodeResult.getAttCount()); } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. + */ + @Test + public void testSearchEngineCountAttachmentAfterDeletion() { + + // delete Lanfeust book, attached to tree + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(Product.EXT_PRODUCT) + .eq(Product.FIELD_PRODUCT_NAME, "Lanfeust").end(); + String bookId = wikittyClient.findByQuery(query); + wikittyClient.delete(bookId); + + query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Catalog").end(); + 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 + } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. + * + * @throws IOException + */ + @Test + public void testSearchEngineCountAttachmentMultipleSameNode() throws IOException { + importBooks(); + + // delete Lanfeust book, attached to tree + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Action").end(); + CatalogNode actionNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + + query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Everything else").end(); + CatalogNode eeNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + + // 4 attachement en plus, mais sur seulement 2 livres + actionNode.addAttachment("db9dc782-e650-4fd4-83ac-3c1c5c136cde"); + actionNode.addAttachment("584adc1e-726d-4348-9a57-77153d245b34"); + eeNode.addAttachment("db9dc782-e650-4fd4-83ac-3c1c5c136cde"); + eeNode.addAttachment("584adc1e-726d-4348-9a57-77153d245b34"); + + + query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Catalog").end(); + 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 + } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. + * + * @throws IOException + */ + @Test + public void testSearchEngineCountAttachmentNodeMove() throws IOException { + + // delete Lanfeust book, attached to tree + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Action").end(); + CatalogNode actionNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + + query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Everything else").end(); + CatalogNode eeNode = wikittyClient.findAllByQuery(CatalogNode.class, query).peek(); + + // move action node + actionNode.setParent(eeNode.getWikittyId()); + wikittyClient.store(actionNode); + + query = new WikittyQueryMaker().and() + .exteq(CatalogNode.EXT_CATALOGNODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "Media").end(); + 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 + + treeNodeResult = wikittyClient.findAllIdTreeNode(eeNode.getWikittyId(), 0, true, null); + Assert.assertEquals(2, treeNodeResult.getAttCount()); // 0 before move + } } Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2012-01-30 10:55:42 UTC (rev 1388) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2012-01-30 11:23:24 UTC (rev 1389) @@ -1,204 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * 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.conform; - -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map.Entry; - -import junit.framework.Assert; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; -import org.nuiton.wikitty.WikittyUtil; - -public abstract class AbstractTestConformance { - - public static final String EXTNAME = "wikittyExt"; - public static final String EXTREQUIRED = "wikittyRequired"; - public static final String EXTREQUIRES = "wikittyRequires"; - - private final static Log log = LogFactory.getLog(AbstractTestConformance.class); - - public static final WikittyExtension EXT_REQUIRED = - createExtension(EXTREQUIRED, null); - - public static final WikittyExtension EXT_REQUIRES = - createExtension(EXTREQUIRES, EXTREQUIRED); - - public static final WikittyExtension EXT_TEST = - createExtension(EXTNAME, null, - createType(WikittyTypes.STRING, 0, 1), - createType(WikittyTypes.NUMERIC, 1, 1), - createType(WikittyTypes.DATE, 1, 1) - ); - - private WikittyService ws; - protected WikittyProxy proxy = null; - - abstract public ApplicationConfig getConfig(); - - public WikittyProxy getProxy() { - if (proxy == null) { - proxy = new WikittyProxy(getWikittyService()); - } - return proxy; - } - - public WikittyService getWikittyService() { - if (ws == null) { - ws = WikittyServiceFactory.buildWikittyService(getConfig()); - } - return ws; - } - - public void setWikittyService(WikittyService wikittyService) { - this.ws = wikittyService; - } - - - protected static FieldType createType( WikittyTypes type, int lower, int upper ) { - FieldType fieldType = new FieldType(type, lower, upper); - return fieldType; - } - - protected static Wikitty createBasicWikitty() { - return createWikitty( EXT_TEST ); - } - - protected static Wikitty createWikitty( WikittyExtension... extensions ) { - Wikitty w = new WikittyImpl(); - for ( WikittyExtension ext : extensions ) { - w.addExtension( ext ); - } - return w; - } - - protected static WikittyExtension createExtension(String extName, String requires, - FieldType... types) { - LinkedHashMap<String, FieldType> fieldsMap = new LinkedHashMap<String, FieldType>(); - for ( int i = 0; i < types.length; i++ ) { - fieldsMap.put( "fieldName" + i, types[i] ); - } - return new WikittyExtension(extName, "1", null, requires, fieldsMap); - } - - public static String format(String dateTestFormat) { - try { - return WikittyUtil.formatDate( - dateTestFormat == null || dateTestFormat.isEmpty() - ? new Date() - : parse(dateTestFormat) - ); - } catch (ParseException e) { - Assert.fail( "Error format date : " + dateTestFormat ); - e.printStackTrace(); - return null; - } - } - - public static Date parse(String dateAsString) { - try { - return WikittyUtil.parseDate(dateAsString); - } catch (ParseException e) { - Assert.fail( "Error parsing date : " + dateAsString ); - e.printStackTrace(); - return null; - } - } - - protected static ArrayList<Wikitty> createSampleWikitty( WikittyService ws ) { - ArrayList<Wikitty> result = new ArrayList<Wikitty>(); - String[] wValues = new String[] { - // wikitty[ 0 ] - "fieldName0 = table," + - "fieldName1 = 003300," + - "fieldName2 = " + format("23/01/1982"), - - // wikitty[ 1 ] - "fieldName0 = chaise," + - "fieldName1 = 113311," + - "fieldName2 = " + format("26/09/2009"), - - // wikitty[ 2 ] - "fieldName0 = bureau," + - "fieldName1 = 223322," + - "fieldName2 = " + format("25/12/2029") - }; - for ( String wValue : wValues ) { - Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); - result.add( w ); - } - ws.store(null, result, false); - return result; - } - - - - public static Wikitty createWikitty( String values, String defaultExtName, WikittyExtension... exts ) { - Wikitty w = new WikittyImpl(); - for (WikittyExtension ext : exts) { - w.addExtension(ext); - } - for( Entry<String, String> keyValuePair : getKeyPairs(values) ) { - String[] s = keyValuePair.getKey().split("\\."); - String fieldName = null, extName = null; - if ( s.length > 1 ) { - fieldName = s[1].trim(); - extName = s[0].trim(); - } - else { - fieldName = s[0].trim(); - extName = defaultExtName; - } - w.setField(extName, fieldName, keyValuePair.getValue()); - } - return w; - } - - protected static Iterable<Entry<String, String>> getKeyPairs(String values) { - LinkedHashMap<String, String> keyPairs = new LinkedHashMap<String, String>(); - for ( String keyValuePair : values.split(",") ) { - String[] l = keyValuePair.split("="); - String key = l[0].trim(); - String value = l.length > 1 ? l[1].trim() : null; - keyPairs.put(key, value); - } - return keyPairs.entrySet(); - } - - -} Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2012-01-30 10:55:42 UTC (rev 1388) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2012-01-30 11:23:24 UTC (rev 1389) @@ -1,53 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * 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.storage.solr; - -import org.junit.Before; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; - -public abstract class AbstractTestSolr { - - protected WikittyProxy proxy = null; - - protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - - protected static WikittyServiceEnhanced ws; - - public WikittyProxy getProxy() { - if (proxy == null) { - proxy = new WikittyProxy(ws); - } - return proxy; - } - - @Before - public void deleteAll() throws Exception { - ws.clear(null); - } - -} Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2012-01-30 10:55:42 UTC (rev 1388) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2012-01-30 11:23:24 UTC (rev 1389) @@ -1,63 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 CodeLutin - * %% - * 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.storage.solr; - -import java.io.File; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfigOption; - -/** - * User: couteau - * Date: 12/04/11 - */ -public class SolrTestHelper { - - static private Log log = LogFactory.getLog(SolrTestHelper.class); - - public static void initTests(ApplicationConfig config) { - // Create tmpdir if not exist - String tmpdir = System.getProperty("java.io.tmpdir"); - File file = new File(tmpdir); - if (!file.exists()) { - file.mkdirs(); - } - - // file where to put wikitty datas - File dataDirectory = new File(tmpdir, "wikitty-data-store"); - if (log.isInfoEnabled()) { - log.info("Will use data directory : " + dataDirectory); - } - - // set data dir configuration - config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.key, - dataDirectory.getAbsolutePath()); - } - - public static void closeTests(WikittyServiceSolr service) { - service.close(); - } -} Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2012-01-30 10:55:42 UTC (rev 1388) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2012-01-30 11:23:24 UTC (rev 1389) @@ -1,580 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * 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.storage.solr; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.nuiton.wikitty.conform.AbstractTestConformance; -import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; -import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; -import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.TreeNodeResult; -import org.nuiton.wikitty.services.WikittyEvent; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; - -/** - * - * @author ruchaud, martel - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class TreeTest extends AbstractTestSolr { - - static private Log log = LogFactory.getLog(TreeTest.class); - - protected WikittyExtension extension; - - @Before - public void onSetUp() throws Exception { - createBasicWikitty(); - createTestData(); - } - - @BeforeClass - public static void initTests() throws Exception { - - SolrTestHelper.initTests(instance); - - ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); - } - - /** - * Create a extension, use to store element in tree - */ - private void createBasicWikitty() { - extension = ExtensionFactory.create("test", "1") - .addField("name", WikittyTypes.STRING) - .extension(); - ws.storeExtension(null, Arrays.asList(extension)); - } - - /** - * Init data with a basic tree - */ - private void createTestData() { - // Create tree as following : - // root - // |_ node 1 - // | |_ node 11 (2) - // | | |_ node 111 (1) - // | |_ node 12 - // | | |_ node 121 (2) - // | |_ node 13 - // |_ node 2 (1) - - createBranch("root/node1/node11/node111"); - createBranch("root/node1/node12/node121"); - createBranch("root/node1/node13"); - createBranch("root/node2"); - - addNode("node11", "value 1"); - addNode("node11", "value 2"); - - addNode("node111", "value 3"); - - addNode("node121", "value 4"); - addNode("node121", "value 5"); - - addNode("node2", "value 6"); - } - - /** - * Create all node contains in path - */ - protected void createBranch(String path) { - String parent = null; - String[] names = path.split("/"); - for (String name : names) { - - Wikitty found = findNode(name); - if(found == null) { - found = createNode(name, parent); - log.debug("[Storing] " + name + " with id " + found.getId()); - ws.store(null, found); - assertNotNull(findNode(name)); - } - parent = found.getId(); - } - } - - /** - * Attach value in node - */ - protected void addNode(String nodeName, String value) { - Wikitty leaf = new WikittyImpl(); - leaf.addExtension(extension); - leaf.setField("test", "name", value); - - log.debug("[Storing] " + value + " with id " + leaf.getId()); - ws.store(null, leaf); - - Wikitty node = findNode(nodeName); - assertNotNull(node); - WikittyTreeNodeHelper.addAttachment(node, leaf.getId()); - ws.store(null, node); - } - - /** - * Find node by name - */ - protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq( - WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); - Wikitty wikitty = getProxy().findByCriteria(criteria); - return wikitty; - } - - /** - * Find value by name - */ - protected Wikitty findValue(String value) { - Criteria criteria = Search.query().eq("test.name", value).criteria(); - Wikitty wikitty = getProxy().findByCriteria(criteria); - return wikitty; - } - - static private class CollectAttachmentVisitor implements TreeNodeResult.Visitor<WikittyTreeNode> { - - protected Set attachment = new HashSet(); - - public Set getAttachment() { - return attachment; - } - - @Override - public boolean visitEnter(TreeNodeResult<WikittyTreeNode> node) { - Collection att = node.getObject().getAttachment(); - if (att != null) { - attachment.addAll(att); - } - return true; - } - - @Override - public boolean visitLeave(TreeNodeResult<WikittyTreeNode> node) { - return true; - } - } - - /** - * Count all element in sub tree, with element in node - */ - protected int sum(Wikitty node) { - // Sum attachment object in node - String nodeId = node.getId(); - TreeNodeResult<WikittyTreeNode> tree = getProxy().findTreeNode( - WikittyTreeNode.class, nodeId, -1, true, null); - CollectAttachmentVisitor visitor = new CollectAttachmentVisitor(); - tree.acceptVisitor(visitor); - - int result=visitor.getAttachment().size(); - return result; - } -// int sum = 0; -// -// // Sum value in node -// Set<String> values = WikittyTreeNodeHelper.getAttachment(node); -// if(values != null) { -// sum = values.size(); -// } -// -// // Sum children node in node -// String nodeId = node.getId(); -// TreeNodeResult<WikittyTreeNode> children = getProxy().findTreeNode( -// nodeId, 1, true, null); -// -// /* -// for (Integer count : children.values()) { -// sum += count; -// } -// */ -// -// for (TreeNodeResult<WikittyTreeNode> e : children.getChildren()) { -// log.debug("*treeNode = " + e.getObject().getName() + " " -// + e.getAttCount() + " -> " + e.getObject().getAttachment()); -// } -// -// for (TreeNodeResult<WikittyTreeNode> treeNodeResult : children) { -// WikittyTreeNode treeNode = treeNodeResult.getObject(); -// Set<String> treeNodeChildren = treeNode.getAttachment(); -// log.debug("+treeNode = " + treeNode.getName() + " " + -// (treeNodeChildren==null?0:treeNodeChildren.size()) + -// " -> " + treeNodeChildren); -//// if (treeNodeChildren == null) { -//// sum += 0; -//// } else { -//// sum += treeNodeChildren.size(); -//// } -// sum += sum(((WikittyTreeNodeImpl)treeNode).getWikitty()); -// } -// -// return sum; -// } - - /** - * Create a Wikitty WikittyTreeNode - * - * @param name - * name of the node - * @param parentId - * id of the parent - * @return - * the wikitty object corresponding to the WikittyTreeNode - */ - protected Wikitty createNode(String name, String parentId) { - // on force l'id pour simplifier le debuggage - WikittyImpl w = new WikittyImpl("id" + name); - WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(w); - node.setName(name); - node.setParent(parentId); - Wikitty nodeWikitty = node.getWikitty(); - return nodeWikitty; - } - - @Test - public void testRestoreTree() throws Exception { - Wikitty root = findNode("root"); - String rootId = root.getId(); - - TreeNodeResult<WikittyTreeNode> tree = - getProxy().findTreeNode(WikittyTreeNode.class, rootId, -1, false, null); - assertNotNull(tree); - } - - @Test - public void testHierarchicalFacet() throws Exception { - Wikitty root = findNode("root"); - int sum = sum(root); - assertEquals(6, sum); - - Wikitty node1 = findNode("node1"); - sum = sum(node1); - assertEquals(5, sum); - - Wikitty node11 = findNode("node11"); - sum = sum(node11); - assertEquals(3, sum); - } - - @Test - public void testRestoreChildren() throws Exception { - Wikitty node1 = findNode("node1"); - String node1Id = node1.getId(); - - TreeNodeResult<WikittyTreeNode> children = getProxy().findTreeNode( - WikittyTreeNode.class, node1Id, 1, false, null); - assertEquals(3, children.getChildCount()); - } - - @Test - public void testFilterRestoreChildren() { - Map<String, Integer> result = new HashMap<String, Integer>(); - result.put("node11", 1); - result.put("node13", 0); - result.put("node12", 0); - - Wikitty node1 = findNode("node1"); - String node1Id = node1.getId(); - - Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - TreeNodeResult<WikittyTreeNode> children = getProxy().findTreeNode( - WikittyTreeNode.class, node1Id, 1, true, filter); - System.out.println(children); - assertEquals(3, children.getChildCount()); - for (TreeNodeResult<WikittyTreeNode> e : children.getChildren()) { - assertEquals(result.get(e.getObject().getName()), Integer.valueOf(e.getAttCount())); - } - } - - @Test - public void testRestoreNode() throws Exception { - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - - TreeNodeResult<WikittyTreeNode> count = getProxy().findTreeNode( - WikittyTreeNode.class, node11Id, 0, true, null); - assertEquals(3, count.getAttCount()); - } - - @Test - public void testFilterRestoreNode() throws Exception { - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - - Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - TreeNodeResult<WikittyTreeNode> count = getProxy().findTreeNode( - WikittyTreeNode.class, node11Id, 0, true, filter); - System.out.println(count); - assertEquals(1, count.getAttCount()); - } - - @Test - public void testNewNode() throws Exception { - // Check that node 2 it has any child - Wikitty node2 = findNode("node2"); - String node2Id = node2.getId(); - TreeNodeResult<WikittyTreeNode> children = getProxy().findTreeNode( - WikittyTreeNode.class, node2Id, 1, true, null); - assertEquals(0, children.getChildCount()); - - // Create a new node, child of node 2 - Wikitty nodeWikitty = createNode("node21", node2Id); - ws.store(null, nodeWikitty); - - // Retrieve it to check - Wikitty found = findNode("node21"); - assertNotNull(found); - - // Check that it was great added as node2 child - children = getProxy().findTreeNode( - WikittyTreeNode.class, node2Id, 1, false, null); - assertEquals(1, children.getChildCount()); - } - - @Test - public void testAddValueInNode() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Create a leaf - Wikitty leaf = AbstractTestConformance.createWikitty("name=totoTheLeaf", "test", extension); - ws.store(null, leaf); - - // Add it in the node2 (now: two values in it) - Wikitty node = findNode("node2"); - assertNotNull(node); - WikittyTreeNodeHelper.addAttachment(node, leaf.getId()); - ws.store(null, node); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit + 1, newSum); - } - - @Test - public void testDeleteNode() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int rootChildInit = sum(root); - - // Remove the node 121 - Wikitty node121 = findNode("node121"); - int node121Init = sum(node121); - String node121Id = node121.getId(); - ws.delete(null, node121Id); - - // node12 must have any child - Wikitty node12 = findNode("node12"); - int sum = sum(node12); - assertEquals(0, sum); - - // check that root node has weel one less children value - int newRootChidlren = sum(root); - assertEquals(rootChildInit - node121Init, newRootChidlren); - - // Remove the node 1 and node 11 simultaneously - Wikitty node1 = findNode("node1"); - int node1Init = sum(node1); - String node1Id = node1.getId(); - - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - ws.delete(null, Arrays.asList(node1Id, node11Id)); - - // check that root node has weel one less children value - newRootChidlren = sum(root); - assertEquals(rootChildInit - node121Init - node1Init, newRootChidlren); - } - - @Test - public void testDeleteChild() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Remove a value on node11 - Wikitty node = findNode("node11"); - - List<String> leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); - node.removeFromField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leafs.get(0)); - - leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); - log.info("leafs after remove = " + leafs); - - ws.store(null, node); - - node = ws.restore(null, node.getId()); - leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); - log.info("leafs after restore = " + leafs); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit - 1, newSum); - } - - /** regression test, for unknown reason the child may not be removed in the index */ - @Test - public void testSimpleDeleteChild() throws Exception { - - WikittyTreeNodeImpl parent = new WikittyTreeNodeImpl(); - ws.store(null, parent.getWikitty()); - - WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); - child.setParent(parent.getWikittyId()); - WikittyEvent event = ws.store(null, child.getWikitty()); - event.update(child.getWikitty()); - - TreeNodeResult<WikittyTreeNode> children = getProxy().findTreeNode( - WikittyTreeNode.class, parent.getWikittyId(), 1, true, null); - - assertEquals(1, children.getChildCount()); - assertEquals(0, children.getChild(child).getAttCount()); - - child.setParent(null); - - ws.store(null, child.getWikitty()); - - children = getProxy().findTreeNode( - WikittyTreeNode.class, parent.getWikittyId(), 1, true, null); - - assertEquals(0, children.getChildCount()); - } - - @Test - public void testDeleteValue() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Remove a value - Wikitty value4 = findValue("value 4"); - String value4Id = value4.getId(); - ws.delete(null, value4Id); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit - 1, newSum); - } - - @Test - public void testMoveNode() throws Exception { - // Get the initial number of values for node 1 - Wikitty node1 = findNode("node1"); - int childSum1 = sum(node1); - - // Get the initial number of values for node 121 - Wikitty node121 = findNode("node121"); - int childSum121 = sum(node121); - - // Get the initial number of values for node 2 - Wikitty node2 = findNode("node2"); - int childSum2 = sum(node2); - - // Move node 1 in mode 2 - WikittyTreeNodeHelper.setParent(node121, node2.getId()); - ws.store(null, node121); - - // now, there is less value node 121 for the node 1 - int newSum1 = sum(node1); - assertEquals(childSum1 - childSum121, newSum1); - - // now, there is more value node 121 for the node 2 - int newSum2 = sum(node2); - assertEquals(childSum2 + childSum121, newSum2); - } - - @Test - public void testValueInMultipleNode() throws Exception { - createBranch("node3/node31"); - createBranch("node3/node32"); - - Wikitty value = AbstractTestConformance.createWikitty("name=value", "test", extension); - ws.store(null, value); - String valueId = value.getId(); - - Wikitty node31 = findNode("node31"); - WikittyTreeNodeHelper.addAttachment(node31, valueId); - ws.store(null, node31); - - Wikitty node32 = findNode("node32"); - WikittyTreeNodeHelper.addAttachment(node32, valueId); - ws.store(null, node32); - - Wikitty node3 = findNode("node3"); - int sum = sum(node3); - assertEquals(1, sum); - - TreeNodeResult<WikittyTreeNode> count = getProxy().findTreeNode( - WikittyTreeNode.class, node3.getId(), 0, true, null); - assertEquals(1, count.getAttCount()); - - sum = sum(node31); - assertEquals(1, sum); - - sum = sum(node32); - assertEquals(1, sum); - } - - // verifier que l'indexation de l'arbre fonctionne bien et la reindexation aussi - @Test - public void testReindexation() throws Exception { -// FIXME poussin 20101222 a faire - // creer deux arbres (3 noeud) - // mettre 3 attachments par noeud (les memes) dans les 2 arbres - - // enlever un attachment par noeud et supprime le noeud intermediaire - // en meme temps et store les arbres - - // verifier que tout est bien reindexe et que le dernier noeud est bien - // devenu un noeud root - } - -}

1 0

r1388 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 30 Jan '12

30 Jan '12

Author: echatellier Date: 2012-01-30 11:55:42 +0100 (Mon, 30 Jan 2012) New Revision: 1388 Url: http://nuiton.org/repositories/revision/wikitty/1388 Log: Add count attachement test with filter 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:35:14 UTC (rev 1387) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-30 10:55:42 UTC (rev 1388) @@ -2096,43 +2096,6 @@ } /** - * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. - */ - @Test - public void testCountAttachment() { - - 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(); - - WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null); - int val = treeNodeResult.getAttCount(); - Assert.assertEquals(9, val); - - WikittyQueryResultTreeNode<String> children = wikittyClient.findAllIdTreeNode(bookNode.getWikittyId(), 1, true, null); - if (log.isDebugEnabled()) { - log.debug("Children : " + children); - } - - Assert.assertEquals(3, children.getChildCount()); - Assert.assertEquals(2, children.getChild(bdNode.getWikittyId()).getAttCount()); - Assert.assertEquals(1, children.getChild(newsNode.getWikittyId()).getAttCount()); - } - - /** * Test que lors de la reindexation les noeuds indexés le sont * correctement si leur attachement ne sont pas encore * présent dans l'index. @@ -2274,4 +2237,65 @@ Assert.assertEquals(0, wikittyClient.findAllByQuery(query).getTotalResult()); Assert.assertEquals(0, wikittyClient.findAllByQuery(WikittyLabel.class, query).getTotalResult()); } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. + */ + @Test + public void testSearchEngineCountAttachment() { + + 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(); + + WikittyQueryResultTreeNode<String> treeNodeResult = + wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), 0, true, null); + int val = treeNodeResult.getAttCount(); + Assert.assertEquals(9, val); + + WikittyQueryResultTreeNode<String> children = + wikittyClient.findAllIdTreeNode(bookNode.getWikittyId(), 1, true, null); + if (log.isDebugEnabled()) { + log.debug("Children : " + children); + } + + Assert.assertEquals(3, children.getChildCount()); + Assert.assertEquals(2, children.getChild(bdNode.getWikittyId()).getAttCount()); + Assert.assertEquals(1, children.getChild(newsNode.getWikittyId()).getAttCount()); + } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres + * avec un filtre cette fois. + */ + @Test + public void testSearchEngineCountAttachmentFiltered() { + + 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(); + + // on filtre par category (society) + WikittyQuery filter = WikittyQueryParser.parse("Product.category={SELECT id WHERE Category.code = society}"); + + WikittyQueryResultTreeNode<String> treeNodeResult = wikittyClient.findAllIdTreeNode(catalogNode.getWikittyId(), + 0, true, filter); + int val = treeNodeResult.getAttCount(); + // parmis les 9 du test precedent, seulement 1 dans la category society + Assert.assertEquals(1, val); + } }

1 0

r1387 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 30 Jan '12

30 Jan '12

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()); } /**

1 0

r1386 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 30 Jan '12

30 Jan '12

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()); } }

1 0

r1385 - in trunk: wikitty-api/src/test/java/org/nuiton/wikitty wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 16:27:38 +0100 (Fri, 27 Jan 2012) New Revision: 1385 Url: http://nuiton.org/repositories/revision/wikitty/1385 Log: Remove SolrSearchTest (same test alreay done in wikitty client test) Removed: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 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-27 15:02:09 UTC (rev 1384) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-27 15:27:38 UTC (rev 1385) @@ -31,7 +31,6 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -73,7 +72,6 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; @@ -1594,6 +1592,61 @@ } /** + * Test les recherches avec les accents et les charactères spéciaux. + */ + @Test + public void testSearchWithAccent() { + WikittyGroupImpl group = new WikittyGroupImpl(); + group.setName("coucou"); + WikittyGroupImpl groupAccent = new WikittyGroupImpl(); + groupAccent.setName("çéçà"); + + wikittyClient.store(group, groupAccent); + + { + // sans accent + WikittyQuery query = new WikittyQueryMaker().keyword("coucou").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + { + // avec accent + WikittyQuery query = new WikittyQueryMaker().keyword("çéçà").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + { + // avec accent specifiquement sur le champs name + WikittyQuery query = new WikittyQueryMaker().eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "çéçà").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + { + // avec accent specifiquement sur le champs name mais sans accent pour la recherche + // specifique à solr + WikittyQuery query = new WikittyQueryMaker().eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME + "_c_t", "ceca").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + { + // avec accent specifiquement sur le champs name + // mais sans accent pour la recherche + // et et majuscule + WikittyQuery query = new WikittyQueryMaker().eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME + "_c_t", "CECA").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + { + // avec accent specifiquement sur le champs name + // mais sans accent pour la recherche + // et et majuscule + WikittyQuery query = new WikittyQueryMaker().like(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "ceca").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.size()); + } + } + + /** * Test de la selection et de la pagination. * @throws IOException */ @@ -1639,7 +1692,7 @@ WikittyExtension ext = new WikittyExtension("Test", "1.0", // version WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values - (List)null, + (List<String>)null, WikittyUtil.buildFieldMapExtension( // building field map "Numeric number", "String string", Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2012-01-27 15:02:09 UTC (rev 1384) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2012-01-27 15:27:38 UTC (rev 1385) @@ -1,631 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * 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.storage.solr; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.FacetTopic; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.conform.AbstractTestConformance; -import org.nuiton.wikitty.entities.WikittyGroup; -import org.nuiton.wikitty.entities.WikittyGroupImpl; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.RestrictionHelper; -import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.operators.Like; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; - -public class SolrSearchTest extends AbstractTestSolr { - - private static final Log log = LogFactory.getLog(SolrSearchTest.class); - - protected WikittyExtension extCategory; - protected WikittyExtension extProduct; - protected WikittyExtension extTest; - - @BeforeClass - public static void initTests() throws Exception { - - SolrTestHelper.initTests(instance); - - ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); - } - - @Before - public void createTestData() throws Exception { - extCategory = new WikittyExtension("Category", "1", - WikittyUtil.buildFieldMapExtension( - "String name") - ); - - Wikitty[] wikitties = createWikitties(extCategory, new String[] { - "name = Library", - "name = Stuff", - "name = Hardware", - "name = Staff", - "name = FooBar" - }); - - String hardwareCategoryId = wikitties[2].getId(); - String staffCategoryId = wikitties[3].getId(); - - extProduct = new WikittyExtension("Product", "1", - WikittyUtil.buildFieldMapExtension( - "String name", - "Numeric price", - "String value", - "String optional", - "Wikitty category") - ); - - createWikitties(extProduct, new String[] { - "name = Paint blue," + - "price = 20," + - "value = 1," + - "category = " + hardwareCategoryId, - - "name = Other Paint blue," + - "price = 20," + - "value = 1," + - "optional = test," + - "category = " + hardwareCategoryId, - - "name = Paint red," + - "price = 35," + - "value = 1," + - "optional = test," + - "category = " + hardwareCategoryId, - - "name = Paint Staff blue," + - "price = 20," + - "value = 2," + - "category = " + staffCategoryId, - - "name = Paint green," + - "price = 18," + - "value = 1," + - "category = " + hardwareCategoryId, - }); - - extTest = new WikittyExtension("Test", "1", - WikittyUtil.buildFieldMapExtension( - "String name", - "String description", - "Numeric amount", - "Date buildDate", - "Boolean enabled") - ); - - createWikitties(extTest, new String[] { - "name = table," + - "amount = 003300," + - "buildDate = " + AbstractTestConformance.format("23/01/1982") + "," + - "enabled = false", - - "name = chaise," + - "amount = 113311," + - "buildDate = " + AbstractTestConformance.format("26/09/2009") + "," + - "enabled = false", - - - "name = bureau," + - "description=One use for WordDelimiterFilter is to helped match words with different delimiters.," + - "amount = 223322," + - "buildDate = " + AbstractTestConformance.format("25/12/2029") + "," + - "enabled = true" - }); - } - - private Wikitty[] createWikitties(WikittyExtension lonelyExtension, String[] wValues) { - ArrayList<Wikitty> result = new ArrayList<Wikitty>(); - for ( String wValue : wValues ) { - Wikitty w = AbstractTestConformance.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); - result.add( w ); - } - ws.store(null, result); - return result.toArray( new Wikitty[]{} ); - } - - @Test - public void testBasicSearch() throws Exception { - Criteria criteria = Search.query() - .eq("Test.name_s", "chaise") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("chaise", w.getFieldAsString("Test", "name")); - assertEquals(113311, w.getFieldAsInt("Test", "amount")); - assertEquals(AbstractTestConformance.parse("26/09/2009"), - w.getFieldAsDate("Test", "buildDate")); - } - - @Test - public void testContainsSearch() throws Exception { - { - Criteria criteria = Search.query() - .contains("Product.price", "20") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(3, list.size()); - } - { - Criteria criteria = Search.query() - .contains("Product.price", "20", "30", "35") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(0, list.size()); - } - } - - @Test - public void testInSearch() throws Exception { - { - Criteria criteria = Search.query() - .in("Product.price", "20") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(3, list.size()); - } - { - Criteria criteria = Search.query() - .in("Product.price", "20", "30", "35") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(4, list.size()); - } - { - Criteria criteria = Search.query() - .in("Product.price", "25", "30", "40") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(0, list.size()); - } - } - - @Test - public void testAdvancedSearch() throws Exception { - Criteria criteria = Search.query() - .eq("Product.value", "1") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(4, list.size()); - - criteria = Search.query() - .eq("Product.value", "1") - .bw("Product.price", "15", "25") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - list = result.getAll(); - assertEquals(3, list.size()); - } - - @Test - public void testAssociativeSearch() throws Exception { - Search search = Search.query() - .bw("Product.price", "15", "25") - .sw("Product.name", "Paint"); - search.associated( "Product.category") - .eq("Category.name", "Hardware"); - Criteria criteria = search.criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals( 2, list.size() ); - } - - @Test - public void testKeywordSearch() throws Exception { - Criteria criteria = Search.query().keyword("bureau").criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().keyword("nothing").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(0, result.size()); - - // il faut etre un peu restrictif sur la chaine recherchee - // sinon on peut trouve la chaine dans un id et donc fausser le test :( - // donc remplacement de la chaine *33* par *ai* - // *ai* matches 'paint' et 'chaise' - criteria = Search.query().keyword("*ai*").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(6, result.size()); - - criteria = Search.query() - .keyword("*33*") - .eq("Test.name", "bureau") - .criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - } - - @Test - public void testFacetOnExtension() throws Exception { - Criteria criteria = Search.query().keyword("*").criteria(); - criteria.addFacetField(Element.ELT_EXTENSION); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(13, result.getAll().size()); - - List<FacetTopic> topics = result.getTopic(Element.ELT_EXTENSION); - for (FacetTopic topic : topics) { - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - - if(topicName.equals("Category")) { - assertEquals(5, topicCount); - } else if(topicName.equals("Product")) { - assertEquals(5, topicCount); - } else if(topicName.equals("Test")) { - assertEquals(3, topicCount); - } - } - } - - @Test - public void testSearchOnBoolean() throws Exception { - Criteria criteria = Search.query() - .eq("Test.enabled", "true") - .criteria(); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(1, result.getNumFound()); - - criteria = Search.query() - .eq("Test.enabled", "false") - .criteria(); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(2, result.getNumFound()); - } - - @Test - public void testSearchWithNot() throws Exception { - Search query = Search.query(); - query.not().eq("Test.name", "bureau"); - Criteria criteria = query.criteria(); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(12, result.getNumFound()); - - query = Search.query().eq("Test.amount", "003300"); - query.not().eq("Test.name", "bureau"); - criteria = query.criteria(); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(1, result.getNumFound()); - } - - @Test - public void testFindAllByExample() throws Exception { - Wikitty example = new WikittyImpl(); - example.addExtension(extProduct); - example.setField("Product", "price", 20); - - Criteria criteria = Search.query(example).criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - - assertEquals(3, result.getNumFound()); - } - - @Test - public void testFacet() throws Exception { - Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); - criteria.addFacetField("Product.value"); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<FacetTopic> topics = result.getTopic("Product.value"); - for (FacetTopic topic : topics) { - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - if("1".equals(topicName)) { - assertEquals(4, topicCount); - } else { - assertEquals(1, topicCount); - } - } - - criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); - Criteria facet1 = Search.query().eq("Product.value", "1").criteria("1"); - criteria.addFacetCriteria(facet1); - Criteria facet2 = Search.query().eq("Product.value", "2").criteria("2"); - criteria.addFacetCriteria(facet2); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - - topics = result.getTopic("1"); - FacetTopic topic = topics.get(0); - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - assertEquals("1", topicName); - assertEquals(4, topicCount); - - topics = result.getTopic("2"); - topic = topics.get(0); - topicName = topic.getTopicName(); - topicCount = topic.getCount(); - assertEquals("2", topicName); - assertEquals(1, topicCount); - } - - /** - * WARNING: as the only solr index is clear, all data in all test is reindexed. - */ - @Test - public void testSyncSearchEngine() { - Criteria criteria = new Criteria(); - criteria.setRestriction(RestrictionHelper.rTrue()); - criteria.setFirstIndex(0); - criteria.setEndIndex(0); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(13, result.getNumFound()); - - ws.syncSearchEngine(null); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertTrue(13 <= result.getNumFound()); - } - - @Test - public void testNullSearch() { - Criteria criteria = Search.query().isNotNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> result = pagedResult.getAll(); - assertEquals(2, result.size()); - - criteria = Search.query().isNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(3, result.size()); - } - - // on ignore ce test car le like ne fonctionne plus de la même manière - // depuis qu'on a enlevé la lemmatisation - @Ignore - @Test - public void testLikeSearch() throws Exception { - Criteria criteria = Search.query().like("Category.name", "hArDwArE").criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Category.name", "*wAr*").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Category.name", "Har*").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Test.description", "help").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(1, pagedResult.getNumFound()); - - criteria = Search.query().like("Test.description", "helped").criteria(); - pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - assertEquals(1, pagedResult.getNumFound()); - } - - // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( -// @Ignore - @Test - public void testLikeStrict() throws Exception { - - Criteria criteria = Search.query() - .like("Product.name_s", "paint red") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("Paint red", w.getFieldAsString("Product", "name")); - - criteria = Search.query() - .like("Product.name_s", "paint") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - list = result.getAll(); - assertEquals(5, list.size()); - } - - /** test that doing a search with a date criteria is possible */ - @Test - public void testSearchByDate() throws Exception { - Calendar cal = Calendar.getInstance(); - cal.set(Calendar.DAY_OF_MONTH, 20); - cal.set(Calendar.MONTH, 9); - cal.set(Calendar.YEAR, 2009); - - // this must return a date in a format understandable for solr - // pattern in WikittyUtil has to be compatible - String dateString = WikittyUtil.formatDate(cal.getTime()); - - Criteria criteria = Search.query() - .gt("Test.buildDate", dateString) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - // If an exception is thrown, check that the pattern in WikittyUtil - // is compatible with solr, in particular that the trailing Z - // is present and respect http://wiki.apache.org/solr/IndexingDates - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - - - List<String> list = result.getAll(); - assertEquals(1, list.size()); - } - - @Test - public void testDateSearch() throws Exception { - Criteria criteria = Search.query() - .bw("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009"), Criteria.ALL_VALUES) - .criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(2, list.size()); - - criteria = Search.query() - .ge("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009")) - .criteria(); - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - list = result.getAll(); - assertEquals(2, list.size()); - } - - @Test - public void testAccent() throws Exception { - WikittyGroupImpl group = new WikittyGroupImpl(); - group.setName("coucou"); - WikittyGroupImpl groupAccent = new WikittyGroupImpl(); - groupAccent.setName("çéçà"); - - ws.store(null, group.getWikitty()); - ws.store(null, groupAccent.getWikitty()); - - { - // sans accent - Criteria criteria = Search.query().keyword("coucou").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - { - // avec accent - Criteria criteria = Search.query().keyword("çéçà").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - { - // avec accent specifiquement sur le champs name - Criteria criteria = Search.query().eq( - WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME,"çéçà").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - { - // avec accent specifiquement sur le champs name mais sans accent pour la recherche - Criteria criteria = Search.query().eq( - WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME - + WikittySolrConstant.SUFFIX_STRING - + WikittySolrConstant.SUFFIX_STRING_FULLTEXT, "ceca").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - { - // avec accent specifiquement sur le champs name - // mais sans accent pour la recherche - // et et majuscule - Criteria criteria = Search.query().eq( - WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME - + WikittySolrConstant.SUFFIX_STRING - + WikittySolrConstant.SUFFIX_STRING_FULLTEXT, "CECA").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - { - // avec accent specifiquement sur le champs name - // mais sans accent pour la recherche - // et et majuscule - Criteria criteria = Search.query().like( - WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "CECA").criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size()); - } - } - - @Test - public void testSearchNonSensitive() throws Exception { - Criteria criteria = Search.query() - .like("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("chaise", w.getFieldAsString("Test", "name")); - assertEquals(113311, w.getFieldAsInt("Test", "amount")); - assertEquals(AbstractTestConformance.parse("26/09/2009"), w.getFieldAsDate("Test", "buildDate")); - - criteria = Search.query() - .unlike("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - list = result.getAll(); - assertEquals(12, list.size()); - } -}

1 0

r1384 - in trunk: wikitty-api/src/test/java/org/nuiton/wikitty wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 16:02:09 +0100 (Fri, 27 Jan 2012) New Revision: 1384 Url: http://nuiton.org/repositories/revision/wikitty/1384 Log: Move some query test and tree node tests to api module. Removed: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 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-27 11:38:41 UTC (rev 1383) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-27 15:02:09 UTC (rev 1384) @@ -31,6 +31,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -51,6 +52,8 @@ import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyGroup; +import org.nuiton.wikitty.entities.WikittyGroupImpl; import org.nuiton.wikitty.entities.WikittyI18n; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabel; @@ -59,12 +62,18 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import org.nuiton.wikitty.entities.WikittyTypes; +import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.query.FacetSortType; 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.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.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; @@ -1621,4 +1630,656 @@ Assert.assertEquals(17, results1.getTotalResult()); Assert.assertEquals(0, results1.getAll().size()); } + + + + + @Test + public void testQueryMarkerSelectSortAndAggregate() throws Exception { + WikittyExtension ext = new WikittyExtension("Test", + "1.0", // version + WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values + (List)null, + WikittyUtil.buildFieldMapExtension( // building field map + "Numeric number", + "String string", + "Date date")); + Wikitty w1 = new WikittyImpl(); + w1.addExtension(ext); + w1.setField("Test", "number", 5); + w1.setField("Test", "date", WikittyUtil.parseDate("02/05/1975")); + + Wikitty w2 = new WikittyImpl(); + w2.addExtension(ext); + w2.setField("Test", "number", -4); + w2.setField("Test", "date", WikittyUtil.parseDate("19830606")); + + Wikitty w3 = new WikittyImpl(); + w3.addExtension(ext); + w3.setField("Test", "number", 10); + w3.setField("Test", "date", WikittyUtil.parseDate("21/05/2002")); + + Wikitty w4 = new WikittyImpl(); + w4.addExtension(ext); + w4.setField("Test", "number", 1); + w4.setField("Test", "date", WikittyUtil.parseDate("05/01/2012")); + + wikittyClient.store(w1, w2, w3, w4); + + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number").end() + .addSortDescending(new ElementField("Test", "number")); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.date").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.date").end() + .addSortDescending(new ElementField("Test", "date")); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + } + + // test aggregate + { + 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()); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.COUNT).end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + Assert.assertEquals("4", result.peek()); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + Assert.assertEquals("10.0", result.peek()); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end() + .addSortDescending(new ElementField("Test", "number")); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + Assert.assertEquals("10.0", result.peek()); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + Assert.assertEquals("-4.0", result.peek()); + } + { + WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end() + .addSortDescending(new ElementField("Test", "number")); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + System.out.println("q: " + result); + Assert.assertEquals("-4.0", result.peek()); + } + { + 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()); + } + + } + + @Test + public void testQueryMakerFacetOnGroup() throws Exception { + // for id for easy debugging + WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); + g1.setName("Group1"); + WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); + g2.setName("GROUP"); + WikittyGroupImpl g3 = new WikittyGroupImpl(new WikittyImpl("g3")); + g3.setName("Group3"); + WikittyGroupImpl g4 = new WikittyGroupImpl(new WikittyImpl("g4")); + g4.setName("GROUP"); + + wikittyClient.store(g1, g2, g3, g4); + + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group*") + .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testFacet" + result); + Assert.assertEquals(2, result.size()); + Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "GROUP") + .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testFacet" + result); + Assert.assertEquals(2, result.size()); + Assert.assertEquals(1, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); + Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).get(0).getCount()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "GROUP") + .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME) + .setLimit(0); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testFacet" + result); + Assert.assertEquals(0, result.size()); + Assert.assertEquals(1, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); + Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).get(0).getCount()); + } + } + + @Test + public void testQueryMakerEqOnGroup() throws Exception { + // for id for easy debugging + WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); + g1.setName("Group1"); + WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); + g2.setName("GROUP2"); + + wikittyClient.store(g1, g2); + + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group1") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testEq" + result.getAll()); + Assert.assertEquals(1, result.size()); + Assert.assertEquals(g1.getWikittyId(), result.peek()); + } + + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group*") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testEq" + result.getAll()); + Assert.assertEquals(1, result.size()); + Assert.assertEquals(g1.getWikittyId(), result.peek()); + } + + { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "G*") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testEq" + result.getAll()); + Assert.assertEquals(2, result.size()); + } + + { + WikittyQuery query = new WikittyQueryMaker() + .like(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "*oup*") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testLike" + result); + Assert.assertEquals(2, result.size()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .like("*", "Grou*") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testLike" + result); + Assert.assertEquals(2, result.size()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .keyword("Gro") + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println("testKeyword:" + result); + Assert.assertEquals(2, result.size()); + } + + } + + @Test + public void testQueryMarkerSelect() throws Exception { + // for id for easy debugging + WikittyImpl w = new WikittyImpl("g1"); + WikittyGroupImpl g1 = new WikittyGroupImpl(w); + g1.setName("Group1"); + w = new WikittyImpl("g2"); + WikittyGroupImpl g2 = new WikittyGroupImpl(w); + g2.setName("GROUP2"); + + w = new WikittyImpl("l1"); + WikittyLabelImpl l1 = new WikittyLabelImpl(w); + l1.addLabels(g1.getName()); + + wikittyClient.store(g1, g2, l1); + + { + WikittyQuery query = new WikittyQueryMaker() + .select(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println(result.getAll()); + Assert.assertEquals(2, result.getTotalResult()); + } + + { + WikittyQuery query = new WikittyQueryMaker() + .and() + .exteq(WikittyGroup.EXT_WIKITTYGROUP) + .containsOne(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) + .select(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS) + .end(); + + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + + System.out.println(result.getAll()); + Assert.assertEquals(1, result.getTotalResult()); + } + } + + @Test + public void testQueryParserOnTree() throws Exception { + WikittyQueryParser parser = new WikittyQueryParser(); + parser.addAlias("MyAlias\$(.*), (.*)\$", + "id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=$1)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=$2)})}"); + + WikittyQuery q1 = parser.parseQuery( + "WikittyGroup.name=Group* AND MyAlias(OtherTree, OtherBranch)"); + + WikittyQuery q2 = parser.parseQuery( + "WikittyGroup.name=Group* AND id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)})}"); + + System.out.println("Q1:" + q1); + System.out.println("Q2:" + q2); + Assert.assertEquals(q2, q1); + + WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); + g1.setName("Group1"); + WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); + g2.setName("GROUP2"); + WikittyGroupImpl g3 = new WikittyGroupImpl(new WikittyImpl("g3")); + g3.setName("Group3"); + WikittyGroupImpl g4 = new WikittyGroupImpl(new WikittyImpl("g4")); + g4.setName("group4"); + + WikittyTreeNode root = new WikittyTreeNodeImpl(new WikittyImpl("root")); + root.setName("OtherTree"); + + WikittyTreeNode node = new WikittyTreeNodeImpl(new WikittyImpl("node1")); + node.setName("node1"); + node.setParent(root.getWikittyId()); + node.addAttachment(g1.getWikittyId(), g2.getWikittyId()); + + WikittyTreeNode branch = new WikittyTreeNodeImpl(new WikittyImpl("branch")); + branch.setName("OtherBranch"); + branch.setParent(node.getWikittyId()); + + WikittyTreeNode leaf = new WikittyTreeNodeImpl(new WikittyImpl("leaf")); + leaf.setName("leaf"); + leaf.setParent(branch.getWikittyId()); + leaf.addAttachment(g3.getWikittyId(), g4.getWikittyId()); + + wikittyClient.store(g1, g2, g3, g4, root, node, branch, leaf); + + { + WikittyQuery q0 = parser.parseQuery( + "rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)} AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)}"); + System.out.println("qO: " + q0); + WikittyQueryResult<String> q0Result = wikittyClient.findAllByQuery(q0); + System.out.println("q0Result:" + q0Result); + } + { + WikittyQuery q0 = parser.parseQuery( + "SELECT WikittyTreeNode.attachment WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)} AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)})") + .addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); + System.out.println("qO: " + q0); + WikittyQueryResult<String> q0Result = wikittyClient.findAllByQuery(q0); + System.out.println("q0Result:" + q0Result); + } + { + WikittyQuery q0 = parser.parseQuery( + "SELECT WikittyTreeNode.attachment WHERE (ID={branch, leaf})") + .addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); + System.out.println("qO: " + q0); + WikittyQueryResult<String> q0Result = wikittyClient.findAllByQuery(q0); + System.out.println("q0Result:" + q0Result); + } + { + WikittyQuery q0 = parser.parseQuery( + "ID={branch, leaf}").addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); + System.out.println("qO: " + q0); + WikittyQueryResult<String> q0Result = wikittyClient.findAllByQuery(q0); + System.out.println("q0Result:" + q0Result); + } + { + WikittyQuery q0 = parser.parseQuery( + "WikittyGroup.name=Group*"); + System.out.println("q0: " + q0); + WikittyQueryResult<String> q0Result = wikittyClient.findAllByQuery(q0); + System.out.println("q0Result:" + q0Result); + } + + WikittyQueryResult<String> q1Result = wikittyClient.findAllByQuery(q1); + WikittyQueryResult<String> q2Result = wikittyClient.findAllByQuery(q2); + + System.out.println("q2Result: " + q2Result); + + Assert.assertEquals(q2Result.getAll(), q1Result.getAll()); + Assert.assertEquals(1, q2Result.size()); + Assert.assertEquals(Collections.singletonList(g3.getWikittyId()), q2Result.getAll()); + } + + /** + * Test la recherche full text. + */ + @Test + public void testSearchEngineFullTextSearch() { + // for id for easy debugging + WikittyImpl w = new WikittyImpl("label"); + WikittyLabelImpl l = new WikittyLabelImpl(w); + l.addLabels("label"); + w = new WikittyImpl("LABEL"); + WikittyLabelImpl l2 = new WikittyLabelImpl(w); + l2.addLabels("OTHER LABEL"); + w = new WikittyImpl("TATA"); + WikittyUserImpl u = new WikittyUserImpl(w); + u.setLogin("tata"); + + List<Wikitty> toStore = new ArrayList<Wikitty>(); + toStore.add(l.getWikitty()); + toStore.add(l2.getWikitty()); + toStore.add(u.getWikitty()); + + wikittyClient.storeWikitty(toStore); + + { + WikittyQuery query = new WikittyQueryMaker().keyword("lab*").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + System.out.println(result.getAll()); + Assert.assertEquals(2, result.getTotalResult()); + } + { + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(WikittyLabel.EXT_WIKITTYLABEL) + .keyword("*a*").end(); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + System.out.println(result.getAll()); + Assert.assertEquals(3, result.getTotalResult()); + } + } + + /** + * Test le nombre d'attachment (fichiers attachés) au noeud des arbres. + */ + @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"); + + 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); + int val = treeNodeResult.getAttCount(); + Assert.assertEquals(12, val); + + WikittyQueryResultTreeNode<String> children = wikittyClient.findAllIdTreeNode(root.getId(), 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()); + } + + /** + * Test que lors de la reindexation les noeuds indexés le sont + * correctement si leur attachement ne sont pas encore + * présent dans l'index. + * + * Stocke les attachements avant le noeud. + */ + @Test + public void testReindexWithAttachement() { + + // store attachement + Wikitty attach1 = new WikittyImpl("att1"); + Wikitty attach2 = new WikittyImpl("att2"); + List<Wikitty> toStore = new ArrayList<Wikitty>(); + toStore.add(attach1); + toStore.add(attach2); + wikittyClient.storeWikitty(toStore); + + // store first node + Wikitty treeNode = new WikittyImpl(); + WikittyTreeNode treeNodeImpl = new WikittyTreeNodeImpl(treeNode); + treeNodeImpl.setName("root"); + treeNodeImpl.addAttachment(attach1.getId()); + treeNodeImpl.addAttachment(attach2.getId()); + wikittyClient.store(treeNode); + + // set resync + wikittyClient.syncSearchEngine(); + + // search wikitty with attachement + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "root").end(); + WikittyQueryResult<Wikitty> result = wikittyClient.findAllByQuery(Wikitty.class, query); + Assert.assertEquals(1, result.getTotalResult()); + WikittyTreeNode resultTreeNode = new WikittyTreeNodeImpl(result.get(0)); + Assert.assertEquals(2, resultTreeNode.getAttachment().size()); + } + + /** + * Test que lors de la reindexation les noeuds indexés le sont + * correctement si leur attachement ne sont pas encore + * présent dans l'index. + * + * Stocke le noeud avant les attachements. + */ + @Test + public void testReindexWithAttachementOrdering() { + + // store first node + Wikitty treeNode = new WikittyImpl(); + WikittyTreeNode treeNodeImpl = new WikittyTreeNodeImpl(treeNode); + treeNodeImpl.setName("root"); + treeNode = wikittyClient.store(treeNode); + treeNodeImpl = new WikittyTreeNodeImpl(treeNode); + + // store attachement + Wikitty attach1 = new WikittyImpl("att1"); + Wikitty attach2 = new WikittyImpl("att2"); + treeNodeImpl.addAttachment(attach1.getId()); + treeNodeImpl.addAttachment(attach2.getId()); + List<Wikitty> toStore = new ArrayList<Wikitty>(); + toStore.add(attach1); + toStore.add(attach2); + toStore.add(treeNode); + wikittyClient.storeWikitty(toStore); + + // set resync + wikittyClient.syncSearchEngine(); + + // search wikitty with attachement + WikittyQuery query = new WikittyQueryMaker().and() + .exteq(WikittyTreeNodeImpl.EXT_WIKITTYTREENODE) + .eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "root").end(); + WikittyQueryResult<Wikitty> result = wikittyClient.findAllByQuery(Wikitty.class, query); + Assert.assertEquals(1, result.getTotalResult()); + WikittyTreeNode resultTreeNode = new WikittyTreeNodeImpl(result.get(0)); + Assert.assertEquals(2, resultTreeNode.getAttachment().size()); + } + + /** + * Test que lorsqu'un document solr est supprimé, il l'est réelement + * car le proxy gere les retours null pour des documents qui n'existe + * plus dans le base, mais les recherches continue de les trouver. + */ + @Test + public void testSolrDeleteDocument() { + // store new wikitty + Wikitty toDeleteWikitty = new WikittyImpl("wikkitytodelete"); + wikittyClient.store(toDeleteWikitty); + + // look for it + WikittyQuery query = new WikittyQueryMaker().ideq("wikkitytodelete").end(); + Assert.assertEquals(1, wikittyClient.findAllByQuery(Collections.singletonList(query)).get(0).getTotalResult()); + Assert.assertEquals(1, wikittyClient.findAllByQuery(query).getTotalResult()); + + // delete it + wikittyClient.delete(Collections.singleton(toDeleteWikitty.getId())); + + // try to look for it after deletion + Assert.assertEquals(0, wikittyClient.findAllByQuery(query).getTotalResult()); + Assert.assertEquals(0, wikittyClient.findAllByQuery( + Collections.singletonList(query)).get(0).getTotalResult()); + } + + /** + * Test que lorsque plus de 10 documents solr sont supprimés, il le sont + * réelement car par défault, solr limte les resultats à 10. + */ + @Test + public void testSolrDeleteMoreThan10Documents() { + final int NB_DOCS_TO_DELETE = 37; + List<WikittyLabel> toDelete = new ArrayList<WikittyLabel>(); + + for (int i = 0;i < NB_DOCS_TO_DELETE;i++) { + WikittyLabel toDeleteEntity = new WikittyLabelImpl(); + + // store new wikitty + toDeleteEntity.addLabels("toDeleteEntity" + i); + toDelete.add(toDeleteEntity); + } + + // Store all + wikittyClient.store(toDelete); + + // look for it + WikittyQuery query = new WikittyQueryMaker() + .exteq(WikittyLabel.EXT_WIKITTYLABEL).end(); + Assert.assertEquals(NB_DOCS_TO_DELETE, wikittyClient.findAllByQuery( + Collections.singletonList(query)).get(0).getTotalResult()); + Assert.assertEquals(NB_DOCS_TO_DELETE, wikittyClient.findAllByQuery(query).getTotalResult()); + Assert.assertEquals(NB_DOCS_TO_DELETE, wikittyClient.findAllByQuery(WikittyLabel.class, query).getTotalResult()); + + // delete it + wikittyClient.delete(toDelete); + + // try to look for it after deletion + Assert.assertEquals(0, wikittyClient.findAllByQuery( + Collections.singletonList(query)).get(0).getTotalResult()); + Assert.assertEquals(0, wikittyClient.findAllByQuery(query).getTotalResult()); + Assert.assertEquals(0, wikittyClient.findAllByQuery(WikittyLabel.class, query).getTotalResult()); + } } Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-27 11:38:41 UTC (rev 1383) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-27 15:02:09 UTC (rev 1384) @@ -1,463 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.storage.solr; - -import java.util.Collections; -import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -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.WikittyClient; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyGroup; -import org.nuiton.wikitty.entities.WikittyGroupImpl; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.entities.WikittyLabelImpl; -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.query.conditions.Aggregate; -import org.nuiton.wikitty.entities.ElementField; - -/** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittySearchEngineSolrForQueryTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittySearchEngineSolrForQueryTest.class); - - protected static WikittyServiceSolr ws; - - protected static ApplicationConfig instance = - WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - - protected WikittyClient client = new WikittyClient(instance, ws); - - @Before - public void deleteAll() throws Exception { - ws.clear(null); - } - - @BeforeClass - public static void initTests() throws Exception { - - SolrTestHelper.initTests(instance); - - ws = new WikittyServiceSolr(instance); - } - - @Test - public void testSelectSortAndAggregate() throws Exception { - WikittyExtension ext = new WikittyExtension("Test", - "1.0", // version - WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values - (List)null, - WikittyUtil.buildFieldMapExtension( // building field map - "Numeric number", - "String string", - "Date date")); - Wikitty w1 = new WikittyImpl(); - w1.addExtension(ext); - w1.setField("Test", "number", 5); - w1.setField("Test", "date", WikittyUtil.parseDate("02/05/1975")); - - Wikitty w2 = new WikittyImpl(); - w2.addExtension(ext); - w2.setField("Test", "number", -4); - w2.setField("Test", "date", WikittyUtil.parseDate("19830606")); - - Wikitty w3 = new WikittyImpl(); - w3.addExtension(ext); - w3.setField("Test", "number", 10); - w3.setField("Test", "date", WikittyUtil.parseDate("21/05/2002")); - - Wikitty w4 = new WikittyImpl(); - w4.addExtension(ext); - w4.setField("Test", "number", 1); - w4.setField("Test", "date", WikittyUtil.parseDate("05/01/2012")); - - client.store(w1, w2, w3, w4); - - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number").end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number").end() - .addSortDescending(new ElementField("Test", "number")); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.date").end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.date").end() - .addSortDescending(new ElementField("Test", "date")); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - } - - // test aggregate - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.AVG).end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("3.0", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.COUNT).end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("4", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("10.0", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end() - .addSortDescending(new ElementField("Test", "number")); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("10.0", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("-4.0", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end() - .addSortDescending(new ElementField("Test", "number")); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("-4.0", result.peek()); - } - { - WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.SUM).end(); - WikittyQueryResult<String> result = client.findAllByQuery(q); - System.out.println("q: " + result); - Assert.assertEquals("12.0", result.peek()); - } - - } - - @Test - public void testSelectAggregate() throws Exception { - - } - - @Test - public void testFacet() throws Exception { - // for id for easy debugging - WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); - g1.setName("Group1"); - WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); - g2.setName("GROUP"); - WikittyGroupImpl g3 = new WikittyGroupImpl(new WikittyImpl("g3")); - g3.setName("Group3"); - WikittyGroupImpl g4 = new WikittyGroupImpl(new WikittyImpl("g4")); - g4.setName("GROUP"); - - client.store(g1, g2, g3, g4); - - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group*") - .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testFacet" + result); - Assert.assertEquals(2, result.size()); - Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); - } - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "GROUP") - .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testFacet" + result); - Assert.assertEquals(2, result.size()); - Assert.assertEquals(1, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); - Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).get(0).getCount()); - } - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "GROUP") - .end().addFacetField(WikittyGroup.ELEMENT_FIELD_WIKITTYGROUP_NAME) - .setLimit(0); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testFacet" + result); - Assert.assertEquals(0, result.size()); - Assert.assertEquals(1, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).size()); - Assert.assertEquals(2, result.getFacets().get(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME).get(0).getCount()); - } - } - - @Test - public void testEq() throws Exception { - // for id for easy debugging - WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); - g1.setName("Group1"); - WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); - g2.setName("GROUP2"); - - client.store(g1, g2); - - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group1") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testEq" + result.getAll()); - Assert.assertEquals(1, result.size()); - Assert.assertEquals(g1.getWikittyId(), result.peek()); - } - - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group*") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testEq" + result.getAll()); - Assert.assertEquals(1, result.size()); - Assert.assertEquals(g1.getWikittyId(), result.peek()); - } - - { - WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "G*") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testEq" + result.getAll()); - Assert.assertEquals(2, result.size()); - } - - { - WikittyQuery query = new WikittyQueryMaker() - .like(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "*oup*") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testLike" + result); - Assert.assertEquals(2, result.size()); - } - { - WikittyQuery query = new WikittyQueryMaker() - .like("*", "Grou*") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testLike" + result); - Assert.assertEquals(2, result.size()); - } - { - WikittyQuery query = new WikittyQueryMaker() - .keyword("Gro") - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println("testKeyword:" + result); - Assert.assertEquals(2, result.size()); - } - - } - - @Test - public void testSelect() throws Exception { - // for id for easy debugging - WikittyImpl w = new WikittyImpl("g1"); - WikittyGroupImpl g1 = new WikittyGroupImpl(w); - g1.setName("Group1"); - w = new WikittyImpl("g2"); - WikittyGroupImpl g2 = new WikittyGroupImpl(w); - g2.setName("GROUP2"); - - w = new WikittyImpl("l1"); - WikittyLabelImpl l1 = new WikittyLabelImpl(w); - l1.addLabels(g1.getName()); - - client.store(g1, g2, l1); - - { - WikittyQuery query = new WikittyQueryMaker() - .select(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println(result.getAll()); - Assert.assertEquals(2, result.getTotalResult()); - } - - { - WikittyQuery query = new WikittyQueryMaker() - .and() - .exteq(WikittyGroup.EXT_WIKITTYGROUP) - .containsOne(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) - .select(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS) - .end(); - - WikittyQueryResult<String> result = client.findAllByQuery(query); - - System.out.println(result.getAll()); - Assert.assertEquals(1, result.getTotalResult()); - } - } - - @Test - public void testQueryOnTree() throws Exception { - WikittyQueryParser parser = new WikittyQueryParser(); - parser.addAlias("MyAlias\$(.*), (.*)\$", - "id={SELECT WikittyTreeNode.attachment" - + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=$1)}" - + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=$2)})}"); - - WikittyQuery q1 = parser.parseQuery( - "WikittyGroup.name=Group* AND MyAlias(OtherTree, OtherBranch)"); - - WikittyQuery q2 = parser.parseQuery( - "WikittyGroup.name=Group* AND id={SELECT WikittyTreeNode.attachment" - + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)}" - + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)})}"); - - System.out.println("Q1:" + q1); - System.out.println("Q2:" + q2); - Assert.assertEquals(q2, q1); - - WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); - g1.setName("Group1"); - WikittyGroupImpl g2 = new WikittyGroupImpl(new WikittyImpl("g2")); - g2.setName("GROUP2"); - WikittyGroupImpl g3 = new WikittyGroupImpl(new WikittyImpl("g3")); - g3.setName("Group3"); - WikittyGroupImpl g4 = new WikittyGroupImpl(new WikittyImpl("g4")); - g4.setName("group4"); - - WikittyTreeNode root = new WikittyTreeNodeImpl(new WikittyImpl("root")); - root.setName("OtherTree"); - - WikittyTreeNode node = new WikittyTreeNodeImpl(new WikittyImpl("node1")); - node.setName("node1"); - node.setParent(root.getWikittyId()); - node.addAttachment(g1.getWikittyId(), g2.getWikittyId()); - - WikittyTreeNode branch = new WikittyTreeNodeImpl(new WikittyImpl("branch")); - branch.setName("OtherBranch"); - branch.setParent(node.getWikittyId()); - - WikittyTreeNode leaf = new WikittyTreeNodeImpl(new WikittyImpl("leaf")); - leaf.setName("leaf"); - leaf.setParent(branch.getWikittyId()); - leaf.addAttachment(g3.getWikittyId(), g4.getWikittyId()); - - client.store(g1, g2, g3, g4, root, node, branch, leaf); - - { - WikittyQuery q0 = parser.parseQuery( - "rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)} AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)}"); - System.out.println("qO: " + q0); - WikittyQueryResult<String> q0Result = client.findAllByQuery(q0); - System.out.println("q0Result:" + q0Result); - } - { - WikittyQuery q0 = parser.parseQuery( - "SELECT WikittyTreeNode.attachment WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)} AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)})") - .addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); - System.out.println("qO: " + q0); - WikittyQueryResult<String> q0Result = client.findAllByQuery(q0); - System.out.println("q0Result:" + q0Result); - } - { - WikittyQuery q0 = parser.parseQuery( - "SELECT WikittyTreeNode.attachment WHERE (ID={branch, leaf})") - .addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); - System.out.println("qO: " + q0); - WikittyQueryResult<String> q0Result = client.findAllByQuery(q0); - System.out.println("q0Result:" + q0Result); - } - { - WikittyQuery q0 = parser.parseQuery( - "ID={branch, leaf}").addFacetField(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT); - System.out.println("qO: " + q0); - WikittyQueryResult<String> q0Result = client.findAllByQuery(q0); - System.out.println("q0Result:" + q0Result); - } - { - WikittyQuery q0 = parser.parseQuery( - "WikittyGroup.name=Group*"); - System.out.println("q0: " + q0); - WikittyQueryResult<String> q0Result = client.findAllByQuery(q0); - System.out.println("q0Result:" + q0Result); - } - - WikittyQueryResult<String> q1Result = client.findAllByQuery(q1); - WikittyQueryResult<String> q2Result = client.findAllByQuery(q2); - - System.out.println("q2Result: " + q2Result); - - Assert.assertEquals(q2Result.getAll(), q1Result.getAll()); - Assert.assertEquals(1, q2Result.size()); - Assert.assertEquals(Collections.singletonList(g3.getWikittyId()), q2Result.getAll()); - } -} Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2012-01-27 11:38:41 UTC (rev 1383) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2012-01-27 15:02:09 UTC (rev 1384) @@ -1,369 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin - * %% - * 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.storage.solr; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -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.WikittyConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.*; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.TreeNodeResult; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.services.WikittyEvent; - -/** - * Test for class {@link WikittySearchEngineSolr}. - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittySearchEngineSolrTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final Log log = LogFactory.getLog(WikittySearchEngineSolrTest.class); - - protected static WikittyServiceSolr ws; - - protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - - protected WikittyProxy proxy = new WikittyProxy(ws); - - @Before - public void deleteAll() throws Exception { - ws.clear(null); - } - - @BeforeClass - public static void initTests() throws Exception { - - SolrTestHelper.initTests(instance); - - ws = new WikittyServiceSolr(instance); - } - - @Test - public void testFullTextSearch() throws Exception { - // for id for easy debugging - WikittyImpl w = new WikittyImpl("label"); - WikittyLabelImpl l = new WikittyLabelImpl(w); - l.addLabels("label"); - w = new WikittyImpl("LABEL"); - WikittyLabelImpl l2 = new WikittyLabelImpl(w); - l2.addLabels("OTHER LABEL"); - w = new WikittyImpl("TATA"); - WikittyUserImpl u = new WikittyUserImpl(w); - u.setLogin("tata"); - - List<Wikitty> toStore = new ArrayList<Wikitty>(); - toStore.add(l.getWikitty()); - toStore.add(l2.getWikitty()); - toStore.add(u.getWikitty()); - - ws.store(null, toStore, false); - - { - Criteria c = Search.query().keyword("lab*").criteria(); - PagedResult<String> result = ws.findAllByCriteria( - null, Collections.singletonList(c)).get(0); - System.out.println(result.getAll()); - Assert.assertEquals(2, result.getNumFound()); - } - { - Criteria c = Search.query().keyword("*a*").criteria(); - PagedResult<String> result = ws.findAllByCriteria( - null, Collections.singletonList(c)).get(0); - System.out.println(result.getAll()); - Assert.assertEquals(3, result.getNumFound()); - } - - } - - @Test - public void testCountAttachment() throws Exception { - List<Wikitty> toStore = new ArrayList<Wikitty>(); - - WikittyImpl w1 = new WikittyImpl("at1"); - WikittyImpl w2 = new WikittyImpl("at2"); - WikittyImpl w3 = new WikittyImpl("at3"); - - 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); - - ws.store(null, toStore, false); - 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); - - ws.store(null, toStore, false); - 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); - - ws.store(null, toStore, false); - 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); - - ws.store(null, toStore, false); - toStore.clear(); - - TreeNodeResult<String> treeNodeResult = - ws.getSearchEngine().findAllChildrenCount( - null, root.getId(), 0, true, (Criteria)null); - int val = treeNodeResult.getAttCount(); -// Integer val = ws.getSearchEngine().findNodeCount(null, root, null); - Assert.assertEquals(12, val); - -// Map<WikittyTreeNode, Integer> children = ws.findTreeNode(null, root.getId(), null); -// Map<String, Integer> children = ws.getSearchEngine().findAllChildrenCount(null, root, null); - TreeNodeResult<String> children = - ws.getSearchEngine().findAllChildrenCount( - null, root.getId(), 1, true, (Criteria)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()); - } - - /** - * Test que lors de la reindexation les noeuds indexés le sont - * correctement si leur attachement ne sont pas encore - * présent dans l'index. - * - * Stocke les attachements avant le noeud. - */ - @Test - public void testReindexWithAttachement() { - - // store attachement - Wikitty attach1 = new WikittyImpl("att1"); - Wikitty attach2 = new WikittyImpl("att2"); - Collection<Wikitty> toStore = new ArrayList<Wikitty>(); - toStore.add(attach1); - toStore.add(attach2); - ws.store(null, toStore, false); - - // store first node - Wikitty treeNode = new WikittyImpl(); - WikittyTreeNode treeNodeImpl = new WikittyTreeNodeImpl(treeNode); - treeNodeImpl.setName("root"); - treeNodeImpl.addAttachment(attach1.getId()); - treeNodeImpl.addAttachment(attach2.getId()); - ws.store(null, Collections.singleton(treeNode), false); - - // set resync - ws.syncSearchEngine(null); - - // search wikitty with attachement - Search query = Search.query(); - query.eq(Element.ELT_EXTENSION, WikittyTreeNodeImpl.EXT_WIKITTYTREENODE); - query.eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "root"); - PagedResult<Wikitty> results = proxy.findAllByCriteria(query.criteria()); - Assert.assertEquals(1, results.size()); - WikittyTreeNode resultTreeNode = new WikittyTreeNodeImpl(results.get(0)); - Assert.assertEquals(2, resultTreeNode.getAttachment().size()); - } - - /** - * Test que lors de la reindexation les noeuds indexés le sont - * correctement si leur attachement ne sont pas encore - * présent dans l'index. - * - * Stocke le noeud avant les attachements. - */ - @Test - public void testReindexWithAttachementOrdering() { - - // store first node - Wikitty treeNode = new WikittyImpl(); - WikittyTreeNode treeNodeImpl = new WikittyTreeNodeImpl(treeNode); - treeNodeImpl.setName("root"); - WikittyEvent event = ws.store(null, Collections.singleton(treeNode), false); - treeNode = event.getWikitties().get(treeNode.getId()); - treeNodeImpl = new WikittyTreeNodeImpl(treeNode); - - // store attachement - Wikitty attach1 = new WikittyImpl("att1"); - Wikitty attach2 = new WikittyImpl("att2"); - treeNodeImpl.addAttachment(attach1.getId()); - treeNodeImpl.addAttachment(attach2.getId()); - Collection<Wikitty> toStore = new ArrayList<Wikitty>(); - toStore.add(attach1); - toStore.add(attach2); - toStore.add(treeNode); - ws.store(null, toStore, false); - - // set resync - ws.syncSearchEngine(null); - - // search wikitty with attachement - Search query = Search.query(); - query.eq(Element.ELT_EXTENSION, WikittyTreeNodeImpl.EXT_WIKITTYTREENODE); - query.eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "root"); - PagedResult<Wikitty> results = proxy.findAllByCriteria(query.criteria()); - Assert.assertEquals(1, results.size()); - WikittyTreeNode resultTreeNode = new WikittyTreeNodeImpl(results.get(0)); - Assert.assertEquals(2, resultTreeNode.getAttachment().size()); - } - - /** - * Test que lorsqu'un document solr est supprimé, il l'est réelement - * car le proxy gere les retours null pour des documents qui n'existe - * plus dans le base, mais les recherches continue de les trouver. - */ - @Test - public void testSolrDeleteDocument() { - // store new wikitty - Wikitty toDeleteWikitty = new WikittyImpl("wikkitytodelete"); - ws.store(null, Collections.singleton(toDeleteWikitty), false); - // look for it - Search query = Search.query(); - query.eq(Element.ELT_ID, "wikkitytodelete"); - Assert.assertEquals(1, ws.findAllByCriteria(null, - Collections.singletonList(query.criteria())).get(0).getNumFound()); - Assert.assertEquals(1, proxy.findAllByCriteria(query.criteria()).getNumFound()); - - // delete it - ws.delete(null, Collections.singleton(toDeleteWikitty.getId())); - - // try to look for it after deletion - Assert.assertEquals(0, proxy.findAllByCriteria(query.criteria()).getNumFound()); - Assert.assertEquals(0, ws.findAllByCriteria(null, - Collections.singletonList(query.criteria())).get(0).getNumFound()); - } - - // Nombre of iteration for test delete - public static final int NB_DOCS_TO_DELETE = 17; - - /** - * Test que lorsque plus de 10 documents solr sont supprimés, il le sont réelement - * car par défault, solr limte les resultats à 10 - * - * @see - */ - @Test - public void testSolrDeleteMoreThan10Documents() { - - List<WikittyLabel> toDelete = new ArrayList<WikittyLabel>(); - - for (int i = 0;i < NB_DOCS_TO_DELETE;i++) { - WikittyLabel toDeleteEntity = new WikittyLabelImpl(); - - // store new wikitty - toDeleteEntity.addLabels("toDeleteEntity" + i); - toDelete.add(toDeleteEntity); - } - - // Store all - proxy.store(toDelete); - - // look for it - Search query = Search.query(); - query.eq(Element.ELT_EXTENSION, WikittyLabel.EXT_WIKITTYLABEL); - Assert.assertEquals(NB_DOCS_TO_DELETE, ws.findAllByCriteria(null, - Collections.singletonList(query.criteria())).get(0).getNumFound()); - Assert.assertEquals(NB_DOCS_TO_DELETE, proxy.findAllByCriteria(query.criteria()).getNumFound()); - Assert.assertEquals(NB_DOCS_TO_DELETE, proxy.findAllByCriteria(WikittyLabel.class, query.criteria()).getNumFound()); - - // delete it - proxy.delete(toDelete); - - // try to look for it after deletion - Assert.assertEquals(0, proxy.findAllByCriteria(query.criteria()).getNumFound()); - Assert.assertEquals(0, ws.findAllByCriteria(null, - Collections.singletonList(query.criteria())).get(0).getNumFound()); - Assert.assertEquals(0, proxy.findAllByCriteria(WikittyLabel.class, query.criteria()).size()); - } -}

1 0

r1383 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 12:38:41 +0100 (Fri, 27 Jan 2012) New Revision: 1383 Url: http://nuiton.org/repositories/revision/wikitty/1383 Log: Indent/import Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-27 11:04:08 UTC (rev 1382) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-27 11:38:41 UTC (rev 1383) @@ -65,10 +65,8 @@ import org.nuiton.util.TimeLog; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.query.FacetQuery; -import org.nuiton.wikitty.query.FacetSortType; import org.nuiton.wikitty.query.FacetTopic; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; @@ -1056,9 +1054,7 @@ solrCore.shutdown(); } - - - @Override + @Override public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) { try { // Create query with restriction

1 0

r1382 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 12:04:08 +0100 (Fri, 27 Jan 2012) New Revision: 1382 Url: http://nuiton.org/repositories/revision/wikitty/1382 Log: improve imbricated service detection Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.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 10:56:52 UTC (rev 1381) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-01-27 11:04:08 UTC (rev 1382) @@ -46,6 +46,7 @@ import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyTypes; +import org.nuiton.wikitty.services.WikittyServiceDelegator; import org.nuiton.wikitty.services.WikittyServiceInMemory; import org.nuiton.wikitty.test.CatalogNode; import org.nuiton.wikitty.test.CatalogNodeImpl; @@ -85,7 +86,14 @@ * l'instance in memory ne supporte pas la fonctionnalité testée. */ protected void assumeTrueSearchEngineCanRunTest() { - boolean isInMomory = wikittyClient.getWikittyService() instanceof WikittyServiceInMemory; + + // improve imbricated service detection + WikittyService ws = wikittyClient.getWikittyService(); + while (ws instanceof WikittyServiceDelegator) { + ws = ((WikittyServiceDelegator)ws).getDelegate(); + } + + boolean isInMomory = ws instanceof WikittyServiceInMemory; if (isInMomory) { log.warn("Not yet implemented in memory, skipping"); }

1 0

r1381 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 11:56:52 +0100 (Fri, 27 Jan 2012) New Revision: 1381 Url: http://nuiton.org/repositories/revision/wikitty/1381 Log: Disable some tests in memory mode 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-27 10:47:17 UTC (rev 1380) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-27 10:56:52 UTC (rev 1381) @@ -275,6 +275,7 @@ @Test public void testSearchByExampleFacet() throws Exception { + assumeTrueSearchEngineCanRunTest(); // facets // create some wikitty Wikitty gf1Movie = new WikittyImpl(); @@ -328,6 +329,8 @@ @Test public void testSearchExtensionFacet() throws Exception { + assumeTrueSearchEngineCanRunTest(); // facets + // essai de facettiser sur les extensions WikittyQuery query = new WikittyQueryMaker().keyword("*").end(); query.setFirst(0); @@ -431,6 +434,8 @@ @Test public void testStorageAndClassification() throws Exception { + assumeTrueSearchEngineCanRunTest(); // not supported + // create some wikitty to permit search test WikittyQuery query1 = new WikittyQueryMaker().exteq(MOVIE_EXTENSION_NAME).end(); List<Wikitty> wikitties = wikittyClient.findAllByQuery(Wikitty.class, query1).getAll(); @@ -529,6 +534,8 @@ */ @Test public void testStorageVersionForce() { + // FIXME version force fails, but should work + assumeTrueSearchEngineCanRunTest(); // TODO // store 1 Wikitty myWikitty = new WikittyImpl(); @@ -579,6 +586,8 @@ */ @Test public void testStoragePreviouslyDeleted() { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); // store 1 Wikitty myWikitty = new WikittyImpl(); @@ -979,6 +988,9 @@ */ @Test public void testQueryMakerNeq() { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // 18 wikitty in init // only one with price == 42 // test strict equals @@ -1120,6 +1132,9 @@ @Test public void testQueryMakerUnlike() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -6 HP @@ -1130,6 +1145,9 @@ @Test public void testQueryParserUnlike() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -6 HP @@ -1172,6 +1190,9 @@ @Test public void testQueryMakerNotsw() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -6 HP @@ -1182,6 +1203,9 @@ @Test public void testQueryParserNotsw() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -6 HP @@ -1192,6 +1216,9 @@ @Test public void testQueryMakerNotew() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -1 sorciers @@ -1202,6 +1229,9 @@ @Test public void testQueryParserNotew() throws IOException { + // FIXME echatellier 20120125 should work + assumeTrueSearchEngineCanRunTest(); + // + 18 in init db importBooks(); // 13 importé = 31 // -1 sorciers @@ -1378,6 +1408,8 @@ @Test public void testSearchFacetSingleField() throws Exception { + assumeTrueSearchEngineCanRunTest(); // facets + importBooks(); WikittyQuery query = new WikittyQueryMaker().exteq(Product.EXT_PRODUCT).end();

1 0

r1380 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 27 Jan '12

27 Jan '12

Author: echatellier Date: 2012-01-27 11:47:17 +0100 (Fri, 27 Jan 2012) New Revision: 1380 Url: http://nuiton.org/repositories/revision/wikitty/1380 Log: Fix imports and warnings Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.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-27 10:44:56 UTC (rev 1379) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-27 10:47:17 UTC (rev 1380) @@ -25,9 +25,6 @@ package org.nuiton.wikitty; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -272,7 +269,7 @@ w2 = wikittyClient.store(w2); Wikitty w3 = wikittyClient.restore(w.getId()); - Set set = new HashSet(Arrays.asList("tata", "titi", "toto")); + Set<String> set = new HashSet<String>(Arrays.asList("tata", "titi", "toto")); Assert.assertEquals(set, w3.getFieldAsSet("TestConstraint", "ext", String.class)); } @@ -429,7 +426,7 @@ Assert.assertEquals(w1, wt); Set<String> labels = WikittyLabelUtil.findAllAppliedLabels(wikittyClient, w2.getId()); - Assert.assertEquals(new HashSet(Arrays.asList("tata"+ts, "titi"+ts)), labels); + Assert.assertEquals(new HashSet<String>(Arrays.asList("tata"+ts, "titi"+ts)), labels); } @Test Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2012-01-27 10:44:56 UTC (rev 1379) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2012-01-27 10:47:17 UTC (rev 1380) @@ -441,7 +441,7 @@ @Test public void testToList() { Object value = null; - Class clazz = Object.class; + Class<Object> clazz = Object.class; List<Object> expResult = null; List<Object> result = WikittyUtil.toList(value, clazz); Assert.assertEquals(expResult, result); @@ -480,9 +480,8 @@ { Object obj = new Object(); Class<String> clazz = String.class; - Object expResult = obj; try { - Object result = WikittyUtil.cast(obj, clazz); + WikittyUtil.cast(obj, clazz); Assert.fail("cast object to string !!!"); } catch (Exception eee) { // ok @@ -543,9 +542,14 @@ // use in testNewInstance static class MonLabel extends WikittyLabelImpl { + /** serialVersionUID. */ + private static final long serialVersionUID = 1L; } - /** check that a date is the same after parse and format */ + /** + * Check that a date is the same after parse and format. + * @throws Exception + */ @Test public void testDateConsistency() throws Exception { Date date = WikittyUtil.parseDate("30/01/2009");

1 0