Author: jcouteau Date: 2011-04-12 18:19:00 +0200 (Tue, 12 Apr 2011) New Revision: 795 Url: http://nuiton.org/repositories/revision/wikitty/795 Log: Put beforeclass in each test instead of abstract 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/SolrSearchTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 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 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 16:19:00 UTC (rev 795) @@ -51,12 +51,4 @@ 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/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-12 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-12 16:19:00 UTC (rev 795) @@ -40,6 +40,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.util.CollectionUtil; import org.nuiton.wikitty.search.Criteria; @@ -57,6 +58,7 @@ 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 { @@ -66,6 +68,14 @@ 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", null, 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 2011-04-12 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2011-04-12 16:19:00 UTC (rev 795) @@ -40,6 +40,7 @@ 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.search.Criteria; import org.nuiton.wikitty.entities.ExtensionFactory; @@ -54,6 +55,7 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; /** * @@ -75,6 +77,14 @@ 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 */