More improvements to StepHarnessWithFile.

Author: nedtwigg

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

@@ -52,7 +52,8 @@ public static StepHarnessWithFile forFormatter(ResourceHarness harness, Formatte
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
-	public StepHarnessWithFile test(File file, String before, String after) {
+	public StepHarnessWithFile test(String filename, String before, String after) {
+		File file = harness.setFile(filename).toContent(before);
 		String actual = formatter().compute(LineEnding.toUnix(before), file);
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(file, after);
@@ -65,15 +66,19 @@ public StepHarnessWithFile testUnaffected(File file, String idempotentElement) {
 		return this;
 	}
 
+	/** Asserts that the given element is idempotent w.r.t the step under test. */
+	public StepHarnessWithFile testUnaffected(String file, String idempotentElement) {
+		return testUnaffected(harness.setFile(file).toContent(idempotentElement), idempotentElement);
+	}
+
 	/** Asserts that the given elements in  the resources directory are transformed as expected. */
 	public StepHarnessWithFile testResource(String resourceBefore, String resourceAfter) {
 		return testResource(resourceBefore, resourceBefore, resourceAfter);
 	}
 
 	public StepHarnessWithFile testResource(String filename, String resourceBefore, String resourceAfter) {
 		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
-		File file = harness.setFile(filename).toContent(contentBefore);
-		return test(file, contentBefore, ResourceHarness.getTestResource(resourceAfter));
+		return test(filename, contentBefore, ResourceHarness.getTestResource(resourceAfter));
 	}
 
 	/** Asserts that the given elements in the resources directory are transformed as expected. */

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

@@ -268,16 +268,15 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"))
+				.test("Test.java", getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"))
 				.testUnaffected(new File("Test.java"), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
 	}
 
 	@Test
 	void should_update_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(
-						new File("After.java"),
+				.test("After.java",
 						hasHeaderFileName(HEADER_WITH_$FILE, "Before.java"),
 						hasHeaderFileName(HEADER_WITH_$FILE, "After.java"));
 	}
@@ -286,12 +285,10 @@ void should_update_license_containing_filename_token() throws Exception {
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(
-						new File("Test.java"),
+				.test("Test.java",
 						getTestResource(FILE_NO_LICENSE),
 						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"))
-				.testUnaffected(
-						new File("Test.java"),
+				.testUnaffected("Test.java",
 						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
 	}
 

testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java

@@ -56,7 +56,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
 
 			final String dirtyFile = filedir + "javascript-es6.dirty";
-			File dirtyFileFile = setFile(testDir + "test.js").toResource(dirtyFile);
 			final String cleanFile = filedir + "javascript-es6.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -69,7 +68,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					new EslintConfig(eslintRc, null));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test("test.js", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -100,7 +99,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 				tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
 			}
 			final String dirtyFile = filedir + "typescript.dirty";
-			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -113,7 +111,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test(testDir + "test.ts", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -158,7 +156,6 @@ void formattingUsingInlineXoConfig() throws Exception {
 
 			File tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
 			final String dirtyFile = filedir + "typescript.dirty";
-			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -171,7 +168,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test(testDir + "test.ts", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}