am f55e9fee: Remove NoProcessOutgoingCallPermissionTest#testProcessOutgoingCall from large suite.
Merge commit 'f55e9fee1b4d8f43cb0ee29445a98ff343a4c6b5'
* commit 'f55e9fee1b4d8f43cb0ee29445a98ff343a4c6b5':
Remove NoProcessOutgoingCallPermissionTest#testProcessOutgoingCall from large suite.
diff --git a/tests/core/ctscore.mk b/tests/core/ctscore.mk
index 971fa74..91c5184 100644
--- a/tests/core/ctscore.mk
+++ b/tests/core/ctscore.mk
@@ -41,7 +41,7 @@
$(call unzip-jar-files,$(PRIVATE_CORETESTS_INTERMEDIATES_COMMON)/javalib.jar,\
$(PRIVATE_INTERMEDIATES_COMMON)/ctsclasses)
@find $(PRIVATE_INTERMEDIATES_COMMON)/ctsclasses -type f -name "*.class" -delete
- @rm $(PRIVATE_INTERMEDIATES_COMMON)/ctsclasses/classes.dex
+ @rm -f $(PRIVATE_INTERMEDIATES_COMMON)/ctsclasses/classes.dex
@cp $< $@
@jar uf $@ -C $(PRIVATE_INTERMEDIATES_COMMON)/ctsclasses .
$(sign-package)
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index 25c8efb..9a2e2f9 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -28,7 +28,11 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.IContentProvider;
-import android.content.ISyncAdapter;
+import android.content.Entity;
+import android.content.EntityIterator;
+import android.content.ContentProviderResult;
+import android.content.ContentProviderOperation;
+import android.content.OperationApplicationException;
import android.content.pm.ProviderInfo;
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
@@ -45,6 +49,7 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.ArrayList;
/**
* Test {@link ContentProvider}.
@@ -224,16 +229,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "getSyncAdapter",
- args = {}
- )
- public void testGetSyncAdapter() {
- MockContentProvider mockContentProvider = new MockContentProvider();
- assertNull(mockContentProvider.getSyncAdapter());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "isTemporary",
args = {}
)
@@ -341,6 +336,10 @@
return null;
}
+ public Uri insertEntity(Uri uri, Entity entities) throws RemoteException {
+ return null;
+ }
+
public int bulkInsert(Uri url, ContentValues[] initialValues) {
return 0;
}
@@ -349,10 +348,6 @@
return 0;
}
- public ISyncAdapter getSyncAdapter() {
- return null;
- }
-
public String getType(Uri url) {
return null;
}
@@ -369,16 +364,31 @@
return null;
}
+ public ContentProviderResult[] applyBatch(
+ ArrayList<ContentProviderOperation> operations)
+ throws RemoteException, OperationApplicationException {
+ return null;
+ }
+
public Cursor query(Uri url, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
return null;
}
+ public EntityIterator queryEntities(Uri url, String selection, String[] selectionArgs,
+ String sortOrder) throws RemoteException {
+ return null;
+ }
+
public int update(Uri url, ContentValues values, String selection,
String[] selectionArgs) {
return 0;
}
+ public int updateEntity(Uri uri, Entity entity) throws RemoteException {
+ return 0;
+ }
+
public IBinder asBinder() {
return null;
}
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index d2e964d..c6cb7ac 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -34,6 +34,7 @@
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
+import android.accounts.Account;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -50,6 +51,8 @@
private static final Uri TABLE1_URI = Uri.parse("content://" + AUTHORITY + "/testtable1/");
private static final Uri TABLE2_URI = Uri.parse("content://" + AUTHORITY + "/testtable2/");
+ private static final Account ACCOUNT = new Account("cts", "cts");
+
private static final String KEY1 = "key1";
private static final String KEY2 = "key2";
private static final String KEY3 = "key3";
@@ -718,13 +721,12 @@
public void testStartCancelSync() {
Bundle extras = new Bundle();
- extras.putBoolean(ContentResolver.SYNC_EXTRAS_FORCE, true);
- extras.putString(ContentResolver.SYNC_EXTRAS_ACCOUNT, "cts");
+ extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
- mContentResolver.startSync(TABLE1_URI, extras);
+ ContentResolver.requestSync(ACCOUNT, AUTHORITY, extras);
//FIXME: how to get the result to assert.
- mContentResolver.cancelSync(TABLE1_URI);
+ ContentResolver.cancelSync(ACCOUNT, AUTHORITY);
//FIXME: how to assert.
}
@@ -737,7 +739,7 @@
"ContentResolver#startSync(Uri, Bundle) when extras is null")
public void testStartSyncFailure() {
try {
- mContentResolver.startSync(TABLE1_URI, null);
+ ContentResolver.requestSync(null, null, null);
fail("did not throw IllegalArgumentException when extras is null.");
} catch (IllegalArgumentException e) {
//expected.
diff --git a/tests/tests/permission/src/android/permission/cts/NoAudioPermissionTest.java b/tests/tests/permission/src/android/permission/cts/NoAudioPermissionTest.java
index 06eeef4..f3c5ae8 100644
--- a/tests/tests/permission/src/android/permission/cts/NoAudioPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/NoAudioPermissionTest.java
@@ -59,57 +59,22 @@
}
/**
- * Verify that AudioManager.setRouting requires permissions.
+ * Verify that AudioManager routing methods require permissions.
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.
*/
@SuppressWarnings("deprecation")
@SmallTest
- public void testSetRouting() {
- int[] defaultRoutes = new int[MODE_COUNT];
- defaultRoutes[0] = mAudioManager.getRouting(AudioManager.MODE_NORMAL);
- defaultRoutes[1] = mAudioManager.getRouting(AudioManager.MODE_RINGTONE);
- defaultRoutes[2] = mAudioManager.getRouting(AudioManager.MODE_IN_CALL);
+ public void testRouting() {
- // If there is no permission of MODIFY_AUDIO_SETTINGS, setRouting does nothing.
- // Please referring android.media.cts.AudioManagerTest#testRouting().
- mAudioManager.setBluetoothScoOn(true);
- mAudioManager.setRouting(AudioManager.MODE_IN_CALL, AudioManager.ROUTE_BLUETOOTH_SCO,
- AudioManager.ROUTE_ALL);
- assertEquals(defaultRoutes[0], getRouting(AudioManager.MODE_NORMAL));
- assertEquals(defaultRoutes[1], getRouting(AudioManager.MODE_RINGTONE));
- assertEquals(defaultRoutes[2], getRouting(AudioManager.MODE_IN_CALL));
+ // If there is no permission of MODIFY_AUDIO_SETTINGS, setSpeakerphoneOn does nothing.
+ boolean prevState = mAudioManager.isSpeakerphoneOn();
+ mAudioManager.setSpeakerphoneOn(!prevState);
+ assertEquals(prevState, mAudioManager.isSpeakerphoneOn());
- mAudioManager.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER,
- AudioManager.ROUTE_ALL);
- mAudioManager.setRouting(AudioManager.MODE_RINGTONE, AudioManager.ROUTE_SPEAKER,
- AudioManager.ROUTE_ALL);
- mAudioManager.setRouting(AudioManager.MODE_IN_CALL, AudioManager.ROUTE_SPEAKER,
- AudioManager.ROUTE_ALL);
- assertEquals(defaultRoutes[0], getRouting(AudioManager.MODE_NORMAL));
- assertEquals(defaultRoutes[1], getRouting(AudioManager.MODE_RINGTONE));
- assertEquals(defaultRoutes[2], getRouting(AudioManager.MODE_IN_CALL));
-
- mAudioManager.setSpeakerphoneOn(true);
- assertFalse(mAudioManager.isSpeakerphoneOn());
- assertEquals(defaultRoutes[2], getRouting(AudioManager.MODE_IN_CALL));
- mAudioManager.setSpeakerphoneOn(false);
- assertFalse(mAudioManager.isSpeakerphoneOn());
- assertEquals(defaultRoutes[2], getRouting(AudioManager.MODE_IN_CALL));
-
- mAudioManager.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE,
- AudioManager.ROUTE_ALL);
- mAudioManager.setRouting(AudioManager.MODE_RINGTONE, AudioManager.ROUTE_EARPIECE,
- AudioManager.ROUTE_ALL);
- mAudioManager.setRouting(AudioManager.MODE_IN_CALL, AudioManager.ROUTE_EARPIECE,
- AudioManager.ROUTE_ALL);
- assertEquals(defaultRoutes[0], getRouting(AudioManager.MODE_NORMAL));
- assertEquals(defaultRoutes[1], getRouting(AudioManager.MODE_RINGTONE));
- assertEquals(defaultRoutes[2], getRouting(AudioManager.MODE_IN_CALL));
- }
-
- @SuppressWarnings("deprecation")
- private int getRouting(int mode) {
- return mAudioManager.getRouting(mode);
+ // If there is no permission of MODIFY_AUDIO_SETTINGS, setBluetoothScoOn does nothing.
+ prevState = mAudioManager.isBluetoothScoOn();
+ mAudioManager.setBluetoothScoOn(!prevState);
+ assertEquals(prevState, mAudioManager.isBluetoothScoOn());
}
}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
index be42e1d..98da060 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
@@ -69,25 +69,27 @@
*/
public void testPeopleTable() {
final String[] PEOPLE_PROJECTION = new String[] {
- People._ID, People._SYNC_ACCOUNT, People._SYNC_ID, People._SYNC_TIME,
+ People._ID, People._SYNC_ACCOUNT, People._SYNC_ACCOUNT_TYPE, People._SYNC_ID,
+ People._SYNC_TIME,
People._SYNC_VERSION, People._SYNC_LOCAL_ID, People._SYNC_DIRTY,
People.NAME, People.NOTES, People.TIMES_CONTACTED,
People.LAST_TIME_CONTACTED, People.STARRED,
People.CUSTOM_RINGTONE, People.SEND_TO_VOICEMAIL,};
final int ID_INDEX = 0;
- final int SYNC_ACCOUNT_INDEX = 1;
- final int SYNC_ID_INDEX = 2;
- final int SYNC_TIME_INDEX = 3;
- final int SYNC_VERSION_INDEX = 4;
- final int SYNC_LOCAL_ID_INDEX = 5;
- final int SYNC_DIRTY_INDEX = 6;
- final int NAME_INDEX = 7;
- final int NOTES_INDEX = 8;
- final int TIMES_CONTACTED_INDEX = 9;
- final int LAST_TIME_CONTACTED_INDEX = 10;
- final int STARRED_INDEX = 11;
- final int CUSTOM_RINGTONE_INDEX = 12;
- final int SEND_TO_VOICEMAIL_INDEX = 13;
+ final int SYNC_ACCOUNT_NAME_INDEX = 1;
+ final int SYNC_ACCOUNT_TYPE_INDEX = 2;
+ final int SYNC_ID_INDEX = 3;
+ final int SYNC_TIME_INDEX = 4;
+ final int SYNC_VERSION_INDEX = 5;
+ final int SYNC_LOCAL_ID_INDEX = 6;
+ final int SYNC_DIRTY_INDEX = 7;
+ final int NAME_INDEX = 8;
+ final int NOTES_INDEX = 9;
+ final int TIMES_CONTACTED_INDEX = 10;
+ final int LAST_TIME_CONTACTED_INDEX = 11;
+ final int STARRED_INDEX = 12;
+ final int CUSTOM_RINGTONE_INDEX = 13;
+ final int SEND_TO_VOICEMAIL_INDEX = 14;
String insertPeopleName = "name_insert";
String insertPeopleNotes = "notes_insert";
@@ -160,7 +162,7 @@
public void testGroupsTable() {
final String[] GROUPS_PROJECTION = new String[] {
Groups._ID, Groups.NAME, Groups.NOTES, Groups.SHOULD_SYNC,
- Groups.SYSTEM_ID, Groups._SYNC_ACCOUNT, Groups._SYNC_ID,
+ Groups.SYSTEM_ID, Groups._SYNC_ACCOUNT, Groups._SYNC_ACCOUNT_TYPE, Groups._SYNC_ID,
Groups._SYNC_TIME, Groups._SYNC_VERSION, Groups._SYNC_LOCAL_ID,
Groups._SYNC_DIRTY};
final int ID_INDEX = 0;
@@ -168,12 +170,13 @@
final int NOTES_INDEX = 2;
final int SHOULD_SYNC_INDEX = 3;
final int SYSTEM_ID_INDEX = 4;
- final int SYNC_ACCOUNT_INDEX = 5;
- final int SYNC_ID_INDEX = 6;
- final int SYNC_TIME_INDEX = 7;
- final int SYNC_VERSION_INDEX = 8;
- final int SYNC_LOCAL_ID_INDEX = 9;
- final int SYNC_DIRTY_INDEX = 10;
+ final int SYNC_ACCOUNT_NAME_INDEX = 5;
+ final int SYNC_ACCOUNT_TYPE_INDEX = 6;
+ final int SYNC_ID_INDEX = 7;
+ final int SYNC_TIME_INDEX = 8;
+ final int SYNC_VERSION_INDEX = 9;
+ final int SYNC_LOCAL_ID_INDEX = 10;
+ final int SYNC_DIRTY_INDEX = 11;
String insertGroupsName = "name_insert";
String insertGroupsNotes = "notes_insert";
@@ -237,7 +240,7 @@
public void testPhotosTable() {
final String[] PHOTOS_PROJECTION = new String[] {
Photos._ID, Photos.EXISTS_ON_SERVER, Photos.PERSON_ID,
- Photos.LOCAL_VERSION, Photos.DATA, Photos._SYNC_ACCOUNT,
+ Photos.LOCAL_VERSION, Photos.DATA, Photos._SYNC_ACCOUNT, Photos._SYNC_ACCOUNT_TYPE,
Photos._SYNC_ID, Photos._SYNC_TIME, Photos._SYNC_VERSION,
Photos._SYNC_LOCAL_ID, Photos._SYNC_DIRTY,
Photos.SYNC_ERROR};
@@ -246,13 +249,14 @@
final int PERSON_ID_INDEX = 2;
final int LOCAL_VERSION_INDEX = 3;
final int DATA_INDEX = 4;
- final int SYNC_ACCOUNT_INDEX = 5;
- final int SYNC_ID_INDEX = 6;
- final int SYNC_TIME_INDEX = 7;
- final int SYNC_VERSION_INDEX = 8;
- final int SYNC_LOCAL_ID_INDEX = 9;
- final int SYNC_DIRTY_INDEX = 10;
- final int SYNC_ERROR_INDEX = 11;
+ final int SYNC_ACCOUNT_NAME_INDEX = 5;
+ final int SYNC_ACCOUNT_TYPE_INDEX = 6;
+ final int SYNC_ID_INDEX = 7;
+ final int SYNC_TIME_INDEX = 8;
+ final int SYNC_VERSION_INDEX = 9;
+ final int SYNC_LOCAL_ID_INDEX = 10;
+ final int SYNC_DIRTY_INDEX = 11;
+ final int SYNC_ERROR_INDEX = 12;
String updatePhotosLocalVersion = "local_version1";
@@ -684,11 +688,13 @@
*/
public void testSettingsTable() {
final String[] SETTINGS_PROJECTION = new String[] {
- Settings._ID, Settings._SYNC_ACCOUNT, Settings.KEY, Settings.VALUE};
+ Settings._ID, Settings._SYNC_ACCOUNT, Settings._SYNC_ACCOUNT_TYPE,
+ Settings.KEY, Settings.VALUE};
final int ID_INDEX = 0;
- final int SYNC_ACCOUNT_INDEX = 1;
- final int KEY_INDEX = 2;
- final int VALUE_INDEX = 3;
+ final int SYNC_ACCOUNT_NAME_INDEX = 1;
+ final int SYNC_ACCOUNT_TYPE_INDEX = 2;
+ final int KEY_INDEX = 3;
+ final int VALUE_INDEX = 4;
String insertKey = "key_insert";
String insertValue = "value_insert";
@@ -716,7 +722,8 @@
Settings.KEY + " = ?",
new String[] {insertKey}, null);
assertTrue(cursor.moveToNext());
- assertNull(cursor.getString(SYNC_ACCOUNT_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
assertEquals(insertKey, cursor.getString(KEY_INDEX));
assertEquals(insertValue, cursor.getString(VALUE_INDEX));
int id = cursor.getInt(ID_INDEX);
@@ -734,7 +741,8 @@
Settings.KEY + " = ?",
new String[] {updateKey}, null);
assertTrue(cursor.moveToNext());
- assertNull(cursor.getString(SYNC_ACCOUNT_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
assertEquals(updateKey, cursor.getString(KEY_INDEX));
assertEquals(updateValue, cursor.getString(VALUE_INDEX));
cursor.close();
@@ -743,7 +751,8 @@
Settings.KEY + " = ?",
new String[] {insertKey}, null);
assertTrue(cursor.moveToNext());
- assertNull(cursor.getString(SYNC_ACCOUNT_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
assertEquals(insertKey, cursor.getString(KEY_INDEX));
assertEquals(insertValue, cursor.getString(VALUE_INDEX));
cursor.close();
@@ -760,7 +769,8 @@
Settings.KEY + " = ?",
new String[] {insertKey}, null);
assertTrue(cursor.moveToNext());
- assertNull(cursor.getString(SYNC_ACCOUNT_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
assertEquals(insertKey, cursor.getString(KEY_INDEX));
assertEquals(updateValue, cursor.getString(VALUE_INDEX));
cursor.close();
@@ -769,7 +779,8 @@
Settings.KEY + " = ?",
new String[] {updateKey}, null);
assertTrue(cursor.moveToNext());
- assertNull(cursor.getString(SYNC_ACCOUNT_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+ assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
assertEquals(updateKey, cursor.getString(KEY_INDEX));
assertEquals(updateValue, cursor.getString(VALUE_INDEX));
cursor.close();
diff --git a/tools/test-progress-new/etc/test-progress b/tools/test-progress-new/etc/test-progress
index 62eb672..94a4289 100644
--- a/tools/test-progress-new/etc/test-progress
+++ b/tools/test-progress-new/etc/test-progress
@@ -227,7 +227,6 @@
javax.security.cert \
javax.sql \
javax.xml.parsers \
-org.w3c.dom \
org.xml.sax \
org.xml.sax.ext \
org.xml.sax.helpers"
@@ -365,6 +364,11 @@
javadoc -J-Xmx1024M -docletpath $CLASSES -doclet testprogress2.TestCoverageDoclet -f $TESTCOVERAGE_FLAGS -d $OUTPUT -sourcepath $SOURCE_PATH
# left out on purpose:
+# org.w3c.dom packages: the tests in the xml module are superseded by the
+# official w3c test suite located in the dom module.
+#
+
+# left out on purpose:
# concurrent packages: a full test suite exists (JCP JSR166 test suite) and it located at
# device/dalvik/libcore/concurrent/src/test/java/tests/api/java/util/concurrent
#