refactor: move some stubs out

Author: GaoYushanTw

src/test/java/org/jd/core/v1/JavaAutoboxingTest.java

@@ -23,6 +23,7 @@
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.stub.AutoboxingAndUnboxing;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -40,19 +41,12 @@ public class JavaAutoboxingTest extends TestCase {
     @Test
     // https://github.com/java-decompiler/jd-core/issues/14
     public void testAutoboxing() throws Exception {
-        class AutoboxingAndUnboxing {
-            void test() {
-                Integer intObj = 10;
-                int i = intObj;
-            }
-        }
-
         String internalClassName = AutoboxingAndUnboxing.class.getName().replace('.', '/');
         String source = decompile(new ClassPathLoader(), new PlainTextPrinter(), internalClassName);
 
         // Check decompiled source code
-        assertTrue(source.matches(PatternMaker.make(": 44 */", "Integer intObj = 10;")));
-        assertTrue(source.matches(PatternMaker.make(": 45 */", "int i = intObj;")));
+        assertTrue(source.matches(PatternMaker.make(": 5 */", "Integer intObj = 10;")));
+        assertTrue(source.matches(PatternMaker.make(": 6 */", "int i = intObj;")));
 
         // Recompile decompiled source code and check errors
         assertTrue(CompilerUtil.compile("1.8", new JavaSourceFileObject(internalClassName, source)));

src/test/java/org/jd/core/v1/JavaMethodOverloadingTest.java

@@ -23,6 +23,7 @@
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.stub.ArrayMethodOverloading;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -40,32 +41,14 @@ public class JavaMethodOverloadingTest extends TestCase {
     @Test
     // https://github.com/java-decompiler/jd-core/issues/33
     public void testArrayMethodOverloading() throws Exception {
-        class ArrayMethodOverloading {
-            void use(Object[] o) { }
-            void use(Object o) { }
-
-            void test1() {
-                use("string");
-            }
-            void test2() {
-                use((Object) new Object[] {""});
-            }
-            void test3() {
-                use(null);
-            }
-            void test4() {
-                use((Object)null);
-            }
-        }
-
         String internalClassName = ArrayMethodOverloading.class.getName().replace('.', '/');
         String source = decompile(new ClassPathLoader(), new PlainTextPrinter(), internalClassName);
 
         // Check decompiled source code
-        assertTrue(source.matches(PatternMaker.make(": 47 */", "use(\"string\");")));
-        assertTrue(source.matches(PatternMaker.make(": 50 */", "use((Object)new Object[] { \"\" });")));
-        assertTrue(source.matches(PatternMaker.make(": 53 */", "use((Object[])null);")));
-        assertTrue(source.matches(PatternMaker.make(": 56 */", "use((Object)null);")));
+        assertTrue(source.matches(PatternMaker.make(": 11 */", "use(\"string\");")));
+        assertTrue(source.matches(PatternMaker.make(": 15 */", "use((Object)new Object[] { \"\" });")));
+        assertTrue(source.matches(PatternMaker.make(": 19 */", "use((Object[])null);")));
+        assertTrue(source.matches(PatternMaker.make(": 23 */", "use((Object)null);")));
 
         // Recompile decompiled source code and check errors
         assertTrue(CompilerUtil.compile("1.8", new JavaSourceFileObject(internalClassName, source)));

src/test/java/org/jd/core/v1/JavaOperatorPrecedenceTest.java

@@ -23,6 +23,7 @@
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.stub.NewOperatorPrecedence;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -39,18 +40,11 @@ public class JavaOperatorPrecedenceTest extends TestCase {
 
     @Test
     public void testNewOperatorPrecedence() throws Exception {
-        class NewOperatorPrecedence {
-            void test() {}
-            public /* static */ void main(String ... args) {
-                new NewOperatorPrecedence().test();
-            }
-        }
-
         String internalClassName = NewOperatorPrecedence.class.getName().replace('.', '/');
         String source = decompile(new ClassPathLoader(), new PlainTextPrinter(), internalClassName);
 
         // Check decompiled source code
-        assertTrue(source.matches(PatternMaker.make(": 44 */", "new NewOperatorPrecedence().test();")));
+        assertTrue(source.matches(PatternMaker.make(": 8 */", "new NewOperatorPrecedence().test();")));
 
         // Recompile decompiled source code and check errors
         assertTrue(CompilerUtil.compile("1.8", new JavaSourceFileObject(internalClassName, source)));

src/test/java/org/jd/core/v1/stub/ArrayMethodOverloading.java

@@ -0,0 +1,25 @@
+package org.jd.core.v1.stub;
+
+public class ArrayMethodOverloading {
+    void use(Object[] o) {
+    }
+
+    void use(Object o) {
+    }
+
+    void test1() {
+        use("string");
+    }
+
+    void test2() {
+        use((Object) new Object[]{""});
+    }
+
+    void test3() {
+        use(null);
+    }
+
+    void test4() {
+        use((Object) null);
+    }
+}

src/test/java/org/jd/core/v1/stub/AutoboxingAndUnboxing.java

@@ -0,0 +1,8 @@
+package org.jd.core.v1.stub;
+
+public class  AutoboxingAndUnboxing {
+    void test() {
+        Integer intObj = 10;
+        int i = intObj;
+    }
+}

src/test/java/org/jd/core/v1/stub/NewOperatorPrecedence.java

@@ -0,0 +1,10 @@
+package org.jd.core.v1.stub;
+
+public class NewOperatorPrecedence {
+    void test() {
+    }
+
+    public /* static */ void main(String... args) {
+        new NewOperatorPrecedence().test();
+    }
+}