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 2015/04/20 19:23:59 UTC
svn commit: r1674946 - in /lucene/dev/trunk/lucene: ./
core/src/test/org/apache/lucene/ core/src/test/org/apache/lucene/analysis/
core/src/test/org/apache/lucene/codecs/asserting/
core/src/test/org/apache/lucene/codecs/compressing/ core/src/test/org/ap...
Author: rmuir
Date: Mon Apr 20 17:23:58 2015
New Revision: 1674946
URL: http://svn.apache.org/r1674946
Log:
LUCENE-6439: Create test-framework/src/test
Added:
lucene/dev/trunk/lucene/test-framework/src/test/
lucene/dev/trunk/lucene/test-framework/src/test/org/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockCharFilter.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestPosition.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/
- copied from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/asserting/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
- copied unchanged from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/mockfile/
- copied from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/mockfile/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SorePoint.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SoreType.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestLeaveFilesIfTestFails.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimatorOnWildAnimals.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessageWithRepeated.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSetupTeardownChaining.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java
- copied, changed from r1674944, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java
- copied, changed from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/
- copied from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/
Removed:
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockCharFilter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestPosition.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/asserting/
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/mockfile/
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimatorOnWildAnimals.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/SorePoint.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/SoreType.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessageWithRepeated.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/TestSetupTeardownChaining.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java
lucene/dev/trunk/lucene/test-framework/build.xml
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1674946&r1=1674945&r2=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Mon Apr 20 17:23:58 2015
@@ -53,7 +53,7 @@
</target>
<!-- "-clover.load" is *not* a useless dependency. do not remove -->
- <target name="test" depends="-clover.load, -init-totals, test-core, test-modules, -check-totals"
+ <target name="test" depends="-clover.load, -init-totals, test-core, test-test-framework, test-modules, -check-totals"
description="Runs all unit tests (core, modules and back-compat)"
/>
@@ -449,9 +449,18 @@
<ant dir="core" target="compile-test" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
+ <ant dir="test-framework" target="compile-test" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
<modules-crawl target="compile-test" failonerror="true"/>
</sequential>
</target>
+
+ <target name="test-test-framework">
+ <ant dir="test-framework" target="test" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
<target name="test-modules">
<modules-crawl target="test" failonerror="true"/>
@@ -470,6 +479,9 @@
<ant dir="${common.dir}/core" target="jacoco" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
+ <ant dir="${common.dir}/test-framework" target="jacoco" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
<modules-crawl target="jacoco" failonerror="true"/>
<!-- produce aggregate report -->
@@ -486,7 +498,6 @@
<classfiles>
<fileset dir="${common.dir}/build">
<include name="**/classes/java/**/*.class"/>
- <exclude name="test-framework/**"/>
<exclude name="tools/**"/>
</fileset>
</classfiles>
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java?rev=1674946&r1=1674945&r2=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java Mon Apr 20 17:23:58 2015
@@ -24,29 +24,9 @@ import java.util.Arrays;
import java.util.List;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
-public class TestDirectory extends BaseDirectoryTestCase {
-
- @Override
- protected Directory getDirectory(Path path) throws IOException {
- final Directory dir;
- if (random().nextBoolean()) {
- dir = newDirectory();
- } else {
- dir = newFSDirectory(path);
- }
- if (dir instanceof MockDirectoryWrapper) {
- // test manipulates directory directly
- ((MockDirectoryWrapper)dir).setEnableVirusScanner(false);
- }
- return dir;
- }
-
- // we wrap the directory in slow stuff, so only run nightly
- @Override @Nightly
- public void testThreadSafety() throws Exception {
- super.testThreadSafety();
- }
+public class TestDirectory extends LuceneTestCase {
// Test that different instances of FSDirectory can coexist on the same
// path, can read, write, and lock files.
Modified: lucene/dev/trunk/lucene/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/build.xml?rev=1674946&r1=1674945&r2=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/build.xml (original)
+++ lucene/dev/trunk/lucene/test-framework/build.xml Mon Apr 20 17:23:58 2015
@@ -30,7 +30,17 @@
<fileset dir="lib"/>
</path>
- <path id="test.classpath"/>
+ <path id="test.classpath">
+ <pathelement location="${build.dir}/classes/java"/>
+ <pathelement location="${build.dir}/classes/test"/>
+ <path refid="classpath"/>
+ <path refid="junit-path"/>
+ </path>
+
+ <path id="junit.classpath">
+ <path refid="test.classpath"/>
+ <pathelement path="${java.class.path}"/>
+ </path>
<!--
Specialize compile-core to depend on lucene-core and lucene-codecs compilation.
@@ -38,16 +48,11 @@
<target name="compile-core" depends="init,compile-lucene-core,compile-codecs,common.compile-core"
description="Compiles test-framework classes"/>
- <!-- redefine the clover setup, because we dont want to run clover for the test-framework -->
- <target name="-clover.setup" if="run.clover"/>
-
- <!-- redefine the test compilation, so it's just a no-op -->
- <target name="compile-test"/>
-
<!-- redefine the forbidden apis for tests, as we check ourselves - no sysout testing -->
<target name="-check-forbidden-tests" depends="-init-forbidden-apis,compile-core">
<forbidden-apis suppressAnnotation="**.SuppressForbidden" signaturesFile="${common.dir}/tools/forbiddenApis/tests.txt" classpathref="forbidden-apis.allclasses.classpath">
<fileset dir="${build.dir}/classes/java"/>
+ <fileset dir="${build.dir}/classes/test"/>
</forbidden-apis>
</target>
<target name="-check-forbidden-sysout"/>
Modified: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java?rev=1674946&r1=1674704&r2=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java Mon Apr 20 17:23:58 2015
@@ -18,19 +18,14 @@ package org.apache.lucene.codecs.asserti
*/
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.index.BasePostingsFormatTestCase;
+import org.apache.lucene.index.BaseDocValuesFormatTestCase;
-/** Test AssertingPostingsFormat directly */
-public class TestAssertingDocValuesFormat extends BasePostingsFormatTestCase {
+/** Test AssertingDocValuesFormat directly */
+public class TestAssertingDocValuesFormat extends BaseDocValuesFormatTestCase {
private final Codec codec = new AssertingCodec();
@Override
protected Codec getCodec() {
return codec;
}
-
- @Override
- protected boolean isPostingsEnumReuseImplemented() {
- return false;
- }
}
Modified: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java?rev=1674946&r1=1674704&r2=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java Mon Apr 20 17:23:58 2015
@@ -18,10 +18,10 @@ package org.apache.lucene.codecs.asserti
*/
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.index.BaseStoredFieldsFormatTestCase;
+import org.apache.lucene.index.BaseTermVectorsFormatTestCase;
-/** Test AssertingStoredFieldsFormat directly */
-public class TestAssertingTermVectorsFormat extends BaseStoredFieldsFormatTestCase {
+/** Test AssertingTermVectorsFormat directly */
+public class TestAssertingTermVectorsFormat extends BaseTermVectorsFormatTestCase {
private final Codec codec = new AssertingCodec();
@Override
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java Mon Apr 20 17:23:58 2015
@@ -18,15 +18,34 @@ package org.apache.lucene.store;
*/
import java.io.IOException;
+import java.nio.file.Path;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.Nightly;
-public class TestMockDirectoryWrapper extends LuceneTestCase {
+public class TestMockDirectoryWrapper extends BaseDirectoryTestCase {
+
+ @Override
+ protected Directory getDirectory(Path path) throws IOException {
+ final MockDirectoryWrapper dir;
+ if (random().nextBoolean()) {
+ dir = newMockDirectory();
+ } else {
+ dir = newMockFSDirectory(path);
+ }
+ dir.setEnableVirusScanner(false); // test manipulates filesystem directly
+ return dir;
+ }
+
+ // we wrap the directory in slow stuff, so only run nightly
+ @Override @Nightly
+ public void testThreadSafety() throws Exception {
+ super.testThreadSafety();
+ }
public void testFailIfIndexWriterNotClosed() throws IOException {
MockDirectoryWrapper dir = newMockDirectory();
@@ -103,6 +122,5 @@ public class TestMockDirectoryWrapper ex
iw.commit();
iw.close();
dir.close();
- }
-
+ }
}
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SorePoint.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SorePoint.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SorePoint.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SoreType.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SoreType.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/SoreType.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
import org.junit.After;
import org.junit.Assert;
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
import org.apache.lucene.codecs.Codec;
import org.junit.Assert;
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestLeaveFilesIfTestFails.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestLeaveFilesIfTestFails.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestLeaveFilesIfTestFails.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestLeaveFilesIfTestFails.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java Mon Apr 20 17:23:58 2015
@@ -19,7 +19,7 @@ package org.apache.lucene.util;
import java.util.concurrent.CountDownLatch;
-import org.apache.lucene.util.junitcompat.WithNestedTests;
+import org.apache.lucene.util.WithNestedTests;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimatorOnWildAnimals.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimatorOnWildAnimals.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimatorOnWildAnimals.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java Mon Apr 20 17:23:58 2015
@@ -22,7 +22,7 @@ import org.junit.Assert;
/**
* Check large and special graphs.
*/
-public class TestRamUsageEstimatorOnWildAnimals extends LuceneTestCase {
+public class TestRamUsageTesterOnWildAnimals extends LuceneTestCase {
public static class ListElement {
ListElement next;
}
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessageWithRepeated.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessageWithRepeated.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessageWithRepeated.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSetupTeardownChaining.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSetupTeardownChaining.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSetupTeardownChaining.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java (from r1674944, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java&r1=1674944&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene;
+package org.apache.lucene.util;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Ignore;
Copied: lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java (from r1674704, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java?p2=lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java&r1=1674704&r2=1674946&rev=1674946&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java Mon Apr 20 17:23:58 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.junitcompat;
+package org.apache.lucene.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more