TECH: try to fix tests on Api30

KasperskyLab · Jul 26, 2023 · 21560bb · 21560bb
1 parent cdc6042
commit 21560bb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/...sample/src/main/kotlin/com/kaspersky/kaspressample/systemdialogs/SystemDialogsActivity.kt b/...sample/src/main/kotlin/com/kaspersky/kaspressample/systemdialogs/SystemDialogsActivity.kt
@@ -17,7 +17,7 @@ class SystemDialogsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         binding = ActivitySystemDialogsBinding.inflate(layoutInflater)
         setContentView(binding.root)
     }
@@ -30,4 +30,9 @@ class SystemDialogsActivity : AppCompatActivity() {
                 RESULT_CODE)
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
 }
diff --git a/...matorsample/kaspresso/sanity/dialogs_safety/SystemDialogSafetyObjectDisabledSanityTest.kt b/...matorsample/kaspresso/sanity/dialogs_safety/SystemDialogSafetyObjectDisabledSanityTest.kt
@@ -32,17 +32,21 @@ class SystemDialogSafetyObjectDisabledSanityTest : TestCase(
         step("Click first button") {
             SystemDialogsScreen {
                 btn1 {
-                    click()
+                    flakySafely(3000) {
+                        click()
+                    }
                 }
             }
         }
 
         step("Click second button") {
             SystemDialogsScreen {
                 btn2 {
-                    Assert.assertThrows(null, StaleObjectException::class.java) {
-                        isDisplayed()
-                        click()
+                    flakySafely(3000) {
+                        Assert.assertThrows(null, StaleObjectException::class.java) {
+                            isDisplayed()
+                            click()
+                        }
                     }
                 }
             }

diff --git a/...main/java/com/kaspersky/kaspresso/kautomatorsample/systemdialogs/SystemDialogsActivity.kt b/...main/java/com/kaspersky/kaspresso/kautomatorsample/systemdialogs/SystemDialogsActivity.kt
@@ -2,6 +2,7 @@ package com.kaspersky.kaspresso.kautomatorsample.systemdialogs
 
 import android.Manifest
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import com.kaspersky.kaspresso.kautomatorsample.databinding.ActivitySystemDialogsBinding
@@ -16,6 +17,7 @@ class SystemDialogsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         binding = ActivitySystemDialogsBinding.inflate(layoutInflater)
         setContentView(binding.root)
     }
@@ -28,4 +30,9 @@ class SystemDialogsActivity : AppCompatActivity() {
                 RESULT_CODE)
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
 }