Author: echatellier Date: 2012-01-26 15:28:33 +0100 (Thu, 26 Jan 2012) New Revision: 1372 Url: http://nuiton.org/repositories/revision/wikitty/1372 Log: Remove StorageTest class (refactored) Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -1,182 +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 static junit.framework.Assert.assertEquals; - -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; - -import org.junit.Test; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.WikittyTypes; -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.search.Search; - -public class SearchTest extends AbstractTestConformance { - - private final static Log log = LogFactory.getLog(AbstractTestConformance.class); - - private ApplicationConfig config = null; - - @Override - public ApplicationConfig getConfig() { - if (config == null) { - config = WikittyConfig.getConfig(); // default config for in memory -// String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); -// log.info(msg); - } - return config; - } - - @Before - public void clearStorage() throws Exception { - getProxy().clear(); - } - - /* - * TODO Will contains all conformance tests to the search features. - */ - - public void testSearch() throws Exception { - String value = ""; - Criteria criteria = - Search.query() - .eq( "element", value ) - .gt( "element2", value ) - .or() - .lt( "element3", value ) - .criteria(); - /* - * is equivalent to : - * ( element = value ) AND ( ( element2 > value ) OR ( element3 < value ) ) - */ - } - - @Test - public void testSearch2() throws Exception { - WikittyExtension ext = ExtensionFactory.create("testExt", "1") - .addField("name", WikittyTypes.STRING) - .addField("age", WikittyTypes.NUMERIC) - .addField("birth", WikittyTypes.DATE) - .extension(); - List<Wikitty> wikitties = new LinkedList<Wikitty>(); - - Wikitty w = new WikittyImpl(); - w.addExtension(ext); - w.setField(ext.getName(), "name", "Guillaume"); - w.setField(ext.getName(), "age", "27"); - w.setField(ext.getName(), "birth", "19/04/1968"); - wikitties.add( w ); - - w = new WikittyImpl(); - w.addExtension(ext); - w.setField(ext.getName(), "name", "Toto"); - w.setField(ext.getName(), "age", "125"); - w.setField(ext.getName(), "birth", "19/04/1968 15:12"); - wikitties.add( w ); - - wikitties = getProxy().storeWikitty(wikitties); - - // Testing search on a date criteria - Criteria criteria = Search.query() - .gt("testExt.birth", "19/04/1968 15:00") - .criteria(); - PagedResult<String> result = getProxy().findAllIdByCriteria(criteria); - List<String> found = result.getAll(); - assertEquals(1, found.size()); - Wikitty wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "birth") ); - - // Testing search on a date criteria - criteria = Search.query() - .ge("testExt.birth", "19/04/1968") - .criteria(); - result = getProxy().findAllIdByCriteria(criteria); - found = result.getAll(); - assertEquals(2, found.size()); - wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "birth") ); - - criteria = Search.query() - .eq("testExt.name", "Guillaume") - .criteria(); - result = getProxy().findAllIdByCriteria(criteria); - found = result.getAll(); - assertEquals(1, found.size()); - wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - - criteria = Search.query() - .eq("testExt.age", "125") - .criteria(); - result = getProxy().findAllIdByCriteria(criteria); - found = result.getAll(); - assertEquals(1, found.size()); - wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - - criteria = Search.query() - .gt("testExt.age", "10") - .criteria(); - result = getProxy().findAllIdByCriteria(criteria); - found = result.getAll(); - assertEquals(2, found.size()); - wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - wikittyFound = getProxy().restore(found.get(1)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - - Wikitty exemple = new WikittyImpl(); - exemple.addExtension(ext); - exemple.setField(ext.getName(), "name", "Guillaume"); - exemple.setField(ext.getName(), "age", "27"); - result = getProxy().findAllIdByCriteria(Search.query(exemple).criteria() ); - found = result.getAll(); - assertEquals(1, found.size()); - wikittyFound = getProxy().restore(found.get(0)); - log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - - exemple = new WikittyImpl(); - exemple.addExtension(ext); - exemple.setField(ext.getName(), "name", "Guillaume"); - exemple.setField(ext.getName(), "age", "125"); - result = getProxy().findAllIdByCriteria(Search.query(exemple).criteria() ); - found = result.getAll(); - assertEquals(0, found.size()); - // log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); - - } - -} Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -1,29 +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; - -public abstract class StorageTest extends AbstractTestConformance { - -} Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -40,7 +40,6 @@ import org.junit.Test; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.conform.StorageTest; /** * Tests on wikitty object only. @@ -230,33 +229,33 @@ @Test public void testFieldCastRules() throws Exception { Wikitty w = createBasicWikitty(); - w.addExtension(StorageTest.EXT_TEST); + w.addExtension(EXT_TEST); // casted assignment ... final String stringValue = "Hello"; // test any object => string type (casted as its toString() value) - w.setField(StorageTest.EXTNAME, "fieldName0", new Object() { + w.setField(EXTNAME, "fieldName0", new Object() { public String toString() { return stringValue; } }); // test java.lang.Integer => int - w.setField(StorageTest.EXTNAME, "fieldName1", Integer.valueOf(123)); - Assert.assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); + w.setField(EXTNAME, "fieldName1", Integer.valueOf(123)); + Assert.assertEquals(123, w.getFieldAsInt(EXTNAME, "fieldName1") ); // test String => int - w.setField(StorageTest.EXTNAME, "fieldName1", "123"); - Assert.assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); + w.setField(EXTNAME, "fieldName1", "123"); + Assert.assertEquals(123, w.getFieldAsInt(EXTNAME, "fieldName1") ); // test String => Date Calendar cal = Calendar.getInstance(Locale.ROOT); cal.set(1982, 0, 23, 0, 0, 0); cal.set( Calendar.MILLISECOND, 0 ); - w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.formatDate(cal.getTime()) ); - Assert.assertEquals(cal.getTime(), w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); + w.setField( EXTNAME, "fieldName2", WikittyUtil.formatDate(cal.getTime()) ); + Assert.assertEquals(cal.getTime(), w.getFieldAsDate(EXTNAME, "fieldName2") ); } @Test public void testFieldBoundsManagement() throws Exception { String fieldName = "fieldName0"; - WikittyExtension ext = ExtensionFactory.create(StorageTest.EXTNAME, "1") + WikittyExtension ext = ExtensionFactory.create(EXTNAME, "1") .addField(fieldName, WikittyTypes.NUMERIC) .maxOccur(FieldType.NOLIMIT) .extension(); @@ -266,7 +265,7 @@ // test setting a (primitive) value to the field ... try { - w.setField(StorageTest.EXTNAME, fieldName, 123); + w.setField(EXTNAME, fieldName, 123); Assert.fail("setting an int to a list of int is forbidden !"); } catch (WikittyException e) { // OK @@ -274,10 +273,10 @@ // test adding elements to the field ... for ( int i = 0; i < 10; i++ ) { - w.addToField(StorageTest.EXTNAME, fieldName, i); + w.addToField(EXTNAME, fieldName, i); } int z = 0; - for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { + for ( int value : w.getFieldAsList(EXTNAME, fieldName, Integer.class) ) { Assert.assertEquals( "element " + z + " failed", z, value ); z++; @@ -285,17 +284,17 @@ // test set a list as the field value ... Integer[] listInt = new Integer[] {4, 2, 8, 9, 5, -12, Integer.MIN_VALUE, Integer.MAX_VALUE }; - w.setField( StorageTest.EXTNAME, fieldName, Arrays.asList(listInt) ); + w.setField( EXTNAME, fieldName, Arrays.asList(listInt) ); z = 0; - for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { + for ( int value : w.getFieldAsList(EXTNAME, fieldName, Integer.class) ) { Assert.assertEquals( listInt[z++].intValue(), value ); } // test remove an element ... - w.removeFromField( StorageTest.EXTNAME, fieldName, Integer.MIN_VALUE ); - List<Integer> values = w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class); + w.removeFromField( EXTNAME, fieldName, Integer.MIN_VALUE ); + List<Integer> values = w.getFieldAsList(EXTNAME, fieldName, Integer.class); z = 0; - for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { + for ( int value : w.getFieldAsList(EXTNAME, fieldName, Integer.class) ) { Assert.assertEquals( // on the last element, we expect MAX_VALUE because MIN_VALUE was deleted. z == values.size() - 1 ? Integer.MAX_VALUE : listInt[z++].intValue() @@ -303,8 +302,8 @@ } // test clear field ... - w.clearField(StorageTest.EXTNAME, fieldName); - values = w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class); + w.clearField(EXTNAME, fieldName); + values = w.getFieldAsList(EXTNAME, fieldName, Integer.class); Assert.assertTrue( values.isEmpty() ); } @@ -345,31 +344,31 @@ Map<String, Object> m = new HashMap<String, Object>(); Wikitty w = createBasicWikitty(); - w.addExtension(StorageTest.EXT_TEST); + w.addExtension(EXT_TEST); PerfFieldAccesClass z = new PerfFieldAccesClass(); long time = System.currentTimeMillis(); for (int i=0; i<MAX; i++) { // basic valid assignment ... String stringValue = "A Test Value"; - m.put(StorageTest.EXTNAME+".fieldName0", stringValue); + m.put(EXTNAME+".fieldName0", stringValue); int intValue = 123456; - m.put(StorageTest.EXTNAME + ".fieldName1", intValue); + m.put(EXTNAME + ".fieldName1", intValue); Date dateValue = new Date(); - m.put(StorageTest.EXTNAME + ".fieldName2", dateValue); + m.put(EXTNAME + ".fieldName2", dateValue); } long timeSetM = System.currentTimeMillis() - time; time = System.currentTimeMillis(); String tmp = ""; for (int i = 0; i < MAX; i++) { - String stringValue = (String)m.get(StorageTest.EXTNAME + ".fieldName0"); + String stringValue = (String)m.get(EXTNAME + ".fieldName0"); - int intValue = (Integer) m.get(StorageTest.EXTNAME + ".fieldName1"); + int intValue = (Integer) m.get(EXTNAME + ".fieldName1"); - Date dateValue = (Date)m.get(StorageTest.EXTNAME + ".fieldName2"); + Date dateValue = (Date)m.get(EXTNAME + ".fieldName2"); tmp = stringValue + intValue + dateValue; } long timeGetM = System.currentTimeMillis() - time; @@ -379,23 +378,23 @@ for (int i=0; i<MAX; i++) { // basic valid assignment ... String stringValue = "A Test Value"; - w.setField(StorageTest.EXTNAME, "fieldName0", stringValue); + w.setField(EXTNAME, "fieldName0", stringValue); int intValue = 123456; - w.setField(StorageTest.EXTNAME, "fieldName1", intValue); + w.setField(EXTNAME, "fieldName1", intValue); - w.setField(StorageTest.EXTNAME, "fieldName2", new Date()); + w.setField(EXTNAME, "fieldName2", new Date()); } long timeSetW = System.currentTimeMillis() - time; time = System.currentTimeMillis(); for (int i=0; i<MAX; i++) { // basic valid assignment ... - String stringValue = w.getFieldAsString(StorageTest.EXTNAME, "fieldName0"); + String stringValue = w.getFieldAsString(EXTNAME, "fieldName0"); - int intValue = w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1"); + int intValue = w.getFieldAsInt(EXTNAME, "fieldName1"); - Date dateValue = w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2"); + Date dateValue = w.getFieldAsDate(EXTNAME, "fieldName2"); tmp = stringValue + intValue + dateValue; } long timeGetW = System.currentTimeMillis() - time; Deleted: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -1,68 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-jdbc-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 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.jdbc.test; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyConfigOption; -import org.nuiton.wikitty.conform.StorageTest; - - -/** - * - * @author ruchaud, martel - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class StorageJDBCTest extends StorageTest { - - protected final static Log log = LogFactory.getLog(StorageJDBCTest.class); - - private ApplicationConfig config = null; - - @Override - public ApplicationConfig getConfig() { - if (config == null) { - config = WikittyConfig.getConfig("wikitty-config-sample-standalone.properties"); - config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), - "./target/data"); -// String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); -// log.info(msg); - } - return config; - } - - @Before - public void clearStorage() throws Exception { - getProxy().clear(); - } - -} Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -1,65 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $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 org.junit.AfterClass; -import org.junit.BeforeClass; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.api.AbstractSearchTest; - -/** - * User: couteau - * Date: 06/04/11 - */ -public class SolrSearchInMemoryTest extends AbstractSearchTest { - - static protected WikittyService service; - - static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - - @BeforeClass - public static void initTests() { - SolrTestHelper.initTests(config); - } - - @AfterClass - public static void closeTests() { - SolrTestHelper.closeTests((WikittyServiceSolr)service); - } - - @Override - public WikittyService getWikittyService() { - - if (service == null) { - service = new WikittyServiceSolr(config); - } - - service.clear(null); - - return service; - } -} \ No newline at end of file Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java 2012-01-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -1,64 +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 org.junit.AfterClass; -import org.junit.BeforeClass; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.api.AbstractSearchTest; - -/** - * @author sletellier - */ -public class SolrSearchServerTest extends AbstractSearchTest { - - protected static WikittyService service; - - protected static ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-server.properties"); - - @BeforeClass - public static void initTests() { - SolrTestHelper.initTests(config); - } - - @AfterClass - public static void closeTests() { - SolrTestHelper.closeTests((WikittyServiceSolr) service); - } - - @Override - public WikittyService getWikittyService() { - - if (service == null) { - service = new WikittyServiceSolr(config); - } - - service.clear(null); - - return service; - } -} \ No newline at end of file Modified: 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-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -48,7 +48,6 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.conform.AbstractTestConformance; -import org.nuiton.wikitty.conform.StorageTest; import org.nuiton.wikitty.entities.WikittyGroup; import org.nuiton.wikitty.entities.WikittyGroupImpl; import org.nuiton.wikitty.search.operators.Element; @@ -161,7 +160,7 @@ private Wikitty[] createWikitties(WikittyExtension lonelyExtension, String[] wValues) { ArrayList<Wikitty> result = new ArrayList<Wikitty>(); for ( String wValue : wValues ) { - Wikitty w = StorageTest.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); + Wikitty w = AbstractTestConformance.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); result.add( w ); } ws.store(null, result); Modified: 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-26 13:32:44 UTC (rev 1371) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2012-01-26 14:28:33 UTC (rev 1372) @@ -42,19 +42,19 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.conform.AbstractTestConformance; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.services.WikittyEvent; -import org.nuiton.wikitty.conform.StorageTest; +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; /** @@ -385,7 +385,7 @@ int childInit = sum(root); // Create a leaf - Wikitty leaf = StorageTest.createWikitty("name=totoTheLeaf", "test", extension); + Wikitty leaf = AbstractTestConformance.createWikitty("name=totoTheLeaf", "test", extension); ws.store(null, leaf); // Add it in the node2 (now: two values in it) @@ -536,7 +536,7 @@ createBranch("node3/node31"); createBranch("node3/node32"); - Wikitty value = StorageTest.createWikitty("name=value", "test", extension); + Wikitty value = AbstractTestConformance.createWikitty("name=value", "test", extension); ws.store(null, value); String valueId = value.getId();