diff options
| -rw-r--r-- | packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java index 1d08711715c3..d988111c29d5 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java @@ -89,6 +89,10 @@ public class AvatarPhotoControllerTest { @After public void tearDown() { + String[] entries = mImagesDir.list(); + for (String entry : entries) { + new File(mImagesDir, entry).delete(); + } mImagesDir.delete(); } @@ -233,7 +237,8 @@ public class AvatarPhotoControllerTest { public void internalCropUsedIfNoSystemCropperFound() throws IOException { when(mMockAvatarUi.startSystemActivityForResult(any(), anyInt())).thenReturn(false); - new File(mImagesDir, "file.txt").createNewFile(); + File file = new File(mImagesDir, "file.txt"); + saveBitmapToFile(file); Intent intent = new Intent(); intent.setData(Uri.parse( @@ -241,10 +246,6 @@ public class AvatarPhotoControllerTest { mController.onActivityResult( REQUEST_CODE_TAKE_PHOTO, Activity.RESULT_OK, intent); - Intent startIntent = verifyStartSystemActivityForResult( - "com.android.camera.action.CROP", REQUEST_CODE_CROP_PHOTO); - assertThat(startIntent.getData()).isNotEqualTo(mTakePhotoUri); - verify(mMockAvatarUi, timeout(TIMEOUT_MILLIS)).returnUriResult(mCropPhotoUri); InputStream imageStream = mContext.getContentResolver().openInputStream(mCropPhotoUri); |