Reorganize test classes

zxh0 · Oct 14, 2019 · 476f6a3 · 476f6a3
1 parent ca86f5e
commit 476f6a3
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 34 deletions.
diff --git a/test/testclasses/src/main/java/UnitTests.java b/test/testclasses/src/main/java/UnitTests.java
@@ -1,4 +1,5 @@
 import helper.UnitTestRunner;
+import jvm8.InterfaceMethodTest;
 
 public class UnitTests {
 
@@ -28,12 +29,12 @@ public static void main(String[] args) {
             stdlib.basic.thread.MainThreadTest.class,
             stdlib.basic.thread.SleepTest.class,
             stdlib.basic.wrapper.DoubleTest.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,
+            //jvm8.InterfaceDefaultMethodTest.class,
+            InterfaceMethodTest.class,
+            jls8.ch12.Eg12_4_1_1.class,
+            jls8.ch12.Eg12_4_1_2.class,
+            jls8.ch12.Eg12_4_1_3.class,
+            jls8.ch12.Eg12_5_2.class,
             thirdparty.gson.GsonTest.class
         );
     }

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

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

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

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

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

diff --git a/test/testclasses/src/main/java/jvm/java8/LambdaTest.java b/test/testclasses/src/main/java/jvm/java8/LambdaTest.java
diff --git a/...java7/jsr292/MethodHandleNativesTest.java → .../jvm7/jsr292/MethodHandleNativesTest.java b/...java7/jsr292/MethodHandleNativesTest.java → .../jvm7/jsr292/MethodHandleNativesTest.java
@@ -1,4 +1,4 @@
-package jvm.java7.jsr292;
+package jvm7.jsr292;
 
 import helper.ReflectionHelper;
 import helper.UnitTestRunner;

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

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

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

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

diff --git a/test/testclasses/src/main/java/jvm8/LambdaTest.java b/test/testclasses/src/main/java/jvm8/LambdaTest.java
@@ -0,0 +1,10 @@
+package jvm8;
+
+public class LambdaTest {
+
+    public static void main(String[] args) {
+        Runnable r = () -> System.out.println("Hello, World!");
+        r.run();
+    }
+
+}
diff --git a/test/testclasses/src/main/java/stdlib/net/UrlTest.java b/test/testclasses/src/main/java/stdlib/net/UrlTest.java
@@ -1,13 +1,18 @@
 package stdlib.net;
 
+import java.io.InputStream;
 import java.net.URL;
 
 public class UrlTest {
-    
+
     public static void main(String[] args) throws Exception {
         URL url = new URL("http://cn.bing.com");
-        url.openStream();
+        try (InputStream is = url.openStream()) {
+            byte[] bytes = new byte[is.available()];
+            int n = is.read(bytes);
+            System.out.println(new String(bytes));
+        }
         System.out.println("OK!");
     }
-    
+
 }