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 2010/08/23 21:15:42 UTC
svn commit: r988259 - in
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util:
LuceneTestCase.java LuceneTestCaseJ4.java
Author: rmuir
Date: Mon Aug 23 19:15:42 2010
New Revision: 988259
URL: http://svn.apache.org/viewvc?rev=988259&view=rev
Log:
LUCENE-2598: use the specified -Dtests.directory when tests copy from an existing one too
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=988259&r1=988258&r2=988259&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Mon Aug 23 19:15:42 2010
@@ -343,7 +343,11 @@ public abstract class LuceneTestCase ext
public MockDirectoryWrapper newDirectory(Random r, Directory d) throws IOException {
StackTraceElement[] stack = new Exception().getStackTrace();
- MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(d));
+ Directory impl = LuceneTestCaseJ4.newDirectoryImpl(TEST_DIRECTORY);
+ for (String file : d.listAll()) {
+ d.copy(impl, file, file);
+ }
+ MockDirectoryWrapper dir = new MockDirectoryWrapper(impl);
stores.put(dir, stack);
return dir;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java?rev=988259&r1=988258&r2=988259&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java Mon Aug 23 19:15:42 2010
@@ -596,7 +596,11 @@ public class LuceneTestCaseJ4 {
public static MockDirectoryWrapper newDirectory(Random r, Directory d) throws IOException {
StackTraceElement[] stack = new Exception().getStackTrace();
- MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(d));
+ Directory impl = newDirectoryImpl(TEST_DIRECTORY);
+ for (String file : d.listAll()) {
+ d.copy(impl, file, file);
+ }
+ MockDirectoryWrapper dir = new MockDirectoryWrapper(impl);
stores.put(dir, stack);
return dir;
}