diff options
Diffstat (limited to 'test-runner')
4 files changed, 225 insertions, 21 deletions
diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/src/android/test/RenamingDelegatingContext.java index 3d763c7..3c4da9e 100644 --- a/test-runner/src/android/test/RenamingDelegatingContext.java +++ b/test-runner/src/android/test/RenamingDelegatingContext.java @@ -107,7 +107,7 @@ public class RenamingDelegatingContext extends ContextWrapper { } /** - * @param context : the context that will be delagated. + * @param context : the context that will be delegated. * @param filePrefix : a prefix with which database and file names will be * prefixed. */ @@ -118,8 +118,8 @@ public class RenamingDelegatingContext extends ContextWrapper { } /** - * @param context : the context that will be delagated. - * @param fileContext : the context that file and db methods will be delgated to + * @param context : the context that will be delegated. + * @param fileContext : the context that file and db methods will be delegated to * @param filePrefix : a prefix with which database and file names will be * prefixed. */ diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java index 3378872..e5e3e44 100644 --- a/test-runner/src/android/test/mock/MockContext.java +++ b/test-runner/src/android/test/mock/MockContext.java @@ -16,6 +16,7 @@ package android.test.mock; +import android.annotation.SystemApi; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -317,6 +318,13 @@ public class MockContext extends Context { } /** @hide */ + @SystemApi + @Override + public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) { + throw new UnsupportedOperationException(); + } + + /** @hide */ @Override public void sendBroadcast(Intent intent, String receiverPermission, int appOp) { throw new UnsupportedOperationException(); @@ -336,6 +344,15 @@ public class MockContext extends Context { } /** @hide */ + @SystemApi + @Override + public void sendOrderedBroadcast(Intent intent, String receiverPermission, + Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData, + Bundle initialExtras) { + throw new UnsupportedOperationException(); + } + + /** @hide */ @Override public void sendOrderedBroadcast(Intent intent, String receiverPermission, int appOp, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData, @@ -354,6 +371,13 @@ public class MockContext extends Context { throw new UnsupportedOperationException(); } + /** @hide */ + @Override + public void sendBroadcastAsUser(Intent intent, UserHandle user, + String receiverPermission, int appOp) { + throw new UnsupportedOperationException(); + } + @Override public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user, String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler, @@ -480,6 +504,11 @@ public class MockContext extends Context { } @Override + public String getSystemServiceName(Class<?> serviceClass) { + throw new UnsupportedOperationException(); + } + + @Override public int checkPermission(String permission, int pid, int uid) { throw new UnsupportedOperationException(); } @@ -501,6 +530,11 @@ public class MockContext extends Context { } @Override + public int checkSelfPermission(String permission) { + throw new UnsupportedOperationException(); + } + + @Override public void enforcePermission( String permission, int pid, int uid, String message) { throw new UnsupportedOperationException(); diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-runner/src/android/test/mock/MockCursor.java index a37c6eb..28fa0f8 100644 --- a/test-runner/src/android/test/mock/MockCursor.java +++ b/test-runner/src/android/test/mock/MockCursor.java @@ -35,162 +35,209 @@ import android.os.Bundle; * </P> */ public class MockCursor implements Cursor { + @Override public int getColumnCount() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getColumnIndex(String columnName) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getColumnIndexOrThrow(String columnName) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public String getColumnName(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public String[] getColumnNames() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getCount() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isNull(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getInt(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public long getLong(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public short getShort(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public float getFloat(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public double getDouble(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public byte[] getBlob(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public String getString(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override + public void setExtras(Bundle extras) { + throw new UnsupportedOperationException("unimplemented mock method"); + } + + @Override public Bundle getExtras() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getPosition() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isAfterLast() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isBeforeFirst() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isFirst() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isLast() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean move(int offset) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean moveToFirst() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean moveToLast() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean moveToNext() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean moveToPrevious() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean moveToPosition(int position) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override + @Deprecated public void deactivate() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void close() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean isClosed() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override + @Deprecated public boolean requery() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void registerContentObserver(ContentObserver observer) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void registerDataSetObserver(DataSetObserver observer) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public Bundle respond(Bundle extras) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public boolean getWantsAllOnMoveCalls() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void setNotificationUri(ContentResolver cr, Uri uri) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public Uri getNotificationUri() { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void unregisterContentObserver(ContentObserver observer) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public void unregisterDataSetObserver(DataSetObserver observer) { throw new UnsupportedOperationException("unimplemented mock method"); } + @Override public int getType(int columnIndex) { throw new UnsupportedOperationException("unimplemented mock method"); } diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index 7531d7b..ac92dc0 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -28,9 +28,9 @@ import android.content.pm.FeatureInfo; import android.content.pm.IPackageDataObserver; import android.content.pm.IPackageDeleteObserver; import android.content.pm.IPackageInstallObserver; -import android.content.pm.IPackageMoveObserver; import android.content.pm.IPackageStatsObserver; import android.content.pm.InstrumentationInfo; +import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.KeySet; import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; @@ -49,7 +49,9 @@ import android.content.res.XmlResourceParser; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Handler; import android.os.UserHandle; +import android.os.storage.VolumeInfo; import java.util.List; @@ -191,13 +193,46 @@ public class MockPackageManager extends PackageManager { /** @hide */ @Override - public void grantPermission(String packageName, String permissionName) { + public void grantRuntimePermission(String packageName, String permissionName, + UserHandle user) { + throw new UnsupportedOperationException(); + } + + /** @hide */ + @Override + public void revokeRuntimePermission(String packageName, String permissionName, + UserHandle user) { + throw new UnsupportedOperationException(); + } + + /** @hide */ + @Override + public int getPermissionFlags(String permissionName, String packageName, UserHandle user) { throw new UnsupportedOperationException(); } /** @hide */ @Override - public void revokePermission(String packageName, String permissionName) { + public void updatePermissionFlags(String permissionName, String packageName, + int flagMask, int flagValues, UserHandle user) { + throw new UnsupportedOperationException(); + } + + /** @hide */ + @Override + public boolean shouldShowRequestPermissionRationale(String permission) { + throw new UnsupportedOperationException(); + } + + /** @hide */ + @Override + public void addOnPermissionsChangeListener(OnPermissionsChangedListener listener) { + throw new UnsupportedOperationException(); + } + + /** @hide */ + @Override + public void removeOnPermissionsChangeListener(OnPermissionsChangedListener listener) { throw new UnsupportedOperationException(); } @@ -484,16 +519,62 @@ public class MockPackageManager extends PackageManager { throw new UnsupportedOperationException(); } - /** - * @hide - to match hiding in superclass - */ @Override - public void movePackage(String packageName, IPackageMoveObserver observer, int flags) { + public String getInstallerPackageName(String packageName) { throw new UnsupportedOperationException(); } + /** {@hide} */ @Override - public String getInstallerPackageName(String packageName) { + public int getMoveStatus(int moveId) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public void registerMoveCallback(MoveCallback callback, Handler handler) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public void unregisterMoveCallback(MoveCallback callback) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public int movePackage(String packageName, VolumeInfo vol) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public VolumeInfo getPackageCurrentVolume(ApplicationInfo app) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public int movePrimaryStorage(VolumeInfo vol) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public VolumeInfo getPrimaryStorageCurrentVolume() { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override + public List<VolumeInfo> getPrimaryStorageCandidateVolumes() { throw new UnsupportedOperationException(); } @@ -515,21 +596,16 @@ public class MockPackageManager extends PackageManager { throw new UnsupportedOperationException(); } - /** - * @hide - to match hiding in superclass - */ + /** {@hide} */ @Override - public void freeStorageAndNotify( - long idealStorageSize, IPackageDataObserver observer) { + public void freeStorageAndNotify(String volumeUuid, long idealStorageSize, + IPackageDataObserver observer) { throw new UnsupportedOperationException(); } - /** - * @hide - to match hiding in superclass - */ + /** {@hide} */ @Override - public void freeStorage( - long idealStorageSize, IntentSender pi) { + public void freeStorage(String volumeUuid, long idealStorageSize, IntentSender pi) { throw new UnsupportedOperationException(); } @@ -725,6 +801,53 @@ public class MockPackageManager extends PackageManager { * @hide */ @Override + public void verifyIntentFilter(int id, int verificationCode, List<String> outFailedDomains) { + throw new UnsupportedOperationException(); + } + + /** + * @hide + */ + @Override + public int getIntentVerificationStatus(String packageName, int userId) { + throw new UnsupportedOperationException(); + } + + /** + * @hide + */ + @Override + public boolean updateIntentVerificationStatus(String packageName, int status, int userId) { + throw new UnsupportedOperationException(); + } + + /** + * @hide + */ + @Override + public List<IntentFilterVerificationInfo> getIntentFilterVerifications(String packageName) { + throw new UnsupportedOperationException(); + } + + @Override + public List<IntentFilter> getAllIntentFilters(String packageName) { + throw new UnsupportedOperationException(); + } + + @Override + public String getDefaultBrowserPackageName(int userId) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean setDefaultBrowserPackageName(String packageName, int userId) { + throw new UnsupportedOperationException(); + } + + /** + * @hide + */ + @Override public VerifierDeviceIdentity getVerifierDeviceIdentity() { throw new UnsupportedOperationException(); } |