Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair

Browse Source 
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
This commit is contained in:
Brett Chabot
2009-10-28 12:43:52 -07:00
committed by Android Git Automerger
parent 7373755ac3 622b190c87
commit 32be57d100
11 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
View File

@@ -51,8 +51,8 @@ public class LifecycleTest extends ActivityTestsBase {
} }
//Marking flaky until bug 1164344 is fixed. //Marking flaky until bug 1164344 is fixed.
@FlakyTest(tolerance=2) // @FlakyTest(tolerance=2)
@LargeTest // @LargeTest
public void testScreen() throws Exception { public void testScreen() throws Exception {
mIntent = mTopIntent; mIntent = mTopIntent;
runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN); runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);

6
tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java
View File

@@ -160,7 +160,8 @@ public class PerformanceCollectorTest extends TestCase {
verifyTimingBundle(timing, labels); verifyTimingBundle(timing, labels);
} }
@LargeTest // TODO: flaky test
// @LargeTest
public void testSimpleSequence() throws Exception { public void testSimpleSequence() throws Exception {
MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter(); MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();
mPerfCollector.setPerformanceResultsWriter(writer); mPerfCollector.setPerformanceResultsWriter(writer);
@@ -192,7 +193,8 @@ public class PerformanceCollectorTest extends TestCase {
verifyTimingBundle(timing, labels); verifyTimingBundle(timing, labels);
} }
@LargeTest // TODO: flaky test
// @LargeTest
public void testLongSequence() throws Exception { public void testLongSequence() throws Exception {
MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter(); MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();
mPerfCollector.setPerformanceResultsWriter(writer); mPerfCollector.setPerformanceResultsWriter(writer);

3
tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
View File

@@ -67,7 +67,8 @@ public class ScrollingThroughListOfFocusablesTest extends InstrumentationTestCas
assertEquals(mNumRowsPerItem, mActivity.getNumRowsPerItem()); assertEquals(mNumRowsPerItem, mActivity.getNumRowsPerItem());
} }
@MediumTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @MediumTest
public void testScrollingDownInFirstItem() throws Exception { public void testScrollingDownInFirstItem() throws Exception {
for (int i = 0; i < mNumRowsPerItem; i++) { for (int i = 0; i < mNumRowsPerItem; i++) {

6
tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
View File

@@ -70,7 +70,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum
newLastChild.getId()); newLastChild.getId());
} }
@LargeTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @LargeTest
public void testShortScroll() { public void testShortScroll() {
View firstChild = mGridView.getChildAt(0); View firstChild = mGridView.getChildAt(0);
if (firstChild.getTop() < this.mGridView.getListPaddingTop()) { if (firstChild.getTop() < this.mGridView.getListPaddingTop()) {
@@ -91,7 +92,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum
newLastChild.getId()); newLastChild.getId());
} }
@LargeTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @LargeTest
public void testLongScroll() { public void testLongScroll() {
View firstChild = mGridView.getChildAt(0); View firstChild = mGridView.getChildAt(0);
if (firstChild.getTop() < mGridView.getListPaddingTop()) { if (firstChild.getTop() < mGridView.getListPaddingTop()) {

6
tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
View File

@@ -67,7 +67,8 @@ public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCas
assertEquals("Wrong view in first position", 0, newFirstChild.getId()); 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() { public void testShortScroll() {
View firstChild = mGridView.getChildAt(0); View firstChild = mGridView.getChildAt(0);
View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1); 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()); 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() { public void testLongScroll() {
View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1); View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);

6
tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
View File

@@ -53,13 +53,15 @@ public class FixedWidthTest extends ActivityInstrumentationTestCase<FixedWidth>
assertNotNull(mNonFixedWidth); assertNotNull(mNonFixedWidth);
} }
@MediumTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @MediumTest
public void testFixedWidth() throws Exception { public void testFixedWidth() throws Exception {
assertEquals(150, mFixedWidth.getWidth()); assertEquals(150, mFixedWidth.getWidth());
assertEquals(mFixedWidth.getWidth(), mNonFixedWidth.getWidth()); assertEquals(mFixedWidth.getWidth(), mNonFixedWidth.getWidth());
} }
@MediumTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @MediumTest
public void testFixedHeight() throws Exception { public void testFixedHeight() throws Exception {
assertEquals(48, mFixedHeight.getHeight()); assertEquals(48, mFixedHeight.getHeight());
} }

6
tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
View File

@@ -52,7 +52,8 @@ public class ListOfTouchablesTest extends ActivityInstrumentationTestCase<ListOf
assertNotNull(mListView); assertNotNull(mListView);
} }
@LargeTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @LargeTest
public void testShortScroll() { public void testShortScroll() {
View firstChild = mListView.getChildAt(0); View firstChild = mListView.getChildAt(0);
View lastChild = mListView.getChildAt(mListView.getChildCount() - 1); 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()); 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() { public void testLongScroll() {
View lastChild = mListView.getChildAt(mListView.getChildCount() - 1); View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);

6
tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
View File

@@ -112,7 +112,8 @@ public class ListTouchBottomGravityManyTest extends ActivityInstrumentationTestC
newLastChild.getId()); newLastChild.getId());
} }
@LargeTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @LargeTest
public void testShortScroll() { public void testShortScroll() {
View firstChild = mListView.getChildAt(0); View firstChild = mListView.getChildAt(0);
if (firstChild.getTop() < this.mListView.getListPaddingTop()) { if (firstChild.getTop() < this.mListView.getListPaddingTop()) {
@@ -133,7 +134,8 @@ public class ListTouchBottomGravityManyTest extends ActivityInstrumentationTestC
newLastChild.getId()); newLastChild.getId());
} }
@LargeTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @LargeTest
public void testLongScroll() { public void testLongScroll() {
View firstChild = mListView.getChildAt(0); View firstChild = mListView.getChildAt(0);
if (firstChild.getTop() < mListView.getListPaddingTop()) { if (firstChild.getTop() < mListView.getListPaddingTop()) {

6
tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
View File

@@ -159,7 +159,8 @@ public class ListTouchManyTest extends ActivityInstrumentationTestCase<ListTopGr
assertEquals("Wrong view in first position", 0, newFirstChild.getId()); 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() { public void testShortScroll() {
View firstChild = mListView.getChildAt(0); View firstChild = mListView.getChildAt(0);
View lastChild = mListView.getChildAt(mListView.getChildCount() - 1); 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()); 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() { public void testLongScroll() {
View lastChild = mListView.getChildAt(mListView.getChildCount() - 1); View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);

3
tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
View File

@@ -60,7 +60,8 @@ public class BigCacheTest extends ActivityInstrumentationTestCase<BigCache> {
assertNotNull(createCacheForView(mTiny)); assertNotNull(createCacheForView(mTiny));
} }
@MediumTest // TODO: needs to be adjusted to pass on non-HVGA displays
// @MediumTest
public void testDrawingCacheAboveMaximumSize() throws Exception { public void testDrawingCacheAboveMaximumSize() throws Exception {
final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize(); final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max); assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max);

3
tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
View File

@@ -66,7 +66,8 @@ public class IncludeTest extends ActivityInstrumentationTestCase<Include> {
assertEquals("Included button should be invisible", View.INVISIBLE, button1.getVisibility()); 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 { public void testIncludedWithSize() throws Exception {
final Include activity = getActivity(); final Include activity = getActivity();
final View button1 = activity.findViewById(R.id.included_button_with_size); final View button1 = activity.findViewById(R.id.included_button_with_size);