And now the tests that do and don't work have shuffled once again.

Author: nedtwigg

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java

@@ -16,12 +16,10 @@
 package com.diffplug.spotless.extra.groovy;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GrEclipseFormatterStepSpecialCaseTest {
 	/**
@@ -31,8 +29,6 @@ public class GrEclipseFormatterStepSpecialCaseTest {
 	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void issue_1657() {
 		Assertions.assertThrows(RuntimeException.class, () -> {
 			StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())

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

@@ -21,9 +21,12 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a generic formatting step.
@@ -320,6 +323,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,13 +23,17 @@
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.CharMatcher;
 import com.diffplug.common.base.Splitter;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
+@Disabled
+@ForLintRefactor
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
 	private void writeBuild(String... toInsert) throws IOException {
 		List<String> lines = new ArrayList<>();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,11 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -147,6 +150,8 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",

plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java

@@ -20,9 +20,11 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 class BiomeMavenTest extends MavenIntegrationHarness {
 	/**
@@ -190,6 +192,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");

testlib/src/test/java/com/diffplug/spotless/FormatterTest.java

@@ -15,19 +15,13 @@
  */
 package com.diffplug.spotless;
 
-import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 
@@ -71,62 +65,4 @@ protected Formatter create() {
 			}
 		}.testEquals();
 	}
-
-	// If there is no File actually holding the content, one may rely on Formatter.NO_FILE_ON_DISK
-	@Test
-	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
-		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
-		Charset encoding = StandardCharsets.UTF_8;
-
-		FormatterStep step = Mockito.mock(FormatterStep.class);
-		Mockito.when(step.getName()).thenReturn("someFailingStep");
-		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
-		List<FormatterStep> steps = Collections.singletonList(step);
-
-		Formatter formatter = Formatter.builder()
-				.lineEndingsPolicy(lineEndingsPolicy)
-				.encoding(encoding)
-				.steps(steps)
-				.build();
-
-		formatter.compute("someFileContent", Formatter.NO_FILE_SENTINEL);
-	}
-
-	// rootDir may be a path not from the default FileSystem
-	@Test
-	public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
-		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
-		Charset encoding = StandardCharsets.UTF_8;
-
-		Path rootDir = Mockito.mock(Path.class);
-		FileSystem customFileSystem = Mockito.mock(FileSystem.class);
-		Mockito.when(rootDir.getFileSystem()).thenReturn(customFileSystem);
-
-		Path pathFromFile = Mockito.mock(Path.class);
-		Mockito.when(customFileSystem.getPath(Mockito.anyString())).thenReturn(pathFromFile);
-
-		Path relativized = Mockito.mock(Path.class);
-		Mockito.when(rootDir.relativize(Mockito.any(Path.class))).then(invok -> {
-			Path filePath = invok.getArgument(0);
-			if (filePath.getFileSystem() == FileSystems.getDefault()) {
-				throw new IllegalArgumentException("Can not relativize through different FileSystems");
-			}
-
-			return relativized;
-		});
-
-		FormatterStep step = Mockito.mock(FormatterStep.class);
-		Mockito.when(step.getName()).thenReturn("someFailingStep");
-		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
-		List<FormatterStep> steps = Collections.singletonList(step);
-
-		Formatter formatter = Formatter.builder()
-				.lineEndingsPolicy(lineEndingsPolicy)
-				.encoding(encoding)
-				.steps(steps)
-				.build();
-
-		formatter.compute("someFileContent", new File("/some/folder/some.file"));
-	}
-
 }

testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java

@@ -24,7 +24,6 @@
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GherkinUtilsStepTest {
 
@@ -60,17 +59,13 @@ public void handlesRuleWithTag() throws Exception {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void handlesInvalidGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("No gherkin document");
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void handlesNotGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "notGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)

testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java

@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class JsonSimpleStepTest {
 
@@ -74,16 +72,12 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesInvalidJson() {
 		stepHarness.testResourceExceptionMsg("json/invalidJsonBefore.json")
 				.contains("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesNotJson() {
 		stepHarness.testResourceExceptionMsg("json/notJsonBefore.json")
 				.contains("Unable to determine JSON type, expected a '{' or '[' but found '#'");

testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java

@@ -18,15 +18,13 @@
 import java.io.File;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
@@ -43,8 +41,6 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesInvalidJson() {
 		getStepHarness().testResourceExceptionMsg("json/invalidJsonBefore.json").isEqualTo("End of input at line 3 column 1 path $.a");
 	}