Cleaning in ListWithEditTextHeaderTest.

Switched to ActivityInstrumentationTestCase2.

As far as http://b/issue?id=2446911 is concerned, I was unable
to reproduce a test fail. This was not the case a week ago.
A fix has probably been submitted in the meantime.

Change-Id: Id6e95218a2c9d29b0b4eb051a7a1288f9a9809fd

1 files changed, 9 insertions, 9 deletions

diff --git a/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
index 93bddb0..b9051e9 100644
--- a/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
+++ b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
@@ -16,21 +16,21 @@
 
 package android.widget.listview.focus;
 
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
 import android.test.FlakyTest;
+import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
 import android.view.KeyEvent;
 import android.widget.AbsListView;
 import android.widget.ListView;
 import android.widget.listview.ListWithEditTextHeader;
 
-public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase<ListWithEditTextHeader> {
+public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase2<ListWithEditTextHeader> {
     private ListView mListView;
 
     public ListWithEditTextHeaderTest() {
-        super("com.android.frameworks.coretests", ListWithEditTextHeader.class);
+        super(ListWithEditTextHeader.class);
     }
 
     @Override
@@ -44,15 +44,15 @@ public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase<
         assertTrue("listview.getItemsCanFocus()", mListView.getItemsCanFocus());
         assertFalse("out of touch-mode", mListView.isInTouchMode());
         assertEquals("header view count", 1, mListView.getHeaderViewsCount());
-        assertTrue("header has focus", mListView.getChildAt(0).isFocused());
+        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
     }
 
     @FlakyTest(tolerance=2)
     @LargeTest
     public void testClickingHeaderKeepsFocus() {
         TouchUtils.clickView(this, mListView.getChildAt(0));
-        assertTrue("header has focus", mListView.getChildAt(0).isFocused());
-        assertEquals("nothing selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
+        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
+        assertEquals("something is selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
     }
 
     @LargeTest
@@ -60,7 +60,7 @@ public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase<
         sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
         assertEquals("selected position", 1, mListView.getSelectedItemPosition());
         TouchUtils.clickView(this, mListView.getChildAt(0));
-        assertTrue("header has focus", mListView.getChildAt(0).isFocused());        
-        assertEquals("nothing selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
+        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
+        assertEquals("something is selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
     }
 }