commit cb9dfb78d80572952de63d8ddcd1c29d6f69b944
author Brett Chabot <brettchabot@android.com> Mon Feb 01 10:58:55 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 01 10:58:55 2010 -0800
tree 6242c89ae39bd4f2795c3d7de0889cb217b06243
parent 9bb039cb2249cc3237a3ade0fea37d01b72f28e5
parent 75c851d80e95784bf94977c63ccd0a1d32e824eb

Merge "Update CTS version check." into eclair

tests/tests/app/src/android/app/cts/ListActivityTest.java

diff --git a/tests/tests/app/src/android/app/cts/ListActivityTest.java b/tests/tests/app/src/android/app/cts/ListActivityTest.java
index 78a7dd9..43ebd05 100644
--- a/tests/tests/app/src/android/app/cts/ListActivityTest.java
+++ b/tests/tests/app/src/android/app/cts/ListActivityTest.java
@@ -16,6 +16,12 @@
 
 package android.app.cts;
 
+import dalvik.annotation.BrokenTest;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
 import android.app.ListActivity;
 import android.content.pm.ActivityInfo;
 import android.test.ActivityInstrumentationTestCase2;
@@ -24,10 +30,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 
 @TestTargetClass(ListActivity.class)
 public class ListActivityTest extends ActivityInstrumentationTestCase2<ListActivityTestHelper> {
@@ -101,6 +103,7 @@
             args = {android.os.Bundle.class}
         )
     })
+    @BrokenTest(value="flaky test. bug 2334738")
     public void testListActivity() throws Throwable {
         waitForAction();
         sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);

tests/tests/webkit/src/android/webkit/cts/DateSorterTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/DateSorterTest.java b/tests/tests/webkit/src/android/webkit/cts/DateSorterTest.java
index 3c05de7..82bb402 100644
--- a/tests/tests/webkit/src/android/webkit/cts/DateSorterTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/DateSorterTest.java
@@ -16,6 +16,7 @@
 
 package android.webkit.cts;
 
+import dalvik.annotation.BrokenTest;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
@@ -83,6 +84,7 @@
             args = {long.class}
         )
     })
+    @BrokenTest(value="time-based test, fixed in next release. bug 2361382")
     public void testGetIndex() {
         DateSorter dateSorter = new DateSorter(mContext);
 
@@ -103,6 +105,7 @@
             args = {int.class}
         )
     })
+    @BrokenTest(value="time-based test, fixed in next release. bug 2361382")
     public void testGetBoundary() {
         DateSorter dateSorter = new DateSorter(mContext);