Renaming test/java to test/java7

48 files changed, 2 insertions, 0 deletions

diff --git a/build.gradle b/build.gradle
index f317d8a1..21b5eecd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -137,6 +137,8 @@ project('dcevm') {
     def m = System.getProperty('java.version') =~ /^1\.([0-9]+)\.*/
     def major = m[0][1].toInteger()
     if (major >= 7) {
+        sourceSets.test.java.srcDirs += 'src/test/java7'
+    } else if (major >= 8) {
         sourceSets.test.java.srcDirs += 'src/test/java8'
     }
 
diff --git a/dcevm/src/test/java/org/dcevm/test/LightTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/LightTestSuite.java
index b5a2af02..b5a2af02 100644
--- a/dcevm/src/test/java/org/dcevm/test/LightTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/LightTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/TestUtil.java b/dcevm/src/test/java7/org/dcevm/test/TestUtil.java
index 7876dac5..7876dac5 100644
--- a/dcevm/src/test/java/org/dcevm/test/TestUtil.java
+++ b/dcevm/src/test/java7/org/dcevm/test/TestUtil.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/ArrayTest.java b/dcevm/src/test/java7/org/dcevm/test/body/ArrayTest.java
index d82f5010..d82f5010 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/ArrayTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/ArrayTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/BodyTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/body/BodyTestSuite.java
index 37426aab..37426aab 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/BodyTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/BodyTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/ClassRenamingTestCase.java b/dcevm/src/test/java7/org/dcevm/test/body/ClassRenamingTestCase.java
index 84488815..84488815 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/ClassRenamingTestCase.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/ClassRenamingTestCase.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/EMCPTest.java b/dcevm/src/test/java7/org/dcevm/test/body/EMCPTest.java
index 0d28d6fe..0d28d6fe 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/EMCPTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/EMCPTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/FacTest.java b/dcevm/src/test/java7/org/dcevm/test/body/FacTest.java
index 832ea7a8..832ea7a8 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/FacTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/FacTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/FibTest.java b/dcevm/src/test/java7/org/dcevm/test/body/FibTest.java
index c95f2de5..c95f2de5 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/FibTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/FibTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/MultipleThreadsTest.java b/dcevm/src/test/java7/org/dcevm/test/body/MultipleThreadsTest.java
index 4966a2fc..4966a2fc 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/MultipleThreadsTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/MultipleThreadsTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/OldActivationTest.java b/dcevm/src/test/java7/org/dcevm/test/body/OldActivationTest.java
index 3ad7f400..3ad7f400 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/OldActivationTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/OldActivationTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/RedefinePrivateMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/body/RedefinePrivateMethodTest.java
index 935907fa..935907fa 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/RedefinePrivateMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/RedefinePrivateMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/RefactorActiveMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/body/RefactorActiveMethodTest.java
index 4dd433ce..4dd433ce 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/RefactorActiveMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/RefactorActiveMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/SimpleStaticTest.java b/dcevm/src/test/java7/org/dcevm/test/body/SimpleStaticTest.java
index a456381d..a456381d 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/SimpleStaticTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/SimpleStaticTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/StaticTest.java b/dcevm/src/test/java7/org/dcevm/test/body/StaticTest.java
index b4369b77..b4369b77 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/StaticTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/StaticTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/body/StressTest.java b/dcevm/src/test/java7/org/dcevm/test/body/StressTest.java
index 3d955810..3d955810 100644
--- a/dcevm/src/test/java/org/dcevm/test/body/StressTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/body/StressTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/eval/AddingInterfaceTest.java b/dcevm/src/test/java7/org/dcevm/test/eval/AddingInterfaceTest.java
index a3bec93d..a3bec93d 100644
--- a/dcevm/src/test/java/org/dcevm/test/eval/AddingInterfaceTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/eval/AddingInterfaceTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/eval/EvalTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/eval/EvalTestSuite.java
index f9baf6c9..f9baf6c9 100644
--- a/dcevm/src/test/java/org/dcevm/test/eval/EvalTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/eval/EvalTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/eval/FractionTest.java b/dcevm/src/test/java7/org/dcevm/test/eval/FractionTest.java
index 37ed44f6..37ed44f6 100644
--- a/dcevm/src/test/java/org/dcevm/test/eval/FractionTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/eval/FractionTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/eval/GeometryScenario.java b/dcevm/src/test/java7/org/dcevm/test/eval/GeometryScenario.java
index f671b6ca..f671b6ca 100644
--- a/dcevm/src/test/java/org/dcevm/test/eval/GeometryScenario.java
+++ b/dcevm/src/test/java7/org/dcevm/test/eval/GeometryScenario.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/ComplexFieldTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/ComplexFieldTest.java
index e7562349..e7562349 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/ComplexFieldTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/ComplexFieldTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/EnumTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/EnumTest.java
index a5443bef..a5443bef 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/EnumTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/EnumTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/FieldAlignmentTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/FieldAlignmentTest.java
index ebd47771..ebd47771 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/FieldAlignmentTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/FieldAlignmentTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/FieldChangedOrderTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/FieldChangedOrderTest.java
index 99f03afa..99f03afa 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/FieldChangedOrderTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/FieldChangedOrderTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/FieldModificationTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/FieldModificationTest.java
index 3529e6ad..3529e6ad 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/FieldModificationTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/FieldModificationTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/FieldsTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/fields/FieldsTestSuite.java
index 55ce5941..55ce5941 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/FieldsTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/FieldsTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/ObjectStressTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/ObjectStressTest.java
index 5109fb9b..5109fb9b 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/ObjectStressTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/ObjectStressTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/RedefinePrivateFieldTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/RedefinePrivateFieldTest.java
index c2ea1dea..c2ea1dea 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/RedefinePrivateFieldTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/RedefinePrivateFieldTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/StringFieldTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/StringFieldTest.java
index 2bf7167a..2bf7167a 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/StringFieldTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/StringFieldTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/fields/YieldTest.java b/dcevm/src/test/java7/org/dcevm/test/fields/YieldTest.java
index 0f5dc40c..0f5dc40c 100644
--- a/dcevm/src/test/java/org/dcevm/test/fields/YieldTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/fields/YieldTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/AddMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/AddMethodTest.java
index 7a56b577..7a56b577 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/AddMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/AddMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/AnnotationTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/AnnotationTest.java
index bb25162f..bb25162f 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/AnnotationTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/AnnotationTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/ClassObjectHashcodeTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectHashcodeTest.java
index 846c86e4..846c86e4 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/ClassObjectHashcodeTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectHashcodeTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/ClassObjectSynchronizationTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectSynchronizationTest.java
index 8bf5eab5..8bf5eab5 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/ClassObjectSynchronizationTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectSynchronizationTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/ClassReflectionTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/ClassReflectionTest.java
index 75fc38b4..75fc38b4 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/ClassReflectionTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/ClassReflectionTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/DeleteActiveMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/DeleteActiveMethodTest.java
index da957093..da957093 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/DeleteActiveMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/DeleteActiveMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/MethodReflectionTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/MethodReflectionTest.java
index 7c1eaaf7..7c1eaaf7 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/MethodReflectionTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/MethodReflectionTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/MethodsTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/methods/MethodsTestSuite.java
index 20888623..20888623 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/MethodsTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/MethodsTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/OverrideMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/OverrideMethodTest.java
index dc98d608..dc98d608 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/OverrideMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/OverrideMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/SingleClassReflectionTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassReflectionTest.java
index 61d3d31a..61d3d31a 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/SingleClassReflectionTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassReflectionTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/methods/SingleClassTest.java b/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassTest.java
index 4e12bc26..4e12bc26 100644
--- a/dcevm/src/test/java/org/dcevm/test/methods/SingleClassTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/AnonymousClassInMethodTest.java b/dcevm/src/test/java7/org/dcevm/test/structural/AnonymousClassInMethodTest.java
index 5f923110..5f923110 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/AnonymousClassInMethodTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/AnonymousClassInMethodTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/InterfaceTest.java b/dcevm/src/test/java7/org/dcevm/test/structural/InterfaceTest.java
index 1a089965..1a089965 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/InterfaceTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/InterfaceTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/RedefineClassClassTest.java b/dcevm/src/test/java7/org/dcevm/test/structural/RedefineClassClassTest.java
index e0da9002..e0da9002 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/RedefineClassClassTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/RedefineClassClassTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/RedefineObjectClassTest.java b/dcevm/src/test/java7/org/dcevm/test/structural/RedefineObjectClassTest.java
index 08d07c1a..08d07c1a 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/RedefineObjectClassTest.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/RedefineObjectClassTest.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/StructuralTestSuite.java b/dcevm/src/test/java7/org/dcevm/test/structural/StructuralTestSuite.java
index 633ba059..633ba059 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/StructuralTestSuite.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/StructuralTestSuite.java
diff --git a/dcevm/src/test/java/org/dcevm/test/structural/ThisTypeChange.java b/dcevm/src/test/java7/org/dcevm/test/structural/ThisTypeChange.java
index 9cfde217..9cfde217 100644
--- a/dcevm/src/test/java/org/dcevm/test/structural/ThisTypeChange.java
+++ b/dcevm/src/test/java7/org/dcevm/test/structural/ThisTypeChange.java
diff --git a/dcevm/src/test/java/org/dcevm/test/util/HotSwapTestHelper.java b/dcevm/src/test/java7/org/dcevm/test/util/HotSwapTestHelper.java
index 5ecbd83e..5ecbd83e 100644
--- a/dcevm/src/test/java/org/dcevm/test/util/HotSwapTestHelper.java
+++ b/dcevm/src/test/java7/org/dcevm/test/util/HotSwapTestHelper.java