Merge pull request #132 from superwall/ir/fix/memory-and-threading

Optimise memory and threading

Author: ianrumac

app/src/androidTest/java/com/example/superapp/test/FlowScreenshotTestExecutor.kt

@@ -12,8 +12,9 @@ import com.example.superapp.utils.waitFor
 import com.superwall.sdk.Superwall
 import com.superwall.sdk.analytics.superwall.SuperwallEvent
 import com.superwall.superapp.test.UITestHandler
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.async
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,6 +30,8 @@ class FlowScreenshotTestExecutor {
             imageComparator = CustomComparator(),
         )
 
+    val mainScope = CoroutineScope(Dispatchers.Main)
+
     @Test
     fun test_paywall_reappers_with_video() =
         with(dropshots) {
@@ -37,7 +40,7 @@ class FlowScreenshotTestExecutor {
                     it.waitFor { it is SuperwallEvent.PaywallWebviewLoadComplete }
                     awaitUntilShimmerDisappears()
                     awaitUntilWebviewAppears()
-                    delayFor(100.milliseconds)
+                    delayFor(500.milliseconds)
                 }
                 step("second_paywall") {
                     awaitUntilWebviewAppears()
@@ -56,23 +59,33 @@ class FlowScreenshotTestExecutor {
                     awaitUntilWebviewAppears()
                     delayFor(500.milliseconds)
                     // We scroll a bit to display the button
-                    Superwall.instance.paywallViewController
-                        ?.webView
-                        ?.scrollBy(0, 300)
+                    mainScope
+                        .async {
+                            Superwall.instance.paywallView
+                                ?.webView
+                                ?.scrollBy(0, 300) ?: kotlin.run {
+                                throw IllegalStateException("No viewcontroller found")
+                            }
+                        }.await()
                     // We delay a bit to ensure the button is visible
                     delayFor(100.milliseconds)
                     // We scroll back to the top
-                    Superwall.instance.paywallViewController
-                        ?.webView
-                        ?.scrollTo(0, 0)
+                    mainScope
+                        .async {
+                            Superwall.instance.paywallView
+                                ?.webView
+                                ?.scrollTo(0, 0) ?: kotlin.run {
+                                throw IllegalStateException("No viewcontroller found")
+                            }
+                        }.await()
                     // We delay a bit to ensure scroll has finished
                     delayFor(1.seconds)
                 }
             }
         }
 
     @Test
-    fun test_paywall_reappers_after_dismissing() =
+    fun test_paywall_reappears_after_dismissing() =
         with(dropshots) {
             screenshotFlow(UITestHandler.test11Info) {
                 step {
@@ -86,7 +99,6 @@ class FlowScreenshotTestExecutor {
                     delayFor(1.seconds)
                 }
                 step {
-                    it.waitFor { it is SuperwallEvent.PaywallClose }
                     it.waitFor { it is SuperwallEvent.PaywallOpen }
                     awaitUntilWebviewAppears()
                     delayFor(1.seconds)
@@ -100,7 +112,8 @@ class FlowScreenshotTestExecutor {
             screenshotFlow(UITestHandler.test34Info) {
                 step("") {
                     it.waitFor { it is SuperwallEvent.PaywallWebviewLoadComplete }
-                    awaitUntilShimmerDisappears() || awaitUntilWebviewAppears()
+                    awaitUntilShimmerDisappears()
+                    awaitUntilWebviewAppears()
                 }
                 step {
                     it.waitFor { it is SuperwallEvent.Reset }
@@ -117,27 +130,36 @@ class FlowScreenshotTestExecutor {
                     it.waitFor { it is SuperwallEvent.PaywallWebviewLoadComplete }
                     awaitUntilShimmerDisappears()
                     awaitUntilWebviewAppears()
-                    delayFor(500.milliseconds)
-                    launch(Dispatchers.Main) {
-                        // We scroll a bit to display the button
-                        Superwall.instance.paywallViewController
-                            ?.webView
-                            ?.scrollBy(0, 300)
-                    }
+                    delayFor(100.milliseconds)
+                    mainScope
+                        .async {
+                            // We scroll a bit to display the button
+                            Superwall.instance.paywallView
+                                ?.webView
+                                ?.apply {
+                                    // Disable the scrollbar for the test
+                                    // so its not visible in screenshots
+                                    isVerticalScrollBarEnabled = false
+                                    scrollTo(0, 300)
+                                }
+                        }.await()
                     // We delay a bit to ensure the button is visible
                     delayFor(100.milliseconds)
                     // We scroll back to the top
-                    launch(Dispatchers.Main) {
-                        Superwall.instance.paywallViewController
-                            ?.webView
-                            ?.scrollTo(0, 0)
-                    }
+                    mainScope
+                        .async {
+                            Superwall.instance.paywallView
+                                ?.webView
+                                ?.apply {
+                                    scrollTo(0, 0)
+                                }
+                        }.await()
                     // We delay a bit to ensure scroll has finished
-                    delayFor(1.seconds)
+                    delayFor(500.milliseconds)
                 }
 
                 step {
-                    it.waitFor { it is SuperwallEvent.PaywallClose }
+                    delayFor(10.seconds)
                 }
             }
         }

app/src/androidTest/java/com/example/superapp/utils/TestingUtils.kt

@@ -110,7 +110,7 @@ fun Dropshots.screenshotFlow(
         }
     }
 
-    runTest(timeout = 3.minutes) {
+    runTest(timeout = 5.minutes) {
         try {
             flow.steps.forEach {
                 if (!testReady.value) {
@@ -164,12 +164,12 @@ suspend fun CoroutineScope.awaitUntilShimmerDisappears(): Boolean {
 }
 
 private fun getShimmerFromPaywall() =
-    Superwall.instance.paywallViewController
+    Superwall.instance.paywallView
         ?.children
         ?.find { it is ShimmerView }
 
 private fun getWebviewFromPaywall() =
-    Superwall.instance.paywallViewController
+    Superwall.instance.paywallView
         ?.children
         ?.find { it is WebView }