diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java b/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java index 963e9fe26ba..6e8e65a236d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java @@ -17,24 +17,23 @@ package org.apache.lucene.index; * limitations under the License. */ -import java.io.IOException; -import java.io.File; - -import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; - import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.CompoundFileDirectory; -import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.SimpleFSDirectory; -import org.apache.lucene.store._TestHelper; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.util.IOUtils; +import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; +import java.io.File; +import java.io.IOException; + +import static org.apache.lucene.store.TestHelper.isSimpleFSIndexInput; +import static org.apache.lucene.store.TestHelper.isSimpleFSIndexInputOpen; public class TestCompoundFile extends LuceneTestCase { @@ -346,8 +345,8 @@ public class TestCompoundFile extends LuceneTestCase IndexInput expected = dir.openInput("f11", newIOContext(random())); // this test only works for FSIndexInput - assertTrue(_TestHelper.isSimpleFSIndexInput(expected)); - assertTrue(_TestHelper.isSimpleFSIndexInputOpen(expected)); + assertTrue(isSimpleFSIndexInput(expected)); + assertTrue(isSimpleFSIndexInputOpen(expected)); IndexInput one = cr.openInput("f11", newIOContext(random())); diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/_TestHelper.java b/lucene/test-framework/src/java/org/apache/lucene/store/TestHelper.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/store/_TestHelper.java rename to lucene/test-framework/src/java/org/apache/lucene/store/TestHelper.java index c3789e08989..7f972332850 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/_TestHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/TestHelper.java @@ -24,7 +24,10 @@ import org.apache.lucene.store.SimpleFSDirectory.SimpleFSIndexInput; /** This class provides access to package-level features defined in the * store package. It is used for testing only. */ -public class _TestHelper { +public final class TestHelper { + private TestHelper() { + // + } /** Returns true if the instance of the provided input stream is actually * an SimpleFSIndexInput.