Disable flaky and failing tests.

Bugs 2118268, 2176089

diff --git a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
index 80904da..069b697 100644 (file)
--- a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
@@ -51,8 +51,8 @@ public class LifecycleTest extends ActivityTestsBase {
     }
 
     //Marking flaky until bug 1164344 is fixed.
-    @FlakyTest(tolerance=2)
-    @LargeTest
+    // @FlakyTest(tolerance=2)
+    // @LargeTest
     public void testScreen() throws Exception {
         mIntent = mTopIntent;
         runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);

diff --git a/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java b/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java
index 1a0c2d1..d0fdff4 100644 (file)
--- a/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java
@@ -160,7 +160,8 @@ public class PerformanceCollectorTest extends TestCase {
         verifyTimingBundle(timing, labels);
     }
 
-    @LargeTest
+    // TODO: flaky test
+    // @LargeTest
     public void testSimpleSequence() throws Exception {
         MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();
         mPerfCollector.setPerformanceResultsWriter(writer);
@@ -192,7 +193,8 @@ public class PerformanceCollectorTest extends TestCase {
         verifyTimingBundle(timing, labels);
     }
 
-    @LargeTest
+    // TODO: flaky test
+    // @LargeTest
     public void testLongSequence() throws Exception {
         MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();
         mPerfCollector.setPerformanceResultsWriter(writer);

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
index 07916ee..6fa9533 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
@@ -67,7 +67,8 @@ public class ScrollingThroughListOfFocusablesTest extends InstrumentationTestCas
         assertEquals(mNumRowsPerItem, mActivity.getNumRowsPerItem());
     }
 
-    @MediumTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @MediumTest
     public void testScrollingDownInFirstItem() throws Exception {
 
         for (int i = 0; i < mNumRowsPerItem; i++) {

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
index 3937c43..cc8fa6e 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
@@ -70,7 +70,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum
                 newLastChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testShortScroll() {
         View firstChild = mGridView.getChildAt(0);
         if (firstChild.getTop() < this.mGridView.getListPaddingTop()) {
@@ -91,7 +92,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum
                 newLastChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testLongScroll() {
         View firstChild = mGridView.getChildAt(0);
         if (firstChild.getTop() < mGridView.getListPaddingTop()) {

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
index 0b39909..355c5a4 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
@@ -67,7 +67,8 @@ public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCas
         assertEquals("Wrong view in first position", 0, newFirstChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testShortScroll() {
         View firstChild = mGridView.getChildAt(0);
         View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
@@ -83,7 +84,8 @@ public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCas
         assertEquals("Wrong view in first position", 0, newFirstChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testLongScroll() {
         View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
         

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
index a54d503..3ca03b7 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
@@ -53,13 +53,15 @@ public class FixedWidthTest extends ActivityInstrumentationTestCase<FixedWidth>
         assertNotNull(mNonFixedWidth);
     }
 
-    @MediumTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @MediumTest
     public void testFixedWidth() throws Exception {
         assertEquals(150, mFixedWidth.getWidth());
         assertEquals(mFixedWidth.getWidth(), mNonFixedWidth.getWidth());
     }
 
-    @MediumTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @MediumTest
     public void testFixedHeight() throws Exception {
         assertEquals(48, mFixedHeight.getHeight());
     }

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
index f8b384d..39c0e45 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
@@ -52,7 +52,8 @@ public class ListOfTouchablesTest extends ActivityInstrumentationTestCase<ListOf
         assertNotNull(mListView);
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testShortScroll() {
         View firstChild = mListView.getChildAt(0);
         View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
@@ -68,7 +69,8 @@ public class ListOfTouchablesTest extends ActivityInstrumentationTestCase<ListOf
         assertEquals("Wrong view in first position", 0, newFirstChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testLongScroll() {
         View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
         

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
index d271564..4e62a4d 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
@@ -112,7 +112,8 @@ public class ListTouchBottomGravityManyTest extends ActivityInstrumentationTestC
                 newLastChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testShortScroll() {
         View firstChild = mListView.getChildAt(0);
         if (firstChild.getTop() < this.mListView.getListPaddingTop()) {
@@ -133,7 +134,8 @@ public class ListTouchBottomGravityManyTest extends ActivityInstrumentationTestC
                 newLastChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testLongScroll() {
         View firstChild = mListView.getChildAt(0);
         if (firstChild.getTop() < mListView.getListPaddingTop()) {

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
index ef085f8..3066d8d 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
@@ -159,7 +159,8 @@ public class ListTouchManyTest extends ActivityInstrumentationTestCase<ListTopGr
         assertEquals("Wrong view in first position", 0, newFirstChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testShortScroll() {
         View firstChild = mListView.getChildAt(0);
         View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
@@ -175,7 +176,8 @@ public class ListTouchManyTest extends ActivityInstrumentationTestCase<ListTopGr
         assertEquals("Wrong view in first position", 0, newFirstChild.getId());
     }
     
-    @LargeTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @LargeTest
     public void testLongScroll() {
         View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
         

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
index 02d5283..8c5dc60 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
@@ -60,7 +60,8 @@ public class BigCacheTest extends ActivityInstrumentationTestCase<BigCache> {
         assertNotNull(createCacheForView(mTiny));
     }
 
-    @MediumTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @MediumTest
     public void testDrawingCacheAboveMaximumSize() throws Exception {
         final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
         assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max);

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
index dd1382d..2e0a18a 100644 (file)
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
@@ -66,7 +66,8 @@ public class IncludeTest extends ActivityInstrumentationTestCase<Include> {
         assertEquals("Included button should be invisible", View.INVISIBLE, button1.getVisibility());
     }
 
-    @MediumTest
+    // TODO: needs to be adjusted to pass on non-HVGA displays
+    // @MediumTest
     public void testIncludedWithSize() throws Exception {
         final Include activity = getActivity();
         final View button1 = activity.findViewById(R.id.included_button_with_size);