Merge change 20806 into donut (3b5f4a84) · Commits · e / os / android_frameworks_base

tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewCallbacks.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package android.widget;
		import android.app.Instrumentation;
		import android.test.ActivityInstrumentationTestCase2;
		import android.test.FlakyTest;
		import android.test.suitebuilder.annotation.MediumTest;

		// TODO: tests fail intermittently. Add back MediumTest annotation when fixed
		public class AutoCompleteTextViewCallbacks
		extends ActivityInstrumentationTestCase2<AutoCompleteTextViewSimple> {

		@@ -32,7 +32,6 @@ public class AutoCompleteTextViewCallbacks

		/** Test that the initial popup of the suggestions does not select anything.
		*/
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupNoSelection() throws Exception {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -57,7 +56,6 @@ public class AutoCompleteTextViewCallbacks
		}

		/** Test that arrow-down into the popup calls the onSelected callback. */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupEnterSelection() throws Exception {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -95,7 +93,6 @@ public class AutoCompleteTextViewCallbacks
		}

		/** Test that arrow-up out of the popup calls the onNothingSelected callback */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupLeaveSelection() {
		AutoCompleteTextViewSimple theActivity = getActivity();

tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -20,10 +20,11 @@ import android.app.Instrumentation;
		import android.test.ActivityInstrumentationTestCase2;
		import android.test.FlakyTest;
		import android.test.suitebuilder.annotation.MediumTest;
		import android.util.Log;

		/**
		* A collection of tests on aspects of the AutoCompleteTextView's popup
		*
		* TODO: tests fail intermittently. Add back MediumTest annotation when fixed
		*/
		public class AutoCompleteTextViewPopup
		extends ActivityInstrumentationTestCase2<AutoCompleteTextViewSimple> {
		@@ -40,7 +41,6 @@ public class AutoCompleteTextViewPopup
		}

		/** Test that we can move the selection and it responds as expected */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupSetListSelection() throws Throwable {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -73,7 +73,6 @@ public class AutoCompleteTextViewPopup
		}

		/** Test that we can look at the selection as we move around */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupGetListSelection() throws Throwable {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -101,7 +100,6 @@ public class AutoCompleteTextViewPopup
		}

		/** Test that we can clear the selection */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupClearListSelection() throws Throwable {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -135,7 +133,6 @@ public class AutoCompleteTextViewPopup
		}

		/** Make sure we handle an empty adapter properly */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupNavigateNoAdapter() throws Throwable {
		AutoCompleteTextViewSimple theActivity = getActivity();
		@@ -170,7 +167,6 @@ public class AutoCompleteTextViewPopup
		}

		/** Test the show/hide behavior of the drop-down. */
		@MediumTest
		@FlakyTest(tolerance=3)
		public void testPopupShow() throws Throwable {
		AutoCompleteTextViewSimple theActivity = getActivity();