5 files changed, 42 insertions, 10 deletions
diff --git a/test/delombok/resource/after/Annotation.java b/test/delombok/resource/after/Annotation.java
new file mode 100644
index 00000000..38eddbf7
--- /dev/null
+++ b/test/delombok/resource/after/Annotation.java
@@ -0,0 +1,7 @@
+@SuppressWarnings("all")
+class Annotation {
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+}
diff --git a/test/delombok/resource/after/ForLoop.java b/test/delombok/resource/after/ForLoop.java
index 609549b7..615f6e8a 100644
--- a/test/delombok/resource/after/ForLoop.java
+++ b/test/delombok/resource/after/ForLoop.java
@@ -1,6 +1,4 @@
-
 public class ForLoop {
-	
 	public static void main(String[] args) {
 		// before loop
 		for (int i = 0; i < 10; i++) {
diff --git a/test/delombok/resource/after/WithComments.java b/test/delombok/resource/after/WithComments.java
index 59cc97c4..684dcc8e 100644
--- a/test/delombok/resource/after/WithComments.java
+++ b/test/delombok/resource/after/WithComments.java
@@ -1,5 +1,4 @@
 // Cool Comments
-
 public class WithComments {
 	// Also inside the body
 }
 \ No newline at end of file
diff --git a/test/delombok/resource/before/Annotation.java b/test/delombok/resource/before/Annotation.java
new file mode 100644
index 00000000..38eddbf7
--- /dev/null
+++ b/test/delombok/resource/before/Annotation.java
@@ -0,0 +1,7 @@
+@SuppressWarnings("all")
+class Annotation {
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+}
diff --git a/test/delombok/src/lombok/delombok/TestSourceFiles.java b/test/delombok/src/lombok/delombok/TestSourceFiles.java
index a5df5197..fc2a9cab 100644
--- a/test/delombok/src/lombok/delombok/TestSourceFiles.java
+++ b/test/delombok/src/lombok/delombok/TestSourceFiles.java
@@ -21,18 +21,39 @@
  */
 package lombok.delombok;
 
-import java.io.File;
-
-import lombok.TestViaDelombok;
+import lombok.ReflectionFileTester;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestSourceFiles {
-	private static final File BEFORE_DIR = new File("test/delombok/resource/before");
-	private static final File AFTER_DIR = new File("test/delombok/resource/after");
+	private static final String AFTER = "test/delombok/resource/after";
+	private static final String BEFORE = "test/delombok/resource/before";
+	
+	private static final ReflectionFileTester tester = new ReflectionFileTester(BEFORE, AFTER);
+	
+	@BeforeClass
+	public static void verify() {
+		tester.verify(TestSourceFiles.class);
+	}
+	
+	@Test
+	public void testAnnotation() throws Exception {
+		tester.test();
+	}
+	
+	@Test
+	public void testCast() throws Exception {
+		tester.test();
+	}
+	
+	@Test
+	public void testForLoop() throws Exception {
+		tester.test();
+	}
 	
 	@Test
-	public void testSources() throws Exception {
-		TestViaDelombok.runComparison(BEFORE_DIR, AFTER_DIR);
+	public void testWithComments() throws Exception {
+		tester.test();
 	}
 }