Reorganize test classes

zxh0 · Oct 15, 2019 · 8748d5b · 8748d5b
1 parent a8635ce
commit 8748d5b
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 40 deletions.
diff --git a/test/testclasses/src/main/java/UnitTests.java b/test/testclasses/src/main/java/UnitTests.java
@@ -1,5 +1,5 @@
 import helper.UnitTestRunner;
-import jvm8.InterfaceMethodTest;
+import jvm.lambda.InterfaceMethodTest;
 
 public class UnitTests {
 
@@ -29,7 +29,7 @@ public static void main(String[] args) {
             stdlib.basic.thread.MainThreadTest.class,
             stdlib.basic.thread.SleepTest.class,
             stdlib.basic.wrapper.DoubleTest.class,
-            //jvm8.InterfaceDefaultMethodTest.class,
+            //jvm.lambda.InterfaceDefaultMethodTest.class,
             InterfaceMethodTest.class,
             jls8.ch12.Eg12_4_1_1.class,
             jls8.ch12.Eg12_4_1_2.class,

diff --git a/test/testclasses/src/main/java/helper/MyAssert.java b/test/testclasses/src/main/java/helper/MyAssert.java
@@ -0,0 +1,11 @@
+package helper;
+
+public class MyAssert {
+
+    public static void assertEquals(Object expected, Object actual) {
+        if (!expected.equals(actual)) {
+            throw new AssertionError(actual.toString() + " != " + expected.toString());
+        }
+    }
+
+}
diff --git a/...rc/main/java/stdlib/basic/MethodCall.java → ...classes/src/main/java/jvm/MethodCall.java b/...rc/main/java/stdlib/basic/MethodCall.java → ...classes/src/main/java/jvm/MethodCall.java
@@ -1,4 +1,4 @@
-package stdlib.basic;
+package jvm;
 
 public class MethodCall {
 

diff --git a/...rc/main/java/stdlib/basic/ObjectInit.java → ...classes/src/main/java/jvm/ObjectInit.java b/...rc/main/java/stdlib/basic/ObjectInit.java → ...classes/src/main/java/jvm/ObjectInit.java
@@ -1,4 +1,4 @@
-package stdlib.basic;
+package jvm;
 
 
 public class ObjectInit {

diff --git a/test/testclasses/src/main/java/jvm/jsr292/LookupTest.java b/test/testclasses/src/main/java/jvm/jsr292/LookupTest.java
@@ -0,0 +1,32 @@
+package jvm.jsr292;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+import static helper.MyAssert.assertEquals;
+
+public class LookupTest {
+
+    public LookupTest(String[] x) {}
+    private void foo(String[] x) {}
+    public void bar(String[] x) {}
+    public int f1;
+    public static long f2;
+
+    public static void main(String[] args) throws Exception {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodType mt = MethodType.methodType(void.class, String[].class);
+
+        assertEquals("MethodHandle(String[])void",            lookup.findStatic(LookupTest.class, "main", mt).toString());
+        assertEquals("MethodHandle(String[])LookupTest",      lookup.findConstructor(LookupTest.class, mt).toString());
+        assertEquals("MethodHandle(LookupTest,String[])void", lookup.findSpecial(LookupTest.class, "foo", mt, LookupTest.class).toString());
+        assertEquals("MethodHandle(LookupTest,String[])void", lookup.findVirtual(LookupTest.class, "bar", mt).toString());
+        assertEquals("MethodHandle(LookupTest)int",           lookup.findGetter(LookupTest.class, "f1", int.class).toString());
+        assertEquals("MethodHandle(LookupTest,int)void",      lookup.findSetter(LookupTest.class, "f1", int.class).toString());
+        assertEquals("MethodHandle()long",                    lookup.findStaticGetter(LookupTest.class, "f2", long.class).toString());
+        assertEquals("MethodHandle(long)void",                lookup.findStaticSetter(LookupTest.class, "f2", long.class).toString());
+
+        System.out.println("OK!");
+    }
+
+}
diff --git a/.../jvm7/jsr292/MethodHandleNativesTest.java → ...a/jvm/jsr292/MethodHandleNativesTest.java b/.../jvm7/jsr292/MethodHandleNativesTest.java → ...a/jvm/jsr292/MethodHandleNativesTest.java
@@ -1,4 +1,4 @@
-package jvm7.jsr292;
+package jvm.jsr292;
 
 import helper.ReflectionHelper;
 import helper.UnitTestRunner;

diff --git a/test/testclasses/src/main/java/jvm/jsr292/MethodHandleTest.java b/test/testclasses/src/main/java/jvm/jsr292/MethodHandleTest.java
@@ -0,0 +1,33 @@
+package jvm.jsr292;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+import static helper.MyAssert.assertEquals;
+
+public class MethodHandleTest {
+
+    private static int x;
+
+    public static String test() {
+        return "hi";
+    }
+
+    public static void main(String[] args) throws Throwable {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+        MethodType mt = MethodType.methodType(String.class);
+        MethodHandle mh = lookup.findStatic(MethodHandleTest.class, "test", mt);
+        assertEquals("hi", mh.invoke());
+        assertEquals("hi", (String) mh.invokeExact());
+
+        MethodHandle getter = lookup.findStaticGetter(MethodHandleTest.class, "x", int.class);
+        MethodHandle setter = lookup.findStaticSetter(MethodHandleTest.class, "x", int.class);
+        setter.invoke(100);
+        assertEquals(100, getter.invoke());
+
+        System.out.println("OK!");
+    }
+
+}
diff --git a/test/testclasses/src/main/java/jvm/jsr292/MethodTypeTest.java b/test/testclasses/src/main/java/jvm/jsr292/MethodTypeTest.java
@@ -0,0 +1,20 @@
+package jvm.jsr292;
+
+import java.util.Arrays;
+
+import static java.lang.invoke.MethodType.*;
+import static helper.MyAssert.assertEquals;
+
+public class MethodTypeTest {
+
+    public static void main(String[] args) {
+        assertEquals("()void",           methodType(void.class).toString());                              // methodType(Class<?> rtype)
+        assertEquals("(String)Object",   methodType(Object.class, String.class).toString());              // methodType(Class<?> rtype, Class<?> ptype0)
+        assertEquals("(int,long)String", methodType(String.class, int.class, long.class).toString());     // methodType(Class<?> rtype, Class<?> ptype0, Class<?>... ptypes)
+        assertEquals("(int)String",      methodType(String.class, new Class<?>[]{int.class}).toString()); // methodType(Class<?> rtype, Class<?>[] ptypes)
+        assertEquals("(int)String",      methodType(String.class, Arrays.asList(int.class)).toString());  // methodType(Class<?> rtype, List<Class<?>> ptypes)
+        assertEquals("()void", fromMethodDescriptorString("()V", null).toString());
+        System.out.println("OK!");
+    }
+
+}
diff --git a/...java/jvm8/InterfaceDefaultMethodTest.java → ...vm/lambda/InterfaceDefaultMethodTest.java b/...java/jvm8/InterfaceDefaultMethodTest.java → ...vm/lambda/InterfaceDefaultMethodTest.java
@@ -1,4 +1,4 @@
-package jvm8;
+package jvm.lambda;
 
 import junit.framework.Assert;
 import helper.UnitTestRunner;

diff --git a/...c/main/java/jvm8/InterfaceMethodTest.java → .../java/jvm/lambda/InterfaceMethodTest.java b/...c/main/java/jvm8/InterfaceMethodTest.java → .../java/jvm/lambda/InterfaceMethodTest.java
@@ -1,4 +1,4 @@
-package jvm8;
+package jvm.lambda;
 
 import helper.UnitTestRunner;
 import org.junit.Test;

diff --git a/...lasses/src/main/java/jvm8/LambdaTest.java → .../src/main/java/jvm/lambda/LambdaTest.java b/...lasses/src/main/java/jvm8/LambdaTest.java → .../src/main/java/jvm/lambda/LambdaTest.java
@@ -1,4 +1,4 @@
-package jvm8;
+package jvm.lambda;
 
 public class LambdaTest {
 

diff --git a/test/testclasses/src/main/java/jvm7/jsr292/MethodHandleTest.java b/test/testclasses/src/main/java/jvm7/jsr292/MethodHandleTest.java
diff --git a/test/testclasses/src/main/java/jvm7/jsr292/MethodTypeTest.java b/test/testclasses/src/main/java/jvm7/jsr292/MethodTypeTest.java