Test prettier's equality checks.

Author: nedtwigg

testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.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.
@@ -16,10 +16,10 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collections;
 
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.ThrowingEx;
 
 public abstract class NpmFormatterStepCommonTests extends ResourceHarness {
 
@@ -41,18 +41,18 @@ private File npmrc() {
 
 	private File buildDir = null;
 
-	protected File buildDir() throws IOException {
+	protected File buildDir() {
 		if (this.buildDir == null) {
-			this.buildDir = newFolder("build-dir");
+			this.buildDir = ThrowingEx.get(() -> newFolder("build-dir"));
 		}
 		return this.buildDir;
 	}
 
 	private File projectDir = null;
 
-	protected File projectDir() throws IOException {
+	protected File projectDir() {
 		if (this.projectDir == null) {
-			this.projectDir = newFolder("project-dir");
+			this.projectDir = ThrowingEx.get(() -> newFolder("project-dir"));
 		}
 		return this.projectDir;
 	}

testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.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.
@@ -19,24 +19,21 @@
 import java.util.Collections;
 import java.util.Map;
 
-import com.diffplug.spotless.SerializableEqualityTester;
-import com.diffplug.spotless.java.GoogleJavaFormatStep;
-
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
-class PrettierFormatterStepTest extends ResourceHarness {
+class PrettierFormatterStepTest extends NpmFormatterStepCommonTests {
 
 	private static final String PRETTIER_VERSION_2 = PrettierFormatterStep.DEFAULT_VERSION;
 
@@ -196,27 +193,30 @@ private String major(String semVer) {
 	@Test
 	void equality() {
 		new SerializableEqualityTester() {
-			String groupArtifact = GoogleJavaFormatStep.defaultGroupArtifact();
-			String version = "1.11.0";
-			String style = "";
-			boolean reflowLongStrings = false;
+			String prettierVersion = "3.0.0";
+			PrettierConfig config = new PrettierConfig(null, Map.of("parser", "typescript"));
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the groupArtifact, and it's different
-				groupArtifact = "io.opil:google-java-format";
+				prettierVersion = "2.8.8";
+				api.areDifferentThan();
+				config = new PrettierConfig(null, Map.of("parser", "css"));
 				api.areDifferentThan();
 			}
 
 			@Override
 			protected FormatterStep create() {
-				return PrettierFormatterStep.create(Map.of(), TestProvisioner.mavenCentral(), 					projectDir(),
-					buildDir(),
-					null,
-					npmPathResolver(),
-					);
+				return PrettierFormatterStep.create(
+						ImmutableMap.of("prettier", prettierVersion),
+						TestProvisioner.mavenCentral(),
+						projectDir(),
+						buildDir(),
+						null,
+						npmPathResolver(),
+						config); // should select parser based on this name
 			}
 		}.testEquals();
 	}