Merge "Add Telephony Feature Tests" into froyo
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
new file mode 100644
index 0000000..9a8ff91
--- /dev/null
+++ b/CtsTestCaseList.mk
@@ -0,0 +1,66 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CTS_SECURITY_APPS_LIST := \
+ CtsAppAccessData \
+ CtsAppWithData \
+ CtsInstrumentationAppDiffCert \
+ CtsPermissionDeclareApp \
+ CtsSharedUidInstall \
+ CtsSharedUidInstallDiffCert \
+ CtsSimpleAppInstall \
+ CtsSimpleAppInstallDiffCert \
+ CtsTargetInstrumentationApp \
+ CtsUsePermissionDiffCert
+
+CTS_TEST_CASE_LIST := \
+ TestDeviceSetup \
+ CtsTestStubs \
+ CtsAccessibilityServiceTestCases \
+ CtsAccountManagerTestCases \
+ CtsAppTestCases \
+ CtsBluetoothTestCases \
+ CtsContentTestCases \
+ CtsDatabaseTestCases \
+ CtsDelegatingAccessibilityService \
+ CtsDpiTestCases \
+ CtsDpiTestCases2 \
+ CtsExampleTestCases \
+ CtsGestureTestCases \
+ CtsGraphicsTestCases \
+ CtsHardwareTestCases \
+ CtsJniTestCases \
+ CtsLocationTestCases \
+ CtsMediaTestCases \
+ CtsOsTestCases \
+ CtsPermissionTestCases \
+ CtsPermission2TestCases \
+ CtsProviderTestCases \
+ CtsSpeechTestCases \
+ CtsTelephonyTestCases \
+ CtsTextTestCases \
+ CtsUtilTestCases \
+ CtsViewTestCases \
+ CtsWebkitTestCases \
+ CtsWidgetTestCases \
+ CtsNetTestCases \
+ SignatureTest \
+ CtsPerformanceTestCases \
+ CtsPerformance2TestCases \
+ CtsPerformance3TestCases \
+ CtsPerformance4TestCases \
+ CtsPerformance5TestCases \
+ ApiDemos \
+ ApiDemosReferenceTest \
+ $(CTS_SECURITY_APPS_LIST)
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
index 0496385..2b0786c 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
@@ -869,7 +869,6 @@
* Test case for the behavior of the ContactsProvider's groupmembership table
* It does not test any APIs in android.provider.Contacts.java
*/
- @KnownFailure(value="bug 2258907, needs investigation")
public void testGroupMembershipTable() {
final String[] GROUP_MEMBERSHIP_PROJECTION = new String[] {
GroupMembership._ID, GroupMembership.PERSON_ID,
@@ -909,8 +908,6 @@
assertTrue(cursor.moveToNext());
assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
assertEquals(groupId1, cursor.getInt(GROUP_ID_INDEX));
- assertNull(cursor.getString(GROUP_SYNC_ACCOUNT_INDEX));
- assertNull(cursor.getString(GROUP_SYNC_ID_INDEX));
int id = cursor.getInt(ID_INDEX);
cursor.close();