svn commit: r1586399 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java

[us...@apache.org]

Author: uschindler
Date: Thu Apr 10 18:38:38 2014
New Revision: 1586399

URL: http://svn.apache.org/r1586399
Log:
Merged revision(s) 1586398 from lucene/dev/trunk:
After Dawid fixed the test runner make this test as simple as possible (the nested test *must* fail)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java?rev=1586399&r1=1586398&r2=1586399&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java Thu Apr 10 18:38:38 2014
@@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.store.RAMDirectory;
 import org.junit.Assert;
 import org.junit.Test;
@@ -44,7 +43,7 @@ public class TestFailOnFieldCacheInsanit
 
     private void makeIndex() throws Exception {
       // we use RAMDirectory here, because we dont want to stay on open files on Windows:
-      d = new MockDirectoryWrapper(random(), new RAMDirectory());
+      d = new RAMDirectory();
       @SuppressWarnings("resource") RandomIndexWriter w =
           new RandomIndexWriter(random(), d);
       Document doc = new Document();