Use StepHarnessWithFile

Author: STAR-ZERO

testlib/src/main/java/com/diffplug/spotless/StepHarness.java

@@ -57,22 +57,14 @@ public static StepHarness forFormatter(Formatter formatter) {
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarness test(String before, String after) {
-		return test(before, after, "");
-	}
-
-	public StepHarness test(String before, String after, String fileName) {
-		String actual = formatter.compute(LineEnding.toUnix(before), new File(fileName));
+		String actual = formatter.compute(LineEnding.toUnix(before), new File(""));
 		assertEquals(after, actual, "Step application failed");
-		return testUnaffected(after, fileName);
+		return testUnaffected(after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
 	public StepHarness testUnaffected(String idempotentElement) {
-		return testUnaffected(idempotentElement, "");
-	}
-
-	public StepHarness testUnaffected(String idempotentElement, String fileName) {
-		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(fileName));
+		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(""));
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}

testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java

@@ -21,6 +21,8 @@
 import java.time.YearMonth;
 import java.time.ZoneOffset;
 
+import com.diffplug.spotless.StepHarnessWithFile;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -266,18 +268,18 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	@Test
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
-		StepHarness.forStep(step)
-			.test(getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"), "Test.java");
+		StepHarnessWithFile.forStep(this, step)
+			.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
 	}
 
 	@Test
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 			.test(
+				new File("Test.java"),
 				getTestResource(FILE_NO_LICENSE),
-				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"),
-				"Test.java"
+				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java")
 			);
 	}
 }