Update test framework

max-kammerer · Sep 29, 2023 · ad539c8 · ad539c8
1 parent 76cb79d
commit ad539c8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -62,7 +62,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        api-level: [29]
+        api-level: [16, 25]
     steps:
       - name: checkout
         uses: actions/checkout@v3

diff --git a/...androidTest/kotlin/universe/constellation/orion/viewer/test/RenderingAndNavigationTest.kt b/...androidTest/kotlin/universe/constellation/orion/viewer/test/RenderingAndNavigationTest.kt
@@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch
 @RunWith(Parameterized::class)
 class RenderingAndNavigationTest(path: String) : InstrumentationTestCase() {
 
-    companion object {
+   companion object {
         @JvmStatic
         @Parameterized.Parameters(name = "Test simple navigation in {0}")
         fun testData(): Iterable<Array<Any>> {
@@ -44,7 +44,9 @@ class RenderingAndNavigationTest(path: String) : InstrumentationTestCase() {
         }
     }
 
-    private val document = openTestBook(path)
+    private val document by lazy {
+        openTestBook(path)
+    }
 
     private val deviceSize = Point(300, 350) //to split page on two screen - page size is 663x886
 

diff --git a/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/RotationTest.kt b/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/RotationTest.kt
@@ -24,25 +24,25 @@ class RotationTest : InstrumentationTestCase() {
 
         Assert.assertTrue(width != 0)
         Assert.assertTrue(height != 0)
-        //OptionActions.FULL_SCREEN.doAction(getActivity(), true, false)
         val orientation = activity.resources!!.configuration.orientation
 
-        val latch = CountDownLatch(1)
         mActivityRule.runOnUiThread {
             getController().changeOrinatation(if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) "PORTRAIT" else "LANDSCAPE")
-            latch.countDown()
         }
 
-        latch.await()
+        Thread.sleep(1000)
 
         try {
             Assert.assertTrue("Orientation not changed: $orientation", orientation != activity.resources!!.configuration.orientation)
-
             val width2 = view.sceneWidth
             val height2 = view.sceneHeight
             Assert.assertTrue("w1: $width, w2: $width2, original orientation: $orientation", width != width2)
             Assert.assertTrue("h1: $height, h2: $$height2, original orientation: $orientation", height != height2)
         } finally {
+            mActivityRule.runOnUiThread {
+                getController().changeOrinatation("PORTRAIT")
+            }
+            Thread.sleep(1000)
             mActivityRule.finishActivity()
         }
     }

diff --git a/...wer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BookTest.kt b/...wer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BookTest.kt
@@ -8,7 +8,7 @@ import org.junit.runners.Parameterized
 @RunWith(Parameterized::class)
 abstract class BookTest(path: String) : BaseTest() {
 
-    protected val document = openTestBook(path)
+    protected val document by lazy {  openTestBook(path) }
 
     @After
     fun close() {

diff --git a/...Test/kotlin/universe/constellation/orion/viewer/test/framework/InstrumentationTestCase.kt b/...Test/kotlin/universe/constellation/orion/viewer/test/framework/InstrumentationTestCase.kt
@@ -2,22 +2,20 @@ package universe.constellation.orion.viewer.test.framework
 
 import android.content.Context
 import android.content.Intent
+import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import org.junit.Rule
 import universe.constellation.orion.viewer.Controller
 import universe.constellation.orion.viewer.OrionViewerActivity
-import androidx.test.rule.ActivityTestRule
 
 
 abstract class InstrumentationTestCase : TestUtil {
 
-    @Rule
-    @JvmField
+    @get:Rule
     val mRuntimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_EXTERNAL_STORAGE)
 
-    @Rule
-    @JvmField
-    var mActivityRule: ActivityTestRule<OrionViewerActivity> = ActivityTestRule(OrionViewerActivity::class.java, true, false)
+    @get:Rule
+    val mActivityRule: ActivityTestRule<OrionViewerActivity> = ActivityTestRule(OrionViewerActivity::class.java, true, false)
 
     val activity: OrionViewerActivity
         get() = mActivityRule.activity