Fix the rest of the ktlint tests.

Author: nedtwigg

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

@@ -177,31 +177,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
-	/**
-	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
-	 * that enabling the experimental ruleset is actually doing something.
-	 *
-	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
-	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
-	 */
-	@Test
-	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
-	}
-
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java

@@ -94,24 +94,6 @@ void integration_default_diktat() throws IOException {
 		assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
 	}
 
-	@Test
-	void integration_pinterest() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.32.0')",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void indentStep() throws IOException {
 		setFile("build.gradle").toLines(
@@ -147,24 +129,6 @@ void withExperimental() throws IOException {
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.clean");
 	}
 
-	@Test
-	void withExperimental_0_32() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.32.0').setUseExperimental(true)",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
@@ -187,53 +151,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
-	@Test
-	void withEditorConfigOverride_0_45_1() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.45.1')",
-				"            .editorConfigOverride([",
-				"        	    indent_size: 5",
-				"            ])",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		Throwable error = assertThrows(Throwable.class,
-				() -> gradleRunner().withArguments("spotlessApply").build());
-		assertThat(error).hasMessageContaining("KtLint editorConfigOverride supported for version 0.45.2 and later");
-	}
-
-	/**
-	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
-	 * that enabling the experimental ruleset is actually doing something.
-	 *
-	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
-	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
-	 */
-	@Test
-	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.dirty");
-	}
-
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt() throws IOException {

plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java

@@ -24,31 +24,9 @@ class KtlintTest extends MavenIntegrationHarness {
 	void testKtlint() throws Exception {
 		writePomWithKotlinSteps("<ktlint/>");
 
-		String path1 = "src/main/kotlin/main1.kt";
-		String path2 = "src/main/kotlin/main2.kt";
-
-		setFile(path1).toResource("kotlin/ktlint/basic.dirty");
-		setFile(path2).toResource("kotlin/ktlint/basic.dirty");
-
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/basic.dirty");
 		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile(path1).sameAsResource("kotlin/ktlint/basic.clean");
-		assertFile(path2).sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void testKtlintShyiko() throws Exception {
-		writePomWithKotlinSteps("<ktlint><version>0.21.0</version></ktlint>");
-
-		String path1 = "src/main/kotlin/main1.kt";
-		String path2 = "src/main/kotlin/main2.kt";
-
-		setFile(path1).toResource("kotlin/ktlint/basic.dirty");
-		setFile(path2).toResource("kotlin/ktlint/basic.dirty");
-
-		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile(path1).sameAsResource("kotlin/ktlint/basic.clean");
-		assertFile(path2).sameAsResource("kotlin/ktlint/basic.clean");
+		assertFile(path).sameAsResource("kotlin/ktlint/basic.clean");
 	}
 }