Author: jcouteau Date: 2011-04-12 12:04:16 +0200 (Tue, 12 Apr 2011) New Revision: 790 Url: http://nuiton.org/repositories/revision/wikitty/790 Log: Anomalie #1166: Bad test configuration - Fix for solr module Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java Modified: trunk/wikitty-solr/pom.xml trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/pom.xml 2011-04-12 10:04:16 UTC (rev 790) @@ -105,5 +105,33 @@ <description>Wikiity solr search engine</description> <inceptionYear>2009</inceptionYear> + + + <build> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefirePluginVersion}</version> + <configuration> + <systemPropertyVariables> + <!-- Override property so that solr temp dir is in target during tests --> + <wikitty.searchengine.solr.directory.data> + ${java.io.tmpdir}/solr/data + </wikitty.searchengine.solr.directory.data> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefirePluginVersion}</version> + </plugin> + </plugins> + </build> </project> Modified: 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 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 10:04:16 UTC (rev 790) @@ -25,17 +25,20 @@ package org.nuiton.wikitty.storage.solr; import org.junit.Before; +import org.junit.BeforeClass; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.services.WikittyServiceEnhanced; public abstract class AbstractTestSolr { protected WikittyProxy proxy = null; - protected WikittyServiceEnhanced ws = - new WikittyServiceEnhanced(new WikittyServiceSolr(new WikittyConfig())); + protected static WikittyConfig instance = new WikittyConfig(); + protected static WikittyServiceEnhanced ws; + public WikittyProxy getProxy() { if (proxy == null) { proxy = new WikittyProxy(ws); @@ -48,4 +51,12 @@ ws.clear(null); } + @BeforeClass + public static void initTests() throws Exception { + + SolrTestHelper.initTests(instance); + + ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); + } + } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-12 10:04:16 UTC (rev 790) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.storage.solr; +import org.junit.BeforeClass; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.api.AbstractSearchTest; @@ -36,11 +37,17 @@ WikittyService service; + static protected WikittyConfig config = new WikittyConfig(); + + @BeforeClass + public static void initTests() { + SolrTestHelper.initTests(config); + } + @Override public WikittyService getWikittyService() { if (service == null) { - WikittyConfig config = new WikittyConfig(); service = new WikittyServiceSolr(config); } Added: 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 (rev 0) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-12 10:04:16 UTC (rev 790) @@ -0,0 +1,35 @@ +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.WikittyConfig; + +/** + * 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(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.key, + dataDirectory.getAbsolutePath()); + } +} Modified: 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 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-12 10:04:16 UTC (rev 790) @@ -34,6 +34,7 @@ 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.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; @@ -59,8 +60,10 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(WikittySearchEngineSolrTest.class); - protected WikittyServiceSolr ws = new WikittyServiceSolr(new WikittyConfig()); + protected static WikittyServiceSolr ws; + protected static WikittyConfig instance = new WikittyConfig(); + protected WikittyProxy proxy = new WikittyProxy(ws); @Before @@ -68,6 +71,14 @@ 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