Less errors in equoIde

blacelle · Feb 27, 2023 · cd2ff0f · cd2ff0f
1 parent 6716228
commit cd2ff0f
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -33,7 +33,7 @@ void testEnableDraft() throws Exception {
 				"  <includeDraft>true</includeDraft>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyOptionalIsPresent.java");
 	}
 
 	@Test
@@ -45,7 +45,7 @@ void testLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
+		runTest("LiteralsFirstInComparisons_dirty.java", "LiteralsFirstInComparisons_clean.java");
 	}
 
 	@Test
@@ -59,7 +59,7 @@ void testMultipleMutators_defaultIsJdk7() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -73,7 +73,7 @@ void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean.java");
 	}
 
 	@Test
@@ -89,7 +89,7 @@ void testExcludeOptionalNotEmpty() throws Exception {
 				"  </excludedMutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -101,7 +101,7 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {

diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
@@ -0,0 +1,8 @@
+package java.cleanthat;
+
+public class LiteralsFirstInComparisons_clean {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
@@ -0,0 +1,8 @@
+package java.cleanthat;
+
+public class LiteralsFirstInComparisons_dirty {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+}
diff --git a/...ava/cleanthat/MultipleMutators.clean.java → ...ava/cleanthat/MultipleMutators_clean.java b/...ava/cleanthat/MultipleMutators.clean.java → ...ava/cleanthat/MultipleMutators_clean.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);

diff --git a/...ipleMutators.clean.onlyLiteralsFirst.java → ...ipleMutators_clean_onlyLiteralsFirst.java b/...ipleMutators.clean.onlyLiteralsFirst.java → ...ipleMutators_clean_onlyLiteralsFirst.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean_onlyLiteralsFirst {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);

diff --git a/...Mutators.clean.onlyOptionalIsPresent.java → ...Mutators_clean_onlyOptionalIsPresent.java b/...Mutators.clean.onlyOptionalIsPresent.java → ...Mutators_clean_onlyOptionalIsPresent.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean_onlyOptionalIsPresent {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");

diff --git a/...ava/cleanthat/MultipleMutators.dirty.java → ...ava/cleanthat/MultipleMutators_dirty.java b/...ava/cleanthat/MultipleMutators.dirty.java → ...ava/cleanthat/MultipleMutators_dirty.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_dirty {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");