diff --git a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java index 5d36262d7..02aaaf524 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java +++ b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiReferenceList; import com.intellij.psi.PsiType; import com.intellij.util.containers.SortedList; -import com.jgoodies.common.base.Objects; import org.apache.log4j.Logger; import org.jetbrains.annotations.NotNull; @@ -91,7 +90,7 @@ private void compareClasses(PsiClass[] beforeClasses, PsiClass[] afterClasses) { for (PsiClass afterClass : afterClasses) { boolean compared = false; for (PsiClass beforeClass : beforeClasses) { - if (Objects.equals(afterClass.getName(), beforeClass.getName())) { + if (Objects.equal(afterClass.getName(), beforeClass.getName())) { compareTwoClasses(beforeClass, afterClass); compared = true; } @@ -128,7 +127,7 @@ private void compareFields(PsiClass beforeClass, PsiClass afterClass) { boolean compared = false; final PsiModifierList afterFieldModifierList = afterField.getModifierList(); for (PsiField beforeField : beforeClassFields) { - if (Objects.equals(afterField.getName(), beforeField.getName())) { + if (Objects.equal(afterField.getName(), beforeField.getName())) { final PsiModifierList beforeFieldModifierList = beforeField.getModifierList(); compareModifiers(beforeFieldModifierList, afterFieldModifierList); diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/AccessorsTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/AccessorsTest.java index 672b4902f..35a3547d5 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/AccessorsTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/AccessorsTest.java @@ -7,7 +7,7 @@ */ public class AccessorsTest extends AbstractLombokParsingTestCase { - public void testAccessors() throws Exception { + public void testAccessors$Accessors() throws Exception { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java index d1d5a3fe0..bb017a167 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java @@ -10,107 +10,107 @@ public class BuilderTest extends AbstractLombokParsingTestCase { // This test is lombok's homepage example. - public void testBuilderExample() throws IOException { + public void testBuilder$BuilderExample() throws IOException { doTest(); } // This test is lombok's homepage customized example. - public void testBuilderExampleCustomized() throws IOException { + public void testBuilder$BuilderExampleCustomized() throws IOException { doTest(); } - public void testBuilderSimple() throws IOException { + public void testBuilder$BuilderSimple() throws IOException { doTest(); } - public void testBuilderComplex() throws IOException { + public void testBuilder$BuilderComplex() throws IOException { doTest(); } - public void testBuilderChainAndFluent() throws IOException { + public void testBuilder$BuilderChainAndFluent() throws IOException { doTest(); } - public void testBuilderWithAccessors() throws IOException { + public void testBuilder$BuilderWithAccessors() throws IOException { doTest(); } // This test is lombok's homepage example with predefined elements and another inner class. - public void testBuilderPredefined() throws IOException { + public void testBuilder$BuilderPredefined() throws IOException { doTest(); } - public void testBuilderWithExistingBuilderClass() throws IOException { + public void testBuilder$BuilderWithExistingBuilderClass() throws IOException { doTest(); } - public void testBuilderConstructorException() throws IOException { + public void testBuilder$BuilderConstructorException() throws IOException { doTest(); } - public void testBuilderAndAllArgsConstructor() throws IOException { + public void testBuilder$BuilderAndAllArgsConstructor() throws IOException { doTest(); } - public void testBuilderMethodException() throws IOException { + public void testBuilder$BuilderMethodException() throws IOException { doTest(); } - public void testBuilderSingularGuavaListsSets() throws IOException { + public void testBuilder$BuilderSingularGuavaListsSets() throws IOException { doTest(); } - public void testBuilderSingularGuavaMaps() throws IOException { + public void testBuilder$BuilderSingularGuavaMaps() throws IOException { doTest(); } - public void testBuilderSingularSets() throws IOException { + public void testBuilder$BuilderSingularSets() throws IOException { doTest(); } - public void testBuilderSingularLists() throws IOException { + public void testBuilder$BuilderSingularLists() throws IOException { doTest(); } - public void testBuilderSingularMaps() throws IOException { + public void testBuilder$BuilderSingularMaps() throws IOException { doTest(); } // ignored because of disabled auto singularization - public void ignore_testBuilderSingularNoAuto() throws IOException { + public void ignore_testBuilder$BuilderSingularNoAuto() throws IOException { doTest(); } - public void testBuilderSingularRedirectToGuava() throws IOException { + public void testBuilder$BuilderSingularRedirectToGuava() throws IOException { doTest(); } // TODO implement me - public void ignore_testBuilderInstanceMethod() throws IOException { + public void ignore_testBuilder$BuilderInstanceMethod() throws IOException { doTest(); } - public void testBuilderSingularWithPrefixes() throws IOException { + public void testBuilder$BuilderSingularWithPrefixes() throws IOException { doTest(); } // TODO implement me - public void ignore_testBuilderWithToBuilder() throws IOException { + public void ignore_testBuilder$BuilderWithToBuilder() throws IOException { doTest(); } // TODO fixme - public void ignore_testBuilderWithToBuilderOnClass() throws IOException { + public void ignore_testBuilder$BuilderWithToBuilderOnClass() throws IOException { doTest(); } // TODO fixme - public void ignore_testBuilderWithToBuilderOnConstructor() throws IOException { + public void ignore_testBuilder$BuilderWithToBuilderOnConstructor() throws IOException { doTest(); } // TODO fixme - public void ignore_testBuilderWithToBuilderOnMethod() throws IOException { + public void ignore_testBuilder$BuilderWithToBuilderOnMethod() throws IOException { doTest(); } } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/ConstructorTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/ConstructorTest.java index 2ca14faf3..4e78afb2d 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/ConstructorTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/ConstructorTest.java @@ -9,27 +9,27 @@ */ public class ConstructorTest extends AbstractLombokParsingTestCase { - public void testConstructors() throws IOException { + public void testConstructors$Constructors() throws IOException { doTest(); } - public void testConflictingStaticConstructorNames() throws IOException { + public void testConstructors$ConflictingStaticConstructorNames() throws IOException { doTest(); } - public void testNoArgsConstructorForced() throws IOException { + public void testConstructors$NoArgsConstructorForced() throws IOException { doTest(); } - public void testConstructorEnum() throws IOException { + public void testConstructors$ConstructorEnum() throws IOException { doTest(); } - public void testRequiredArgsConstructorWithGeneric136() throws IOException { + public void testConstructors$RequiredArgsConstructorWithGeneric136() throws IOException { doTest(); } - public void testRequiredArgsConstructorWithGeneric157() throws IOException { + public void testConstructors$RequiredArgsConstructorWithGeneric157() throws IOException { doTest(); } } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/DataTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/DataTest.java index 64f439bb4..3d5c76e22 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/DataTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/DataTest.java @@ -13,40 +13,40 @@ protected boolean shouldCompareCodeBlocks() { return false; } - public void testDataExtended() throws IOException { + public void testData$DataExtended() throws IOException { doTest(); } - public void testDataIgnore() throws IOException { + public void testData$DataIgnore() throws IOException { doTest(); } - public void testDataOnEnum() throws IOException { + public void testData$DataOnEnum() throws IOException { doTest(); } - public void testDataOnLocalClass() throws IOException { + public void testData$DataOnLocalClass() throws IOException { doTest(); } - public void testDataPlain() throws IOException { + public void testData$DataPlain() throws IOException { doTest(); } - public void testDataWithGetter() throws IOException { + public void testData$DataWithGetter() throws IOException { doTest(); } - public void testDataWithGetterNone() throws IOException { + public void testData$DataWithGetterNone() throws IOException { doTest(); } - public void testDataStaticConstructor() throws IOException { + public void testData$DataStaticConstructor() throws IOException { // Test for issue #9 doTest(); } - public void testDataWithGeneric176() throws IOException { + public void testData$DataWithGeneric176() throws IOException { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/DelegateTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/DelegateTest.java index 4e31dc9ad..dec2db4e0 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/DelegateTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/DelegateTest.java @@ -7,36 +7,36 @@ */ public class DelegateTest extends AbstractLombokParsingTestCase { - public void ignore_testDelegateOnGetter() throws Exception { + public void ignore_testDelegate$DelegateOnGetter() throws Exception { //TODO known problem, try to fix later doTest(); } - public void testDelegateOnGetterNone() throws Exception { + public void testDelegate$DelegateOnGetterNone() throws Exception { doTest(); } - public void testDelegateOnMethods() throws Exception { + public void testDelegate$DelegateOnMethods() throws Exception { doTest(); } - public void testDelegateRecursion() throws Exception { + public void testDelegate$DelegateRecursion() throws Exception { doTest(); } - public void testDelegateTypesAndExcludes() throws Exception { + public void testDelegate$DelegateTypesAndExcludes() throws Exception { doTest(); } - public void testDelegateWithDeprecated() throws Exception { + public void testDelegate$DelegateWithDeprecated() throws Exception { doTest(); } - public void testDelegateWithException() throws Exception { + public void testDelegate$DelegateWithException() throws Exception { doTest(); } - public void testDelegateGenericInterfaceIssue88() throws Exception { + public void testDelegate$DelegateGenericInterfaceIssue88() throws Exception { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/GetterTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/GetterTest.java index c73b60a49..eb4bcd569 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/GetterTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/GetterTest.java @@ -13,95 +13,95 @@ protected boolean shouldCompareCodeBlocks() { return false; } - public void testGetterAccessLevel() throws IOException { + public void testGetter$GetterAccessLevel() throws IOException { doTest(); } - public void testGetterAlreadyExists() throws IOException { + public void testGetter$GetterAlreadyExists() throws IOException { doTest(); } - public void testGetterBoolean() throws IOException { + public void testGetter$GetterBoolean() throws IOException { doTest(); } - public void testGetterDeprecated() throws IOException { + public void testGetter$GetterDeprecated() throws IOException { doTest(); } - public void testGetterEnum() throws IOException { + public void testGetter$GetterEnum() throws IOException { doTest(); } - public void ignore_testGetterLazy() throws IOException { + public void ignore_testGetter$GetterLazy() throws IOException { //TODO known problem, try to fix later doTest(); } - public void ignore_testGetterLazyBoolean() throws IOException { + public void ignore_testGetter$GetterLazyBoolean() throws IOException { //TODO known problem, try to fix later doTest(); } - public void ignore_testGetterLazyEahcToString() throws IOException { + public void ignore_testGetter$GetterLazyEahcToString() throws IOException { //TODO known problem, try to fix later doTest(); } - public void testGetterLazyInvalid() throws IOException { + public void testGetter$GetterLazyInvalid() throws IOException { doTest(); } - public void ignore_testGetterLazyNative() throws IOException { + public void ignore_testGetter$GetterLazyNative() throws IOException { //TODO known problem, try to fix later doTest(); } - public void testGetterNone() throws IOException { + public void testGetter$GetterNone() throws IOException { doTest(); } - public void testGetterOnClass() throws IOException { + public void testGetter$GetterOnClass() throws IOException { doTest(); } - public void testGetterOnMethod() throws IOException { + public void testGetter$GetterOnMethod() throws IOException { doTest(); } - public void testGetterOnMethodErrors() throws IOException { + public void testGetter$GetterOnMethodErrors() throws IOException { doTest(); } - public void testGetterOnMethodErrors2() throws IOException { + public void testGetter$GetterOnMethodErrors2() throws IOException { doTest(); } - public void testGetterOnStatic() throws IOException { + public void testGetter$GetterOnStatic() throws IOException { doTest(); } - public void testGetterPlain() throws IOException { + public void testGetter$GetterPlain() throws IOException { doTest(); } - public void testGetterWithDollar() throws IOException { + public void testGetter$GetterWithDollar() throws IOException { doTest(); } - public void testMultiFieldGetter() throws IOException { + public void testGetter$MultiFieldGetter() throws IOException { doTest(); } - public void testTrickyTypeResolution() throws IOException { + public void testGetter$TrickyTypeResolution() throws IOException { doTest(); } - public void testClassNamedAfterGetter() throws IOException { + public void testGetter$ClassNamedAfterGetter() throws IOException { doTest(); } - public void testCommentsInterspersed() throws IOException { + public void testGetter$CommentsInterspersed() throws IOException { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/IntelliJLombokPluginTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/IntelliJLombokPluginTest.java index dcc908357..7070fd9ac 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/IntelliJLombokPluginTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/IntelliJLombokPluginTest.java @@ -26,12 +26,4 @@ public void ignore_testSynchronizedPlain() throws IOException { doTest(); } - public void testClassNamedAfterGetter() throws IOException { - doTest(); - } - - public void testCommentsInterspersed() throws IOException { - doTest(); - } - } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/LoggerTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/LoggerTest.java index e3a5457de..75490c9f8 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/LoggerTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/LoggerTest.java @@ -9,43 +9,43 @@ */ public class LoggerTest extends AbstractLombokParsingTestCase { - public void testLoggerCommons() throws IOException { + public void testLogger$LoggerCommons() throws IOException { doTest(); } - public void testLoggerJul() throws IOException { + public void testLogger$LoggerJul() throws IOException { doTest(); } - public void testLoggerLog4j() throws IOException { + public void testLogger$LoggerLog4j() throws IOException { doTest(); } - public void testLoggerLog4j2() throws IOException { + public void testLogger$LoggerLog4j2() throws IOException { doTest(); } - public void testLoggerSlf4j() throws IOException { + public void testLogger$LoggerSlf4j() throws IOException { doTest(); } - public void testLoggerSlf4jAlreadyExists() throws IOException { + public void testLogger$LoggerSlf4jAlreadyExists() throws IOException { doTest(); } - public void testLoggerSlf4jOnNonType() throws IOException { + public void testLogger$LoggerSlf4jOnNonType() throws IOException { doTest(); } - public void testLoggerSlf4jTypes() throws IOException { + public void testLogger$LoggerSlf4jTypes() throws IOException { doTest(); } - public void testLoggerSlf4jWithPackage() throws IOException { + public void testLogger$LoggerSlf4jWithPackage() throws IOException { doTest(); } - public void testLoggerXSlf4j() throws IOException { + public void testLogger$LoggerXSlf4j() throws IOException { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/SetterTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/SetterTest.java index edcaa3922..9af19659c 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/SetterTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/SetterTest.java @@ -9,35 +9,35 @@ */ public class SetterTest extends AbstractLombokParsingTestCase { - public void testSetterAccessLevel() throws IOException { + public void testSetter$SetterAccessLevel() throws IOException { doTest(); } - public void testSetterAlreadyExists() throws IOException { + public void testSetter$SetterAlreadyExists() throws IOException { doTest(); } - public void testSetterDeprecated() throws IOException { + public void testSetter$SetterDeprecated() throws IOException { doTest(); } - public void testSetterOnClass() throws IOException { + public void testSetter$SetterOnClass() throws IOException { doTest(); } - public void testSetterOnMethodOnParam() throws IOException { + public void testSetter$SetterOnMethodOnParam() throws IOException { doTest(); } - public void testSetterOnStatic() throws IOException { + public void testSetter$SetterOnStatic() throws IOException { doTest(); } - public void testSetterPlain() throws IOException { + public void testSetter$SetterPlain() throws IOException { doTest(); } - public void testSetterWithDollar() throws IOException { + public void testSetter$SetterWithDollar() throws IOException { doTest(); } } \ No newline at end of file diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/WitherTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/WitherTest.java index 3d760fd32..cde095f6c 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/WitherTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/WitherTest.java @@ -10,39 +10,39 @@ protected boolean shouldCompareCodeBlocks() { return false; } - public void testWitherAccessLevel() throws IOException { + public void testWither$WitherAccessLevel() throws IOException { doTest(); } - public void testWitherAlreadyExists() throws IOException { + public void testWither$WitherAlreadyExists() throws IOException { doTest(); } - public void testWitherAndAllArgsConstructor() throws IOException { + public void testWither$WitherAndAllArgsConstructor() throws IOException { doTest(); } - public void testWitherDeprecated() throws IOException { + public void testWither$WitherDeprecated() throws IOException { doTest(); } - public void testWitherOnClass() throws IOException { + public void testWither$WitherOnClass() throws IOException { doTest(); } - public void testWitherOnStatic() throws IOException { + public void testWither$WitherOnStatic() throws IOException { doTest(); } - public void testWitherPlain() throws IOException { + public void testWither$WitherPlain() throws IOException { doTest(); } - public void testWitherWithDollar() throws IOException { + public void testWither$WitherWithDollar() throws IOException { doTest(); } - public void testWitherWithGenerics() throws IOException { + public void testWither$WitherWithGenerics() throws IOException { doTest(); } } \ No newline at end of file diff --git a/testData/after/Accessors.java b/testData/after/accessors/Accessors.java similarity index 100% rename from testData/after/Accessors.java rename to testData/after/accessors/Accessors.java diff --git a/testData/after/BuilderAndAllArgsConstructor.java b/testData/after/builder/BuilderAndAllArgsConstructor.java similarity index 100% rename from testData/after/BuilderAndAllArgsConstructor.java rename to testData/after/builder/BuilderAndAllArgsConstructor.java diff --git a/testData/after/BuilderChainAndFluent.java b/testData/after/builder/BuilderChainAndFluent.java similarity index 100% rename from testData/after/BuilderChainAndFluent.java rename to testData/after/builder/BuilderChainAndFluent.java diff --git a/testData/after/BuilderComplex.java b/testData/after/builder/BuilderComplex.java similarity index 100% rename from testData/after/BuilderComplex.java rename to testData/after/builder/BuilderComplex.java diff --git a/testData/after/BuilderConstructorException.java b/testData/after/builder/BuilderConstructorException.java similarity index 100% rename from testData/after/BuilderConstructorException.java rename to testData/after/builder/BuilderConstructorException.java diff --git a/testData/after/BuilderExample.java b/testData/after/builder/BuilderExample.java similarity index 100% rename from testData/after/BuilderExample.java rename to testData/after/builder/BuilderExample.java diff --git a/testData/after/BuilderExampleCustomized.java b/testData/after/builder/BuilderExampleCustomized.java similarity index 100% rename from testData/after/BuilderExampleCustomized.java rename to testData/after/builder/BuilderExampleCustomized.java diff --git a/testData/after/BuilderInstanceMethod.java b/testData/after/builder/BuilderInstanceMethod.java similarity index 100% rename from testData/after/BuilderInstanceMethod.java rename to testData/after/builder/BuilderInstanceMethod.java diff --git a/testData/after/BuilderMethodException.java b/testData/after/builder/BuilderMethodException.java similarity index 100% rename from testData/after/BuilderMethodException.java rename to testData/after/builder/BuilderMethodException.java diff --git a/testData/after/BuilderPredefined.java b/testData/after/builder/BuilderPredefined.java similarity index 100% rename from testData/after/BuilderPredefined.java rename to testData/after/builder/BuilderPredefined.java diff --git a/testData/after/BuilderSimple.java b/testData/after/builder/BuilderSimple.java similarity index 100% rename from testData/after/BuilderSimple.java rename to testData/after/builder/BuilderSimple.java diff --git a/testData/after/BuilderSingularGuavaListsSets.java b/testData/after/builder/BuilderSingularGuavaListsSets.java similarity index 100% rename from testData/after/BuilderSingularGuavaListsSets.java rename to testData/after/builder/BuilderSingularGuavaListsSets.java diff --git a/testData/after/BuilderSingularGuavaMaps.java b/testData/after/builder/BuilderSingularGuavaMaps.java similarity index 100% rename from testData/after/BuilderSingularGuavaMaps.java rename to testData/after/builder/BuilderSingularGuavaMaps.java diff --git a/testData/after/BuilderSingularLists.java b/testData/after/builder/BuilderSingularLists.java similarity index 100% rename from testData/after/BuilderSingularLists.java rename to testData/after/builder/BuilderSingularLists.java diff --git a/testData/after/BuilderSingularMaps.java b/testData/after/builder/BuilderSingularMaps.java similarity index 100% rename from testData/after/BuilderSingularMaps.java rename to testData/after/builder/BuilderSingularMaps.java diff --git a/testData/after/BuilderSingularNoAuto.java b/testData/after/builder/BuilderSingularNoAuto.java similarity index 100% rename from testData/after/BuilderSingularNoAuto.java rename to testData/after/builder/BuilderSingularNoAuto.java diff --git a/testData/after/BuilderSingularRedirectToGuava.java b/testData/after/builder/BuilderSingularRedirectToGuava.java similarity index 100% rename from testData/after/BuilderSingularRedirectToGuava.java rename to testData/after/builder/BuilderSingularRedirectToGuava.java diff --git a/testData/after/BuilderSingularSets.java b/testData/after/builder/BuilderSingularSets.java similarity index 100% rename from testData/after/BuilderSingularSets.java rename to testData/after/builder/BuilderSingularSets.java diff --git a/testData/after/BuilderSingularWithPrefixes.java b/testData/after/builder/BuilderSingularWithPrefixes.java similarity index 100% rename from testData/after/BuilderSingularWithPrefixes.java rename to testData/after/builder/BuilderSingularWithPrefixes.java diff --git a/testData/after/BuilderWithAccessors.java b/testData/after/builder/BuilderWithAccessors.java similarity index 100% rename from testData/after/BuilderWithAccessors.java rename to testData/after/builder/BuilderWithAccessors.java diff --git a/testData/after/BuilderWithExistingBuilderClass.java b/testData/after/builder/BuilderWithExistingBuilderClass.java similarity index 100% rename from testData/after/BuilderWithExistingBuilderClass.java rename to testData/after/builder/BuilderWithExistingBuilderClass.java diff --git a/testData/after/BuilderWithToBuilder.java b/testData/after/builder/BuilderWithToBuilder.java similarity index 100% rename from testData/after/BuilderWithToBuilder.java rename to testData/after/builder/BuilderWithToBuilder.java diff --git a/testData/after/BuilderWithToBuilderOnClass.java b/testData/after/builder/BuilderWithToBuilderOnClass.java similarity index 100% rename from testData/after/BuilderWithToBuilderOnClass.java rename to testData/after/builder/BuilderWithToBuilderOnClass.java diff --git a/testData/after/BuilderWithToBuilderOnConstructor.java b/testData/after/builder/BuilderWithToBuilderOnConstructor.java similarity index 100% rename from testData/after/BuilderWithToBuilderOnConstructor.java rename to testData/after/builder/BuilderWithToBuilderOnConstructor.java diff --git a/testData/after/BuilderWithToBuilderOnMethod.java b/testData/after/builder/BuilderWithToBuilderOnMethod.java similarity index 100% rename from testData/after/BuilderWithToBuilderOnMethod.java rename to testData/after/builder/BuilderWithToBuilderOnMethod.java diff --git a/testData/after/ConflictingStaticConstructorNames.java b/testData/after/constructors/ConflictingStaticConstructorNames.java similarity index 100% rename from testData/after/ConflictingStaticConstructorNames.java rename to testData/after/constructors/ConflictingStaticConstructorNames.java diff --git a/testData/after/ConstructorEnum.java b/testData/after/constructors/ConstructorEnum.java similarity index 100% rename from testData/after/ConstructorEnum.java rename to testData/after/constructors/ConstructorEnum.java diff --git a/testData/after/Constructors.java b/testData/after/constructors/Constructors.java similarity index 100% rename from testData/after/Constructors.java rename to testData/after/constructors/Constructors.java diff --git a/testData/after/NoArgsConstructorForced.java b/testData/after/constructors/NoArgsConstructorForced.java similarity index 100% rename from testData/after/NoArgsConstructorForced.java rename to testData/after/constructors/NoArgsConstructorForced.java diff --git a/testData/after/RequiredArgsConstructorWithGeneric136.java b/testData/after/constructors/RequiredArgsConstructorWithGeneric136.java similarity index 100% rename from testData/after/RequiredArgsConstructorWithGeneric136.java rename to testData/after/constructors/RequiredArgsConstructorWithGeneric136.java diff --git a/testData/after/RequiredArgsConstructorWithGeneric157.java b/testData/after/constructors/RequiredArgsConstructorWithGeneric157.java similarity index 100% rename from testData/after/RequiredArgsConstructorWithGeneric157.java rename to testData/after/constructors/RequiredArgsConstructorWithGeneric157.java diff --git a/testData/after/DataExtended.java b/testData/after/data/DataExtended.java similarity index 100% rename from testData/after/DataExtended.java rename to testData/after/data/DataExtended.java diff --git a/testData/after/DataIgnore.java b/testData/after/data/DataIgnore.java similarity index 100% rename from testData/after/DataIgnore.java rename to testData/after/data/DataIgnore.java diff --git a/testData/after/DataOnEnum.java b/testData/after/data/DataOnEnum.java similarity index 100% rename from testData/after/DataOnEnum.java rename to testData/after/data/DataOnEnum.java diff --git a/testData/after/DataOnLocalClass.java b/testData/after/data/DataOnLocalClass.java similarity index 100% rename from testData/after/DataOnLocalClass.java rename to testData/after/data/DataOnLocalClass.java diff --git a/testData/after/DataPlain.java b/testData/after/data/DataPlain.java similarity index 100% rename from testData/after/DataPlain.java rename to testData/after/data/DataPlain.java diff --git a/testData/after/DataStaticConstructor.java b/testData/after/data/DataStaticConstructor.java similarity index 100% rename from testData/after/DataStaticConstructor.java rename to testData/after/data/DataStaticConstructor.java diff --git a/testData/after/DataWithGeneric176.java b/testData/after/data/DataWithGeneric176.java similarity index 100% rename from testData/after/DataWithGeneric176.java rename to testData/after/data/DataWithGeneric176.java diff --git a/testData/after/DataWithGetter.java b/testData/after/data/DataWithGetter.java similarity index 100% rename from testData/after/DataWithGetter.java rename to testData/after/data/DataWithGetter.java diff --git a/testData/after/DataWithGetterNone.java b/testData/after/data/DataWithGetterNone.java similarity index 100% rename from testData/after/DataWithGetterNone.java rename to testData/after/data/DataWithGetterNone.java diff --git a/testData/after/DelegateGenericInterfaceIssue88.java b/testData/after/delegate/DelegateGenericInterfaceIssue88.java similarity index 100% rename from testData/after/DelegateGenericInterfaceIssue88.java rename to testData/after/delegate/DelegateGenericInterfaceIssue88.java diff --git a/testData/after/DelegateOnGetter.java b/testData/after/delegate/DelegateOnGetter.java similarity index 100% rename from testData/after/DelegateOnGetter.java rename to testData/after/delegate/DelegateOnGetter.java diff --git a/testData/after/DelegateOnGetterNone.java b/testData/after/delegate/DelegateOnGetterNone.java similarity index 100% rename from testData/after/DelegateOnGetterNone.java rename to testData/after/delegate/DelegateOnGetterNone.java diff --git a/testData/after/DelegateOnMethods.java b/testData/after/delegate/DelegateOnMethods.java similarity index 100% rename from testData/after/DelegateOnMethods.java rename to testData/after/delegate/DelegateOnMethods.java diff --git a/testData/after/DelegateRecursion.java b/testData/after/delegate/DelegateRecursion.java similarity index 100% rename from testData/after/DelegateRecursion.java rename to testData/after/delegate/DelegateRecursion.java diff --git a/testData/after/DelegateTypesAndExcludes.java b/testData/after/delegate/DelegateTypesAndExcludes.java similarity index 100% rename from testData/after/DelegateTypesAndExcludes.java rename to testData/after/delegate/DelegateTypesAndExcludes.java diff --git a/testData/after/DelegateWithDeprecated.java b/testData/after/delegate/DelegateWithDeprecated.java similarity index 100% rename from testData/after/DelegateWithDeprecated.java rename to testData/after/delegate/DelegateWithDeprecated.java diff --git a/testData/after/DelegateWithException.java b/testData/after/delegate/DelegateWithException.java similarity index 100% rename from testData/after/DelegateWithException.java rename to testData/after/delegate/DelegateWithException.java diff --git a/testData/after/ClassNamedAfterGetter.java b/testData/after/getter/ClassNamedAfterGetter.java similarity index 100% rename from testData/after/ClassNamedAfterGetter.java rename to testData/after/getter/ClassNamedAfterGetter.java diff --git a/testData/after/CommentsInterspersed.java b/testData/after/getter/CommentsInterspersed.java similarity index 100% rename from testData/after/CommentsInterspersed.java rename to testData/after/getter/CommentsInterspersed.java diff --git a/testData/after/GetterAccessLevel.java b/testData/after/getter/GetterAccessLevel.java similarity index 100% rename from testData/after/GetterAccessLevel.java rename to testData/after/getter/GetterAccessLevel.java diff --git a/testData/after/GetterAlreadyExists.java b/testData/after/getter/GetterAlreadyExists.java similarity index 100% rename from testData/after/GetterAlreadyExists.java rename to testData/after/getter/GetterAlreadyExists.java diff --git a/testData/after/GetterBoolean.java b/testData/after/getter/GetterBoolean.java similarity index 100% rename from testData/after/GetterBoolean.java rename to testData/after/getter/GetterBoolean.java diff --git a/testData/after/GetterDeprecated.java b/testData/after/getter/GetterDeprecated.java similarity index 100% rename from testData/after/GetterDeprecated.java rename to testData/after/getter/GetterDeprecated.java diff --git a/testData/after/GetterEnum.java b/testData/after/getter/GetterEnum.java similarity index 100% rename from testData/after/GetterEnum.java rename to testData/after/getter/GetterEnum.java diff --git a/testData/after/GetterLazy.java b/testData/after/getter/GetterLazy.java similarity index 100% rename from testData/after/GetterLazy.java rename to testData/after/getter/GetterLazy.java diff --git a/testData/after/GetterLazyBoolean.java b/testData/after/getter/GetterLazyBoolean.java similarity index 100% rename from testData/after/GetterLazyBoolean.java rename to testData/after/getter/GetterLazyBoolean.java diff --git a/testData/after/GetterLazyEahcToString.java b/testData/after/getter/GetterLazyEahcToString.java similarity index 100% rename from testData/after/GetterLazyEahcToString.java rename to testData/after/getter/GetterLazyEahcToString.java diff --git a/testData/after/GetterLazyInvalid.java b/testData/after/getter/GetterLazyInvalid.java similarity index 100% rename from testData/after/GetterLazyInvalid.java rename to testData/after/getter/GetterLazyInvalid.java diff --git a/testData/after/GetterLazyNative.java b/testData/after/getter/GetterLazyNative.java similarity index 100% rename from testData/after/GetterLazyNative.java rename to testData/after/getter/GetterLazyNative.java diff --git a/testData/after/GetterNone.java b/testData/after/getter/GetterNone.java similarity index 100% rename from testData/after/GetterNone.java rename to testData/after/getter/GetterNone.java diff --git a/testData/after/GetterOnClass.java b/testData/after/getter/GetterOnClass.java similarity index 100% rename from testData/after/GetterOnClass.java rename to testData/after/getter/GetterOnClass.java diff --git a/testData/after/GetterOnMethod.java b/testData/after/getter/GetterOnMethod.java similarity index 100% rename from testData/after/GetterOnMethod.java rename to testData/after/getter/GetterOnMethod.java diff --git a/testData/after/GetterOnMethodErrors.java b/testData/after/getter/GetterOnMethodErrors.java similarity index 100% rename from testData/after/GetterOnMethodErrors.java rename to testData/after/getter/GetterOnMethodErrors.java diff --git a/testData/after/GetterOnMethodErrors2.java b/testData/after/getter/GetterOnMethodErrors2.java similarity index 100% rename from testData/after/GetterOnMethodErrors2.java rename to testData/after/getter/GetterOnMethodErrors2.java diff --git a/testData/after/GetterOnStatic.java b/testData/after/getter/GetterOnStatic.java similarity index 100% rename from testData/after/GetterOnStatic.java rename to testData/after/getter/GetterOnStatic.java diff --git a/testData/after/GetterPlain.java b/testData/after/getter/GetterPlain.java similarity index 100% rename from testData/after/GetterPlain.java rename to testData/after/getter/GetterPlain.java diff --git a/testData/after/GetterWithDollar.java b/testData/after/getter/GetterWithDollar.java similarity index 100% rename from testData/after/GetterWithDollar.java rename to testData/after/getter/GetterWithDollar.java diff --git a/testData/after/MultiFieldGetter.java b/testData/after/getter/MultiFieldGetter.java similarity index 100% rename from testData/after/MultiFieldGetter.java rename to testData/after/getter/MultiFieldGetter.java diff --git a/testData/after/TrickyTypeResolution.java b/testData/after/getter/TrickyTypeResolution.java similarity index 100% rename from testData/after/TrickyTypeResolution.java rename to testData/after/getter/TrickyTypeResolution.java diff --git a/testData/after/LoggerCommons.java b/testData/after/logger/LoggerCommons.java similarity index 100% rename from testData/after/LoggerCommons.java rename to testData/after/logger/LoggerCommons.java diff --git a/testData/after/LoggerJul.java b/testData/after/logger/LoggerJul.java similarity index 100% rename from testData/after/LoggerJul.java rename to testData/after/logger/LoggerJul.java diff --git a/testData/after/LoggerLog4j.java b/testData/after/logger/LoggerLog4j.java similarity index 100% rename from testData/after/LoggerLog4j.java rename to testData/after/logger/LoggerLog4j.java diff --git a/testData/after/LoggerLog4j2.java b/testData/after/logger/LoggerLog4j2.java similarity index 100% rename from testData/after/LoggerLog4j2.java rename to testData/after/logger/LoggerLog4j2.java diff --git a/testData/after/LoggerSlf4j.java b/testData/after/logger/LoggerSlf4j.java similarity index 100% rename from testData/after/LoggerSlf4j.java rename to testData/after/logger/LoggerSlf4j.java diff --git a/testData/after/LoggerSlf4jAlreadyExists.java b/testData/after/logger/LoggerSlf4jAlreadyExists.java similarity index 100% rename from testData/after/LoggerSlf4jAlreadyExists.java rename to testData/after/logger/LoggerSlf4jAlreadyExists.java diff --git a/testData/after/LoggerSlf4jOnNonType.java b/testData/after/logger/LoggerSlf4jOnNonType.java similarity index 100% rename from testData/after/LoggerSlf4jOnNonType.java rename to testData/after/logger/LoggerSlf4jOnNonType.java diff --git a/testData/after/LoggerSlf4jTypes.java b/testData/after/logger/LoggerSlf4jTypes.java similarity index 100% rename from testData/after/LoggerSlf4jTypes.java rename to testData/after/logger/LoggerSlf4jTypes.java diff --git a/testData/after/LoggerSlf4jWithPackage.java b/testData/after/logger/LoggerSlf4jWithPackage.java similarity index 100% rename from testData/after/LoggerSlf4jWithPackage.java rename to testData/after/logger/LoggerSlf4jWithPackage.java diff --git a/testData/after/LoggerXSlf4j.java b/testData/after/logger/LoggerXSlf4j.java similarity index 100% rename from testData/after/LoggerXSlf4j.java rename to testData/after/logger/LoggerXSlf4j.java diff --git a/testData/after/SetterAccessLevel.java b/testData/after/setter/SetterAccessLevel.java similarity index 100% rename from testData/after/SetterAccessLevel.java rename to testData/after/setter/SetterAccessLevel.java diff --git a/testData/after/SetterAlreadyExists.java b/testData/after/setter/SetterAlreadyExists.java similarity index 100% rename from testData/after/SetterAlreadyExists.java rename to testData/after/setter/SetterAlreadyExists.java diff --git a/testData/after/SetterDeprecated.java b/testData/after/setter/SetterDeprecated.java similarity index 100% rename from testData/after/SetterDeprecated.java rename to testData/after/setter/SetterDeprecated.java diff --git a/testData/after/SetterOnClass.java b/testData/after/setter/SetterOnClass.java similarity index 100% rename from testData/after/SetterOnClass.java rename to testData/after/setter/SetterOnClass.java diff --git a/testData/after/SetterOnMethodOnParam.java b/testData/after/setter/SetterOnMethodOnParam.java similarity index 100% rename from testData/after/SetterOnMethodOnParam.java rename to testData/after/setter/SetterOnMethodOnParam.java diff --git a/testData/after/SetterOnStatic.java b/testData/after/setter/SetterOnStatic.java similarity index 100% rename from testData/after/SetterOnStatic.java rename to testData/after/setter/SetterOnStatic.java diff --git a/testData/after/SetterPlain.java b/testData/after/setter/SetterPlain.java similarity index 100% rename from testData/after/SetterPlain.java rename to testData/after/setter/SetterPlain.java diff --git a/testData/after/SetterWithDollar.java b/testData/after/setter/SetterWithDollar.java similarity index 100% rename from testData/after/SetterWithDollar.java rename to testData/after/setter/SetterWithDollar.java diff --git a/testData/after/TrickyTypeResolution2.java b/testData/after/val/TrickyTypeResolution2.java similarity index 100% rename from testData/after/TrickyTypeResolution2.java rename to testData/after/val/TrickyTypeResolution2.java diff --git a/testData/after/ValComplex.java b/testData/after/val/ValComplex.java similarity index 100% rename from testData/after/ValComplex.java rename to testData/after/val/ValComplex.java diff --git a/testData/after/ValErrors.java b/testData/after/val/ValErrors.java similarity index 100% rename from testData/after/ValErrors.java rename to testData/after/val/ValErrors.java diff --git a/testData/after/ValInBasicFor.java b/testData/after/val/ValInBasicFor.java similarity index 100% rename from testData/after/ValInBasicFor.java rename to testData/after/val/ValInBasicFor.java diff --git a/testData/after/ValInFor.java b/testData/after/val/ValInFor.java similarity index 100% rename from testData/after/ValInFor.java rename to testData/after/val/ValInFor.java diff --git a/testData/after/ValInMultiDeclaration.java b/testData/after/val/ValInMultiDeclaration.java similarity index 100% rename from testData/after/ValInMultiDeclaration.java rename to testData/after/val/ValInMultiDeclaration.java diff --git a/testData/after/ValInTryWithResources.java b/testData/after/val/ValInTryWithResources.java similarity index 100% rename from testData/after/ValInTryWithResources.java rename to testData/after/val/ValInTryWithResources.java diff --git a/testData/after/ValLessSimple.java b/testData/after/val/ValLessSimple.java similarity index 100% rename from testData/after/ValLessSimple.java rename to testData/after/val/ValLessSimple.java diff --git a/testData/after/ValLub.java b/testData/after/val/ValLub.java similarity index 100% rename from testData/after/ValLub.java rename to testData/after/val/ValLub.java diff --git a/testData/after/ValOutersWithGenerics.java b/testData/after/val/ValOutersWithGenerics.java similarity index 100% rename from testData/after/ValOutersWithGenerics.java rename to testData/after/val/ValOutersWithGenerics.java diff --git a/testData/after/ValRawType.java b/testData/after/val/ValRawType.java similarity index 100% rename from testData/after/ValRawType.java rename to testData/after/val/ValRawType.java diff --git a/testData/after/ValSimple.java b/testData/after/val/ValSimple.java similarity index 100% rename from testData/after/ValSimple.java rename to testData/after/val/ValSimple.java diff --git a/testData/after/ValWeirdTypes.java b/testData/after/val/ValWeirdTypes.java similarity index 100% rename from testData/after/ValWeirdTypes.java rename to testData/after/val/ValWeirdTypes.java diff --git a/testData/after/ValWithLabel.java b/testData/after/val/ValWithLabel.java similarity index 100% rename from testData/after/ValWithLabel.java rename to testData/after/val/ValWithLabel.java diff --git a/testData/after/WithInnerAnnotation.java b/testData/after/wither/WithInnerAnnotation.java similarity index 100% rename from testData/after/WithInnerAnnotation.java rename to testData/after/wither/WithInnerAnnotation.java diff --git a/testData/after/WitherAccessLevel.java b/testData/after/wither/WitherAccessLevel.java similarity index 100% rename from testData/after/WitherAccessLevel.java rename to testData/after/wither/WitherAccessLevel.java diff --git a/testData/after/WitherAlreadyExists.java b/testData/after/wither/WitherAlreadyExists.java similarity index 100% rename from testData/after/WitherAlreadyExists.java rename to testData/after/wither/WitherAlreadyExists.java diff --git a/testData/after/WitherAndAllArgsConstructor.java b/testData/after/wither/WitherAndAllArgsConstructor.java similarity index 100% rename from testData/after/WitherAndAllArgsConstructor.java rename to testData/after/wither/WitherAndAllArgsConstructor.java diff --git a/testData/after/WitherDeprecated.java b/testData/after/wither/WitherDeprecated.java similarity index 100% rename from testData/after/WitherDeprecated.java rename to testData/after/wither/WitherDeprecated.java diff --git a/testData/after/WitherOnClass.java b/testData/after/wither/WitherOnClass.java similarity index 100% rename from testData/after/WitherOnClass.java rename to testData/after/wither/WitherOnClass.java diff --git a/testData/after/WitherOnStatic.java b/testData/after/wither/WitherOnStatic.java similarity index 100% rename from testData/after/WitherOnStatic.java rename to testData/after/wither/WitherOnStatic.java diff --git a/testData/after/WitherPlain.java b/testData/after/wither/WitherPlain.java similarity index 100% rename from testData/after/WitherPlain.java rename to testData/after/wither/WitherPlain.java diff --git a/testData/after/WitherWithDollar.java b/testData/after/wither/WitherWithDollar.java similarity index 100% rename from testData/after/WitherWithDollar.java rename to testData/after/wither/WitherWithDollar.java diff --git a/testData/after/WitherWithGenerics.java b/testData/after/wither/WitherWithGenerics.java similarity index 100% rename from testData/after/WitherWithGenerics.java rename to testData/after/wither/WitherWithGenerics.java diff --git a/testData/before/Accessors.java b/testData/before/accessors/Accessors.java similarity index 100% rename from testData/before/Accessors.java rename to testData/before/accessors/Accessors.java diff --git a/testData/before/BuilderAndAllArgsConstructor.java b/testData/before/builder/BuilderAndAllArgsConstructor.java similarity index 100% rename from testData/before/BuilderAndAllArgsConstructor.java rename to testData/before/builder/BuilderAndAllArgsConstructor.java diff --git a/testData/before/BuilderChainAndFluent.java b/testData/before/builder/BuilderChainAndFluent.java similarity index 100% rename from testData/before/BuilderChainAndFluent.java rename to testData/before/builder/BuilderChainAndFluent.java diff --git a/testData/before/BuilderComplex.java b/testData/before/builder/BuilderComplex.java similarity index 100% rename from testData/before/BuilderComplex.java rename to testData/before/builder/BuilderComplex.java diff --git a/testData/before/BuilderConstructorException.java b/testData/before/builder/BuilderConstructorException.java similarity index 100% rename from testData/before/BuilderConstructorException.java rename to testData/before/builder/BuilderConstructorException.java diff --git a/testData/before/BuilderExample.java b/testData/before/builder/BuilderExample.java similarity index 100% rename from testData/before/BuilderExample.java rename to testData/before/builder/BuilderExample.java diff --git a/testData/before/BuilderExampleCustomized.java b/testData/before/builder/BuilderExampleCustomized.java similarity index 100% rename from testData/before/BuilderExampleCustomized.java rename to testData/before/builder/BuilderExampleCustomized.java diff --git a/testData/before/BuilderInstanceMethod.java b/testData/before/builder/BuilderInstanceMethod.java similarity index 100% rename from testData/before/BuilderInstanceMethod.java rename to testData/before/builder/BuilderInstanceMethod.java diff --git a/testData/before/BuilderMethodException.java b/testData/before/builder/BuilderMethodException.java similarity index 100% rename from testData/before/BuilderMethodException.java rename to testData/before/builder/BuilderMethodException.java diff --git a/testData/before/BuilderPredefined.java b/testData/before/builder/BuilderPredefined.java similarity index 100% rename from testData/before/BuilderPredefined.java rename to testData/before/builder/BuilderPredefined.java diff --git a/testData/before/BuilderSimple.java b/testData/before/builder/BuilderSimple.java similarity index 100% rename from testData/before/BuilderSimple.java rename to testData/before/builder/BuilderSimple.java diff --git a/testData/before/BuilderSingularGuavaListsSets.java b/testData/before/builder/BuilderSingularGuavaListsSets.java similarity index 100% rename from testData/before/BuilderSingularGuavaListsSets.java rename to testData/before/builder/BuilderSingularGuavaListsSets.java diff --git a/testData/before/BuilderSingularGuavaMaps.java b/testData/before/builder/BuilderSingularGuavaMaps.java similarity index 100% rename from testData/before/BuilderSingularGuavaMaps.java rename to testData/before/builder/BuilderSingularGuavaMaps.java diff --git a/testData/before/BuilderSingularLists.java b/testData/before/builder/BuilderSingularLists.java similarity index 100% rename from testData/before/BuilderSingularLists.java rename to testData/before/builder/BuilderSingularLists.java diff --git a/testData/before/BuilderSingularMaps.java b/testData/before/builder/BuilderSingularMaps.java similarity index 100% rename from testData/before/BuilderSingularMaps.java rename to testData/before/builder/BuilderSingularMaps.java diff --git a/testData/before/BuilderSingularNoAuto.java b/testData/before/builder/BuilderSingularNoAuto.java similarity index 100% rename from testData/before/BuilderSingularNoAuto.java rename to testData/before/builder/BuilderSingularNoAuto.java diff --git a/testData/before/BuilderSingularRedirectToGuava.java b/testData/before/builder/BuilderSingularRedirectToGuava.java similarity index 100% rename from testData/before/BuilderSingularRedirectToGuava.java rename to testData/before/builder/BuilderSingularRedirectToGuava.java diff --git a/testData/before/BuilderSingularSets.java b/testData/before/builder/BuilderSingularSets.java similarity index 100% rename from testData/before/BuilderSingularSets.java rename to testData/before/builder/BuilderSingularSets.java diff --git a/testData/before/BuilderSingularWithPrefixes.java b/testData/before/builder/BuilderSingularWithPrefixes.java similarity index 100% rename from testData/before/BuilderSingularWithPrefixes.java rename to testData/before/builder/BuilderSingularWithPrefixes.java diff --git a/testData/before/BuilderWithAccessors.java b/testData/before/builder/BuilderWithAccessors.java similarity index 100% rename from testData/before/BuilderWithAccessors.java rename to testData/before/builder/BuilderWithAccessors.java diff --git a/testData/before/BuilderWithExistingBuilderClass.java b/testData/before/builder/BuilderWithExistingBuilderClass.java similarity index 100% rename from testData/before/BuilderWithExistingBuilderClass.java rename to testData/before/builder/BuilderWithExistingBuilderClass.java diff --git a/testData/before/BuilderWithToBuilder.java b/testData/before/builder/BuilderWithToBuilder.java similarity index 100% rename from testData/before/BuilderWithToBuilder.java rename to testData/before/builder/BuilderWithToBuilder.java diff --git a/testData/before/BuilderWithToBuilderOnClass.java b/testData/before/builder/BuilderWithToBuilderOnClass.java similarity index 100% rename from testData/before/BuilderWithToBuilderOnClass.java rename to testData/before/builder/BuilderWithToBuilderOnClass.java diff --git a/testData/before/BuilderWithToBuilderOnConstructor.java b/testData/before/builder/BuilderWithToBuilderOnConstructor.java similarity index 100% rename from testData/before/BuilderWithToBuilderOnConstructor.java rename to testData/before/builder/BuilderWithToBuilderOnConstructor.java diff --git a/testData/before/BuilderWithToBuilderOnMethod.java b/testData/before/builder/BuilderWithToBuilderOnMethod.java similarity index 100% rename from testData/before/BuilderWithToBuilderOnMethod.java rename to testData/before/builder/BuilderWithToBuilderOnMethod.java diff --git a/testData/before/ConflictingStaticConstructorNames.java b/testData/before/constructors/ConflictingStaticConstructorNames.java similarity index 100% rename from testData/before/ConflictingStaticConstructorNames.java rename to testData/before/constructors/ConflictingStaticConstructorNames.java diff --git a/testData/before/ConstructorEnum.java b/testData/before/constructors/ConstructorEnum.java similarity index 100% rename from testData/before/ConstructorEnum.java rename to testData/before/constructors/ConstructorEnum.java diff --git a/testData/before/Constructors.java b/testData/before/constructors/Constructors.java similarity index 100% rename from testData/before/Constructors.java rename to testData/before/constructors/Constructors.java diff --git a/testData/before/NoArgsConstructorForced.java b/testData/before/constructors/NoArgsConstructorForced.java similarity index 100% rename from testData/before/NoArgsConstructorForced.java rename to testData/before/constructors/NoArgsConstructorForced.java diff --git a/testData/before/RequiredArgsConstructorWithGeneric136.java b/testData/before/constructors/RequiredArgsConstructorWithGeneric136.java similarity index 100% rename from testData/before/RequiredArgsConstructorWithGeneric136.java rename to testData/before/constructors/RequiredArgsConstructorWithGeneric136.java diff --git a/testData/before/RequiredArgsConstructorWithGeneric157.java b/testData/before/constructors/RequiredArgsConstructorWithGeneric157.java similarity index 100% rename from testData/before/RequiredArgsConstructorWithGeneric157.java rename to testData/before/constructors/RequiredArgsConstructorWithGeneric157.java diff --git a/testData/before/DataExtended.java b/testData/before/data/DataExtended.java similarity index 100% rename from testData/before/DataExtended.java rename to testData/before/data/DataExtended.java diff --git a/testData/before/DataIgnore.java b/testData/before/data/DataIgnore.java similarity index 100% rename from testData/before/DataIgnore.java rename to testData/before/data/DataIgnore.java diff --git a/testData/before/DataOnEnum.java b/testData/before/data/DataOnEnum.java similarity index 100% rename from testData/before/DataOnEnum.java rename to testData/before/data/DataOnEnum.java diff --git a/testData/before/DataOnLocalClass.java b/testData/before/data/DataOnLocalClass.java similarity index 100% rename from testData/before/DataOnLocalClass.java rename to testData/before/data/DataOnLocalClass.java diff --git a/testData/before/DataPlain.java b/testData/before/data/DataPlain.java similarity index 100% rename from testData/before/DataPlain.java rename to testData/before/data/DataPlain.java diff --git a/testData/before/DataStaticConstructor.java b/testData/before/data/DataStaticConstructor.java similarity index 100% rename from testData/before/DataStaticConstructor.java rename to testData/before/data/DataStaticConstructor.java diff --git a/testData/before/DataWithGeneric176.java b/testData/before/data/DataWithGeneric176.java similarity index 100% rename from testData/before/DataWithGeneric176.java rename to testData/before/data/DataWithGeneric176.java diff --git a/testData/before/DataWithGetter.java b/testData/before/data/DataWithGetter.java similarity index 100% rename from testData/before/DataWithGetter.java rename to testData/before/data/DataWithGetter.java diff --git a/testData/before/DataWithGetterNone.java b/testData/before/data/DataWithGetterNone.java similarity index 100% rename from testData/before/DataWithGetterNone.java rename to testData/before/data/DataWithGetterNone.java diff --git a/testData/before/DelegateGenericInterfaceIssue88.java b/testData/before/delegate/DelegateGenericInterfaceIssue88.java similarity index 100% rename from testData/before/DelegateGenericInterfaceIssue88.java rename to testData/before/delegate/DelegateGenericInterfaceIssue88.java diff --git a/testData/before/DelegateOnGetter.java b/testData/before/delegate/DelegateOnGetter.java similarity index 100% rename from testData/before/DelegateOnGetter.java rename to testData/before/delegate/DelegateOnGetter.java diff --git a/testData/before/DelegateOnGetterNone.java b/testData/before/delegate/DelegateOnGetterNone.java similarity index 100% rename from testData/before/DelegateOnGetterNone.java rename to testData/before/delegate/DelegateOnGetterNone.java diff --git a/testData/before/DelegateOnMethods.java b/testData/before/delegate/DelegateOnMethods.java similarity index 100% rename from testData/before/DelegateOnMethods.java rename to testData/before/delegate/DelegateOnMethods.java diff --git a/testData/before/DelegateRecursion.java b/testData/before/delegate/DelegateRecursion.java similarity index 100% rename from testData/before/DelegateRecursion.java rename to testData/before/delegate/DelegateRecursion.java diff --git a/testData/before/DelegateTypesAndExcludes.java b/testData/before/delegate/DelegateTypesAndExcludes.java similarity index 100% rename from testData/before/DelegateTypesAndExcludes.java rename to testData/before/delegate/DelegateTypesAndExcludes.java diff --git a/testData/before/DelegateWithDeprecated.java b/testData/before/delegate/DelegateWithDeprecated.java similarity index 100% rename from testData/before/DelegateWithDeprecated.java rename to testData/before/delegate/DelegateWithDeprecated.java diff --git a/testData/before/DelegateWithException.java b/testData/before/delegate/DelegateWithException.java similarity index 100% rename from testData/before/DelegateWithException.java rename to testData/before/delegate/DelegateWithException.java diff --git a/testData/before/ClassNamedAfterGetter.java b/testData/before/getter/ClassNamedAfterGetter.java similarity index 100% rename from testData/before/ClassNamedAfterGetter.java rename to testData/before/getter/ClassNamedAfterGetter.java diff --git a/testData/before/CommentsInterspersed.java b/testData/before/getter/CommentsInterspersed.java similarity index 100% rename from testData/before/CommentsInterspersed.java rename to testData/before/getter/CommentsInterspersed.java diff --git a/testData/before/GetterAccessLevel.java b/testData/before/getter/GetterAccessLevel.java similarity index 100% rename from testData/before/GetterAccessLevel.java rename to testData/before/getter/GetterAccessLevel.java diff --git a/testData/before/GetterAlreadyExists.java b/testData/before/getter/GetterAlreadyExists.java similarity index 100% rename from testData/before/GetterAlreadyExists.java rename to testData/before/getter/GetterAlreadyExists.java diff --git a/testData/before/GetterBoolean.java b/testData/before/getter/GetterBoolean.java similarity index 100% rename from testData/before/GetterBoolean.java rename to testData/before/getter/GetterBoolean.java diff --git a/testData/before/GetterDeprecated.java b/testData/before/getter/GetterDeprecated.java similarity index 100% rename from testData/before/GetterDeprecated.java rename to testData/before/getter/GetterDeprecated.java diff --git a/testData/before/GetterEnum.java b/testData/before/getter/GetterEnum.java similarity index 100% rename from testData/before/GetterEnum.java rename to testData/before/getter/GetterEnum.java diff --git a/testData/before/GetterLazy.java b/testData/before/getter/GetterLazy.java similarity index 100% rename from testData/before/GetterLazy.java rename to testData/before/getter/GetterLazy.java diff --git a/testData/before/GetterLazyBoolean.java b/testData/before/getter/GetterLazyBoolean.java similarity index 100% rename from testData/before/GetterLazyBoolean.java rename to testData/before/getter/GetterLazyBoolean.java diff --git a/testData/before/GetterLazyEahcToString.java b/testData/before/getter/GetterLazyEahcToString.java similarity index 100% rename from testData/before/GetterLazyEahcToString.java rename to testData/before/getter/GetterLazyEahcToString.java diff --git a/testData/before/GetterLazyInvalid.java b/testData/before/getter/GetterLazyInvalid.java similarity index 100% rename from testData/before/GetterLazyInvalid.java rename to testData/before/getter/GetterLazyInvalid.java diff --git a/testData/before/GetterLazyNative.java b/testData/before/getter/GetterLazyNative.java similarity index 100% rename from testData/before/GetterLazyNative.java rename to testData/before/getter/GetterLazyNative.java diff --git a/testData/before/GetterNone.java b/testData/before/getter/GetterNone.java similarity index 100% rename from testData/before/GetterNone.java rename to testData/before/getter/GetterNone.java diff --git a/testData/before/GetterOnClass.java b/testData/before/getter/GetterOnClass.java similarity index 100% rename from testData/before/GetterOnClass.java rename to testData/before/getter/GetterOnClass.java diff --git a/testData/before/GetterOnMethod.java b/testData/before/getter/GetterOnMethod.java similarity index 100% rename from testData/before/GetterOnMethod.java rename to testData/before/getter/GetterOnMethod.java diff --git a/testData/before/GetterOnMethodErrors.java b/testData/before/getter/GetterOnMethodErrors.java similarity index 100% rename from testData/before/GetterOnMethodErrors.java rename to testData/before/getter/GetterOnMethodErrors.java diff --git a/testData/before/GetterOnMethodErrors2.java b/testData/before/getter/GetterOnMethodErrors2.java similarity index 100% rename from testData/before/GetterOnMethodErrors2.java rename to testData/before/getter/GetterOnMethodErrors2.java diff --git a/testData/before/GetterOnStatic.java b/testData/before/getter/GetterOnStatic.java similarity index 100% rename from testData/before/GetterOnStatic.java rename to testData/before/getter/GetterOnStatic.java diff --git a/testData/before/GetterPlain.java b/testData/before/getter/GetterPlain.java similarity index 100% rename from testData/before/GetterPlain.java rename to testData/before/getter/GetterPlain.java diff --git a/testData/before/GetterWithDollar.java b/testData/before/getter/GetterWithDollar.java similarity index 100% rename from testData/before/GetterWithDollar.java rename to testData/before/getter/GetterWithDollar.java diff --git a/testData/before/MultiFieldGetter.java b/testData/before/getter/MultiFieldGetter.java similarity index 100% rename from testData/before/MultiFieldGetter.java rename to testData/before/getter/MultiFieldGetter.java diff --git a/testData/before/TrickyTypeResolution.java b/testData/before/getter/TrickyTypeResolution.java similarity index 100% rename from testData/before/TrickyTypeResolution.java rename to testData/before/getter/TrickyTypeResolution.java diff --git a/testData/before/LoggerCommons.java b/testData/before/logger/LoggerCommons.java similarity index 100% rename from testData/before/LoggerCommons.java rename to testData/before/logger/LoggerCommons.java diff --git a/testData/before/LoggerJul.java b/testData/before/logger/LoggerJul.java similarity index 100% rename from testData/before/LoggerJul.java rename to testData/before/logger/LoggerJul.java diff --git a/testData/before/LoggerLog4j.java b/testData/before/logger/LoggerLog4j.java similarity index 100% rename from testData/before/LoggerLog4j.java rename to testData/before/logger/LoggerLog4j.java diff --git a/testData/before/LoggerLog4j2.java b/testData/before/logger/LoggerLog4j2.java similarity index 100% rename from testData/before/LoggerLog4j2.java rename to testData/before/logger/LoggerLog4j2.java diff --git a/testData/before/LoggerSlf4j.java b/testData/before/logger/LoggerSlf4j.java similarity index 100% rename from testData/before/LoggerSlf4j.java rename to testData/before/logger/LoggerSlf4j.java diff --git a/testData/before/LoggerSlf4jAlreadyExists.java b/testData/before/logger/LoggerSlf4jAlreadyExists.java similarity index 100% rename from testData/before/LoggerSlf4jAlreadyExists.java rename to testData/before/logger/LoggerSlf4jAlreadyExists.java diff --git a/testData/before/LoggerSlf4jOnNonType.java b/testData/before/logger/LoggerSlf4jOnNonType.java similarity index 100% rename from testData/before/LoggerSlf4jOnNonType.java rename to testData/before/logger/LoggerSlf4jOnNonType.java diff --git a/testData/before/LoggerSlf4jTypes.java b/testData/before/logger/LoggerSlf4jTypes.java similarity index 100% rename from testData/before/LoggerSlf4jTypes.java rename to testData/before/logger/LoggerSlf4jTypes.java diff --git a/testData/before/LoggerSlf4jWithPackage.java b/testData/before/logger/LoggerSlf4jWithPackage.java similarity index 100% rename from testData/before/LoggerSlf4jWithPackage.java rename to testData/before/logger/LoggerSlf4jWithPackage.java diff --git a/testData/before/LoggerXSlf4j.java b/testData/before/logger/LoggerXSlf4j.java similarity index 100% rename from testData/before/LoggerXSlf4j.java rename to testData/before/logger/LoggerXSlf4j.java diff --git a/testData/before/SetterAccessLevel.java b/testData/before/setter/SetterAccessLevel.java similarity index 100% rename from testData/before/SetterAccessLevel.java rename to testData/before/setter/SetterAccessLevel.java diff --git a/testData/before/SetterAlreadyExists.java b/testData/before/setter/SetterAlreadyExists.java similarity index 100% rename from testData/before/SetterAlreadyExists.java rename to testData/before/setter/SetterAlreadyExists.java diff --git a/testData/before/SetterDeprecated.java b/testData/before/setter/SetterDeprecated.java similarity index 100% rename from testData/before/SetterDeprecated.java rename to testData/before/setter/SetterDeprecated.java diff --git a/testData/before/SetterOnClass.java b/testData/before/setter/SetterOnClass.java similarity index 100% rename from testData/before/SetterOnClass.java rename to testData/before/setter/SetterOnClass.java diff --git a/testData/before/SetterOnMethodOnParam.java b/testData/before/setter/SetterOnMethodOnParam.java similarity index 100% rename from testData/before/SetterOnMethodOnParam.java rename to testData/before/setter/SetterOnMethodOnParam.java diff --git a/testData/before/SetterOnStatic.java b/testData/before/setter/SetterOnStatic.java similarity index 100% rename from testData/before/SetterOnStatic.java rename to testData/before/setter/SetterOnStatic.java diff --git a/testData/before/SetterPlain.java b/testData/before/setter/SetterPlain.java similarity index 100% rename from testData/before/SetterPlain.java rename to testData/before/setter/SetterPlain.java diff --git a/testData/before/SetterWithDollar.java b/testData/before/setter/SetterWithDollar.java similarity index 100% rename from testData/before/SetterWithDollar.java rename to testData/before/setter/SetterWithDollar.java diff --git a/testData/before/TrickyTypeResolution2.java b/testData/before/val/TrickyTypeResolution2.java similarity index 100% rename from testData/before/TrickyTypeResolution2.java rename to testData/before/val/TrickyTypeResolution2.java diff --git a/testData/before/ValComplex.java b/testData/before/val/ValComplex.java similarity index 100% rename from testData/before/ValComplex.java rename to testData/before/val/ValComplex.java diff --git a/testData/before/ValErrors.java b/testData/before/val/ValErrors.java similarity index 100% rename from testData/before/ValErrors.java rename to testData/before/val/ValErrors.java diff --git a/testData/before/ValInBasicFor.java b/testData/before/val/ValInBasicFor.java similarity index 100% rename from testData/before/ValInBasicFor.java rename to testData/before/val/ValInBasicFor.java diff --git a/testData/before/ValInFor.java b/testData/before/val/ValInFor.java similarity index 100% rename from testData/before/ValInFor.java rename to testData/before/val/ValInFor.java diff --git a/testData/before/ValInMultiDeclaration.java b/testData/before/val/ValInMultiDeclaration.java similarity index 100% rename from testData/before/ValInMultiDeclaration.java rename to testData/before/val/ValInMultiDeclaration.java diff --git a/testData/before/ValInTryWithResources.java b/testData/before/val/ValInTryWithResources.java similarity index 100% rename from testData/before/ValInTryWithResources.java rename to testData/before/val/ValInTryWithResources.java diff --git a/testData/before/ValLessSimple.java b/testData/before/val/ValLessSimple.java similarity index 100% rename from testData/before/ValLessSimple.java rename to testData/before/val/ValLessSimple.java diff --git a/testData/before/ValLub.java b/testData/before/val/ValLub.java similarity index 100% rename from testData/before/ValLub.java rename to testData/before/val/ValLub.java diff --git a/testData/before/ValOutersWithGenerics.java b/testData/before/val/ValOutersWithGenerics.java similarity index 100% rename from testData/before/ValOutersWithGenerics.java rename to testData/before/val/ValOutersWithGenerics.java diff --git a/testData/before/ValRawType.java b/testData/before/val/ValRawType.java similarity index 100% rename from testData/before/ValRawType.java rename to testData/before/val/ValRawType.java diff --git a/testData/before/ValSimple.java b/testData/before/val/ValSimple.java similarity index 100% rename from testData/before/ValSimple.java rename to testData/before/val/ValSimple.java diff --git a/testData/before/ValWeirdTypes.java b/testData/before/val/ValWeirdTypes.java similarity index 100% rename from testData/before/ValWeirdTypes.java rename to testData/before/val/ValWeirdTypes.java diff --git a/testData/before/ValWithLabel.java b/testData/before/val/ValWithLabel.java similarity index 100% rename from testData/before/ValWithLabel.java rename to testData/before/val/ValWithLabel.java diff --git a/testData/before/WithInnerAnnotation.java b/testData/before/wither/WithInnerAnnotation.java similarity index 100% rename from testData/before/WithInnerAnnotation.java rename to testData/before/wither/WithInnerAnnotation.java diff --git a/testData/before/WitherAccessLevel.java b/testData/before/wither/WitherAccessLevel.java similarity index 100% rename from testData/before/WitherAccessLevel.java rename to testData/before/wither/WitherAccessLevel.java diff --git a/testData/before/WitherAlreadyExists.java b/testData/before/wither/WitherAlreadyExists.java similarity index 100% rename from testData/before/WitherAlreadyExists.java rename to testData/before/wither/WitherAlreadyExists.java diff --git a/testData/before/WitherAndAllArgsConstructor.java b/testData/before/wither/WitherAndAllArgsConstructor.java similarity index 100% rename from testData/before/WitherAndAllArgsConstructor.java rename to testData/before/wither/WitherAndAllArgsConstructor.java diff --git a/testData/before/WitherDeprecated.java b/testData/before/wither/WitherDeprecated.java similarity index 100% rename from testData/before/WitherDeprecated.java rename to testData/before/wither/WitherDeprecated.java diff --git a/testData/before/WitherOnClass.java b/testData/before/wither/WitherOnClass.java similarity index 100% rename from testData/before/WitherOnClass.java rename to testData/before/wither/WitherOnClass.java diff --git a/testData/before/WitherOnStatic.java b/testData/before/wither/WitherOnStatic.java similarity index 100% rename from testData/before/WitherOnStatic.java rename to testData/before/wither/WitherOnStatic.java diff --git a/testData/before/WitherPlain.java b/testData/before/wither/WitherPlain.java similarity index 100% rename from testData/before/WitherPlain.java rename to testData/before/wither/WitherPlain.java diff --git a/testData/before/WitherWithDollar.java b/testData/before/wither/WitherWithDollar.java similarity index 100% rename from testData/before/WitherWithDollar.java rename to testData/before/wither/WitherWithDollar.java diff --git a/testData/before/WitherWithGenerics.java b/testData/before/wither/WitherWithGenerics.java similarity index 100% rename from testData/before/WitherWithGenerics.java rename to testData/before/wither/WitherWithGenerics.java