Skip to content

Commit badf733

Browse files
committed
refactor: remove intermediate base test class (no longer needed)
1 parent 465e188 commit badf733

File tree

2 files changed

+40
-61
lines changed

2 files changed

+40
-61
lines changed

app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717

1818
import org.junit.jupiter.api.Test;
1919

20+
import com.diffplug.spotless.cli.CLIIntegrationHarness;
2021
import com.diffplug.spotless.cli.SpotlessCLIRunner;
2122
import com.diffplug.spotless.tag.CliProcessTest;
2223

2324
import static org.assertj.core.api.Assertions.assertThat;
2425

2526
@CliProcessTest
26-
public class EclipseWtpTest extends EclipseWtpTestBase {
27+
public class EclipseWtpTest extends CLIIntegrationHarness {
2728

2829
// XML
2930
@Test
@@ -168,4 +169,42 @@ void itRespectsCustomVersion() {
168169
assertThat(result.exitCode()).isNotEqualTo(0);
169170
assertThat(result.stdErr()).contains("No such version " + invalidCustomVersion);
170171
}
172+
173+
protected String runEclipseWtpWithType(EclipseWtp.Type type, String unformatted) {
174+
String fileName = "test." + type.name().toLowerCase();
175+
setFile(fileName).toContent(unformatted);
176+
177+
SpotlessCLIRunner.Result result = cliRunner()
178+
.withTargets(fileName)
179+
.withStep(EclipseWtp.class)
180+
.withOption("--type", type.name())
181+
.run();
182+
183+
return fileName;
184+
}
185+
186+
protected String runEclipseWtpWithTypeInferred(String fileExtension, String unformatted) {
187+
String fileName = "test." + fileExtension;
188+
setFile(fileName).toContent(unformatted);
189+
190+
SpotlessCLIRunner.Result result =
191+
cliRunner().withTargets(fileName).withStep(EclipseWtp.class).run();
192+
193+
return fileName;
194+
}
195+
196+
protected String runEclipseWtpWithTypeAndConfigFile(EclipseWtp.Type type, String unformatted, String configFile) {
197+
String fileName = "test." + type.name().toLowerCase();
198+
setFile(fileName).toContent(unformatted);
199+
setFile(configFile).toResource("eclipse-wtp/" + configFile);
200+
201+
SpotlessCLIRunner.Result result = cliRunner()
202+
.withTargets(fileName)
203+
.withStep(EclipseWtp.class)
204+
.withOption("--type", type.name())
205+
.withOption("--config-file", configFile)
206+
.run();
207+
208+
return fileName;
209+
}
171210
}

app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)