You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/06/01 10:53:19 UTC
svn commit: r1130058 - in /lucene/dev/branches/solr2193: ./ lucene/
lucene/backwards/ lucene/contrib/misc/src/test/org/apache/lucene/index/
lucene/contrib/misc/src/test/org/apache/lucene/misc/
lucene/src/java/org/apache/lucene/document/ lucene/src/java...
Author: rmuir
Date: Wed Jun 1 08:53:17 2011
New Revision: 1130058
URL: http://svn.apache.org/viewvc?rev=1130058&view=rev
Log:
merge trunk (1130012:1130056)
Added:
lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/core/
- copied from r1130056, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/core/
lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java
- copied unchanged from r1130056, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java
Modified:
lucene/dev/branches/solr2193/ (props changed)
lucene/dev/branches/solr2193/lucene/ (props changed)
lucene/dev/branches/solr2193/lucene/CHANGES.txt
lucene/dev/branches/solr2193/lucene/backwards/ (props changed)
lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/solr2193/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/solr2193/solr/ (props changed)
lucene/dev/branches/solr2193/solr/CHANGES.txt (props changed)
lucene/dev/branches/solr2193/solr/LICENSE.txt (props changed)
lucene/dev/branches/solr2193/solr/NOTICE.txt (props changed)
lucene/dev/branches/solr2193/solr/README.txt (props changed)
lucene/dev/branches/solr2193/solr/build.xml (contents, props changed)
lucene/dev/branches/solr2193/solr/client/ (props changed)
lucene/dev/branches/solr2193/solr/common-build.xml (contents, props changed)
lucene/dev/branches/solr2193/solr/contrib/ (props changed)
lucene/dev/branches/solr2193/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/solr2193/solr/contrib/clustering/build.xml
lucene/dev/branches/solr2193/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/solr2193/solr/contrib/extraction/build.xml
lucene/dev/branches/solr2193/solr/contrib/uima/build.xml
lucene/dev/branches/solr2193/solr/example/ (props changed)
lucene/dev/branches/solr2193/solr/lib/ (props changed)
lucene/dev/branches/solr2193/solr/site/ (props changed)
lucene/dev/branches/solr2193/solr/src/ (props changed)
lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
lucene/dev/branches/solr2193/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/solr2193/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/CHANGES.txt?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solr2193/lucene/CHANGES.txt Wed Jun 1 08:53:17 2011
@@ -236,6 +236,9 @@ Changes in Runtime Behavior
(Mike McCandless, Michael Busch, Simon Willnauer)
+* LUCENE-3146: IndexReader.setNorm throws IllegalStateException if the field
+ does not store norms. (Shai Erera, Mike McCandless)
+
API Changes
* LUCENE-2302, LUCENE-1458, LUCENE-2111, LUCENE-2514: Terms are no longer
Modified: lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Wed Jun 1 08:53:17 2011
@@ -86,7 +86,11 @@ public class TestFieldNormModifier exten
public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
- fnm.reSetNorms("nobodyherebutuschickens");
+ try {
+ fnm.reSetNorms("nobodyherebutuschickens");
+ } catch (IllegalStateException e) {
+ // expected
+ }
}
public void testFieldWithNoNorm() throws Exception {
@@ -101,7 +105,11 @@ public class TestFieldNormModifier exten
r.close();
FieldNormModifier fnm = new FieldNormModifier(store, s);
- fnm.reSetNorms("nonorm");
+ try {
+ fnm.reSetNorms("nonorm");
+ } catch (IllegalStateException e) {
+ // expected
+ }
// nothing should have changed
r = IndexReader.open(store, false);
Modified: lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/branches/solr2193/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Wed Jun 1 08:53:17 2011
@@ -92,12 +92,12 @@ public class TestLengthNormModifier exte
super.tearDown();
}
- public void testMissingField() {
+ public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
fnm.reSetNorms("nobodyherebutuschickens");
- } catch (Exception e) {
- assertNull("caught something", e);
+ } catch (IllegalStateException e) {
+ // expected
}
}
@@ -115,8 +115,8 @@ public class TestLengthNormModifier exte
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
fnm.reSetNorms("nonorm");
- } catch (Exception e) {
- assertNull("caught something", e);
+ } catch (IllegalStateException e) {
+ // expected
}
// nothing should have changed
Modified: lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/document/Field.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/document/Field.java Wed Jun 1 08:53:17 2011
@@ -96,7 +96,7 @@ public final class Field extends Abstrac
},
/** Expert: Index the field's value without an Analyzer,
- * and also disable the storing of norms. Note that you
+ * and also disable the indexing of norms. Note that you
* can also separately enable/disable norms by calling
* {@link Field#setOmitNorms}. No norms means that
* index-time field and document boosting and field
@@ -104,11 +104,11 @@ public final class Field extends Abstrac
* less memory usage as norms take up one byte of RAM
* per indexed field for every document in the index,
* during searching. Note that once you index a given
- * field <i>with</i> norms enabled, disabling norms will
+ * field <i>with</i> norms disabled, enabling norms will
* have no effect. In other words, for this to have the
- * above described effect on a field, all instances of
+ * above described effect on a field, one instance of
* that field must be indexed with NOT_ANALYZED_NO_NORMS
- * from the beginning. */
+ * at some point. */
NOT_ANALYZED_NO_NORMS {
@Override
public boolean isIndexed() { return true; }
Modified: lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/IndexReader.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/IndexReader.java Wed Jun 1 08:53:17 2011
@@ -1025,8 +1025,8 @@ public abstract class IndexReader implem
* length normalization}. Thus, to preserve the length normalization
* values when resetting this, one should base the new value upon the old.
*
- * <b>NOTE:</b> If this field does not store norms, then
- * this method call will silently do nothing.
+ * <b>NOTE:</b> If this field does not index norms, then
+ * this method throws {@link IllegalStateException}.
*
* @see #norms(String)
* @see Similarity#decodeNormValue(byte)
@@ -1037,6 +1037,7 @@ public abstract class IndexReader implem
* has this index open (<code>write.lock</code> could not
* be obtained)
* @throws IOException if there is a low-level IO error
+ * @throws IllegalStateException if the field does not index norms
*/
public synchronized void setNorm(int doc, String field, byte value)
throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {
Modified: lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/solr2193/lucene/src/java/org/apache/lucene/index/SegmentReader.java Wed Jun 1 08:53:17 2011
@@ -566,8 +566,10 @@ public class SegmentReader extends Index
protected void doSetNorm(int doc, String field, byte value)
throws IOException {
SegmentNorms norm = norms.get(field);
- if (norm == null) // not an indexed field
- return;
+ if (norm == null) {
+ // field does not store norms
+ throw new IllegalStateException("Cannot setNorm for field " + field + ": norms were omitted");
+ }
normsDirty = true;
norm.copyOnWrite()[doc] = value; // set the value
Modified: lucene/dev/branches/solr2193/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/solr2193/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Wed Jun 1 08:53:17 2011
@@ -221,7 +221,7 @@ public abstract class LuceneTestCase ext
private static TimeZone timeZone;
private static TimeZone savedTimeZone;
- private static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
+ protected static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock", "MockRandom"};
@@ -620,6 +620,12 @@ public abstract class LuceneTestCase ext
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");
+ }
}
/**
Modified: lucene/dev/branches/solr2193/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/build.xml Wed Jun 1 08:53:17 2011
@@ -463,9 +463,8 @@
<sysproperty key="testmethod" value="${testmethod}"/>
<!-- set whether or not nightly tests should run -->
<sysproperty key="tests.nightly" value="${tests.nightly}"/>
- <!-- TODO: why is this unconditionally set to "" above? disable for now
- <jvmarg line="${dir.prop}"/>
- -->
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
Modified: lucene/dev/branches/solr2193/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/common-build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/common-build.xml (original)
+++ lucene/dev/branches/solr2193/solr/common-build.xml Wed Jun 1 08:53:17 2011
@@ -68,6 +68,7 @@
<property name="tests.seed" value="random" />
<property name="tests.nightly" value="false" />
<property name="tests.verbose" value="false" />
+ <property name="tests.directory" value="random" />
<condition property="dir.prop" value="-Dsolr.directoryFactory=solr.StandardDirectoryFactory">
<isset property="use.fsdir"/>
Modified: lucene/dev/branches/solr2193/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/contrib/analysis-extras/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/contrib/analysis-extras/build.xml Wed Jun 1 08:53:17 2011
@@ -159,6 +159,8 @@
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${junit.output.dir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
Modified: lucene/dev/branches/solr2193/solr/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/contrib/clustering/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/contrib/clustering/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/contrib/clustering/build.xml Wed Jun 1 08:53:17 2011
@@ -131,6 +131,8 @@
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${junit.output.dir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
Modified: lucene/dev/branches/solr2193/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/contrib/dataimporthandler/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/contrib/dataimporthandler/build.xml Wed Jun 1 08:53:17 2011
@@ -183,6 +183,8 @@
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${tempDir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
@@ -245,6 +247,8 @@
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${tempDir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.extras.classpath"/>
Modified: lucene/dev/branches/solr2193/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/contrib/extraction/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/contrib/extraction/build.xml Wed Jun 1 08:53:17 2011
@@ -128,6 +128,8 @@
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${tempDir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
Modified: lucene/dev/branches/solr2193/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/contrib/uima/build.xml?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/contrib/uima/build.xml (original)
+++ lucene/dev/branches/solr2193/solr/contrib/uima/build.xml Wed Jun 1 08:53:17 2011
@@ -124,6 +124,8 @@
<sysproperty key="jetty.insecurerandom" value="1"/>
<sysproperty key="tempDir" file="${tempDir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
+ <sysproperty key="tests.directory" value="${tests.directory}"/>
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<jvmarg line="${args}"/>
<formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
Modified: lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java Wed Jun 1 08:53:17 2011
@@ -19,6 +19,7 @@
package org.apache.solr;
+import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.noggit.CharArr;
import org.apache.noggit.JSONUtil;
@@ -75,6 +76,16 @@ public abstract class SolrTestCaseJ4 ext
endTrackingSearchers();
endTrackingWriters();
}
+
+ // SOLR-2279: hack to shut these directories down
+ // we still keep the ability to track open index files this way
+ public static void closeDirectories() throws Exception {
+ for (MockDirectoryWrapper d : stores.keySet()) {
+ if (d.isOpen()) {
+ d.close();
+ }
+ }
+ }
@Override
public void setUp() throws Exception {
@@ -291,6 +302,7 @@ public abstract class SolrTestCaseJ4 ext
public static void deleteCore() throws Exception {
log.info("###deleteCore" );
if (h != null) { h.close(); }
+ closeDirectories();
if (dataDir != null) {
String skip = System.getProperty("solr.test.leavedatadir");
if (null != skip && 0 != skip.trim().length()) {
Modified: lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java Wed Jun 1 08:53:17 2011
@@ -193,6 +193,7 @@ public abstract class AbstractSolrTestCa
}
if (h != null) { h.close(); }
+ SolrTestCaseJ4.closeDirectories();
String skip = System.getProperty("solr.test.leavedatadir");
if (null != skip && 0 != skip.trim().length()) {
System.err.println("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
Modified: lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/TestSolrCoreProperties.java Wed Jun 1 08:53:17 2011
@@ -59,6 +59,7 @@ public class TestSolrCoreProperties exte
@Override
public void tearDown() throws Exception {
solrJetty.stop();
+ SolrTestCaseJ4.closeDirectories();
AbstractSolrTestCase.recurseDelete(homeDir);
super.tearDown();
}
Modified: lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Wed Jun 1 08:53:17 2011
@@ -78,6 +78,7 @@ public class JettyWebappTest extends Luc
try {
server.stop();
} catch( Exception ex ) {}
+ SolrTestCaseJ4.closeDirectories();
super.tearDown();
}
Modified: lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java Wed Jun 1 08:53:17 2011
@@ -33,6 +33,8 @@ public class MergeIndexesEmbeddedTest ex
@Override
public void setUp() throws Exception {
+ // TODO: fix this test to use MockDirectoryFactory
+ System.clearProperty("solr.directoryFactory");
super.setUp();
File home = new File(getSolrHome());
Modified: lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java?rev=1130058&r1=1130057&r2=1130058&view=diff
==============================================================================
--- lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java (original)
+++ lucene/dev/branches/solr2193/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java Wed Jun 1 08:53:17 2011
@@ -38,6 +38,8 @@ public class MultiCoreExampleJettyTest e
@Override public void setUp() throws Exception
{
+ // TODO: fix this test to use MockDirectoryFactory
+ System.clearProperty("solr.directoryFactory");
super.setUp();
jetty = new JettySolrRunner( context, 0 );