diff --git a/buildScripts/test.ant.xml b/buildScripts/test.ant.xml index 742819c5..5e10bbb0 100644 --- a/buildScripts/test.ant.xml +++ b/buildScripts/test.ant.xml @@ -53,7 +53,7 @@ This buildfile is part of projectlombok.org. It responsible for running unit tes - + diff --git a/test/lombok/resource/after/CleanupName.java b/test/delombok/resource/after/CleanupName.java similarity index 100% rename from test/lombok/resource/after/CleanupName.java rename to test/delombok/resource/after/CleanupName.java diff --git a/test/lombok/resource/after/CleanupPlain.java b/test/delombok/resource/after/CleanupPlain.java similarity index 100% rename from test/lombok/resource/after/CleanupPlain.java rename to test/delombok/resource/after/CleanupPlain.java diff --git a/test/lombok/resource/after/CommentsInterspersed.java b/test/delombok/resource/after/CommentsInterspersed.java similarity index 100% rename from test/lombok/resource/after/CommentsInterspersed.java rename to test/delombok/resource/after/CommentsInterspersed.java diff --git a/test/lombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java similarity index 100% rename from test/lombok/resource/after/GetterAccessLevel.java rename to test/delombok/resource/after/GetterAccessLevel.java diff --git a/test/lombok/resource/after/GetterAlreadyExists.java b/test/delombok/resource/after/GetterAlreadyExists.java similarity index 100% rename from test/lombok/resource/after/GetterAlreadyExists.java rename to test/delombok/resource/after/GetterAlreadyExists.java diff --git a/test/lombok/resource/after/GetterBoolean.java b/test/delombok/resource/after/GetterBoolean.java similarity index 100% rename from test/lombok/resource/after/GetterBoolean.java rename to test/delombok/resource/after/GetterBoolean.java diff --git a/test/lombok/resource/after/GetterPlain.java b/test/delombok/resource/after/GetterPlain.java similarity index 100% rename from test/lombok/resource/after/GetterPlain.java rename to test/delombok/resource/after/GetterPlain.java diff --git a/test/lombok/resource/after/NonNullPlain.java b/test/delombok/resource/after/NonNullPlain.java similarity index 100% rename from test/lombok/resource/after/NonNullPlain.java rename to test/delombok/resource/after/NonNullPlain.java diff --git a/test/lombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java similarity index 100% rename from test/lombok/resource/after/SetterAccessLevel.java rename to test/delombok/resource/after/SetterAccessLevel.java diff --git a/test/lombok/resource/after/SetterAlreadyExists.java b/test/delombok/resource/after/SetterAlreadyExists.java similarity index 100% rename from test/lombok/resource/after/SetterAlreadyExists.java rename to test/delombok/resource/after/SetterAlreadyExists.java diff --git a/test/lombok/resource/after/SetterPlain.java b/test/delombok/resource/after/SetterPlain.java similarity index 100% rename from test/lombok/resource/after/SetterPlain.java rename to test/delombok/resource/after/SetterPlain.java diff --git a/test/lombok/resource/after/SynchronizedName.java b/test/delombok/resource/after/SynchronizedName.java similarity index 100% rename from test/lombok/resource/after/SynchronizedName.java rename to test/delombok/resource/after/SynchronizedName.java diff --git a/test/lombok/resource/after/SynchronizedPlain.java b/test/delombok/resource/after/SynchronizedPlain.java similarity index 100% rename from test/lombok/resource/after/SynchronizedPlain.java rename to test/delombok/resource/after/SynchronizedPlain.java diff --git a/test/delombok/resource/anttest.xml b/test/delombok/resource/anttest.xml deleted file mode 100644 index 4372e094..00000000 --- a/test/delombok/resource/anttest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/test/lombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java similarity index 100% rename from test/lombok/resource/before/CleanupName.java rename to test/delombok/resource/before/CleanupName.java diff --git a/test/lombok/resource/before/CleanupPlain.java b/test/delombok/resource/before/CleanupPlain.java similarity index 100% rename from test/lombok/resource/before/CleanupPlain.java rename to test/delombok/resource/before/CleanupPlain.java diff --git a/test/lombok/resource/before/CommentsInterspersed.java b/test/delombok/resource/before/CommentsInterspersed.java similarity index 100% rename from test/lombok/resource/before/CommentsInterspersed.java rename to test/delombok/resource/before/CommentsInterspersed.java diff --git a/test/lombok/resource/before/GetterAccessLevel.java b/test/delombok/resource/before/GetterAccessLevel.java similarity index 100% rename from test/lombok/resource/before/GetterAccessLevel.java rename to test/delombok/resource/before/GetterAccessLevel.java diff --git a/test/lombok/resource/before/GetterAlreadyExists.java b/test/delombok/resource/before/GetterAlreadyExists.java similarity index 100% rename from test/lombok/resource/before/GetterAlreadyExists.java rename to test/delombok/resource/before/GetterAlreadyExists.java diff --git a/test/lombok/resource/before/GetterBoolean.java b/test/delombok/resource/before/GetterBoolean.java similarity index 100% rename from test/lombok/resource/before/GetterBoolean.java rename to test/delombok/resource/before/GetterBoolean.java diff --git a/test/lombok/resource/before/GetterPlain.java b/test/delombok/resource/before/GetterPlain.java similarity index 100% rename from test/lombok/resource/before/GetterPlain.java rename to test/delombok/resource/before/GetterPlain.java diff --git a/test/lombok/resource/before/NonNullPlain.java b/test/delombok/resource/before/NonNullPlain.java similarity index 100% rename from test/lombok/resource/before/NonNullPlain.java rename to test/delombok/resource/before/NonNullPlain.java diff --git a/test/lombok/resource/before/SetterAccessLevel.java b/test/delombok/resource/before/SetterAccessLevel.java similarity index 100% rename from test/lombok/resource/before/SetterAccessLevel.java rename to test/delombok/resource/before/SetterAccessLevel.java diff --git a/test/lombok/resource/before/SetterAlreadyExists.java b/test/delombok/resource/before/SetterAlreadyExists.java similarity index 100% rename from test/lombok/resource/before/SetterAlreadyExists.java rename to test/delombok/resource/before/SetterAlreadyExists.java diff --git a/test/lombok/resource/before/SetterPlain.java b/test/delombok/resource/before/SetterPlain.java similarity index 100% rename from test/lombok/resource/before/SetterPlain.java rename to test/delombok/resource/before/SetterPlain.java diff --git a/test/lombok/resource/before/SynchronizedName.java b/test/delombok/resource/before/SynchronizedName.java similarity index 100% rename from test/lombok/resource/before/SynchronizedName.java rename to test/delombok/resource/before/SynchronizedName.java diff --git a/test/lombok/resource/before/SynchronizedPlain.java b/test/delombok/resource/before/SynchronizedPlain.java similarity index 100% rename from test/lombok/resource/before/SynchronizedPlain.java rename to test/delombok/resource/before/SynchronizedPlain.java diff --git a/test/delombok/src/lombok/delombok/TestLombokFiles.java b/test/delombok/src/lombok/delombok/TestLombokFiles.java index 12c16d76..713f81f5 100644 --- a/test/delombok/src/lombok/delombok/TestLombokFiles.java +++ b/test/delombok/src/lombok/delombok/TestLombokFiles.java @@ -33,10 +33,10 @@ public class TestLombokFiles { public static File getBeforeDirectory() { RunTestsViaDelombok.printErrors(true); - return new File("test/lombok/resource/before"); + return new File("test/delombok/resource/before"); } public static File getAfterDirectory() { - return new File("test/lombok/resource/after"); + return new File("test/delombok/resource/after"); } } diff --git a/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java b/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java index 556e907c..da6377f3 100644 --- a/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java +++ b/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java @@ -37,6 +37,6 @@ public class TestLombokFilesIdempotent { } public static File getAfterDirectory() { - return new File("test/lombok/resource/after"); + return new File("test/delombok/resource/after"); } } diff --git a/test/delombok/src/lombok/delombok/TestSourceFiles.java b/test/delombok/src/lombok/delombok/TestSourceFiles.java index 2c0085eb..42addcd9 100644 --- a/test/delombok/src/lombok/delombok/TestSourceFiles.java +++ b/test/delombok/src/lombok/delombok/TestSourceFiles.java @@ -30,10 +30,10 @@ import org.junit.runner.RunWith; @RunWith(DirectoryRunner.class) public class TestSourceFiles { public static File getBeforeDirectory() { - return new File("test/delombok/resource/before"); + return new File("test/pretty/resource/before"); } public static File getAfterDirectory() { - return new File("test/delombok/resource/after"); + return new File("test/pretty/resource/after"); } } diff --git a/test/delombok/resource/after/Annotation.java b/test/pretty/resource/after/Annotation.java similarity index 100% rename from test/delombok/resource/after/Annotation.java rename to test/pretty/resource/after/Annotation.java diff --git a/test/delombok/resource/after/Cast.java b/test/pretty/resource/after/Cast.java similarity index 100% rename from test/delombok/resource/after/Cast.java rename to test/pretty/resource/after/Cast.java diff --git a/test/delombok/resource/after/ForEach.java b/test/pretty/resource/after/ForEach.java similarity index 100% rename from test/delombok/resource/after/ForEach.java rename to test/pretty/resource/after/ForEach.java diff --git a/test/delombok/resource/after/ForLoop.java b/test/pretty/resource/after/ForLoop.java similarity index 100% rename from test/delombok/resource/after/ForLoop.java rename to test/pretty/resource/after/ForLoop.java diff --git a/test/delombok/resource/after/WithComments.java b/test/pretty/resource/after/WithComments.java similarity index 100% rename from test/delombok/resource/after/WithComments.java rename to test/pretty/resource/after/WithComments.java diff --git a/test/delombok/resource/before/Annotation.java b/test/pretty/resource/before/Annotation.java similarity index 100% rename from test/delombok/resource/before/Annotation.java rename to test/pretty/resource/before/Annotation.java diff --git a/test/delombok/resource/before/Cast.java b/test/pretty/resource/before/Cast.java similarity index 100% rename from test/delombok/resource/before/Cast.java rename to test/pretty/resource/before/Cast.java diff --git a/test/delombok/resource/before/ForEach.java b/test/pretty/resource/before/ForEach.java similarity index 100% rename from test/delombok/resource/before/ForEach.java rename to test/pretty/resource/before/ForEach.java diff --git a/test/delombok/resource/before/ForLoop.java b/test/pretty/resource/before/ForLoop.java similarity index 100% rename from test/delombok/resource/before/ForLoop.java rename to test/pretty/resource/before/ForLoop.java diff --git a/test/delombok/resource/before/WithComments.java b/test/pretty/resource/before/WithComments.java similarity index 100% rename from test/delombok/resource/before/WithComments.java rename to test/pretty/resource/before/WithComments.java