From e8c26f20ca9ad9b3fc05613c64f3c3bb5fe3e578 Mon Sep 17 00:00:00 2001
From: "Rodrigo B. de Oliveira" <rodrigo@gradle.com>
Date: Tue, 12 Mar 2019 19:23:13 -0300
Subject: [PATCH] Polish `KotlinScriptDependenciesResolverTest`

---
 .../KotlinScriptDependenciesResolverTest.kt   | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/subprojects/kotlin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/resolver/KotlinScriptDependenciesResolverTest.kt b/subprojects/kotlin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/resolver/KotlinScriptDependenciesResolverTest.kt
index c536229009514..13386afb8f711 100644
--- a/subprojects/kotlin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/resolver/KotlinScriptDependenciesResolverTest.kt
+++ b/subprojects/kotlin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/resolver/KotlinScriptDependenciesResolverTest.kt
@@ -31,7 +31,7 @@ import org.hamcrest.Matcher
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertThat
 import org.junit.Assert.assertTrue
-
+import org.junit.Before
 import org.junit.Test
 
 import java.io.File
@@ -46,17 +46,21 @@ import kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity
 
 class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
 
+    @Before
+    fun setUpSettings() {
+
+        withDefaultSettings()
+    }
+
     @Test
     fun `succeeds with no script`() {
 
-        withDefaultSettings()
         assertSucceeds()
     }
 
     @Test
     fun `succeeds on init script`() {
 
-        withDefaultSettings()
         assertSucceeds(withFile("my.init.gradle.kts", """
             require(this is Gradle)
         """))
@@ -79,7 +83,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     @Test
     fun `succeeds on project script`() {
 
-        withDefaultSettings()
         assertSucceeds(withFile("build.gradle.kts", """
             require(this is Project)
         """))
@@ -96,8 +99,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
 
         withKotlinBuildSrc()
 
-        withDefaultSettings()
-
         assertSucceeds(withFile("buildSrc/src/main/kotlin/my-plugin.init.gradle.kts", """
             require(this is Gradle)
         """))
@@ -108,7 +109,7 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
 
         withKotlinBuildSrc()
 
-        withSettings("""
+        withDefaultSettings().appendText("""
             apply(plugin = "my-plugin")
         """)
 
@@ -122,7 +123,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
 
         withKotlinBuildSrc()
 
-        withDefaultSettings()
         withBuildScript("""
             plugins {
                 id("my-plugin")
@@ -138,7 +138,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     fun `report file fatality on TAPI failure`() {
         // thus disabling syntax highlighting
 
-        withDefaultSettings()
         val editedScript = withBuildScript("")
 
         val wrongEnv = arrayOf("gradleHome" to existing("absent"))
@@ -155,7 +154,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     @Test
     fun `report file error on TAPI failure when reusing previous dependencies`() {
 
-        withDefaultSettings()
         val editedScript = withBuildScript("")
 
         val previous = resolvedScriptDependencies(editedScript).apply {
@@ -182,7 +180,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
             BOOM
         """)
 
-        withDefaultSettings()
         val editedScript = withBuildScript("")
 
         resolvedScriptDependencies(editedScript).apply {
@@ -201,7 +198,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
         withKotlinBuildSrc()
         val buildSrcKotlinSource = withFile("buildSrc/src/main/kotlin/Foo.kt", "")
 
-        withDefaultSettings()
         val editedScript = withBuildScript("")
 
         val previous = resolvedScriptDependencies(editedScript).apply {
@@ -224,7 +220,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     fun `do not report file warning on script compilation failure in currently edited script`() {
         // because the IDE already provides user feedback for those
 
-        withDefaultSettings()
         val editedScript = withBuildScript("""
             doNotExists()
         """)
@@ -242,7 +237,7 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     @Test
     fun `report file warning on script compilation failure in another script`() {
 
-        withSettings("""
+        withDefaultSettings().appendText("""
             include("a", "b")
         """)
         withBuildScript("")
@@ -263,7 +258,7 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
 
     @Test
     fun `report file warning on runtime failure in currently edited script`() {
-        withDefaultSettings()
+
         val editedScript = withBuildScript("""
             configurations.getByName("doNotExists")
         """)
@@ -281,7 +276,6 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     @Test
     fun `report line warning on runtime failure in currently edited script when location aware hints are enabled`() {
 
-        withDefaultSettings()
         withFile("gradle.properties", """
             ${EditorReports.locationAwareEditorHintsPropertyName}=true
         """)
@@ -302,7 +296,7 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
     @Test
     fun `report file warning on runtime failure in another script`() {
 
-        withSettings("""
+        withDefaultSettings().appendText("""
             include("a", "b")
         """)
         withBuildScript("")