Android testing // drop jdk

Karlfiner-Robotiken · Jun 23, 2021 · cae4196 · cae4196
1 parent e906e53
commit cae4196
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -50,11 +50,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       - name: run Android tests
         uses: malinskiy/action-android/emulator-run-cmd@release/0.1.2
         with:
+          api: 29
           cmd: ./gradlew connectedAndroidTest -p app-kotlin
diff --git a/app-kotlin/src/androidTest/java/com/romellfudi/ussd/test/RegexMatcher.kt b/app-kotlin/src/androidTest/java/com/romellfudi/ussd/test/RegexMatcher.kt
@@ -16,11 +16,4 @@ class RegexMatcher(private val regex: String) : TypeSafeMatcher<String>() {
     public override fun matchesSafely(string: String): Boolean {
         return string.matches(regex.toRegex())
     }
-
-    companion object {
-        // matcher method you can call on this matcher class
-        fun matchesRegex(regex: String): RegexMatcher {
-            return RegexMatcher(regex)
-        }
-    }
 }
diff --git a/app-kotlin/src/androidTest/java/com/romellfudi/ussd/test/SimpleTest.kt b/app-kotlin/src/androidTest/java/com/romellfudi/ussd/test/SimpleTest.kt
@@ -78,7 +78,7 @@ class SimpleTest : TestCase() {
                         isDisplayed()
                         hasNoText("Empty")
                         hasAnyText()
-                        hasText(RegexMatcher.matchesRegex("^\\n-\\n\\[.+(,\\s+.*)*\\]$"))
+                        hasText(RegexMatcher("^\\n-\\n\\[.+(,\\s+.*)*\\]$"))
                     }
                     device.screenshots.take("over_screenshot")
                 }
@@ -100,7 +100,7 @@ class SimpleTest : TestCase() {
                     result {
                         hasNoText("Empty")
                         hasAnyText()
-                        hasText(RegexMatcher.matchesRegex("^\\n-\\n\\[.+(,\\s+.*)*\\]$"))
+                        hasText(RegexMatcher("^\\n-\\n\\[.+(,\\s+.*)*\\]$"))
                     }
                     device.screenshots.take("over_screenshot")
                 }