build: Dependencies updates [2020-11-02] (#1288)

* [Automatic PR] Dependencies update * Fix MultiLinePrinterTest * Fix unit test * Fix output logic Co-authored-by: pawelpasterz <[email protected]> Co-authored-by: Janek Góral <[email protected]> Co-authored-by: Pawel Pasterz <[email protected]>
Flank · Nov 2, 2020 · 208425c · 208425c
1 parent 22da7bf
commit 208425c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -21,7 +21,7 @@ object Versions {
     const val KOTLIN = "1.4.10"
 
     // https://github.com/Kotlin/kotlinx.coroutines/releases
-    const val KOTLIN_COROUTINES = "1.3.9"
+    const val KOTLIN_COROUTINES = "1.4.0"
 
     // https://github.com/remkop/picocli/releases
     const val PICOCLI = "4.5.2"
@@ -38,7 +38,7 @@ object Versions {
     const val GOOGLE_NIO = "0.121.2"
 
     // https://search.maven.org/search?q=a:google-cloud-storage%20g:com.google.cloud
-    const val GOOGLE_STORAGE = "1.113.1"
+    const val GOOGLE_STORAGE = "1.113.2"
 
     // https://github.com/google/gson/releases
     const val GSON = "2.8.6"
@@ -79,7 +79,7 @@ object Versions {
     const val COMMON_TEXT = "1.9"
 
     // https://github.com/fusesource/jansi/releases
-    const val JANSI = "1.18"
+    const val JANSI = "2.0.1"
 
     // https://github.com/ben-manes/gradle-versions-plugin/releases
     const val BEN_MANES = "0.33.0"
@@ -88,9 +88,9 @@ object Versions {
     const val PROGUARD = "7.0.0"
 
     // ============== flank-scripts ==============
+    const val KOTLIN_SERIALIZATION = "1.0.1"
     const val ARCHIVE_LIB = "1.1.0"
     const val TUKAANI_XZ = "1.0"
-    const val KOTLIN_SERIALIZATION = "1.0.0"
     const val FUEL = "2.3.0"
     const val CLIKT = "2.8.0"
     const val JCABI_GITHUB = "1.1.2"

diff --git a/test_runner/src/main/kotlin/ftl/args/CreateCommonArgs.kt b/test_runner/src/main/kotlin/ftl/args/CreateCommonArgs.kt
@@ -66,4 +66,4 @@ private val CommonConfig.defaultOutputStyle
 
 private val CommonConfig.hasMultipleExecutions
     get() = gcloud.flakyTestAttempts!! > 0 ||
-            (!flank.disableSharding!! && flank.maxTestShards!! > 0)
+            (!flank.disableSharding!! && flank.maxTestShards!! > 1)
diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -440,7 +440,7 @@ AndroidArgs
       run-timeout: -1
       legacy-junit-result: true
       ignore-failed-tests: false
-      output-style: multi
+      output-style: verbose
       disable-results-upload: false
       default-class-test-time: 240.0
         """.trimIndent(),
@@ -488,7 +488,7 @@ AndroidArgs
             assert(testTargetsAlwaysRun, empty)
             assert(disableSharding, false)
             assert(runTimeout, "-1")
-            assert(outputStyle, OutputStyle.Multi)
+            assert(outputStyle, OutputStyle.Verbose)
             assert(fullJUnitResult, false)
         }
     }
@@ -1199,17 +1199,17 @@ AndroidArgs
     @Test
     fun `cli output-style`() {
         val cli = AndroidRunCommand()
-        CommandLine(cli).parseArgs("--output-style=verbose")
+        CommandLine(cli).parseArgs("--output-style=multi")
 
         val yaml = """
         gcloud:
           app: $appApk
           test: $testApk
       """
-        assertThat(AndroidArgs.load(yaml).validate().outputStyle).isEqualTo(OutputStyle.Multi)
+        assertThat(AndroidArgs.load(yaml).validate().outputStyle).isEqualTo(OutputStyle.Verbose)
 
         val args = AndroidArgs.load(yaml, cli).validate()
-        assertThat(args.outputStyle).isEqualTo(OutputStyle.Verbose)
+        assertThat(args.outputStyle).isEqualTo(OutputStyle.Multi)
     }
 
     @Test(expected = FlankConfigurationError::class)

diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt
@@ -326,7 +326,7 @@ IosArgs
       local-result-dir: results
       run-timeout: -1
       ignore-failed-tests: false
-      output-style: multi
+      output-style: verbose
       disable-results-upload: false
       default-class-test-time: 240.0
         """.trimIndent(),
@@ -858,17 +858,17 @@ IosArgs
     @Test
     fun `cli output-style`() {
         val cli = IosRunCommand()
-        CommandLine(cli).parseArgs("--output-style=verbose")
+        CommandLine(cli).parseArgs("--output-style=multi")
 
         val yaml = """
         gcloud:
           test: $testPath
           xctestrun-file: $testPath
       """
-        assertThat(IosArgs.load(yaml).outputStyle).isEqualTo(OutputStyle.Multi)
+        assertThat(IosArgs.load(yaml).outputStyle).isEqualTo(OutputStyle.Verbose)
 
         val args = IosArgs.load(yaml, cli)
-        assertThat(args.outputStyle).isEqualTo(OutputStyle.Verbose)
+        assertThat(args.outputStyle).isEqualTo(OutputStyle.Multi)
     }
 
     private fun getValidTestsSample() = listOf(

diff --git a/test_runner/src/test/kotlin/ftl/run/status/MultiLinePrinterTest.kt b/test_runner/src/test/kotlin/ftl/run/status/MultiLinePrinterTest.kt
@@ -6,6 +6,7 @@ import io.mockk.every
 import io.mockk.spyk
 import io.mockk.verify
 import org.fusesource.jansi.Ansi
+import org.fusesource.jansi.AnsiConsole
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
@@ -21,6 +22,7 @@ class MultiLinePrinterTest {
         // given
         val ansi = spyk(Ansi.ansi()) { every { this@spyk.toString() } returns "" }
         val printChanges = MultiLinePrinter { ansi }
+        AnsiConsole.systemUninstall()
 
         // when
         printChanges(changes1)