svn commit: r1394323 - in /lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store: MockDirectoryWrapper.java SlowOpeningMockIndexInputWrapper.java

[rm...@apache.org]

Author: rmuir
Date: Thu Oct  4 23:06:42 2012
New Revision: 1394323

URL: http://svn.apache.org/viewvc?rev=1394323&view=rev
Log:
LUCENE-4456: add another sleeper to test exception handling

Added:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java   (with props)
Modified:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java

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=1394323&r1=1394322&r2=1394323&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 Thu Oct  4 23:06:42 2012
@@ -506,8 +506,11 @@ public class MockDirectoryWrapper extend
     IndexInput delegateInput = delegate.openInput(name, LuceneTestCase.newIOContext(randomState, context));
 
     final IndexInput ii;
-    if (randomState.nextInt(500) == 0) {
+    int randomInt = randomState.nextInt(500);
+    if (randomInt == 0) {
       ii = new SlowClosingMockIndexInputWrapper(this, name, delegateInput);
+    } else if (randomInt  == 1) { 
+      ii = new SlowOpeningMockIndexInputWrapper(this, name, delegateInput);
     } else {
       ii = new MockIndexInputWrapper(this, name, delegateInput);
     }

Added: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java?rev=1394323&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java (added)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java Thu Oct  4 23:06:42 2012
@@ -0,0 +1,42 @@
+package org.apache.lucene.store;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.util.ThreadInterruptedException;
+
+/**
+ * Takes a while to open files: gives testThreadInterruptDeadlock
+ * a chance to find file leaks if opening an input throws exception
+ */
+class SlowOpeningMockIndexInputWrapper extends MockIndexInputWrapper {
+
+  public SlowOpeningMockIndexInputWrapper(MockDirectoryWrapper dir,
+      String name, IndexInput delegate) throws IOException {
+    super(dir, name, delegate);
+    try {
+      Thread.sleep(50);
+    } catch (InterruptedException ie) {
+      try {
+        super.close();
+      } catch (Throwable ignore) {} // we didnt open successfully
+      throw new ThreadInterruptedException(ie);
+    }
+  }
+}