test/functional: Merge java/lang/Class test cases

There are two different test cases for java/lang/Class. Merge
them to a single file.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

4 files changed, 61 insertions, 74 deletions

diff --git a/Makefile b/Makefile
index 467bcdf0..a35dee73 100644
--- a/Makefile
+++ b/Makefile
@@ -320,7 +320,6 @@ check-integration: $(LIB_FILE)
 REGRESSION_TEST_SUITE_CLASSES = \
 	test/functional/jato/internal/VM.java \
 	test/functional/java/lang/JNITest.java \
-	test/functional/java/lang/reflect/ClassTest.java \
 	test/functional/jvm/ArgsTest.java \
 	test/functional/jvm/ArrayExceptionsTest.java \
 	test/functional/jvm/ArrayMemberTest.java \
diff --git a/test/functional/java/lang/reflect/ClassTest.java b/test/functional/java/lang/reflect/ClassTest.java
deleted file mode 100644
index d0bf412f..00000000
--- a/test/functional/java/lang/reflect/ClassTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2009 Tomasz Grabiec
- *
- * This file is released under the GPL version 2 with the following
- * clarification and special exception:
- *
- *     Linking this library statically or dynamically with other modules is
- *     making a combined work based on this library. Thus, the terms and
- *     conditions of the GNU General Public License cover the whole
- *     combination.
- *
- *     As a special exception, the copyright holders of this library give you
- *     permission to link this library with independent modules to produce an
- *     executable, regardless of the license terms of these independent
- *     modules, and to copy and distribute the resulting executable under terms
- *     of your choice, provided that you also meet, for each linked independent
- *     module, the terms and conditions of the license of that module. An
- *     independent module is a module which is not derived from or based on
- *     this library. If you modify this library, you may extend this exception
- *     to your version of the library, but you are not obligated to do so. If
- *     you do not wish to do so, delete this exception statement from your
- *     version.
- *
- * Please refer to the file LICENSE for details.
- */
-package java.lang.reflect;
-
-import java.lang.reflect.Modifier;
-import jvm.TestCase;
-
-/**
- * @author Tomasz Grabiec
- */
-public class ClassTest extends TestCase {
-    public static void testPrimitiveClassModifiers() {
-        Class<?> primitive = Integer.TYPE;
-        int modifiers = primitive.getModifiers();
-
-        assertEquals(Modifier.PUBLIC
-                 | Modifier.FINAL
-                 | Modifier.ABSTRACT,
-                 modifiers);
-    }
-
-    private static class X {
-    };
-
-    public static void testArrayClassModifiers() {
-        assertEquals(Modifier.PRIVATE | Modifier.STATIC, X.class.getModifiers());
-        X[] array = new X[1];
-        assertEquals(Modifier.FINAL | Modifier.ABSTRACT, array.getClass().getModifiers());
-    }
-
-    public static void testRegularClassModifiers() {
-        assertEquals(Modifier.PUBLIC, ClassTest.class.getModifiers());
-    }
-
-    public static void testGetDeclaringClass() {
-        assertNull(Object.class.getDeclaringClass());
-        assertEquals(ClassTest.class, X.class.getDeclaringClass());
-    }
-
-    public static void main(String []args) {
-        testPrimitiveClassModifiers();
-        testArrayClassModifiers();
-        testRegularClassModifiers();
-        testGetDeclaringClass();
-    }
-}
diff --git a/test/functional/test/java/lang/ClassTest.java b/test/functional/test/java/lang/ClassTest.java
index adb5d866..01929787 100644
--- a/test/functional/test/java/lang/ClassTest.java
+++ b/test/functional/test/java/lang/ClassTest.java
@@ -1,12 +1,38 @@
+/*
+ * Copyright (C) 2009 Tomasz Grabiec
+ *
+ * This file is released under the GPL version 2 with the following
+ * clarification and special exception:
+ *
+ *     Linking this library statically or dynamically with other modules is
+ *     making a combined work based on this library. Thus, the terms and
+ *     conditions of the GNU General Public License cover the whole
+ *     combination.
+ *
+ *     As a special exception, the copyright holders of this library give you
+ *     permission to link this library with independent modules to produce an
+ *     executable, regardless of the license terms of these independent
+ *     modules, and to copy and distribute the resulting executable under terms
+ *     of your choice, provided that you also meet, for each linked independent
+ *     module, the terms and conditions of the license of that module. An
+ *     independent module is a module which is not derived from or based on
+ *     this library. If you modify this library, you may extend this exception
+ *     to your version of the library, but you are not obligated to do so. If
+ *     you do not wish to do so, delete this exception statement from your
+ *     version.
+ *
+ * Please refer to the file LICENSE for details.
+ */
 package test.java.lang;
 
-import jvm.TestCase;
-
-import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Retention;
+import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.List;
 
+import jvm.TestCase;
+
 public class ClassTest extends TestCase {
   public static void testGetAnnotation() {
     Tag tag = TaggedClass.class.getAnnotation(Tag.class);
@@ -165,6 +191,34 @@ public class ClassTest extends TestCase {
     assertFalse(new Object() { }.getClass().isPrimitive());
   }
 
+  public static void testPrimitiveClassModifiers() {
+    Class<?> primitive = Integer.TYPE;
+    int modifiers = primitive.getModifiers();
+
+    assertEquals(Modifier.PUBLIC
+         | Modifier.FINAL
+         | Modifier.ABSTRACT,
+         modifiers);
+  }
+
+  private static class X {
+  };
+
+  public static void testArrayClassModifiers() {
+    assertEquals(Modifier.PRIVATE | Modifier.STATIC, X.class.getModifiers());
+    X[] array = new X[1];
+    assertEquals(Modifier.FINAL | Modifier.ABSTRACT, array.getClass().getModifiers());
+  }
+
+  public static void testRegularClassModifiers() {
+    assertEquals(Modifier.PUBLIC, ClassTest.class.getModifiers());
+  }
+
+  public static void testGetDeclaringClass() {
+    assertNull(Object.class.getDeclaringClass());
+    assertEquals(ClassTest.class, X.class.getDeclaringClass());
+  }
+
   public static void main(String[] args) {
     testGetAnnotation();
     testGetClasses();
@@ -175,5 +229,9 @@ public class ClassTest extends TestCase {
     testIsLocalClass();
     testIsMemberClass();
     testIsPrimitive();
+    testPrimitiveClassModifiers();
+    testArrayClassModifiers();
+    testRegularClassModifiers();
+    testGetDeclaringClass();
   }
 }
diff --git a/tools/test.py b/tools/test.py
index ac868b36..540ec813 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -28,7 +28,6 @@ TESTS = [
 , ( "jvm/ExitStatusIsOneTest", 1, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm/ArgsTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "java.lang.JNITest", 0, NO_SYSTEM_CLASSLOADER, [ "i386" ] )
-, ( "java.lang.reflect.ClassTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm.ArrayExceptionsTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm.ArrayMemberTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm.ArrayTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )