From 8b6be652b22b6ae88cc800d2c5b371a99296a44c Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 1 Jun 2011 09:04:02 +0000 Subject: [PATCH] SOLR-2279: move to beforeClass, so a test doesn't disable it for subsequent tests in the same jvm git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130063 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/lucene/util/LuceneTestCase.java | 14 ++++++++------ .../solrj/embedded/MultiCoreEmbeddedTest.java | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java index 4a58023d466..655d81b092a 100644 --- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java @@ -341,6 +341,14 @@ public abstract class LuceneTestCase extends Assert { random.setSeed(staticSeed); tempDirs.clear(); stores = Collections.synchronizedMap(new IdentityHashMap()); + + // enable this by default, for IDE consistency with ant tests (as its the default from ant) + // TODO: really should be in solr base classes, but some extend LTC directly. + // we do this in beforeClass, because some tests currently disable it + if (System.getProperty("solr.directoryFactory") == null) { + System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory"); + } + savedCodecProvider = CodecProvider.getDefault(); if ("random".equals(TEST_CODECPROVIDER)) { if ("randomPerField".equals(TEST_CODEC)) { @@ -620,12 +628,6 @@ public abstract class LuceneTestCase extends Assert { for (Thread t : Thread.getAllStackTraces().keySet()) { rogueThreads.put(t, true); } - - // enable this by default, for IDE consistency with ant tests (as its the default from ant) - // TODO: really should be in solr base classes, but some extend LTC directly. - if (System.getProperty("solr.directoryFactory") == null) { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory"); - } } /** diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java index be95da03555..ede29c58afd 100644 --- a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java +++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java @@ -32,6 +32,8 @@ public class MultiCoreEmbeddedTest extends MultiCoreExampleTestBase { @Override public void setUp() throws Exception { + // TODO: fix this test to use MockDirectoryFactory + System.clearProperty("solr.directoryFactory"); super.setUp(); File home = new File( getSolrHome() );