AI 143657: am: CL 143626 am: CL 143453 Bringing the luni tests down to zero failures.

  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143657

1 files changed, 7 insertions, 0 deletions

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 3791191..4ce9cb1 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,6 +21,7 @@ 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;
@@ -59,6 +60,7 @@ public class ThreadsTest extends TestCase {
         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);
@@ -77,6 +79,7 @@ public class ThreadsTest extends TestCase {
         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);
@@ -95,6 +98,7 @@ public class ThreadsTest extends TestCase {
         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);
@@ -111,6 +115,7 @@ public class ThreadsTest extends TestCase {
         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);
@@ -129,6 +134,7 @@ public class ThreadsTest extends TestCase {
         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,6 +153,7 @@ public class ThreadsTest extends TestCase {
         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);