41 files changed, 6 insertions, 19 deletions
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
 			<src path="test/delombok/src" />
 		</javac>
 		<copy todir="build/tests">
-			<fileset dir="test/lombok/resource" />
+			<fileset dir="test/pretty/resource" />
 			<fileset dir="test/delombok/resource" />
 		</copy>
 	</target>
diff --git a/test/lombok/resource/after/CleanupName.java b/test/delombok/resource/after/CleanupName.java
index 26997372..26997372 100644
--- a/test/lombok/resource/after/CleanupName.java
+++ b/test/delombok/resource/after/CleanupName.java
diff --git a/test/lombok/resource/after/CleanupPlain.java b/test/delombok/resource/after/CleanupPlain.java
index 35d51543..35d51543 100644
--- a/test/lombok/resource/after/CleanupPlain.java
+++ b/test/delombok/resource/after/CleanupPlain.java
diff --git a/test/lombok/resource/after/CommentsInterspersed.java b/test/delombok/resource/after/CommentsInterspersed.java
index ddc716c9..ddc716c9 100644
--- a/test/lombok/resource/after/CommentsInterspersed.java
+++ b/test/delombok/resource/after/CommentsInterspersed.java
diff --git a/test/lombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java
index eec84e85..eec84e85 100644
--- a/test/lombok/resource/after/GetterAccessLevel.java
+++ b/test/delombok/resource/after/GetterAccessLevel.java
diff --git a/test/lombok/resource/after/GetterAlreadyExists.java b/test/delombok/resource/after/GetterAlreadyExists.java
index fce1ba41..fce1ba41 100644
--- a/test/lombok/resource/after/GetterAlreadyExists.java
+++ b/test/delombok/resource/after/GetterAlreadyExists.java
diff --git a/test/lombok/resource/after/GetterBoolean.java b/test/delombok/resource/after/GetterBoolean.java
index 639d6dc9..639d6dc9 100644
--- a/test/lombok/resource/after/GetterBoolean.java
+++ b/test/delombok/resource/after/GetterBoolean.java
diff --git a/test/lombok/resource/after/GetterPlain.java b/test/delombok/resource/after/GetterPlain.java
index 5e8cc965..5e8cc965 100644
--- a/test/lombok/resource/after/GetterPlain.java
+++ b/test/delombok/resource/after/GetterPlain.java
diff --git a/test/lombok/resource/after/NonNullPlain.java b/test/delombok/resource/after/NonNullPlain.java
index 2d7ebb4f..2d7ebb4f 100644
--- a/test/lombok/resource/after/NonNullPlain.java
+++ b/test/delombok/resource/after/NonNullPlain.java
diff --git a/test/lombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java
index 95179bac..95179bac 100644
--- a/test/lombok/resource/after/SetterAccessLevel.java
+++ b/test/delombok/resource/after/SetterAccessLevel.java
diff --git a/test/lombok/resource/after/SetterAlreadyExists.java b/test/delombok/resource/after/SetterAlreadyExists.java
index e4992b29..e4992b29 100644
--- a/test/lombok/resource/after/SetterAlreadyExists.java
+++ b/test/delombok/resource/after/SetterAlreadyExists.java
diff --git a/test/lombok/resource/after/SetterPlain.java b/test/delombok/resource/after/SetterPlain.java
index 8faad0ec..8faad0ec 100644
--- a/test/lombok/resource/after/SetterPlain.java
+++ b/test/delombok/resource/after/SetterPlain.java
diff --git a/test/lombok/resource/after/SynchronizedName.java b/test/delombok/resource/after/SynchronizedName.java
index a3e64796..a3e64796 100644
--- a/test/lombok/resource/after/SynchronizedName.java
+++ b/test/delombok/resource/after/SynchronizedName.java
diff --git a/test/lombok/resource/after/SynchronizedPlain.java b/test/delombok/resource/after/SynchronizedPlain.java
index fcbe03f2..fcbe03f2 100644
--- a/test/lombok/resource/after/SynchronizedPlain.java
+++ b/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 @@
-<project name="testDelombokAntTask" basedir="../../.." default="test">
-	<taskdef classname="lombok.delombok.ant.DelombokTask" classpath="dist/lombok.jar" name="delombok" />
-	<target name="test">
-		<mkdir dir="build/testResult" />
-		<delombok verbose="true" encoding="UTF-8" to="build/testResult">
-			<fileset dir="test/lombok/resource" />
-			<fileset dir="test/delombok/resource" />
-		</delombok>
-	</target>
-	<target name="clean">
-		<delete quiet="true" dir="build/testResult" />
-	</target>
-</project>
diff --git a/test/lombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java
index 0d253f1e..0d253f1e 100644
--- a/test/lombok/resource/before/CleanupName.java
+++ b/test/delombok/resource/before/CleanupName.java
diff --git a/test/lombok/resource/before/CleanupPlain.java b/test/delombok/resource/before/CleanupPlain.java
index a91ac3c1..a91ac3c1 100644
--- a/test/lombok/resource/before/CleanupPlain.java
+++ b/test/delombok/resource/before/CleanupPlain.java
diff --git a/test/lombok/resource/before/CommentsInterspersed.java b/test/delombok/resource/before/CommentsInterspersed.java
index e7898aaa..e7898aaa 100644
--- a/test/lombok/resource/before/CommentsInterspersed.java
+++ b/test/delombok/resource/before/CommentsInterspersed.java
diff --git a/test/lombok/resource/before/GetterAccessLevel.java b/test/delombok/resource/before/GetterAccessLevel.java
index 8fd9bcc7..8fd9bcc7 100644
--- a/test/lombok/resource/before/GetterAccessLevel.java
+++ b/test/delombok/resource/before/GetterAccessLevel.java
diff --git a/test/lombok/resource/before/GetterAlreadyExists.java b/test/delombok/resource/before/GetterAlreadyExists.java
index 93b77dc1..93b77dc1 100644
--- a/test/lombok/resource/before/GetterAlreadyExists.java
+++ b/test/delombok/resource/before/GetterAlreadyExists.java
diff --git a/test/lombok/resource/before/GetterBoolean.java b/test/delombok/resource/before/GetterBoolean.java
index 7d53ebbf..7d53ebbf 100644
--- a/test/lombok/resource/before/GetterBoolean.java
+++ b/test/delombok/resource/before/GetterBoolean.java
diff --git a/test/lombok/resource/before/GetterPlain.java b/test/delombok/resource/before/GetterPlain.java
index d104f428..d104f428 100644
--- a/test/lombok/resource/before/GetterPlain.java
+++ b/test/delombok/resource/before/GetterPlain.java
diff --git a/test/lombok/resource/before/NonNullPlain.java b/test/delombok/resource/before/NonNullPlain.java
index eef64b2f..eef64b2f 100644
--- a/test/lombok/resource/before/NonNullPlain.java
+++ b/test/delombok/resource/before/NonNullPlain.java
diff --git a/test/lombok/resource/before/SetterAccessLevel.java b/test/delombok/resource/before/SetterAccessLevel.java
index 767341ef..767341ef 100644
--- a/test/lombok/resource/before/SetterAccessLevel.java
+++ b/test/delombok/resource/before/SetterAccessLevel.java
diff --git a/test/lombok/resource/before/SetterAlreadyExists.java b/test/delombok/resource/before/SetterAlreadyExists.java
index a7a94123..a7a94123 100644
--- a/test/lombok/resource/before/SetterAlreadyExists.java
+++ b/test/delombok/resource/before/SetterAlreadyExists.java
diff --git a/test/lombok/resource/before/SetterPlain.java b/test/delombok/resource/before/SetterPlain.java
index e1ac99f8..e1ac99f8 100644
--- a/test/lombok/resource/before/SetterPlain.java
+++ b/test/delombok/resource/before/SetterPlain.java
diff --git a/test/lombok/resource/before/SynchronizedName.java b/test/delombok/resource/before/SynchronizedName.java
index 3aaec705..3aaec705 100644
--- a/test/lombok/resource/before/SynchronizedName.java
+++ b/test/delombok/resource/before/SynchronizedName.java
diff --git a/test/lombok/resource/before/SynchronizedPlain.java b/test/delombok/resource/before/SynchronizedPlain.java
index 6f5f3b64..6f5f3b64 100644
--- a/test/lombok/resource/before/SynchronizedPlain.java
+++ b/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
index 006af03e..006af03e 100644
--- a/test/delombok/resource/after/Annotation.java
+++ b/test/pretty/resource/after/Annotation.java
diff --git a/test/delombok/resource/after/Cast.java b/test/pretty/resource/after/Cast.java
index 95237b0f..95237b0f 100644
--- a/test/delombok/resource/after/Cast.java
+++ b/test/pretty/resource/after/Cast.java
diff --git a/test/delombok/resource/after/ForEach.java b/test/pretty/resource/after/ForEach.java
index c4d4a9dc..c4d4a9dc 100644
--- a/test/delombok/resource/after/ForEach.java
+++ b/test/pretty/resource/after/ForEach.java
diff --git a/test/delombok/resource/after/ForLoop.java b/test/pretty/resource/after/ForLoop.java
index 615f6e8a..615f6e8a 100644
--- a/test/delombok/resource/after/ForLoop.java
+++ b/test/pretty/resource/after/ForLoop.java
diff --git a/test/delombok/resource/after/WithComments.java b/test/pretty/resource/after/WithComments.java
index e4f078aa..e4f078aa 100644
--- a/test/delombok/resource/after/WithComments.java
+++ b/test/pretty/resource/after/WithComments.java
diff --git a/test/delombok/resource/before/Annotation.java b/test/pretty/resource/before/Annotation.java
index 297dd793..297dd793 100644
--- a/test/delombok/resource/before/Annotation.java
+++ b/test/pretty/resource/before/Annotation.java
diff --git a/test/delombok/resource/before/Cast.java b/test/pretty/resource/before/Cast.java
index 95237b0f..95237b0f 100644
--- a/test/delombok/resource/before/Cast.java
+++ b/test/pretty/resource/before/Cast.java
diff --git a/test/delombok/resource/before/ForEach.java b/test/pretty/resource/before/ForEach.java
index c4d4a9dc..c4d4a9dc 100644
--- a/test/delombok/resource/before/ForEach.java
+++ b/test/pretty/resource/before/ForEach.java
diff --git a/test/delombok/resource/before/ForLoop.java b/test/pretty/resource/before/ForLoop.java
index 2bed7f9b..2bed7f9b 100644
--- a/test/delombok/resource/before/ForLoop.java
+++ b/test/pretty/resource/before/ForLoop.java
diff --git a/test/delombok/resource/before/WithComments.java b/test/pretty/resource/before/WithComments.java
index f75551ac..f75551ac 100644
--- a/test/delombok/resource/before/WithComments.java
+++ b/test/pretty/resource/before/WithComments.java