1480: add integration test for tsfmt (and fix api issue)

Author: simschla

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java

@@ -82,31 +82,33 @@ public class TypescriptFormatExtension extends NpmStepConfig<TypescriptFormatExt
 			this.devDependencies = Objects.requireNonNull(devDependencies);
 		}
 
-		public void config(final Map<String, Object> config) {
+		public TypescriptFormatExtension config(final Map<String, Object> config) {
 			this.config = new TreeMap<>(requireNonNull(config));
 			replaceStep();
+			return this;
 		}
 
-		public void tsconfigFile(final Object path) {
-			configFile(TsConfigFileType.TSCONFIG, path);
+		public TypescriptFormatExtension tsconfigFile(final Object path) {
+			return configFile(TsConfigFileType.TSCONFIG, path);
 		}
 
-		public void tslintFile(final Object path) {
-			configFile(TsConfigFileType.TSLINT, path);
+		public TypescriptFormatExtension tslintFile(final Object path) {
+			return configFile(TsConfigFileType.TSLINT, path);
 		}
 
-		public void vscodeFile(final Object path) {
-			configFile(TsConfigFileType.VSCODE, path);
+		public TypescriptFormatExtension vscodeFile(final Object path) {
+			return configFile(TsConfigFileType.VSCODE, path);
 		}
 
-		public void tsfmtFile(final Object path) {
-			configFile(TsConfigFileType.TSFMT, path);
+		public TypescriptFormatExtension tsfmtFile(final Object path) {
+			return configFile(TsConfigFileType.TSFMT, path);
 		}
 
-		private void configFile(TsConfigFileType filetype, Object path) {
+		private TypescriptFormatExtension configFile(TsConfigFileType filetype, Object path) {
 			this.configFileType = requireNonNull(filetype);
 			this.configFilePath = requireNonNull(path);
 			replaceStep();
+			return this;
 		}
 
 		public FormatterStep createStep() {

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

@@ -24,13 +24,16 @@
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.io.TempDir;
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.spotless.tag.NpmTest;
 
+@TestMethodOrder(OrderAnnotation.class)
 @NpmTest
 class NpmInstallCacheIntegrationTests extends GradleIntegrationHarness {
 
@@ -115,6 +118,51 @@ private BuildResult runPhpPrettierOnDir(File projDir, File cacheDir) throws IOEx
 		return spotlessApply;
 	}
 
+	@Test
+	@Order(3)
+	void tsfmtWithSpecificGlobalInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-tsfmt-global-1");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runTsfmtOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.containsPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	@Order(4)
+	void tsfmtWithSpecificGlobalInstallCacheTest2() throws IOException {
+		File dir2 = newFolder("npm-tsfmt-global-2");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runTsfmtOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.doesNotContainPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	private BuildResult runTsfmtOnDir(File projDir, File cacheDir) throws IOException {
+		String baseDir = projDir.getName();
+		String cacheDirEnabled = cacheDirEnabledStringForCacheDir(cacheDir);
+		setFile(baseDir + "/build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def tsfmtconfig = [:]",
+				"tsfmtconfig['indentSize'] = 1",
+				"tsfmtconfig['convertTabsToSpaces'] = true",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        tsfmt().config(tsfmtconfig)" + cacheDirEnabled,
+				"    }",
+				"}");
+		setFile(baseDir + "/test.ts").toResource("npm/tsfmt/tsfmt/tsfmt.dirty");
+		final BuildResult spotlessApply = gradleRunner().withProjectDir(projDir).withArguments("--stacktrace", "--info", "spotlessApply").build();
+		assertFile(baseDir + "/test.ts").sameAsResource("npm/tsfmt/tsfmt/tsfmt.clean");
+		return spotlessApply;
+	}
+
 	private static String cacheDirEnabledStringForCacheDir(File cacheDir) {
 		String cacheDirEnabled;
 		if (cacheDir == null) {