Fast fail when full-junit-result and legacy-junit-result (#965)

Flank · Aug 11, 2020 · 0a030c7 · 0a030c7
1 parent 9dcad04
commit 0a030c7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 0 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -5,6 +5,7 @@
 - [#946](https://github.com/Flank/flank/pull/946) Added tests for flank scripts. ([piotradamczyk5](https://github.com/piotradamczyk5))
 - [#935](https://github.com/Flank/flank/pull/935) Process junit xml even when full junit is not enabled. ([kozaxinan](https://github.com/kozaxinan))
 - [#962](https://github.com/Flank/flank/pull/962) Make table text left aligned. ([pawelpasterz](https://github.com/pawelpasterz))
+- [#965](https://github.com/Flank/flank/pull/965) Fast fail when full-junit-result and legacy-junit-result. ([adamfilipow92](https://github.com/adamfilipow92))
 -
 -
 

diff --git a/test_runner/src/main/kotlin/ftl/args/ValidateAndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/ValidateAndroidArgs.kt
@@ -19,6 +19,7 @@ fun AndroidArgs.validate() {
     assertRoboTest()
     assertDirectoriesToPull()
     assertMaxTestShardsByDeviceType()
+    assertParametersConflict()
 }
 
 private fun AndroidArgs.assertAdditionalAppTestApks() {
@@ -99,3 +100,8 @@ private fun AndroidArgs.throwMaxTestShardsLimitExceeded(): Nothing {
         "max-test-shards must be >= ${IArgs.AVAILABLE_VIRTUAL_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_VIRTUAL_SHARD_COUNT_RANGE.last} for virtual devices, for physical devices max-test-shards must be >= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.last}, or -1. But current is $maxTestShards"
     )
 }
+
+private fun AndroidArgs.assertParametersConflict() {
+    if (useLegacyJUnitResult && fullJUnitResult)
+        throw FlankConfigurationError("Parameters conflict, you cannot set: `--legacy-junit-result` and `--full-junit-result` at the same time.")
+}
diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -1566,6 +1566,74 @@ AndroidArgs
         val args = AndroidArgs.load(yaml)
         assertEquals(AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.last, args.maxTestShards)
     }
+
+    @Test(expected = FlankConfigurationError::class)
+    fun `should throw when --legacy-junit-result and --full-junit-result set`() {
+        val yaml = """
+        gcloud:
+          app: $appApk
+          test: $testApk
+          device:
+            - model: blueline
+              version: 28
+              locale: en
+              orientation: portrait
+            - model: Nexus6
+              version: 25
+              locale: en
+              orientation: portrait
+        flank:
+          max-test-shards: -1
+          full-junit-result: true
+          legacy-junit-result: true
+        """.trimIndent()
+        AndroidArgs.load(yaml)
+    }
+    @Test
+    fun `should not throw when --legacy-junit-result set and --full-junit-result not set`() {
+        val yaml = """
+        gcloud:
+          app: $appApk
+          test: $testApk
+          device:
+            - model: blueline
+              version: 28
+              locale: en
+              orientation: portrait
+            - model: Nexus6
+              version: 25
+              locale: en
+              orientation: portrait
+        flank:
+          max-test-shards: -1
+          full-junit-result: false
+          legacy-junit-result: true
+        """.trimIndent()
+        AndroidArgs.load(yaml)
+    }
+
+    @Test
+    fun `should not throw when --legacy-junit-result not set and --full-junit-result set`() {
+        val yaml = """
+        gcloud:
+          app: $appApk
+          test: $testApk
+          device:
+            - model: blueline
+              version: 28
+              locale: en
+              orientation: portrait
+            - model: Nexus6
+              version: 25
+              locale: en
+              orientation: portrait
+        flank:
+          max-test-shards: -1
+          full-junit-result: true
+          legacy-junit-result: false
+        """.trimIndent()
+        AndroidArgs.load(yaml)
+    }
 }
 
 private fun AndroidArgs.Companion.load(yamlData: String, cli: AndroidRunCommand? = null): AndroidArgs =