Fixed the self-apply bug by moving it into its own folder, so the Tes…

…tKit-generated `.gradle` folder doesn't fight with the real folder.
diffplug · Jan 6, 2017 · c821e85 · c821e85
1 parent f7ba9f6
commit c821e85
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SelfTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SelfTest.java
@@ -129,9 +129,12 @@ private static Project createProject(Consumer<SpotlessExtension> test) throws Ex
 
 	/** Runs against the `spotlessSelfApply.gradle` file. */
 	static void runWithTestKit(Type type) throws Exception {
+		File pluginGradleDir = new File(StandardSystemProperty.USER_DIR.value());
+		File rootDir = pluginGradleDir.getParentFile();
+		File selfApplyDir = new File(rootDir, "selfApply");
 		GradleRunner.create()
 				.withPluginClasspath()
-				.withProjectDir(new File(StandardSystemProperty.USER_DIR.value()).getParentFile())
+				.withProjectDir(selfApplyDir)
 				.withArguments("-b", "spotlessSelf.gradle", "spotless" + type.checkApply("Check", "Apply"), "--stacktrace")
 				.forwardOutput()
 				.build();

diff --git a/spotless.eclipseformat.xml → selfApply/spotless.eclipseformat.xml b/spotless.eclipseformat.xml → selfApply/spotless.eclipseformat.xml
diff --git a/spotless.importorder → selfApply/spotless.importorder b/spotless.importorder → selfApply/spotless.importorder
diff --git a/spotless.license → selfApply/spotless.license b/spotless.license → selfApply/spotless.license
diff --git a/spotlessSelf.gradle → selfApply/spotlessSelf.gradle b/spotlessSelf.gradle → selfApply/spotlessSelf.gradle
@@ -1,27 +1,29 @@
 // applied by SelfTest
+// important for it to be in its own directory
 plugins {
 	id 'com.diffplug.gradle.spotless'
 	id 'java'
 }
+
 repositories { mavenCentral() }
 spotless {
 	java {
-		target '**/*.java'
+		target '../**/*.java'
 		licenseHeaderFile 'spotless.license'
 		importOrderFile   'spotless.importorder'
 		eclipseFormatFile 'spotless.eclipseformat.xml'
 		trimTrailingWhitespace()
 	}
 	freshmark {
-		target '**/*.md'
-		propertiesFile('gradle.properties')
+		target '../**/*.md'
+		propertiesFile('../gradle.properties')
 		properties {
 			it.put('yes', ':+1:')
 			it.put('no', ':white_large_square:')
 		}
 	}
 	format 'misc', {
-		target '**/*.gradle', '**/*.md', '**/*.gitignore'
+		target '../**/*.gradle', '../**/*.md', '../**/*.gitignore'
 		indentWithTabs()
 		trimTrailingWhitespace()
 		endWithNewline()