wip

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

app/src/androidTest/java/com/nextcloud/ui/SetOnlineStatusBottomSheetIT.kt

@@ -28,7 +28,6 @@ class SetOnlineStatusBottomSheetIT : AbstractIT() {
 
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )
 

app/src/androidTest/java/com/nextcloud/ui/SetStatusMessageBottomSheetIT.kt

@@ -27,7 +27,6 @@ import org.junit.Test
 class SetStatusMessageBottomSheetIT : AbstractIT() {
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )
 

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -34,6 +34,7 @@
 import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.nextcloud.client.preferences.DarkMode;
 import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.test.GrantStoragePermissionRule;
 import com.nextcloud.test.RandomStringGenerator;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
@@ -58,6 +59,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -87,8 +90,8 @@
  * Common base for all integration tests.
  */
 public abstract class AbstractIT {
-//    @Rule
-//    public final TestRule storagePermissionRule = GrantStoragePermissionRule.grant();
+    @Rule
+    public final TestRule storagePermissionRule = GrantStoragePermissionRule.grant();
 
 //    @Rule
 //    public GrantPermissionRule notificationsPermissionRule = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS);

app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.kt

@@ -6,7 +6,6 @@
  */
 package com.owncloud.android
 
-import android.Manifest
 import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
@@ -18,7 +17,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.rule.GrantPermissionRule
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.SettingsActivity
@@ -27,20 +25,12 @@ import com.owncloud.android.utils.ScreenshotTest
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
 import org.junit.ClassRule
-import org.junit.Rule
 import org.junit.Test
 import tools.fastlane.screengrab.Screengrab
 import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy
 import tools.fastlane.screengrab.locale.LocaleTestRule
 
 class ScreenshotsIT : AbstractIT() {
-
-    @get:Rule
-    val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        Manifest.permission.POST_NOTIFICATIONS
-    )
-
     @Test
     @ScreenshotTest
     fun gridViewScreenshot() {

app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.kt

@@ -40,7 +40,6 @@ class DrawerActivityIT : AbstractIT() {
 
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )
 

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt

@@ -88,7 +88,6 @@ class DialogFragmentIT : AbstractIT() {
 
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )
 

app/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.kt

@@ -26,7 +26,6 @@ class SyncFileNotEnoughSpaceDialogFragmentTest : AbstractIT() {
 
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )
 

app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewTextFileFragmentTest.kt

@@ -27,7 +27,6 @@ class PreviewTextFileFragmentTest : AbstractIT() {
 
     @get:Rule
     val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
         Manifest.permission.POST_NOTIFICATIONS
     )