Merge pull request #478 from KasperskyLab/TECH-Revert-storage-rules-r…

…emoval Revert "ISSUE-404: Removed storage rules for all tests"
KasperskyLab · Jan 12, 2023 · 1b87ac9 · 1b87ac9
2 parents 5df47dc + ec1cc6c
commit 1b87ac9
Show file tree

Hide file tree

Showing 43 changed files with 347 additions and 6 deletions.
diff --git a/...oidTest/kotlin/com/kaspersky/kaspresso/alluresupport/sample/AllureSupportCustomizeTest.kt b/...oidTest/kotlin/com/kaspersky/kaspresso/alluresupport/sample/AllureSupportCustomizeTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspresso.alluresupport.sample
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.components.alluresupport.addAllureSupport
 import com.kaspersky.components.alluresupport.files.attachViewHierarchyToAllureReport
 import com.kaspersky.components.alluresupport.withAllureSupport
@@ -33,6 +35,11 @@ class AllureSupportCustomizeTest : TestCase(
         }
     }
 ) {
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
 
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()

diff --git a/...roidTest/kotlin/com/kaspersky/kaspresso/alluresupport/sample/AllureSupportTestWithRule.kt b/...roidTest/kotlin/com/kaspersky/kaspresso/alluresupport/sample/AllureSupportTestWithRule.kt
@@ -1,12 +1,14 @@
 package com.kaspersky.kaspresso.alluresupport.sample
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.components.alluresupport.withAllureSupport
-import com.kaspersky.kaspresso.alluresupport.sample.screen.MainScreen
 import com.kaspersky.kaspresso.kaspresso.Kaspresso
+import com.kaspersky.kaspresso.testcases.api.testcaserule.TestCaseRule
+import com.kaspersky.kaspresso.alluresupport.sample.screen.MainScreen
 import com.kaspersky.kaspresso.params.ScreenshotParams
 import com.kaspersky.kaspresso.params.VideoParams
-import com.kaspersky.kaspresso.testcases.api.testcaserule.TestCaseRule
 import org.junit.Rule
 import org.junit.Test
 
@@ -15,6 +17,12 @@ import org.junit.Test
  */
 class AllureSupportTestWithRule {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val testCaseRule = TestCaseRule(
         testClassName = javaClass.simpleName,

diff --git a/...le/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/ComplexComposeTest.kt b/...le/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/ComplexComposeTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.compose_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.external_screens.UiComposeDialog1
 import com.kaspersky.kaspressample.external_screens.UiComposeDialog2
@@ -12,6 +14,12 @@ import org.junit.Test
 
 class ComplexComposeTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...ple/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/SimpleComposeTest.kt b/...ple/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/SimpleComposeTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.compose_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.R
 import com.kaspersky.kaspressample.screen.CommonFlakyScreen
@@ -11,6 +13,12 @@ import org.junit.Test
 
 class SimpleComposeTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...sample/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/WebComposeTest.kt b/...sample/src/androidTest/kotlin/com/kaspersky/kaspressample/compose_tests/WebComposeTest.kt
@@ -1,7 +1,9 @@
 package com.kaspersky.kaspressample.compose_tests
 
+import android.Manifest
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.screen.MainScreen
 import com.kaspersky.kaspressample.screen.WebViewScreen
@@ -11,6 +13,12 @@ import org.junit.Test
 
 class WebComposeTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...st/kotlin/com/kaspersky/kaspressample/configurator_tests/DisabledStepAutoNumberingTest.kt b/...st/kotlin/com/kaspersky/kaspressample/configurator_tests/DisabledStepAutoNumberingTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.configurator_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.R
 import com.kaspersky.kaspressample.screen.MainScreen
@@ -15,6 +17,11 @@ class DisabledStepAutoNumberingTest : TestCase(
         stepParams.autonumber = false
     }
 ) {
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
 
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()

diff --git a/.../com/kaspersky/kaspressample/configurator_tests/defaultaction_tests/DefaultActionsTest.kt b/.../com/kaspersky/kaspressample/configurator_tests/defaultaction_tests/DefaultActionsTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.configurator_tests.defaultaction_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.R
 import com.kaspersky.kaspressample.screen.MainScreen
@@ -21,6 +23,11 @@ class DefaultActionsTest : ParentTestCase(
         }
     }
 ) {
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
 
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()

diff --git a/.../kaspersky/kaspressample/configurator_tests/interceptor_tests/KaspressoConfiguringTest.kt b/.../kaspersky/kaspressample/configurator_tests/interceptor_tests/KaspressoConfiguringTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.configurator_tests.interceptor_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.R
 import com.kaspersky.kaspressample.configurator_tests.interceptor_tests.helpers.CheckCustomInterceptorsStorage
@@ -27,6 +29,12 @@ class KaspressoConfiguringTest : TestCase(
     }
 ) {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...src/androidTest/kotlin/com/kaspersky/kaspressample/continuously_tests/ContinuouslyTest.kt b/...src/androidTest/kotlin/com/kaspersky/kaspressample/continuously_tests/ContinuouslyTest.kt
@@ -1,7 +1,9 @@
 package com.kaspersky.kaspressample.continuously_tests
 
+import android.Manifest
 import android.os.Build
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.screen.ContinuouslyDialogScreen
 import com.kaspersky.kaspressample.screen.ContinuouslyScreen
@@ -17,6 +19,12 @@ class ContinuouslyTest : TestCase() {
         private const val FAKE_MAX_DELAY_MS: Long = 5_000
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...c/androidTest/kotlin/com/kaspersky/kaspressample/continuously_tests/UiContinuouslyTest.kt b/...c/androidTest/kotlin/com/kaspersky/kaspressample/continuously_tests/UiContinuouslyTest.kt
@@ -1,7 +1,9 @@
 package com.kaspersky.kaspressample.continuously_tests
 
+import android.Manifest
 import android.os.Build
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.external_screens.UiContinuouslyDialogScreen
 import com.kaspersky.kaspressample.external_screens.UiContinuouslyScreen
@@ -17,6 +19,12 @@ class UiContinuouslyTest : TestCase() {
         private const val FAKE_MAX_DELAY_MS: Long = 5_000
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...roidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceAccessibilitySampleTest.kt b/...roidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceAccessibilitySampleTest.kt
@@ -1,9 +1,11 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import android.os.Build
 import android.provider.Settings
 import android.provider.Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.device.DeviceSampleAccessibilityService
 import com.kaspersky.kaspressample.device.DeviceSampleActivity
 import com.kaspersky.kaspressample.utils.SafeAssert.assertFalseSafely
@@ -26,6 +28,12 @@ class DeviceAccessibilitySampleTest : TestCase() {
         private val SERVICE_CLASS_NAME = DeviceSampleAccessibilityService::class.java.canonicalName!!
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<DeviceSampleActivity>()
 

diff --git a/...androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceActivitiesSampleTest.kt b/...androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceActivitiesSampleTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import org.hamcrest.CoreMatchers.instanceOf
@@ -10,6 +12,12 @@ import org.junit.Test
 
 class DeviceActivitiesSampleTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...le/src/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceAppSampleTest.kt b/...le/src/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceAppSampleTest.kt
@@ -1,8 +1,9 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
-import com.kaspersky.kaspressample.device_tests.DeviceAppSampleTest.Companion.TEST_APK_FILE_RELATIVE_PATH
 import com.kaspersky.kaspresso.device.apps.Apps
 import com.kaspersky.kaspresso.device.server.AdbServer
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
@@ -26,6 +27,12 @@ class DeviceAppSampleTest : TestCase() {
         private const val TEST_APK_PACKAGE_NAME = "com.example.helloworld"
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...rc/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceExploitSampleTest.kt b/...rc/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceExploitSampleTest.kt
@@ -1,7 +1,9 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import android.content.res.Configuration
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspressample.screen.MainScreen
 import com.kaspersky.kaspressample.utils.SafeAssert.assertTrueSafely
@@ -14,6 +16,12 @@ import org.junit.Test
 
 class DeviceExploitSampleTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/.../src/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceFilesSampleTest.kt b/.../src/androidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceFilesSampleTest.kt
@@ -1,15 +1,17 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import android.os.Environment
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.MainActivity
 import com.kaspersky.kaspresso.device.files.Files
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
+import java.io.File
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
-import java.io.File
 
 /**
  * Pushes and then removes a file file placed at /artifacts directory.
@@ -23,6 +25,12 @@ class DeviceFilesSampleTest : TestCase() {
         private const val FILE_RELATIVE_PATH = "artifacts/$FILE_NAME"
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<MainActivity>()
 

diff --git a/...oidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceFullScreenshotSampleTest.kt b/...oidTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceFullScreenshotSampleTest.kt
@@ -1,6 +1,8 @@
 package com.kaspersky.kaspressample.device_tests
 
+import android.Manifest
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.devicefull.DeviceFullWindowSampleActivity
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import org.junit.Assert
@@ -14,6 +16,12 @@ class DeviceFullScreenshotSampleTest : TestCase() {
         private const val SCREENSHOT_TAG = "screenshot_full"
     }
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<DeviceFullWindowSampleActivity>()
 

diff --git a/...idTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceHackPermissionsSampleTest.kt b/...idTest/kotlin/com/kaspersky/kaspressample/device_tests/DeviceHackPermissionsSampleTest.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.rule.GrantPermissionRule
 import com.kaspersky.kaspressample.device.DeviceSampleActivity
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import com.kaspersky.kaspresso.testcases.core.testcontext.BaseTestContext
@@ -21,6 +22,12 @@ import org.junit.Test
  */
 class DeviceHackPermissionsSampleTest : TestCase() {
 
+    @get:Rule
+    val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    )
+
     @get:Rule
     val activityRule = activityScenarioRule<DeviceSampleActivity>()