fix(android): add a simple sample of com.android.test + fix samples

MarathonLabs · Nov 15, 2023 · 41af499 · 41af499
1 parent a61225d
commit 41af499
Show file tree

Hide file tree

Showing 81 changed files with 99 additions and 1,610 deletions.
diff --git a/.idea/runConfigurations/android_test_gradle_plugin.xml b/.idea/runConfigurations/android_test_gradle_plugin.xml
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/report/bill/BillingReporter.kt b/core/src/main/kotlin/com/malinskiy/marathon/report/bill/BillingReporter.kt
@@ -61,7 +61,7 @@ internal class BillingReporter(
         }
 
         usageTracker.trackEvent(Event.Devices(bills.size))
-        val result = executionReport.summary.pools.map { it.failed.size == 0 }.reduce { acc, b -> acc && b }
+        val result = executionReport.summary.pools.map { it.failed.isEmpty() }.reduceOrNull { acc, b -> acc && b } ?: true
         val flakiness = executionReport.summary.pools.sumOf { it.rawDurationMillis - it.durationMillis / 1000 }
         val durationSeconds = ((Instant.now().toEpochMilli() - defaultStart.toEpochMilli()) / 1000)
         usageTracker.trackEvent(Event.Executed(seconds = bills.sumOf { it.duration } / 1000,

diff --git a/sample/android-app/app/build.gradle.kts b/sample/android-app/app/build.gradle.kts
@@ -4,7 +4,7 @@ import com.malinskiy.marathon.config.vendor.android.TestParserConfiguration
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("com.malinskiy.marathon") version "0.8.2-SNAPSHOT"
+    id("com.malinskiy.marathon") version "0.8.5-SNAPSHOT"
 }
 
 android {

diff --git a/sample/android-app/settings.gradle.kts b/sample/android-app/settings.gradle.kts
@@ -20,3 +20,4 @@ pluginManagement {
 rootProject.name = "android-app"
 rootProject.buildFileName = "build.gradle.kts"
 include("app")
+include("ui-tests")
diff --git a/sample/android-app/ui-tests/build.gradle.kts b/sample/android-app/ui-tests/build.gradle.kts
@@ -0,0 +1,43 @@
+import com.malinskiy.marathon.config.vendor.android.TestParserConfiguration
+
+plugins {
+    id("com.android.test")
+    id("kotlin-android")
+    id("com.malinskiy.marathon") version "0.8.5-SNAPSHOT"
+}
+
+android {
+    buildToolsVersion = "34.0.0"
+    compileSdk = 33
+
+    namespace = "com.example.ui_tests"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 33
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    targetProjectPath(":app")
+}
+
+dependencies {
+    implementation(TestLibraries.testRunner)
+    implementation(TestLibraries.extJunit)
+    implementation(TestLibraries.espressoCore)
+}
+
+marathon {
+    testParserConfiguration = TestParserConfiguration.RemoteTestParserConfiguration()
+    uncompletedTestRetryQuota = 3
+}
diff --git a/...ample/ui_tests/ExampleInstrumentedTest.kt → ...ample/ui_tests/ExampleInstrumentedTest.kt b/...ample/ui_tests/ExampleInstrumentedTest.kt → ...ample/ui_tests/ExampleInstrumentedTest.kt
@@ -3,7 +3,7 @@ package com.example.ui_tests
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.app_impl.AppActivity
+import com.example.MainActivity
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -20,12 +20,12 @@ import org.junit.Rule
 class ExampleInstrumentedTest {
 
     @get:Rule
-    val androidScenarioRule = ActivityScenarioRule(AppActivity::class.java)
+    val androidScenarioRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Test
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.ui_tests.test", appContext.packageName)
+        assertEquals("com.example", appContext.packageName)
     }
-}
+}
diff --git a/sample/android-library/library/build.gradle.kts b/sample/android-library/library/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("com.malinskiy.marathon") version "0.8.2-SNAPSHOT"
+    id("com.malinskiy.marathon") version "0.8.5-SNAPSHOT"
 }
 
 android {

diff --git a/sample/android-test/.gitignore b/sample/android-test/.gitignore
diff --git a/sample/android-test/app_api/.gitignore b/sample/android-test/app_api/.gitignore
diff --git a/sample/android-test/app_api/build.gradle.kts b/sample/android-test/app_api/build.gradle.kts
diff --git a/sample/android-test/app_api/src/main/AndroidManifest.xml b/sample/android-test/app_api/src/main/AndroidManifest.xml
diff --git a/sample/android-test/app_api/src/main/res/drawable/ic_launcher_background.xml b/sample/android-test/app_api/src/main/res/drawable/ic_launcher_background.xml