From 67a2fd987ee1e8439ac6d7a9260a6065480c4893 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 25 Aug 2016 23:13:35 -0500 Subject: [PATCH] Fix backup test permissions --- .../java/org/tasks/injection/TestModule.java | 7 ++++ .../PermissivePermissionChecker.java | 41 +++++++++++++++++++ .../tasks/scheduling/BackupServiceTests.java | 8 ++-- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java diff --git a/src/androidTest/java/org/tasks/injection/TestModule.java b/src/androidTest/java/org/tasks/injection/TestModule.java index 813d6a89e..38c06f6d8 100644 --- a/src/androidTest/java/org/tasks/injection/TestModule.java +++ b/src/androidTest/java/org/tasks/injection/TestModule.java @@ -5,6 +5,8 @@ import android.content.Context; import com.todoroo.astrid.dao.Database; import org.tasks.analytics.Tracker; +import org.tasks.preferences.PermissionChecker; +import org.tasks.preferences.PermissivePermissionChecker; import dagger.Module; import dagger.Provides; @@ -36,4 +38,9 @@ public class TestModule { public Context getContext() { return context; } + + @Provides + public PermissionChecker getPermissionChecker() { + return new PermissivePermissionChecker(context); + } } diff --git a/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java b/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java new file mode 100644 index 000000000..5f5666a92 --- /dev/null +++ b/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java @@ -0,0 +1,41 @@ +package org.tasks.preferences; + +import android.content.Context; + +import org.tasks.injection.ForApplication; + +public class PermissivePermissionChecker extends PermissionChecker { + public PermissivePermissionChecker(@ForApplication Context context) { + super(context); + } + + @Override + public boolean canAccessCalendars() { + return true; + } + + @Override + public boolean canWriteToExternalStorage() { + return true; + } + + @Override + public boolean canAccessAccounts() { + return true; + } + + @Override + public boolean canAccessLocation() { + return true; + } + + @Override + public boolean canAccessMic() { + return true; + } + + @Override + public boolean canAccessMissedCallPermissions() { + return true; + } +} diff --git a/src/androidTest/java/org/tasks/scheduling/BackupServiceTests.java b/src/androidTest/java/org/tasks/scheduling/BackupServiceTests.java index d03096a48..4ce7f6cac 100644 --- a/src/androidTest/java/org/tasks/scheduling/BackupServiceTests.java +++ b/src/androidTest/java/org/tasks/scheduling/BackupServiceTests.java @@ -25,7 +25,7 @@ import java.io.IOException; import javax.inject.Inject; -import static android.support.test.InstrumentationRegistry.getContext; +import static android.support.test.InstrumentationRegistry.getTargetContext; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -91,7 +91,7 @@ public class BackupServiceTests extends DatabaseTestCase { // create a backup BackupIntentService service = new BackupIntentService(); - service.testBackup(xmlExporter, preferences, getContext()); + service.testBackup(xmlExporter, preferences, getTargetContext()); AndroidUtilities.sleepDeep(BACKUP_WAIT_TIME); @@ -129,7 +129,7 @@ public class BackupServiceTests extends DatabaseTestCase { // backup BackupIntentService service = new BackupIntentService(); - service.testBackup(xmlExporter, preferences, getContext()); + service.testBackup(xmlExporter, preferences, getTargetContext()); AndroidUtilities.sleepDeep(BACKUP_WAIT_TIME); @@ -138,7 +138,7 @@ public class BackupServiceTests extends DatabaseTestCase { assertFalse(files[4].exists()); // assert user file still exists - service.testBackup(xmlExporter, preferences, getContext()); + service.testBackup(xmlExporter, preferences, getTargetContext()); assertTrue(myFile.exists()); } }