svn commit: r1367834 - in /lucene/dev/trunk: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/util/junitcompat/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/store/ solr/ solr/core/ solr/core/src/test/org/apache/...

[rm...@apache.org]

Author: rmuir
Date: Wed Aug  1 00:31:29 2012
New Revision: 1367834

URL: http://svn.apache.org/viewvc?rev=1367834&view=rev
Log:
LUCENE-4278: ensure we fail test when directories arent closed (and add test-the-tester)

Added:
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
      - copied unchanged from r1367833, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/core/   (props changed)
    lucene/dev/trunk/lucene/test-framework/   (props changed)
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
    lucene/dev/trunk/solr/   (props changed)
    lucene/dev/trunk/solr/core/   (props changed)
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java?rev=1367834&r1=1367833&r2=1367834&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java Wed Aug  1 00:31:29 2012
@@ -31,8 +31,6 @@ import org.apache.lucene.util._TestUtil;
 public class BaseDirectoryWrapper extends Directory {
   /** our in directory */
   protected final Directory delegate;
-  /** best effort: base on in Directory is volatile */
-  protected boolean open;
   
   private boolean checkIndexOnClose = true;
   private boolean crossCheckTermVectorsOnClose = true;
@@ -43,7 +41,7 @@ public class BaseDirectoryWrapper extend
 
   @Override
   public void close() throws IOException {
-    open = false;
+    isOpen = false;
     if (checkIndexOnClose && indexPossiblyExists()) {
       _TestUtil.checkIndex(this, crossCheckTermVectorsOnClose);
     }
@@ -51,7 +49,7 @@ public class BaseDirectoryWrapper extend
   }
   
   public boolean isOpen() {
-    return open;
+    return isOpen;
   }
   
   /** 

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1367834&r1=1367833&r2=1367834&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Wed Aug  1 00:31:29 2012
@@ -551,7 +551,7 @@ public class MockDirectoryWrapper extend
     if (noDeleteOpenFile && openLocks.size() > 0) {
       throw new RuntimeException("MockDirectoryWrapper: cannot close: there are still open locks: " + openLocks);
     }
-    open = false;
+    isOpen = false;
     if (getCheckIndexOnClose()) {
       if (indexPossiblyExists()) {
         if (LuceneTestCase.VERBOSE) {
@@ -614,11 +614,6 @@ public class MockDirectoryWrapper extend
   public synchronized void removeIndexInput(IndexInput in, String name) {
     removeOpenFile(in, name);
   }
-
-  @Override
-  public synchronized boolean isOpen() {
-    return open;
-  }
   
   /**
    * Objects that represent fail-able conditions. Objects of a derived

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java?rev=1367834&r1=1367833&r2=1367834&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java Wed Aug  1 00:31:29 2012
@@ -123,6 +123,11 @@ public class CoreContainerCoreInitFailur
   }
   
   public void testFlowBadFromStart() throws Exception {
+    // TODO: even if we close all solr cores in the container, there is still a leaked dir?
+    // maybe from one that didnt load right?
+    
+    // TODO: make SolrCore closeable since its has close()
+    System.setProperty("solr.directoryFactory", "org.apache.solr.core.SimpleFSDirectoryFactory");
     
     // reused state
     Map<String,Exception> failures = null;