Add junit report confiugs (#170)

runningcode · Aug 27, 2020 · 4cd3729 · 4cd3729
1 parent eaeba74
commit 4cd3729
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 4 deletions.
diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/FladleConfig.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/FladleConfig.kt
@@ -224,4 +224,18 @@ interface FladleConfig {
    */
   @get:Input
   val outputStyle: Property<String>
+
+  /**
+   * Flank provides two ways for parsing junit xml results.
+   * New way uses google api instead of merging xml files, but can generate slightly different output format.
+   * This flag allows fallback for legacy xml junit results parsing
+   */
+  @get:Input
+  var legacyJunitResult: Boolean
+
+  /**
+   * Enables creating an additional local junit result on local storage with failure nodes on passed flaky tests.
+   */
+  @get:Input
+  var fullJunitResult: Boolean
 }
diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/FladleConfigImpl.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/FladleConfigImpl.kt
@@ -41,5 +41,7 @@ data class FladleConfigImpl(
   override var roboScript: String?,
   override var roboDirectives: List<List<String>>,
   override var testTimeout: String,
-  override var outputStyle: Property<String>
+  override var outputStyle: Property<String>,
+  override var legacyJunitResult: Boolean,
+  override var fullJunitResult: Boolean
 ) : FladleConfig
diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt
@@ -16,6 +16,7 @@ import javax.inject.Inject
 open class FlankGradleExtension @Inject constructor(objects: ObjectFactory) : FladleConfig {
   @get:Input
   val flankCoordinates: Property<String> = objects.property(String::class.java).convention("com.github.flank:flank")
+
   @get:Input
   val flankVersion: Property<String> = objects.property(String::class.java).convention("20.08.3")
   // Project id is automatically discovered by default. Use this to override the project id.
@@ -102,6 +103,10 @@ open class FlankGradleExtension @Inject constructor(objects: ObjectFactory) : Fl
 
   override val outputStyle: Property<String> = objects.property<String>().convention("single")
 
+  override var legacyJunitResult: Boolean = false
+
+  override var fullJunitResult: Boolean = false
+
   @Internal
   val configs: NamedDomainObjectContainer<FladleConfigImpl> = objects.domainObjectContainer(FladleConfigImpl::class.java) {
     FladleConfigImpl(
@@ -141,7 +146,9 @@ open class FlankGradleExtension @Inject constructor(objects: ObjectFactory) : Fl
       roboScript = roboScript,
       roboDirectives = roboDirectives,
       testTimeout = testTimeout,
-      outputStyle = objects.property<String>().convention(outputStyle)
+      outputStyle = objects.property<String>().convention(outputStyle),
+      legacyJunitResult = legacyJunitResult,
+      fullJunitResult = fullJunitResult
     )
   }
 

diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/YamlWriter.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/YamlWriter.kt
@@ -46,6 +46,8 @@ internal class YamlWriter {
     val smartFlankDisableUpload = config.smartFlankDisableUpload
     val localResultsDir = config.localResultsDir.orNull
     val testTargetsAlwaysRun = config.testTargetsAlwaysRun
+    val legacyJunitResult = config.legacyJunitResult
+    val fullJunitResult = config.fullJunitResult
 
     appendln("flank:")
 
@@ -96,6 +98,8 @@ internal class YamlWriter {
       }
     }
 
+    appendln("  legacy-junit-result: $legacyJunitResult")
+    appendln("  full-junit-result: $fullJunitResult")
     appendln("  output-style: ${config.outputStyle.get()}")
   }
 

diff --git a/buildSrc/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt b/buildSrc/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt
@@ -166,6 +166,8 @@ class YamlWriterTest {
                ignore-failed-tests: false
                disable-sharding: false
                smart-flank-disable-upload: false
+               legacy-junit-result: false
+               full-junit-result: false
                output-style: single
       """.trimIndent() + '\n' // Dunno why this needs to be here to make the tests pass.
     )
@@ -255,6 +257,8 @@ class YamlWriterTest {
       ignore-failed-tests: false
       disable-sharding: false
       smart-flank-disable-upload: false
+      legacy-junit-result: false
+      full-junit-result: false
       output-style: single
       """.trimIndent() + '\n'
     )
@@ -271,6 +275,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -289,6 +295,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -307,6 +315,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -325,6 +335,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -342,6 +354,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -360,6 +374,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -380,6 +396,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -529,6 +547,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -602,6 +622,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -621,6 +643,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -641,6 +665,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -721,6 +747,8 @@ class YamlWriterTest {
         "  ignore-failed-tests: false\n" +
         "  disable-sharding: false\n" +
         "  smart-flank-disable-upload: false\n" +
+        "  legacy-junit-result: false\n" +
+        "  full-junit-result: false\n" +
         "  output-style: single\n",
       yamlWriter.writeFlankProperties(extension)
     )
@@ -739,6 +767,8 @@ class YamlWriterTest {
           "  ignore-failed-tests: false\n" +
           "  disable-sharding: false\n" +
           "  smart-flank-disable-upload: false\n" +
+          "  legacy-junit-result: false\n" +
+          "  full-junit-result: false\n" +
           "  output-style: single\n"
       )
   }
@@ -778,6 +808,8 @@ class YamlWriterTest {
                ignore-failed-tests: false
                disable-sharding: false
                smart-flank-disable-upload: false
+               legacy-junit-result: false
+               full-junit-result: false
                output-style: single
       """.trimIndent() + '\n'
     )
@@ -795,6 +827,8 @@ class YamlWriterTest {
         ignore-failed-tests: false
         disable-sharding: false
         smart-flank-disable-upload: false
+        legacy-junit-result: false
+        full-junit-result: false
         output-style: single
       """.trimIndent()
 
@@ -891,6 +925,38 @@ class YamlWriterTest {
     assertTrue(properties.contains("  output-style: single"))
   }
 
+  @Test
+  fun writeLegacyJunitResult() {
+    val properties = emptyExtension {
+      legacyJunitResult = true
+    }.toFlankProperties()
+
+    assertTrue(properties.contains("  legacy-junit-result: true"))
+  }
+
+  @Test
+  fun missingLegacyJunitResult() {
+    val properties = emptyExtension().toFlankProperties()
+
+    assertTrue(properties.contains("  legacy-junit-result: false"))
+  }
+
+  @Test
+  fun writeFullJunitResult() {
+    val properties = emptyExtension {
+      fullJunitResult = true
+    }.toFlankProperties()
+
+    assertTrue(properties.contains("  full-junit-result: true"))
+  }
+
+  @Test
+  fun missingFullJunitResult() {
+    val properties = emptyExtension().toFlankProperties()
+
+    assertTrue(properties.contains("  full-junit-result: false"))
+  }
+
   @Test
   fun writeClientDetails() {
     val properties = emptyExtension {

diff --git a/buildSrc/src/test/java/com/osacky/flank/gradle/integration/AutoConfigureFladleTest.kt b/buildSrc/src/test/java/com/osacky/flank/gradle/integration/AutoConfigureFladleTest.kt
@@ -52,8 +52,8 @@ class AutoConfigureFladleTest {
       """
         > Task :android-project:printYml
         gcloud:
-          app: [0-9a-zA-Z\/]*/android-project/build/outputs/apk/debug/android-project-debug.apk
-          test: [0-9a-zA-Z\/]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
+          app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
+          test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
           device:
           - model: Pixel2
             version: 26
@@ -77,6 +77,9 @@ class AutoConfigureFladleTest {
           ignore-failed-tests: false
           disable-sharding: false
           smart-flank-disable-upload: false
+          legacy-junit-result: false
+          full-junit-result: false
+          output-style: single
       """.trimIndent()
     )
   }

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -109,6 +109,8 @@ fladle {
       ["text", "field1", "my text"],
     ]
     outputStyle = 'multi'
+    legacyJunitResult = false
+    fullJunitResult = false
 }
 ```
 
@@ -375,3 +377,11 @@ Default value is single.
     ``` kotlin
     outputStyle.set("single")
     ```
+
+### legacyJunitResult
+Flank provides two ways for parsing junit xml results.
+New way uses google api instead of merging xml files, but can generate slightly different output format.
+This flag allows fallback for legacy xml junit results parsing
+
+### fullJunitResult
+Enables creating an additional local junit result on local storage with failure nodes on passed flaky tests.