Reorganize test classes

zxh0 · Oct 14, 2019 · 131ce83 · 131ce83
1 parent 75bcc33
commit 131ce83
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 21 deletions.
diff --git a/test/testclasses/RandomAccessFileWriteTest b/test/testclasses/RandomAccessFileWriteTest
diff --git a/test/testclasses/src/main/java/UnitTests.java b/test/testclasses/src/main/java/UnitTests.java
@@ -28,12 +28,12 @@ public static void main(String[] args) {
             stdlib.basic.thread.MainThreadTest.class,
             stdlib.basic.thread.SleepTest.class,
             stdlib.basic.wrapper.DoubleTest.class,
-            //stdlib.basic.java8.InterfaceDefaultMethodTest.class,
-            stdlib.basic.java8.InterfaceMethodTest.class,
-            stdlib.basic.jls8.ch12.Eg12_4_1_1.class,
-            stdlib.basic.jls8.ch12.Eg12_4_1_2.class,
-            stdlib.basic.jls8.ch12.Eg12_4_1_3.class,
-            stdlib.basic.jls8.ch12.Eg12_5_2.class,
+            //jvm.java8.InterfaceDefaultMethodTest.class,
+            jvm.java8.InterfaceMethodTest.class,
+            jvm.jls8.ch12.Eg12_4_1_1.class,
+            jvm.jls8.ch12.Eg12_4_1_2.class,
+            jvm.jls8.ch12.Eg12_4_1_3.class,
+            jvm.jls8.ch12.Eg12_5_2.class,
             thirdparty.gson.GsonTest.class
         );
     }

diff --git a/...java7/jsr292/MethodHandleNativesTest.java → ...java7/jsr292/MethodHandleNativesTest.java b/...java7/jsr292/MethodHandleNativesTest.java → ...java7/jsr292/MethodHandleNativesTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java7.jsr292;
+package jvm.java7.jsr292;
 
 import helper.ReflectionHelper;
 import helper.UnitTestRunner;

diff --git a/.../basic/java7/jsr292/MethodHandleTest.java → ...va/jvm/java7/jsr292/MethodHandleTest.java b/.../basic/java7/jsr292/MethodHandleTest.java → ...va/jvm/java7/jsr292/MethodHandleTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java7.jsr292;
+package jvm.java7.jsr292;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/...ib/basic/java7/jsr292/MethodTypeTest.java → ...java/jvm/java7/jsr292/MethodTypeTest.java b/...ib/basic/java7/jsr292/MethodTypeTest.java → ...java/jvm/java7/jsr292/MethodTypeTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java7.jsr292;
+package jvm.java7.jsr292;
 
 import java.lang.invoke.MethodType;
 

diff --git a/...sic/java8/InterfaceDefaultMethodTest.java → ...jvm/java8/InterfaceDefaultMethodTest.java b/...sic/java8/InterfaceDefaultMethodTest.java → ...jvm/java8/InterfaceDefaultMethodTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java8;
+package jvm.java8;
 
 import junit.framework.Assert;
 import helper.UnitTestRunner;

diff --git a/...dlib/basic/java8/InterfaceMethodTest.java → ...n/java/jvm/java8/InterfaceMethodTest.java b/...dlib/basic/java8/InterfaceMethodTest.java → ...n/java/jvm/java8/InterfaceMethodTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java8;
+package jvm.java8;
 
 import helper.UnitTestRunner;
 import org.junit.Test;

diff --git a/...n/java/stdlib/basic/java8/LambdaTest.java → ...s/src/main/java/jvm/java8/LambdaTest.java b/...n/java/stdlib/basic/java8/LambdaTest.java → ...s/src/main/java/jvm/java8/LambdaTest.java
@@ -1,4 +1,4 @@
-package stdlib.basic.java8;
+package jvm.java8;
 
 public class LambdaTest {
 

diff --git a/...ain/java/stdlib/basic/jls8/StringOut.java → ...ses/src/main/java/jvm/jls8/StringOut.java b/...ain/java/stdlib/basic/jls8/StringOut.java → ...ses/src/main/java/jvm/jls8/StringOut.java
@@ -1,4 +1,4 @@
-package stdlib.basic.jls8;
+package jvm.jls8;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/...va/stdlib/basic/jls8/ch12/Eg12_4_1_1.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_1.java b/...va/stdlib/basic/jls8/ch12/Eg12_4_1_1.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_1.java
@@ -1,6 +1,6 @@
-package stdlib.basic.jls8.ch12;
+package jvm.jls8.ch12;
 
-import stdlib.basic.jls8.StringOut;
+import jvm.jls8.StringOut;
 import helper.UnitTestRunner;
 import org.junit.Test;
 import static org.junit.Assert.*;

diff --git a/...va/stdlib/basic/jls8/ch12/Eg12_4_1_2.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_2.java b/...va/stdlib/basic/jls8/ch12/Eg12_4_1_2.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_2.java
@@ -1,4 +1,4 @@
-package stdlib.basic.jls8.ch12;
+package jvm.jls8.ch12;
 
 import helper.UnitTestRunner;
 import org.junit.Test;

diff --git a/...va/stdlib/basic/jls8/ch12/Eg12_4_1_3.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_3.java b/...va/stdlib/basic/jls8/ch12/Eg12_4_1_3.java → ...c/main/java/jvm/jls8/ch12/Eg12_4_1_3.java
@@ -1,6 +1,6 @@
-package stdlib.basic.jls8.ch12;
+package jvm.jls8.ch12;
 
-import stdlib.basic.jls8.StringOut;
+import jvm.jls8.StringOut;
 import helper.UnitTestRunner;
 import org.junit.Test;
 import static org.junit.Assert.*;

diff --git a/...java/stdlib/basic/jls8/ch12/Eg12_5_2.java → ...src/main/java/jvm/jls8/ch12/Eg12_5_2.java b/...java/stdlib/basic/jls8/ch12/Eg12_5_2.java → ...src/main/java/jvm/jls8/ch12/Eg12_5_2.java
@@ -1,6 +1,6 @@
-package stdlib.basic.jls8.ch12;
+package jvm.jls8.ch12;
 
-import stdlib.basic.jls8.StringOut;
+import jvm.jls8.StringOut;
 import helper.UnitTestRunner;
 import static org.junit.Assert.*;
 

diff --git a/test/testclasses/src/main/java/stdlib/basic/cl/ClassLoaderTest.java b/test/testclasses/src/main/java/stdlib/basic/cl/ClassLoaderTest.java
@@ -86,7 +86,7 @@ public void findLoadedClass() throws Exception {
         ClassLoader urlCl = new URLClassLoader(new URL[0]);
         assertEquals(appCl, urlCl.getParent());
         assertEquals(null, m.invoke(urlCl, "java.lang.Object"));
-        assertEquals(null, m.invoke(urlCl, "stdlib.basic.java7.cl.ClassLoaderTest"));
+        assertEquals(null, m.invoke(urlCl, "jvm.java7.cl.ClassLoaderTest"));
     }
 
 }