diff options
Diffstat (limited to 'luni-kernel/src')
4 files changed, 7 insertions, 52 deletions
diff --git a/luni-kernel/src/main/java/java/lang/Class.java b/luni-kernel/src/main/java/java/lang/Class.java index 101d593..571f5b1 100644 --- a/luni-kernel/src/main/java/java/lang/Class.java +++ b/luni-kernel/src/main/java/java/lang/Class.java @@ -124,14 +124,16 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe private static final long serialVersionUID = 3206093459760846163L; - // TODO How is this field being initialized? What's it being used for? - private ProtectionDomain pd; + /** + * This field is initialized by dalvikvm when the class is loaded. + */ + private transient ProtectionDomain pd; /** * null-ok; cache of reflective information, wrapped in a soft * reference */ - private volatile SoftReference<ClassCache<T>> cacheRef; + private transient volatile SoftReference<ClassCache<T>> cacheRef; private Class() { // Prevent this class to be instantiated, instance diff --git a/luni-kernel/src/test/java/java/lang/reflect/AllTests.java b/luni-kernel/src/test/java/java/lang/reflect/AllTests.java index 7cf1475..8d99672 100644 --- a/luni-kernel/src/test/java/java/lang/reflect/AllTests.java +++ b/luni-kernel/src/test/java/java/lang/reflect/AllTests.java @@ -21,7 +21,7 @@ import junit.framework.TestSuite; public class AllTests { public static final Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + TestSuite suite = new TestSuite(); suite.addTestSuite(java.lang.reflect.ConstructorTest.class); suite.addTestSuite(java.lang.reflect.MethodTest.class); return suite; diff --git a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java b/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java index a59cc3e..e9cf80e 100644 --- a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java +++ b/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java @@ -21,7 +21,7 @@ import junit.framework.TestSuite; public class AllTests { public static final Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + TestSuite suite = new TestSuite(); suite.addTestSuite(tests.api.org.apache.harmony.kernel.dalvik.ThreadsTest.class); return suite; } diff --git a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java index c24e297..8ba2445 100644 --- a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java +++ b/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java @@ -21,15 +21,10 @@ import java.lang.reflect.Field; import junit.framework.Assert; import junit.framework.TestCase; import sun.misc.Unsafe; -import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; /** * Tests for the <code>park()</code> functionality of {@link Unsafe}. */ -@TestTargetClass(Unsafe.class) public class ThreadsTest extends TestCase { private static Unsafe UNSAFE = null; private static RuntimeException INITIALIZEFAILED = null; @@ -54,13 +49,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the park times out. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkFor_1() { Parker parker = new Parker(false, 500); Thread parkerThread = new Thread(parker); @@ -73,13 +61,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the unpark happens before the timeout. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkFor_2() { Parker parker = new Parker(false, 1000); Thread parkerThread = new Thread(parker); @@ -92,13 +73,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the thread is preemptively unparked. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkFor_3() { Parker parker = new Parker(false, 1000); Thread parkerThread = new Thread(parker); @@ -109,13 +83,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the park times out. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkUntil_1() { Parker parker = new Parker(true, 500); Thread parkerThread = new Thread(parker); @@ -128,13 +95,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the unpark happens before the timeout. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkUntil_2() { Parker parker = new Parker(true, 1000); Thread parkerThread = new Thread(parker); @@ -147,13 +107,6 @@ public class ThreadsTest extends TestCase { } /** Test the case where the thread is preemptively unparked. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "unpark", - args = {Object.class} - ) - @AndroidOnly("Accesses Android-specific private field") public void test_parkUntil_3() { Parker parker = new Parker(true, 1000); Thread parkerThread = new Thread(parker); |