Revert "Less errors in equoIde"

This reverts commit cd2ff0f.

Author: nedtwigg

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 {

testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java

@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+}

testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java

@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+}

testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java

@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);

testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java

@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean_onlyLiteralsFirst {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);

testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java renamed to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java

@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean_onlyOptionalIsPresent {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");

testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java renamed to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java

@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_dirty {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");