Make the Gradle testing methods public, to allow easier parameterized testing. (#2359)

nedtwigg · web-flow · commit 339d2c975832 · 2024-12-08T11:00:54.000-08:00
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -39,7 +39,7 @@ private void writeContentWithBadFormatting() throws IOException {
 	}
 
 	@Override
-	protected void applyIsUpToDate(boolean upToDate) throws IOException {
+	public void applyIsUpToDate(boolean upToDate) throws IOException {
 		super.applyIsUpToDate(upToDate);
 		assertFile("README.md").hasContent("abc");
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -22,7 +22,7 @@
 
 public class ConfigurationCacheTest extends GradleIntegrationHarness {
 	@Override
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
 		setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
 		return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -52,7 +52,7 @@ private Git initRepo() throws IllegalStateException, GitAPIException, IOExceptio
 	}
 
 	@Override
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -121,7 +121,7 @@ void gitAttributes() throws IOException {
 		setFile(".gitattributes").toContent("* text eol=lf");
 	}
 
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		GradleVersionSupport version;
 		if (newFile("build.gradle").exists() && read("build.gradle").contains("custom")) {
 			version = GradleVersionSupport.CUSTOM_STEPS;
@@ -136,11 +136,11 @@ protected GradleRunner gradleRunner() throws IOException {
 	}
 
 	/** Dumps the complete file contents of the folder to the console. */
-	protected String getContents() {
+	public String getContents() {
 		return getContents(subPath -> !subPath.startsWith(".gradle"));
 	}
 
-	protected String getContents(Predicate<String> subpathsToInclude) {
+	public String getContents(Predicate<String> subpathsToInclude) {
 		return StringPrinter.buildString(printer -> Errors.rethrow().run(() -> iterateFiles(subpathsToInclude, (subpath, file) -> {
 			printer.println("### " + subpath + " ###");
 			try {
@@ -152,18 +152,18 @@ protected String getContents(Predicate<String> subpathsToInclude) {
 	}
 
 	/** Dumps the filtered file listing of the folder to the console. */
-	protected String listFiles(Predicate<String> subpathsToInclude) {
+	public String listFiles(Predicate<String> subpathsToInclude) {
 		return StringPrinter.buildString(printer -> iterateFiles(subpathsToInclude, (subPath, file) -> {
 			printer.println(subPath + " [" + getFileAttributes(file) + "]");
 		}));
 	}
 
 	/** Dumps the file listing of the folder to the console. */
-	protected String listFiles() {
+	public String listFiles() {
 		return listFiles(subPath -> !subPath.startsWith(".gradle"));
 	}
 
-	protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {
+	public void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {
 		TreeDef<File> treeDef = TreeDef.forFile(Errors.rethrow());
 		List<File> files = TreeStream.depthFirst(treeDef, rootFolder())
 				.filter(File::isFile)
@@ -180,20 +180,20 @@ protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<Stri
 		}
 	}
 
-	protected String getFileAttributes(File file) {
+	public String getFileAttributes(File file) {
 		return (file.canRead() ? "r" : "-") + (file.canWrite() ? "w" : "-") + (file.canExecute() ? "x" : "-");
 	}
 
-	protected void checkRunsThenUpToDate() throws IOException {
+	public void checkRunsThenUpToDate() throws IOException {
 		checkIsUpToDate(false);
 		checkIsUpToDate(true);
 	}
 
-	protected void applyIsUpToDate(boolean upToDate) throws IOException {
+	public void applyIsUpToDate(boolean upToDate) throws IOException {
 		taskIsUpToDate("spotlessApply", upToDate);
 	}
 
-	protected void checkIsUpToDate(boolean upToDate) throws IOException {
+	public void checkIsUpToDate(boolean upToDate) throws IOException {
 		taskIsUpToDate("spotlessCheck", upToDate);
 	}
 
@@ -215,13 +215,13 @@ private void taskIsUpToDate(String task, boolean upToDate) throws IOException {
 		}
 	}
 
-	protected static List<String> outcomes(BuildResult build, TaskOutcome outcome) {
+	public static List<String> outcomes(BuildResult build, TaskOutcome outcome) {
 		return build.taskPaths(outcome).stream()
 				.filter(s -> !s.equals(":spotlessInternalRegisterDependencies"))
 				.collect(Collectors.toList());
 	}
 
-	protected static List<BuildTask> outcomes(BuildResult build) {
+	public static List<BuildTask> outcomes(BuildResult build) {
 		return build.getTasks().stream()
 				.filter(t -> !t.getPath().equals(":spotlessInternalRegisterDependencies"))
 				.collect(Collectors.toList());
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.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.
@@ -17,10 +17,12 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Predicates;
 
+@Disabled("https://status.npmjs.org/ shows npm services down on 12/8/2024, should undisable this later")
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
 
 	@Test
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -53,17 +53,17 @@ public class ResourceHarness {
 	File folderDontUseDirectly;
 
 	/** Returns the root folder (canonicalized to fix OS X issue) */
-	protected File rootFolder() {
+	public File rootFolder() {
 		return Errors.rethrow().get(() -> folderDontUseDirectly.getCanonicalFile());
 	}
 
 	/** Returns a new child of the root folder. */
-	protected File newFile(String subpath) {
+	public File newFile(String subpath) {
 		return new File(rootFolder(), subpath);
 	}
 
 	/** Creates and returns a new child-folder of the root folder. */
-	protected File newFolder(String subpath) throws IOException {
+	public File newFolder(String subpath) throws IOException {
 		File targetDir = newFile(subpath);
 		if (!targetDir.mkdir()) {
 			throw new IOException("Failed to create " + targetDir);
@@ -77,7 +77,7 @@ protected File newFolder(String subpath) throws IOException {
 	 * @return the list of resources in that directory on the classpath, unix-style file separators
 	 * @throws IOException
 	 */
-	protected List<String> listTestResources(String path) throws IOException {
+	public List<String> listTestResources(String path) throws IOException {
 		// add leading slash if required, otherwise resources won't be found
 		if (!path.startsWith("/")) {
 			path = path + "/";
@@ -102,19 +102,19 @@ protected List<String> listTestResources(String path) throws IOException {
 		return filenames;
 	}
 
-	protected String relativeToRoot(String path) {
+	public String relativeToRoot(String path) {
 		return new File(path).toPath().relativize(rootFolder().toPath()).toString();
 	}
 
-	protected String read(String path) throws IOException {
+	public String read(String path) throws IOException {
 		return read(newFile(path).toPath(), StandardCharsets.UTF_8);
 	}
 
-	protected String read(Path path, Charset encoding) throws IOException {
+	public String read(Path path, Charset encoding) throws IOException {
 		return new String(Files.readAllBytes(path), encoding);
 	}
 
-	protected void replace(String path, String toReplace, String replaceWith) throws IOException {
+	public void replace(String path, String toReplace, String replaceWith) throws IOException {
 		String before = read(path);
 		String after = before.replace(toReplace, replaceWith);
 		if (before.equals(after)) {
@@ -124,15 +124,15 @@ protected void replace(String path, String toReplace, String replaceWith) throws
 	}
 
 	/** Returns the contents of the given file from the src/test/resources directory. */
-	protected static String getTestResource(String filename) {
+	public static String getTestResource(String filename) {
 		Optional<URL> resourceUrl = getTestResourceUrl(filename);
 		if (resourceUrl.isPresent()) {
 			return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8)));
 		}
 		throw new IllegalArgumentException("No such resource " + filename);
 	}
 
-	protected static boolean existsTestResource(String filename) {
+	public static boolean existsTestResource(String filename) {
 		return getTestResourceUrl(filename).isPresent();
 	}
 
@@ -142,7 +142,7 @@ private static Optional<URL> getTestResourceUrl(String filename) {
 	}
 
 	/** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected List<File> createTestFiles(String... filenames) {
+	public List<File> createTestFiles(String... filenames) {
 		List<File> files = new ArrayList<>(filenames.length);
 		for (String filename : filenames) {
 			files.add(createTestFile(filename));
@@ -151,15 +151,15 @@ protected List<File> createTestFiles(String... filenames) {
 	}
 
 	/** Returns a File (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected File createTestFile(String filename) {
+	public File createTestFile(String filename) {
 		return createTestFile(filename, UnaryOperator.identity());
 	}
 
 	/**
 	 * Returns a File (in a temporary folder) which has the contents, possibly processed, of the given file from the
 	 * src/test/resources directory.
 	 */
-	protected File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {
+	public File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {
 		int lastSlash = filename.lastIndexOf('/');
 		String name = lastSlash >= 0 ? filename.substring(lastSlash) : filename;
 		File file = newFile(name);
@@ -169,12 +169,12 @@ protected File createTestFile(String filename, UnaryOperator<String> fileContent
 	}
 
 	@CheckReturnValue
-	protected ReadAsserter assertFile(String path) {
+	public ReadAsserter assertFile(String path) {
 		return new ReadAsserter(newFile(path));
 	}
 
 	@CheckReturnValue
-	protected ReadAsserter assertFile(File file) {
+	public ReadAsserter assertFile(File file) {
 		return new ReadAsserter(file);
 	}
 
@@ -207,7 +207,7 @@ public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions)
 		}
 	}
 
-	protected WriteAsserter setFile(String path) {
+	public WriteAsserter setFile(String path) {
 		return new WriteAsserter(newFile(path));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private void writeContentWithBadFormatting() throws IOException {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
`42`		`- protected void applyIsUpToDate(boolean upToDate) throws IOException {`
	`42`	`+ public void applyIsUpToDate(boolean upToDate) throws IOException {`
`43`	`43`	`super.applyIsUpToDate(upToDate);`
`44`	`44`	`assertFile("README.md").hasContent("abc");`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private Git initRepo() throws IllegalStateException, GitAPIException, IOExceptio`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- protected GradleRunner gradleRunner() throws IOException {`
	`55`	`+ public GradleRunner gradleRunner() throws IOException {`
`56`	`56`	`return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void gitAttributes() throws IOException {`
`121`	`121`	`setFile(".gitattributes").toContent("* text eol=lf");`
`122`	`122`	`}`
`123`	`123`
`124`		`- protected GradleRunner gradleRunner() throws IOException {`
	`124`	`+ public GradleRunner gradleRunner() throws IOException {`
`125`	`125`	`GradleVersionSupport version;`
`126`	`126`	`if (newFile("build.gradle").exists() && read("build.gradle").contains("custom")) {`
`127`	`127`	`version = GradleVersionSupport.CUSTOM_STEPS;`
`@@ -136,11 +136,11 @@ protected GradleRunner gradleRunner() throws IOException {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/** Dumps the complete file contents of the folder to the console. */`
`139`		`- protected String getContents() {`
	`139`	`+ public String getContents() {`
`140`	`140`	`return getContents(subPath -> !subPath.startsWith(".gradle"));`
`141`	`141`	`}`
`142`	`142`
`143`		`- protected String getContents(Predicate<String> subpathsToInclude) {`
	`143`	`+ public String getContents(Predicate<String> subpathsToInclude) {`
`144`	`144`	`return StringPrinter.buildString(printer -> Errors.rethrow().run(() -> iterateFiles(subpathsToInclude, (subpath, file) -> {`
`145`	`145`	`printer.println("### " + subpath + " ###");`
`146`	`146`	`try {`
`@@ -152,18 +152,18 @@ protected String getContents(Predicate<String> subpathsToInclude) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`/** Dumps the filtered file listing of the folder to the console. */`
`155`		`- protected String listFiles(Predicate<String> subpathsToInclude) {`
	`155`	`+ public String listFiles(Predicate<String> subpathsToInclude) {`
`156`	`156`	`return StringPrinter.buildString(printer -> iterateFiles(subpathsToInclude, (subPath, file) -> {`
`157`	`157`	`printer.println(subPath + " [" + getFileAttributes(file) + "]");`
`158`	`158`	`}));`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/** Dumps the file listing of the folder to the console. */`
`162`		`- protected String listFiles() {`
	`162`	`+ public String listFiles() {`
`163`	`163`	`return listFiles(subPath -> !subPath.startsWith(".gradle"));`
`164`	`164`	`}`
`165`	`165`
`166`		`- protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {`
	`166`	`+ public void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {`
`167`	`167`	`TreeDef<File> treeDef = TreeDef.forFile(Errors.rethrow());`
`168`	`168`	`List<File> files = TreeStream.depthFirst(treeDef, rootFolder())`
`169`	`169`	`.filter(File::isFile)`
`@@ -180,20 +180,20 @@ protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<Stri`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`		`- protected String getFileAttributes(File file) {`
	`183`	`+ public String getFileAttributes(File file) {`
`184`	`184`	`return (file.canRead() ? "r" : "-") + (file.canWrite() ? "w" : "-") + (file.canExecute() ? "x" : "-");`
`185`	`185`	`}`
`186`	`186`
`187`		`- protected void checkRunsThenUpToDate() throws IOException {`
	`187`	`+ public void checkRunsThenUpToDate() throws IOException {`
`188`	`188`	`checkIsUpToDate(false);`
`189`	`189`	`checkIsUpToDate(true);`
`190`	`190`	`}`
`191`	`191`
`192`		`- protected void applyIsUpToDate(boolean upToDate) throws IOException {`
	`192`	`+ public void applyIsUpToDate(boolean upToDate) throws IOException {`
`193`	`193`	`taskIsUpToDate("spotlessApply", upToDate);`
`194`	`194`	`}`
`195`	`195`
`196`		`- protected void checkIsUpToDate(boolean upToDate) throws IOException {`
	`196`	`+ public void checkIsUpToDate(boolean upToDate) throws IOException {`
`197`	`197`	`taskIsUpToDate("spotlessCheck", upToDate);`
`198`	`198`	`}`
`199`	`199`
`@@ -215,13 +215,13 @@ private void taskIsUpToDate(String task, boolean upToDate) throws IOException {`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- protected static List<String> outcomes(BuildResult build, TaskOutcome outcome) {`
	`218`	`+ public static List<String> outcomes(BuildResult build, TaskOutcome outcome) {`
`219`	`219`	`return build.taskPaths(outcome).stream()`
`220`	`220`	`.filter(s -> !s.equals(":spotlessInternalRegisterDependencies"))`
`221`	`221`	`.collect(Collectors.toList());`
`222`	`222`	`}`
`223`	`223`
`224`		`- protected static List<BuildTask> outcomes(BuildResult build) {`
	`224`	`+ public static List<BuildTask> outcomes(BuildResult build) {`
`225`	`225`	`return build.getTasks().stream()`
`226`	`226`	`.filter(t -> !t.getPath().equals(":spotlessInternalRegisterDependencies"))`
`227`	`227`	`.collect(Collectors.toList());`
Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,17 @@ public class ResourceHarness {`
`53`	`53`	`File folderDontUseDirectly;`
`54`	`54`
`55`	`55`	`/** Returns the root folder (canonicalized to fix OS X issue) */`
`56`		`- protected File rootFolder() {`
	`56`	`+ public File rootFolder() {`
`57`	`57`	`return Errors.rethrow().get(() -> folderDontUseDirectly.getCanonicalFile());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/** Returns a new child of the root folder. */`
`61`		`- protected File newFile(String subpath) {`
	`61`	`+ public File newFile(String subpath) {`
`62`	`62`	`return new File(rootFolder(), subpath);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/** Creates and returns a new child-folder of the root folder. */`
`66`		`- protected File newFolder(String subpath) throws IOException {`
	`66`	`+ public File newFolder(String subpath) throws IOException {`
`67`	`67`	`File targetDir = newFile(subpath);`
`68`	`68`	`if (!targetDir.mkdir()) {`
`69`	`69`	`throw new IOException("Failed to create " + targetDir);`
`@@ -77,7 +77,7 @@ protected File newFolder(String subpath) throws IOException {`
`77`	`77`	`* @return the list of resources in that directory on the classpath, unix-style file separators`
`78`	`78`	`* @throws IOException`
`79`	`79`	`*/`
`80`		`- protected List<String> listTestResources(String path) throws IOException {`
	`80`	`+ public List<String> listTestResources(String path) throws IOException {`
`81`	`81`	`// add leading slash if required, otherwise resources won't be found`
`82`	`82`	`if (!path.startsWith("/")) {`
`83`	`83`	`path = path + "/";`
`@@ -102,19 +102,19 @@ protected List<String> listTestResources(String path) throws IOException {`
`102`	`102`	`return filenames;`
`103`	`103`	`}`
`104`	`104`
`105`		`- protected String relativeToRoot(String path) {`
	`105`	`+ public String relativeToRoot(String path) {`
`106`	`106`	`return new File(path).toPath().relativize(rootFolder().toPath()).toString();`
`107`	`107`	`}`
`108`	`108`
`109`		`- protected String read(String path) throws IOException {`
	`109`	`+ public String read(String path) throws IOException {`
`110`	`110`	`return read(newFile(path).toPath(), StandardCharsets.UTF_8);`
`111`	`111`	`}`
`112`	`112`
`113`		`- protected String read(Path path, Charset encoding) throws IOException {`
	`113`	`+ public String read(Path path, Charset encoding) throws IOException {`
`114`	`114`	`return new String(Files.readAllBytes(path), encoding);`
`115`	`115`	`}`
`116`	`116`
`117`		`- protected void replace(String path, String toReplace, String replaceWith) throws IOException {`
	`117`	`+ public void replace(String path, String toReplace, String replaceWith) throws IOException {`
`118`	`118`	`String before = read(path);`
`119`	`119`	`String after = before.replace(toReplace, replaceWith);`
`120`	`120`	`if (before.equals(after)) {`
`@@ -124,15 +124,15 @@ protected void replace(String path, String toReplace, String replaceWith) throws`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`/** Returns the contents of the given file from the src/test/resources directory. */`
`127`		`- protected static String getTestResource(String filename) {`
	`127`	`+ public static String getTestResource(String filename) {`
`128`	`128`	`Optional<URL> resourceUrl = getTestResourceUrl(filename);`
`129`	`129`	`if (resourceUrl.isPresent()) {`
`130`	`130`	`return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8)));`
`131`	`131`	`}`
`132`	`132`	`throw new IllegalArgumentException("No such resource " + filename);`
`133`	`133`	`}`
`134`	`134`
`135`		`- protected static boolean existsTestResource(String filename) {`
	`135`	`+ public static boolean existsTestResource(String filename) {`
`136`	`136`	`return getTestResourceUrl(filename).isPresent();`
`137`	`137`	`}`
`138`	`138`
`@@ -142,7 +142,7 @@ private static Optional<URL> getTestResourceUrl(String filename) {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */`
`145`		`- protected List<File> createTestFiles(String... filenames) {`
	`145`	`+ public List<File> createTestFiles(String... filenames) {`
`146`	`146`	`List<File> files = new ArrayList<>(filenames.length);`
`147`	`147`	`for (String filename : filenames) {`
`148`	`148`	`files.add(createTestFile(filename));`
`@@ -151,15 +151,15 @@ protected List<File> createTestFiles(String... filenames) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`/** Returns a File (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */`
`154`		`- protected File createTestFile(String filename) {`
	`154`	`+ public File createTestFile(String filename) {`
`155`	`155`	`return createTestFile(filename, UnaryOperator.identity());`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
`159`	`159`	`* Returns a File (in a temporary folder) which has the contents, possibly processed, of the given file from the`
`160`	`160`	`* src/test/resources directory.`
`161`	`161`	`*/`
`162`		`- protected File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {`
	`162`	`+ public File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {`
`163`	`163`	`int lastSlash = filename.lastIndexOf('/');`
`164`	`164`	`String name = lastSlash >= 0 ? filename.substring(lastSlash) : filename;`
`165`	`165`	`File file = newFile(name);`
`@@ -169,12 +169,12 @@ protected File createTestFile(String filename, UnaryOperator<String> fileContent`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`@CheckReturnValue`
`172`		`- protected ReadAsserter assertFile(String path) {`
	`172`	`+ public ReadAsserter assertFile(String path) {`
`173`	`173`	`return new ReadAsserter(newFile(path));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`@CheckReturnValue`
`177`		`- protected ReadAsserter assertFile(File file) {`
	`177`	`+ public ReadAsserter assertFile(File file) {`
`178`	`178`	`return new ReadAsserter(file);`
`179`	`179`	`}`
`180`	`180`
`@@ -207,7 +207,7 @@ public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions)`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`210`		`- protected WriteAsserter setFile(String path) {`
	`210`	`+ public WriteAsserter setFile(String path) {`
`211`	`211`	`return new WriteAsserter(newFile(path));`
`212`	`212`	`}`
`213`	`213`