commit 30e770d7d03f67c6ac00512570ad2057e21997d2
author Gilles Debunne <debunne@google.com> Tue Mar 23 17:35:00 2010 -0700
committer Gilles Debunne <debunne@google.com> Wed Mar 24 14:39:46 2010 -0700
tree 4b25408f7c4268b0c62c5b85b1024c3b97455b7b
parent d128d7b79db6c6c44c1b383fe58da12dc90a7ef9

Fixed CTS ExpandableListView position test.

The test was using invalid positions in getExpandableListPosition.
These now return PACKED_POSITION_VALUE_NULL.

The hardcoded long encoding of the packed position has also been replaced
by a call to ExpandableListView.getPackedPositionForChild

http://b/issue?id=2527704

Change-Id: I7ce7d43908ca48cc1e4ab3c127af95b71785e759

tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
index 8fecc39..af420b4 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
@@ -16,6 +16,14 @@
 
 package android.widget.cts;
 
+import com.android.cts.stub.R;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
@@ -36,16 +44,6 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.ExpandableListView.OnGroupClickListener;
-import android.widget.ExpandableListView.OnGroupCollapseListener;
-import android.widget.ExpandableListView.OnGroupExpandListener;
-
-import com.android.cts.stub.R;
-
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.ToBeFixed;
 
 @TestTargetClass(ExpandableListView.class)
 public class ExpandableListViewTest extends AndroidTestCase {
@@ -334,9 +332,19 @@
         expandableListView.setAdapter(new MockExpandableListAdapter());
 
         assertEquals(0, expandableListView.getExpandableListPosition(0));
-        assertEquals(1L<<32, expandableListView.getExpandableListPosition(1));
-        assertEquals(2L<<32, expandableListView.getExpandableListPosition(2));
-        assertEquals(3L<<32, expandableListView.getExpandableListPosition(3));
+
+        // Group 0 is not expanded, position 1 is invalid
+        assertEquals(ExpandableListView.PACKED_POSITION_VALUE_NULL,
+                expandableListView.getExpandableListPosition(1));
+
+        // Position 1 becomes valid when group 0 is expanded
+        expandableListView.expandGroup(0);
+        assertEquals(ExpandableListView.getPackedPositionForChild(0, 0),
+                expandableListView.getExpandableListPosition(1));
+
+        // Position 2 is still invalid (only one child).
+        assertEquals(ExpandableListView.PACKED_POSITION_VALUE_NULL,
+                expandableListView.getExpandableListPosition(2));
     }
 
     @TestTargetNew(
@@ -780,6 +788,7 @@
             super(context, attrs, defStyle);
         }
 
+        @Override
         protected void dispatchDraw(Canvas canvas) {
             super.dispatchDraw(canvas);
         }