refactored the tests to prepare running ecj as well as delombok.

56 files changed, 0 insertions, 1476 deletions

diff --git a/test/delombok/resource/after/ClassNamedAfterGetter.java b/test/delombok/resource/after/ClassNamedAfterGetter.java
deleted file mode 100644
index 769aaf7c..00000000
--- a/test/delombok/resource/after/ClassNamedAfterGetter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-class GetFoo {
-	private int foo;
-	@java.lang.SuppressWarnings("all")
-	public int getFoo() {
-		return this.foo;
-	}
-}
diff --git a/test/delombok/resource/after/CleanupName.java b/test/delombok/resource/after/CleanupName.java
deleted file mode 100644
index cd29eb68..00000000
--- a/test/delombok/resource/after/CleanupName.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class CleanupName {
-	void test() {
-		Object o = "Hello World!";
-		try {
-			System.out.println(o);
-		} finally {
-			o.toString();
-		}
-	}
-	void test2() {
-		Object o = "Hello World too!";
-		try {
-			System.out.println(o);
-		} finally {
-			o.toString();
-		}
-	}
-}
diff --git a/test/delombok/resource/after/CleanupPlain.java b/test/delombok/resource/after/CleanupPlain.java
deleted file mode 100644
index 35d51543..00000000
--- a/test/delombok/resource/after/CleanupPlain.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.io.*;
-class CleanupPlain {
-	void test() throws Exception {
-		InputStream in = new FileInputStream("in");
-		try {
-			OutputStream out = new FileOutputStream("out");
-			try {
-				if (in.markSupported()) {
-					out.flush();
-				}
-			} finally {
-				out.close();
-			}
-		} finally {
-			in.close();
-		}
-	}
-}
diff --git a/test/delombok/resource/after/CommentsInterspersed.java b/test/delombok/resource/after/CommentsInterspersed.java
deleted file mode 100644
index 5aaafe42..00000000
--- a/test/delombok/resource/after/CommentsInterspersed.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/* cmt *//* cmt2 */ /* cmt3 */ /*bla */
-public class CommentsInterspersed {
-	/** javadoc for field */
-	private int x;
-	/* bla2 */ private String test = "foo"; //$NON-NLS-1$
-	/** Javadoc on method */
-	public native void gwtTest(); /*-{
-		javascript;
-	}-*/
-	@java.lang.SuppressWarnings("all")
-	public String getTest() {
-		return this.test;
-	}
-} //haha!
-//hahaha!
-//hahahaha!
diff --git a/test/delombok/resource/after/DataIgnore.java b/test/delombok/resource/after/DataIgnore.java
deleted file mode 100644
index feb2c0ef..00000000
--- a/test/delombok/resource/after/DataIgnore.java
+++ /dev/null
@@ -1,36 +0,0 @@
-class DataIgnore {
-	final int x;
-	String $name;
-	@java.beans.ConstructorProperties({"x"})
-	@java.lang.SuppressWarnings("all")
-	public DataIgnore(final int x) {
-		this.x = x;
-	}
-	@java.lang.SuppressWarnings("all")
-	public int getX() {
-		return this.x;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (o == null) return false;
-		if (o.getClass() != this.getClass()) return false;
-		final DataIgnore other = (DataIgnore)o;
-		if (this.x != other.x) return false;
-		return true;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = result * PRIME + this.x;
-		return result;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public java.lang.String toString() {
-		return "DataIgnore(x=" + this.x + ")";
-	}
-}
diff --git a/test/delombok/resource/after/DataPlain.java b/test/delombok/resource/after/DataPlain.java
deleted file mode 100644
index 2938a46e..00000000
--- a/test/delombok/resource/after/DataPlain.java
+++ /dev/null
@@ -1,92 +0,0 @@
-class Data1 {
-	final int x;
-	String name;
-	@java.beans.ConstructorProperties({"x"})
-	@java.lang.SuppressWarnings("all")
-	public Data1(final int x) {
-		this.x = x;
-	}
-	@java.lang.SuppressWarnings("all")
-	public int getX() {
-		return this.x;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getName() {
-		return this.name;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setName(final String name) {
-		this.name = name;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (o == null) return false;
-		if (o.getClass() != this.getClass()) return false;
-		final Data1 other = (Data1)o;
-		if (this.x != other.x) return false;
-		if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false;
-		return true;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = result * PRIME + this.x;
-		result = result * PRIME + (this.name == null ? 0 : this.name.hashCode());
-		return result;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public java.lang.String toString() {
-		return "Data1(x=" + this.x + ", name=" + this.name + ")";
-	}
-}
-class Data2 {
-	final int x;
-	String name;
-	@java.beans.ConstructorProperties({"x"})
-	@java.lang.SuppressWarnings("all")
-	public Data2(final int x) {
-		this.x = x;
-	}
-	@java.lang.SuppressWarnings("all")
-	public int getX() {
-		return this.x;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getName() {
-		return this.name;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setName(final String name) {
-		this.name = name;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (o == null) return false;
-		if (o.getClass() != this.getClass()) return false;
-		final Data2 other = (Data2)o;
-		if (this.x != other.x) return false;
-		if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false;
-		return true;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = result * PRIME + this.x;
-		result = result * PRIME + (this.name == null ? 0 : this.name.hashCode());
-		return result;
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public java.lang.String toString() {
-		return "Data2(x=" + this.x + ", name=" + this.name + ")";
-	}
-}
diff --git a/test/delombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java
deleted file mode 100644
index 6d977d87..00000000
--- a/test/delombok/resource/after/GetterAccessLevel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-class GetterAccessLevel {
-	boolean isNone;
-	boolean isPrivate;
-	boolean isPackage;
-	boolean isProtected;
-	boolean isPublic;
-	String noneString;
-	String privateString;
-	String packageString;
-	String protectedString;
-	String publicString;
-	String value;
-	@java.lang.SuppressWarnings("all")
-	private boolean isPrivate() {
-		return this.isPrivate;
-	}
-	@java.lang.SuppressWarnings("all")
-	boolean isPackage() {
-		return this.isPackage;
-	}
-	@java.lang.SuppressWarnings("all")
-	protected boolean isProtected() {
-		return this.isProtected;
-	}
-	@java.lang.SuppressWarnings("all")
-	public boolean isPublic() {
-		return this.isPublic;
-	}
-	@java.lang.SuppressWarnings("all")
-	private String getPrivateString() {
-		return this.privateString;
-	}
-	@java.lang.SuppressWarnings("all")
-	String getPackageString() {
-		return this.packageString;
-	}
-	@java.lang.SuppressWarnings("all")
-	protected String getProtectedString() {
-		return this.protectedString;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getPublicString() {
-		return this.publicString;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getValue() {
-		return this.value;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/GetterAlreadyExists.java b/test/delombok/resource/after/GetterAlreadyExists.java
deleted file mode 100644
index 6a5377ba..00000000
--- a/test/delombok/resource/after/GetterAlreadyExists.java
+++ /dev/null
@@ -1,140 +0,0 @@
-class Getter1 {
-	boolean foo;
-	boolean hasFoo() {
-		return true;
-	}
-}
-class Getter2 {
-	boolean foo;
-	boolean isFoo() {
-		return true;
-	}
-}
-class Getter3 {
-	boolean foo;
-	boolean getFoo() {
-		return true;
-	}
-}
-class Getter4 {
-	String foo;
-	String hasFoo() {
-		return null;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter5 {
-	String foo;
-	String isFoo() {
-		return null;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter6 {
-	String foo;
-	String getFoo() {
-		return null;
-	}
-}
-class Getter7 {
-	String foo;
-	boolean hasFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter8 {
-	String foo;
-	boolean isFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter9 {
-	String foo;
-	boolean getFoo() {
-		return false;
-	}
-}
-class Getter10 {
-	boolean foo;
-	static boolean hasFoo() {
-		return false;
-	}
-}
-class Getter11 {
-	boolean foo;
-	static boolean isFoo() {
-		return false;
-	}
-}
-class Getter12 {
-	boolean foo;
-	static boolean getFoo() {
-		return false;
-	}
-}
-class Getter13 {
-	String foo;
-	static boolean hasFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter14 {
-	String foo;
-	static boolean isFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter15 {
-	String foo;
-	static boolean getFoo() {
-		return false;
-	}
-}
-class Getter16 {
-	String foo;
-	static String hasFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter17 {
-	String foo;
-	static String isFoo() {
-		return false;
-	}
-	@java.lang.SuppressWarnings("all")
-	public String getFoo() {
-		return this.foo;
-	}
-}
-class Getter18 {
-	String foo;
-	static String getFoo() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/GetterBoolean.java b/test/delombok/resource/after/GetterBoolean.java
deleted file mode 100644
index a727e49b..00000000
--- a/test/delombok/resource/after/GetterBoolean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-class Getter {
-	boolean foo;
-	boolean isBar;
-	boolean hasBaz;
-	@java.lang.SuppressWarnings("all")
-	public boolean isFoo() {
-		return this.foo;
-	}
-	@java.lang.SuppressWarnings("all")
-	public boolean isBar() {
-		return this.isBar;
-	}
-	@java.lang.SuppressWarnings("all")
-	public boolean hasBaz() {
-		return this.hasBaz;
-	}
-}
-class MoreGetter {
-	boolean foo;
-	boolean hasFoo() {
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/GetterOnClass.java b/test/delombok/resource/after/GetterOnClass.java
deleted file mode 100644
index bd15ce35..00000000
--- a/test/delombok/resource/after/GetterOnClass.java
+++ /dev/null
@@ -1,59 +0,0 @@
-class GetterOnClass1 {
-	boolean isNone;
-	boolean isPublic;
-	@java.lang.SuppressWarnings("all")
-	public boolean isPublic() {
-		return this.isPublic;
-	}
-}
-class GetterOnClass2 {
-	boolean isNone;
-	boolean isProtected;
-	boolean isPackage;
-	@java.lang.SuppressWarnings("all")
-	protected boolean isProtected() {
-		return this.isProtected;
-	}
-	@java.lang.SuppressWarnings("all")
-	boolean isPackage() {
-		return this.isPackage;
-	}
-}
-class GetterOnClass3 {
-	boolean isNone;
-	boolean isPackage;
-	@java.lang.SuppressWarnings("all")
-	boolean isPackage() {
-		return this.isPackage;
-	}
-}
-class GetterOnClass4 {
-	boolean isNone;
-	boolean isPrivate;
-	@java.lang.SuppressWarnings("all")
-	private boolean isPrivate() {
-		return this.isPrivate;
-	}
-}
-class GetterOnClass5 {
-	boolean isNone;
-	boolean isPublic;
-	@java.lang.SuppressWarnings("all")
-	public boolean isPublic() {
-		return this.isPublic;
-	}
-}
-class GetterOnClass6 {
-	String couldBeNull;
-	@lombok.NonNull
-	String nonNull;
-	@java.lang.SuppressWarnings("all")
-	public String getCouldBeNull() {
-		return this.couldBeNull;
-	}
-	@lombok.NonNull
-	@java.lang.SuppressWarnings("all")
-	public String getNonNull() {
-		return this.nonNull;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/GetterPlain.java b/test/delombok/resource/after/GetterPlain.java
deleted file mode 100644
index 359d46e2..00000000
--- a/test/delombok/resource/after/GetterPlain.java
+++ /dev/null
@@ -1,12 +0,0 @@
-class GetterPlain {
-	int i;
-	int foo;
-	@java.lang.SuppressWarnings("all")
-	public int getI() {
-		return this.i;
-	}
-	@java.lang.SuppressWarnings("all")
-	public int getFoo() {
-		return this.foo;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/GetterWithDollar.java b/test/delombok/resource/after/GetterWithDollar.java
deleted file mode 100644
index 9e02ccb8..00000000
--- a/test/delombok/resource/after/GetterWithDollar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-class GetterWithDollar1 {
-	int $i;
-	@java.lang.SuppressWarnings("all")
-	public int getI() {
-		return this.$i;
-	}
-}
-class GetterWithDollar2 {
-	int $i;
-	int i;
-	@java.lang.SuppressWarnings("all")
-	public int getI() {
-		return this.i;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/NonNullPlain.java b/test/delombok/resource/after/NonNullPlain.java
deleted file mode 100644
index 19869db1..00000000
--- a/test/delombok/resource/after/NonNullPlain.java
+++ /dev/null
@@ -1,25 +0,0 @@
-class NonNullPlain {
-	@lombok.NonNull
-	int i;
-	@lombok.NonNull
-	String s;
-	@lombok.NonNull
-	@java.lang.SuppressWarnings("all")
-	public int getI() {
-		return this.i;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setI(@lombok.NonNull final int i) {
-		this.i = i;
-	}
-	@lombok.NonNull
-	@java.lang.SuppressWarnings("all")
-	public String getS() {
-		return this.s;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setS(@lombok.NonNull final String s) {
-		if (s == null) throw new java.lang.NullPointerException("s");
-		this.s = s;
-	}
-}
diff --git a/test/delombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java
deleted file mode 100644
index dce4cc2f..00000000
--- a/test/delombok/resource/after/SetterAccessLevel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-class SetterAccessLevel {
-	boolean isNone;
-	boolean isPrivate;
-	boolean isPackage;
-	boolean isProtected;
-	boolean isPublic;
-	boolean value;
-	@java.lang.SuppressWarnings("all")
-	private void setIsPrivate(final boolean isPrivate) {
-		this.isPrivate = isPrivate;
-	}
-	@java.lang.SuppressWarnings("all")
-	void setIsPackage(final boolean isPackage) {
-		this.isPackage = isPackage;
-	}
-	@java.lang.SuppressWarnings("all")
-	protected void setIsProtected(final boolean isProtected) {
-		this.isProtected = isProtected;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setIsPublic(final boolean isPublic) {
-		this.isPublic = isPublic;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setValue(final boolean value) {
-		this.value = value;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SetterAlreadyExists.java b/test/delombok/resource/after/SetterAlreadyExists.java
deleted file mode 100644
index e4992b29..00000000
--- a/test/delombok/resource/after/SetterAlreadyExists.java
+++ /dev/null
@@ -1,35 +0,0 @@
-class Setter1 {
-	boolean foo;
-	void setFoo(boolean foo) {
-	}
-}
-class Setter2 {
-	boolean foo;
-	void setFoo(String foo) {
-	}
-}
-class Setter3 {
-	String foo;
-	void setFoo(boolean foo) {
-	}
-}
-class Setter4 {
-	String foo;
-	void setFoo(String foo) {
-	}
-}
-class Setter5 {
-	String foo;
-	void setFoo() {
-	}
-}
-class Setter6 {
-	String foo;
-	void setFoo(String foo, int x) {
-	}
-}
-class Setter7 {
-	String foo;
-	static void setFoo() {
-	}
-}
diff --git a/test/delombok/resource/after/SetterOnClass.java b/test/delombok/resource/after/SetterOnClass.java
deleted file mode 100644
index 05528ff8..00000000
--- a/test/delombok/resource/after/SetterOnClass.java
+++ /dev/null
@@ -1,59 +0,0 @@
-class SetterOnClass1 {
-	boolean isNone;
-	boolean isPublic;
-	@java.lang.SuppressWarnings("all")
-	public void setIsPublic(final boolean isPublic) {
-		this.isPublic = isPublic;
-	}
-}
-class SetterOnClass2 {
-	boolean isNone;
-	boolean isProtected;
-	boolean isPackage;
-	@java.lang.SuppressWarnings("all")
-	protected void setIsProtected(final boolean isProtected) {
-		this.isProtected = isProtected;
-	}
-	@java.lang.SuppressWarnings("all")
-	void setIsPackage(final boolean isPackage) {
-		this.isPackage = isPackage;
-	}
-}
-class SetterOnClass3 {
-	boolean isNone;
-	boolean isPackage;
-	@java.lang.SuppressWarnings("all")
-	void setIsPackage(final boolean isPackage) {
-		this.isPackage = isPackage;
-	}
-}
-class SetterOnClass4 {
-	boolean isNone;
-	boolean isPrivate;
-	@java.lang.SuppressWarnings("all")
-	private void setIsPrivate(final boolean isPrivate) {
-		this.isPrivate = isPrivate;
-	}
-}
-class SetterOnClass5 {
-	boolean isNone;
-	boolean isPublic;
-	@java.lang.SuppressWarnings("all")
-	public void setIsPublic(final boolean isPublic) {
-		this.isPublic = isPublic;
-	}
-}
-class SetterOnClass6 {
-	String couldBeNull;
-	@lombok.NonNull
-	String nonNull;
-	@java.lang.SuppressWarnings("all")
-	public void setCouldBeNull(final String couldBeNull) {
-		this.couldBeNull = couldBeNull;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setNonNull(@lombok.NonNull final String nonNull) {
-		if (nonNull == null) throw new java.lang.NullPointerException("nonNull");
-		this.nonNull = nonNull;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SetterPlain.java b/test/delombok/resource/after/SetterPlain.java
deleted file mode 100644
index 39aa7b61..00000000
--- a/test/delombok/resource/after/SetterPlain.java
+++ /dev/null
@@ -1,12 +0,0 @@
-class SetterPlain {
-	int i;
-	int foo;
-	@java.lang.SuppressWarnings("all")
-	public void setI(final int i) {
-		this.i = i;
-	}
-	@java.lang.SuppressWarnings("all")
-	public void setFoo(final int foo) {
-		this.foo = foo;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SetterWithDollar.java b/test/delombok/resource/after/SetterWithDollar.java
deleted file mode 100644
index c26a1ccd..00000000
--- a/test/delombok/resource/after/SetterWithDollar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-class SetterWithDollar1 {
-	int $i;
-	
-	public void setI(final int i) {
-		this.$i = i;
-	}
-}
-class SetterWithDollar2 {
-	int $i;
-	int i;
-	
-	public void setI(final int i) {
-		this.i = i;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SneakyThrowsMultiple.java b/test/delombok/resource/after/SneakyThrowsMultiple.java
deleted file mode 100644
index bab13990..00000000
--- a/test/delombok/resource/after/SneakyThrowsMultiple.java
+++ /dev/null
@@ -1,45 +0,0 @@
-import java.awt.AWTException;
-import java.io.IOException;
-import java.util.Random;
-class SneakyThrowsMultiple {
-	public void test() {
-		try {
-			try {
-				System.out.println("test1");
-				throw new IOException();
-			} catch (IOException $ex) {
-				throw lombok.Lombok.sneakyThrow($ex);
-			}
-		} catch (Throwable $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-	public void test2() {
-		try {
-			try {
-				System.out.println("test2");
-				if (new Random().nextBoolean()) {
-					throw new IOException();
-				} else {
-					throw new AWTException("WHAT");
-				}
-			} catch (AWTException $ex) {
-				throw lombok.Lombok.sneakyThrow($ex);
-			}
-		} catch (IOException $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-	public void test3() {
-		try {
-			try {
-				System.out.println("test3");
-				throw new IOException();
-			} catch (IOException $ex) {
-				throw lombok.Lombok.sneakyThrow($ex);
-			}
-		} catch (Throwable $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SneakyThrowsPlain.java b/test/delombok/resource/after/SneakyThrowsPlain.java
deleted file mode 100644
index d5abc478..00000000
--- a/test/delombok/resource/after/SneakyThrowsPlain.java
+++ /dev/null
@@ -1,17 +0,0 @@
-class SneakyThrowsPlain {
-	public void test() {
-		try {
-			System.out.println("test1");
-		} catch (java.lang.Throwable $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-	
-	public void test2() {
-		try {
-			System.out.println("test2");
-		} catch (java.lang.Throwable $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SneakyThrowsSingle.java b/test/delombok/resource/after/SneakyThrowsSingle.java
deleted file mode 100644
index 519d06a9..00000000
--- a/test/delombok/resource/after/SneakyThrowsSingle.java
+++ /dev/null
@@ -1,26 +0,0 @@
-import java.io.IOException;
-class SneakyThrowsSingle {
-	public void test() {
-		try {
-			System.out.println("test1");
-		} catch (Throwable $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-	public void test2() {
-		try {
-			System.out.println("test2");
-			throw new IOException();
-		} catch (IOException $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-	public void test3() {
-		try {
-			System.out.println("test3");
-			throw new IOException();
-		} catch (IOException $ex) {
-			throw lombok.Lombok.sneakyThrow($ex);
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/SynchronizedName.java b/test/delombok/resource/after/SynchronizedName.java
deleted file mode 100644
index 066e3bdf..00000000
--- a/test/delombok/resource/after/SynchronizedName.java
+++ /dev/null
@@ -1,25 +0,0 @@
-class SynchronizedName {
-	private Object read = new Object();
-	private static Object READ = new Object();
-	void test1() {
-		synchronized (read) {
-			System.out.println("one");
-		}
-	}
-	void test2() {
-		System.out.println("two");
-	}
-	static void test3() {
-		System.out.println("three");
-	}
-	void test4() {
-		synchronized (READ) {
-			System.out.println("four");
-		}
-	}
-	void test5() {
-		synchronized (read) {
-			System.out.println("five");
-		}
-	}
-}
diff --git a/test/delombok/resource/after/SynchronizedPlain.java b/test/delombok/resource/after/SynchronizedPlain.java
deleted file mode 100644
index 695a3089..00000000
--- a/test/delombok/resource/after/SynchronizedPlain.java
+++ /dev/null
@@ -1,28 +0,0 @@
-class SynchronizedPlain1 {
-	void test() {
-		synchronized (this.$lock) {
-			System.out.println("one");
-		}
-	}
-	void test2() {
-		synchronized (this.$lock) {
-			System.out.println("two");
-		}
-	}
-	@java.lang.SuppressWarnings("all")
-	private final java.lang.Object $lock = new java.lang.Object[0];
-}
-class SynchronizedPlain2 {
-	static void test() {
-		synchronized (SynchronizedPlain2.$LOCK) {
-			System.out.println("three");
-		}
-	}
-	static void test2() {
-		synchronized (SynchronizedPlain2.$LOCK) {
-			System.out.println("four");
-		}
-	}
-	@java.lang.SuppressWarnings("all")
-	private static final java.lang.Object $LOCK = new java.lang.Object[0];
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/ToStringInner.java b/test/delombok/resource/after/ToStringInner.java
deleted file mode 100644
index 29e7dc91..00000000
--- a/test/delombok/resource/after/ToStringInner.java
+++ /dev/null
@@ -1,32 +0,0 @@
-class ToStringOuter {
-	final int x;
-	String name;
-	class ToStringInner {
-		final int y;
-		@java.lang.Override
-		public java.lang.String toString() {
-			return "ToStringOuter.ToStringInner(y=" + y + ")";
-		}
-	}
-	static class ToStringStaticInner {
-		final int y;
-		@java.lang.Override
-		public java.lang.String toString() {
-			return "ToStringOuter.ToStringStaticInner(y=" + y + ")";
-		}
-	}
-	class ToStringMiddle {
-		class ToStringMoreInner {
-			final String name;
-			@java.lang.Override
-			public java.lang.String toString() {
-				return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + name + ")";
-			}
-		}
-	}
-	
-	@java.lang.Override
-	public java.lang.String toString() {
-		return "ToStringOuter(x=" + x + ", name=" + name + ")";
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/after/ToStringPlain.java b/test/delombok/resource/after/ToStringPlain.java
deleted file mode 100644
index 20227464..00000000
--- a/test/delombok/resource/after/ToStringPlain.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class ToString1 {
-	final int x;
-	String name;
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public java.lang.String toString() {
-		return "ToString1(x=" + this.x + ", name=" + this.name + ")";
-	}
-}
-class ToString2 {
-	final int x;
-	String name;
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public java.lang.String toString() {
-		return "ToString2(x=" + this.x + ", name=" + this.name + ")";
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/ClassNamedAfterGetter.java b/test/delombok/resource/before/ClassNamedAfterGetter.java
deleted file mode 100644
index fe61eda1..00000000
--- a/test/delombok/resource/before/ClassNamedAfterGetter.java
+++ /dev/null
@@ -1,3 +0,0 @@
-class GetFoo {
-	@lombok.Getter private int foo;
-}
diff --git a/test/delombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java
deleted file mode 100644
index cbc5b447..00000000
--- a/test/delombok/resource/before/CleanupName.java
+++ /dev/null
@@ -1,10 +0,0 @@
-class CleanupName {
-	void test() {
-		@lombok.Cleanup("toString") Object o = "Hello World!";
-		System.out.println(o);
-	}
-	void test2() {
-		@lombok.Cleanup(value="toString") Object o = "Hello World too!";
-		System.out.println(o);
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/CleanupPlain.java b/test/delombok/resource/before/CleanupPlain.java
deleted file mode 100644
index a91ac3c1..00000000
--- a/test/delombok/resource/before/CleanupPlain.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import lombok.Cleanup;
-import java.io.*;
-class CleanupPlain {
-	void test() throws Exception {
-		@lombok.Cleanup InputStream in = new FileInputStream("in");
-		@Cleanup OutputStream out = new FileOutputStream("out");
-		if (in.markSupported()) {
-			out.flush();
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/CommentsInterspersed.java b/test/delombok/resource/before/CommentsInterspersed.java
deleted file mode 100644
index e7898aaa..00000000
--- a/test/delombok/resource/before/CommentsInterspersed.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import  /* cmt */   lombok./* cmt2 */Getter   /* cmt3 */   ;
-
-public /*bla */ class CommentsInterspersed {
-	/** javadoc for field */
-	private int x;
-	
-	private /* bla2 */ @Getter String test = "foo"; //$NON-NLS-1$
-	
-	/** Javadoc on method */
-	public native void gwtTest(); /*-{
-		javascript;
-	}-*/
-} //haha!
-//hahaha!
-
-//hahahaha!
-
diff --git a/test/delombok/resource/before/DataIgnore.java b/test/delombok/resource/before/DataIgnore.java
deleted file mode 100644
index 5f957bdc..00000000
--- a/test/delombok/resource/before/DataIgnore.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@lombok.Data class DataIgnore {
-	final int x;
-	String $name;
-}
diff --git a/test/delombok/resource/before/DataPlain.java b/test/delombok/resource/before/DataPlain.java
deleted file mode 100644
index 680ae46f..00000000
--- a/test/delombok/resource/before/DataPlain.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import lombok.Data;
-@lombok.Data class Data1 {
-	final int x;
-	String name;
-}
-@Data class Data2 {
-	final int x;
-	String name;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterAccessLevel.java b/test/delombok/resource/before/GetterAccessLevel.java
deleted file mode 100644
index 413b888e..00000000
--- a/test/delombok/resource/before/GetterAccessLevel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-class GetterAccessLevel {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	@lombok.Getter(lombok.AccessLevel.PRIVATE)
-	boolean isPrivate;
-	@lombok.Getter(lombok.AccessLevel.PACKAGE)
-	boolean isPackage;
-	@lombok.Getter(lombok.AccessLevel.PROTECTED)
-	boolean isProtected;
-	@lombok.Getter(lombok.AccessLevel.PUBLIC)
-	boolean isPublic;
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	String noneString;
-	@lombok.Getter(lombok.AccessLevel.PRIVATE)
-	String privateString;
-	@lombok.Getter(lombok.AccessLevel.PACKAGE)
-	String packageString;
-	@lombok.Getter(lombok.AccessLevel.PROTECTED)
-	String protectedString;
-	@lombok.Getter(lombok.AccessLevel.PUBLIC)
-	String publicString;
-	@lombok.Getter(value=lombok.AccessLevel.PUBLIC)
-	String value;
-}
diff --git a/test/delombok/resource/before/GetterAlreadyExists.java b/test/delombok/resource/before/GetterAlreadyExists.java
deleted file mode 100644
index 93b77dc1..00000000
--- a/test/delombok/resource/before/GetterAlreadyExists.java
+++ /dev/null
@@ -1,108 +0,0 @@
-class Getter1 {
-	@lombok.Getter boolean foo;
-	boolean hasFoo() {
-		return true;
-	}
-}
-class Getter2 {
-	@lombok.Getter boolean foo;
-	boolean isFoo() {
-		return true;
-	}
-}
-class Getter3 {
-	@lombok.Getter boolean foo;
-	boolean getFoo() {
-		return true;
-	}
-}
-class Getter4 {
-	@lombok.Getter String foo;
-	String hasFoo() {
-		return null;
-	}
-}
-class Getter5 {
-	@lombok.Getter String foo;
-	String isFoo() {
-		return null;
-	}
-}
-class Getter6 {
-	@lombok.Getter String foo;
-	String getFoo() {
-		return null;
-	}
-}
-class Getter7 {
-	@lombok.Getter String foo;
-	boolean hasFoo() {
-		return false;
-	}
-}
-class Getter8 {
-	@lombok.Getter String foo;
-	boolean isFoo() {
-		return false;
-	}
-}
-class Getter9 {
-	@lombok.Getter String foo;
-	boolean getFoo() {
-		return false;
-	}
-}
-class Getter10 {
-	@lombok.Getter boolean foo;
-	static boolean hasFoo() {
-		return false;
-	}
-}
-class Getter11 {
-	@lombok.Getter boolean foo;
-	static boolean isFoo() {
-		return false;
-	}
-}
-class Getter12 {
-	@lombok.Getter boolean foo;
-	static boolean getFoo() {
-		return false;
-	}
-}
-class Getter13 {
-	@lombok.Getter String foo;
-	static boolean hasFoo() {
-		return false;
-	}
-}
-class Getter14 {
-	@lombok.Getter String foo;
-	static boolean isFoo() {
-		return false;
-	}
-}
-class Getter15 {
-	@lombok.Getter String foo;
-	static boolean getFoo() {
-		return false;
-	}
-}
-class Getter16 {
-	@lombok.Getter String foo;
-	static String hasFoo() {
-		return false;
-	}
-}
-class Getter17 {
-	@lombok.Getter String foo;
-	static String isFoo() {
-		return false;
-	}
-}
-class Getter18 {
-	@lombok.Getter String foo;
-	static String getFoo() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterAlreadyExists.java.messages b/test/delombok/resource/before/GetterAlreadyExists.java.messages
deleted file mode 100644
index 99de957b..00000000
--- a/test/delombok/resource/before/GetterAlreadyExists.java.messages
+++ /dev/null
@@ -1,10 +0,0 @@
-2:9 WARNING Not generating isFoo(): A method with that name already exists (hasFoo)
-8:9 WARNING Not generating isFoo(): A method with that name already exists
-14:9 WARNING Not generating isFoo(): A method with that name already exists (getFoo)
-32:9 WARNING Not generating getFoo(): A method with that name already exists
-50:9 WARNING Not generating getFoo(): A method with that name already exists
-56:9 WARNING Not generating isFoo(): A method with that name already exists (hasFoo)
-62:9 WARNING Not generating isFoo(): A method with that name already exists
-68:9 WARNING Not generating isFoo(): A method with that name already exists (getFoo)
-86:9 WARNING Not generating getFoo(): A method with that name already exists
-104:9 WARNING Not generating getFoo(): A method with that name already exists
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterBoolean.java b/test/delombok/resource/before/GetterBoolean.java
deleted file mode 100644
index 7d53ebbf..00000000
--- a/test/delombok/resource/before/GetterBoolean.java
+++ /dev/null
@@ -1,12 +0,0 @@
-class Getter {
-	@lombok.Getter boolean foo;
-	@lombok.Getter boolean isBar;
-	@lombok.Getter boolean hasBaz;
-}
-class MoreGetter {
-	@lombok.Getter boolean foo;
-	
-	boolean hasFoo() {
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterBoolean.java.messages b/test/delombok/resource/before/GetterBoolean.java.messages
deleted file mode 100644
index 91ba7340..00000000
--- a/test/delombok/resource/before/GetterBoolean.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-7:9 WARNING Not generating isFoo(): A method with that name already exists (hasFoo)
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterOnClass.java b/test/delombok/resource/before/GetterOnClass.java
deleted file mode 100644
index 0a38b386..00000000
--- a/test/delombok/resource/before/GetterOnClass.java
+++ /dev/null
@@ -1,37 +0,0 @@
-@lombok.Getter
-class GetterOnClass1 {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPublic;
-}
-@lombok.Getter(lombok.AccessLevel.PROTECTED)
-class GetterOnClass2 {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isProtected;
-	@lombok.Getter(lombok.AccessLevel.PACKAGE)
-	boolean isPackage;
-}
-@lombok.Getter(lombok.AccessLevel.PACKAGE)
-class GetterOnClass3 {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPackage;
-}
-@lombok.Getter(lombok.AccessLevel.PRIVATE)
-class GetterOnClass4 {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPrivate;
-}
-@lombok.Getter(lombok.AccessLevel.PUBLIC)
-class GetterOnClass5 {
-	@lombok.Getter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPublic;
-}
-@lombok.Getter
-class GetterOnClass6 {
-	String couldBeNull;
-	@lombok.NonNull String nonNull;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterPlain.java b/test/delombok/resource/before/GetterPlain.java
deleted file mode 100644
index d104f428..00000000
--- a/test/delombok/resource/before/GetterPlain.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import lombok.Getter;
-class GetterPlain {
-	@lombok.Getter int i;
-	@Getter int foo;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/GetterWithDollar.java b/test/delombok/resource/before/GetterWithDollar.java
deleted file mode 100644
index e1ef0818..00000000
--- a/test/delombok/resource/before/GetterWithDollar.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//ignore
-class GetterWithDollar1 {
-	@lombok.Getter int $i;
-}
-
-class GetterWithDollar2 {
-	@lombok.Getter int $i;
-	@lombok.Getter int i;
-}
diff --git a/test/delombok/resource/before/NonNullPlain.java b/test/delombok/resource/before/NonNullPlain.java
deleted file mode 100644
index eef64b2f..00000000
--- a/test/delombok/resource/before/NonNullPlain.java
+++ /dev/null
@@ -1,11 +0,0 @@
-class NonNullPlain {
-	@lombok.Getter
-	@lombok.Setter
-	@lombok.NonNull
-	@lombok.Getter int i;
-	
-	@lombok.Getter
-	@lombok.Setter
-	@lombok.NonNull
-	String s;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SetterAccessLevel.java b/test/delombok/resource/before/SetterAccessLevel.java
deleted file mode 100644
index 8a30a7de..00000000
--- a/test/delombok/resource/before/SetterAccessLevel.java
+++ /dev/null
@@ -1,14 +0,0 @@
-class SetterAccessLevel {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	@lombok.Setter(lombok.AccessLevel.PRIVATE)
-	boolean isPrivate;
-	@lombok.Setter(lombok.AccessLevel.PACKAGE)
-	boolean isPackage;
-	@lombok.Setter(lombok.AccessLevel.PROTECTED)
-	boolean isProtected;
-	@lombok.Setter(lombok.AccessLevel.PUBLIC)
-	boolean isPublic;
-	@lombok.Setter(value=lombok.AccessLevel.PUBLIC)
-	boolean value;
-}
diff --git a/test/delombok/resource/before/SetterAlreadyExists.java b/test/delombok/resource/before/SetterAlreadyExists.java
deleted file mode 100644
index a7a94123..00000000
--- a/test/delombok/resource/before/SetterAlreadyExists.java
+++ /dev/null
@@ -1,35 +0,0 @@
-class Setter1 {
-	@lombok.Setter boolean foo;
-	void setFoo(boolean foo) {
-	}
-}
-class Setter2 {
-	@lombok.Setter boolean foo;
-	void setFoo(String foo) {
-	}
-}
-class Setter3 {
-	@lombok.Setter String foo;
-	void setFoo(boolean foo) {
-	}
-}
-class Setter4 {
-	@lombok.Setter String foo;
-	void setFoo(String foo) {
-	}
-}
-class Setter5 {
-	@lombok.Setter String foo;
-	void setFoo() {
-	}
-}
-class Setter6 {
-	@lombok.Setter String foo;
-	void setFoo(String foo, int x) {
-	}
-}
-class Setter7 {
-	@lombok.Setter String foo;
-	static void setFoo() {
-	}
-}
diff --git a/test/delombok/resource/before/SetterAlreadyExists.java.messages b/test/delombok/resource/before/SetterAlreadyExists.java.messages
deleted file mode 100644
index 7d0397ad..00000000
--- a/test/delombok/resource/before/SetterAlreadyExists.java.messages
+++ /dev/null
@@ -1,7 +0,0 @@
-2:9 WARNING Not generating setFoo(boolean foo): A method with that name already exists
-7:9 WARNING Not generating setFoo(boolean foo): A method with that name already exists
-12:9 WARNING Not generating setFoo(String foo): A method with that name already exists
-17:9 WARNING Not generating setFoo(String foo): A method with that name already exists
-22:9 WARNING Not generating setFoo(String foo): A method with that name already exists
-27:9 WARNING Not generating setFoo(String foo): A method with that name already exists
-32:9 WARNING Not generating setFoo(String foo): A method with that name already exists
diff --git a/test/delombok/resource/before/SetterOnClass.java b/test/delombok/resource/before/SetterOnClass.java
deleted file mode 100644
index 5d195ff5..00000000
--- a/test/delombok/resource/before/SetterOnClass.java
+++ /dev/null
@@ -1,37 +0,0 @@
-@lombok.Setter
-class SetterOnClass1 {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPublic;
-}
-@lombok.Setter(lombok.AccessLevel.PROTECTED)
-class SetterOnClass2 {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isProtected;
-	@lombok.Setter(lombok.AccessLevel.PACKAGE)
-	boolean isPackage;
-}
-@lombok.Setter(lombok.AccessLevel.PACKAGE)
-class SetterOnClass3 {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPackage;
-}
-@lombok.Setter(lombok.AccessLevel.PRIVATE)
-class SetterOnClass4 {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPrivate;
-}
-@lombok.Setter(lombok.AccessLevel.PUBLIC)
-class SetterOnClass5 {
-	@lombok.Setter(lombok.AccessLevel.NONE)
-	boolean isNone;
-	boolean isPublic;
-}
-@lombok.Setter
-class SetterOnClass6 {
-	String couldBeNull;
-	@lombok.NonNull String nonNull;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SetterPlain.java b/test/delombok/resource/before/SetterPlain.java
deleted file mode 100644
index e1ac99f8..00000000
--- a/test/delombok/resource/before/SetterPlain.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import lombok.Setter;
-class SetterPlain {
-	@lombok.Setter int i;
-	@Setter int foo;
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SetterWithDollar.java b/test/delombok/resource/before/SetterWithDollar.java
deleted file mode 100644
index c09173b0..00000000
--- a/test/delombok/resource/before/SetterWithDollar.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//ignore
-class SetterWithDollar1 {
-	@lombok.Setter int $i;
-}
-
-class SetterWithDollar2 {
-	@lombok.Setter int $i;
-	@lombok.Setter int i;
-}
diff --git a/test/delombok/resource/before/SneakyThrowsMultiple.java b/test/delombok/resource/before/SneakyThrowsMultiple.java
deleted file mode 100644
index 7e644f3d..00000000
--- a/test/delombok/resource/before/SneakyThrowsMultiple.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import java.awt.AWTException;
-import java.io.IOException;
-import java.util.Random;
-
-class SneakyThrowsMultiple {
-	@lombok.SneakyThrows(IOException.class,Throwable.class) 
-	public void test() {
-		System.out.println("test1");
-		throw new IOException();
-	}
-	
-	@lombok.SneakyThrows(AWTException.class,IOException.class)
-	public void test2() {
-		System.out.println("test2");
-		if (new Random().nextBoolean()) {
-			throw new IOException();
-		}
-		else {
-			throw new AWTException("WHAT");
-		}
-	}
-	
-	@lombok.SneakyThrows(value={IOException.class,Throwable.class})
-	public void test3() {
-		System.out.println("test3");
-		throw new IOException();
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SneakyThrowsPlain.java b/test/delombok/resource/before/SneakyThrowsPlain.java
deleted file mode 100644
index 97fecf8f..00000000
--- a/test/delombok/resource/before/SneakyThrowsPlain.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import lombok.SneakyThrows;
-class SneakyThrowsPlain {
-	@lombok.SneakyThrows public void test() {
-		System.out.println("test1");
-	}
-	
-	@SneakyThrows public void test2() {
-		System.out.println("test2");
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SneakyThrowsSingle.java b/test/delombok/resource/before/SneakyThrowsSingle.java
deleted file mode 100644
index e7b78ec7..00000000
--- a/test/delombok/resource/before/SneakyThrowsSingle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-import java.io.IOException;
-
-class SneakyThrowsSingle {
-	@lombok.SneakyThrows(Throwable.class) 
-	public void test() {
-		System.out.println("test1");
-	}
-	
-	@lombok.SneakyThrows(IOException.class)
-	public void test2() {
-		System.out.println("test2");
-		throw new IOException();
-	}
-	
-	@lombok.SneakyThrows(value=IOException.class)
-	public void test3() {
-		System.out.println("test3");
-		throw new IOException();
-	}
-
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/SynchronizedName.java b/test/delombok/resource/before/SynchronizedName.java
deleted file mode 100644
index 6d9ca5e9..00000000
--- a/test/delombok/resource/before/SynchronizedName.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//ignore
-class SynchronizedName {
-	private Object read = new Object();
-	private static Object READ = new Object();
-	
-	@lombok.Synchronized("read") void test1() {
-		System.out.println("one");
-	}
-	@lombok.Synchronized("write") void test2() {
-		System.out.println("two");
-	}
-	@lombok.Synchronized("read") static void test3() {
-		System.out.println("three");
-	}	
-	@lombok.Synchronized("READ") void test4() {
-		System.out.println("four");
-	}	
-	@lombok.Synchronized(value="read") void test5() {
-		System.out.println("five");
-	}
-}
diff --git a/test/delombok/resource/before/SynchronizedPlain.java b/test/delombok/resource/before/SynchronizedPlain.java
deleted file mode 100644
index 6f5f3b64..00000000
--- a/test/delombok/resource/before/SynchronizedPlain.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import lombok.Synchronized;
-class SynchronizedPlain1 {
-	@lombok.Synchronized void test() {
-		System.out.println("one");
-	}
-	@Synchronized void test2() {
-		System.out.println("two");
-	}
-}
-class SynchronizedPlain2 {
-	@lombok.Synchronized static void test() {
-		System.out.println("three");
-	}
-	@Synchronized static void test2() {
-		System.out.println("four");
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/ToStringInner.java b/test/delombok/resource/before/ToStringInner.java
deleted file mode 100644
index 418c2f92..00000000
--- a/test/delombok/resource/before/ToStringInner.java
+++ /dev/null
@@ -1,17 +0,0 @@
-//ignore
-import lombok.ToString;
-@ToString class ToStringOuter {
-	final int x;
-	String name;
-	@ToString class ToStringInner {
-		final int y;
-	}
-	@ToString static class ToStringStaticInner {
-		final int y;
-	}
-	class ToStringMiddle {
-		@ToString class ToStringMoreInner {
-			final String name;
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/delombok/resource/before/ToStringPlain.java b/test/delombok/resource/before/ToStringPlain.java
deleted file mode 100644
index 5b9db1c7..00000000
--- a/test/delombok/resource/before/ToStringPlain.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import lombok.ToString;
-@lombok.ToString class ToString1 {
-	final int x;
-	String name;
-}
-@ToString class ToString2 {
-	final int x;
-	String name;
-}
\ No newline at end of file
diff --git a/test/delombok/src/lombok/delombok/TestLombokFiles.java b/test/delombok/src/lombok/delombok/TestLombokFiles.java
deleted file mode 100644
index 713f81f5..00000000
--- a/test/delombok/src/lombok/delombok/TestLombokFiles.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.delombok;
-
-import java.io.File;
-
-import lombok.DirectoryRunner;
-import lombok.RunTestsViaDelombok;
-
-import org.junit.runner.RunWith;
-
-@RunWith(DirectoryRunner.class)
-public class TestLombokFiles {
-	
-	public static File getBeforeDirectory() {
-		RunTestsViaDelombok.printErrors(true);
-		return new File("test/delombok/resource/before");
-	}
-	
-	public static File getAfterDirectory() {
-		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
deleted file mode 100644
index da6377f3..00000000
--- a/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.delombok;
-
-import java.io.File;
-
-import lombok.DirectoryRunner;
-import lombok.RunTestsViaDelombok;
-
-import org.junit.runner.RunWith;
-
-@RunWith(DirectoryRunner.class)
-public class TestLombokFilesIdempotent {
-	
-	public static File getBeforeDirectory() {
-		RunTestsViaDelombok.printErrors(true);
-		return getAfterDirectory();
-	}
-	
-	public static File getAfterDirectory() {
-		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
deleted file mode 100644
index 77693200..00000000
--- a/test/delombok/src/lombok/delombok/TestSourceFiles.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.delombok;
-
-import java.io.File;
-
-import lombok.DirectoryRunner;
-import lombok.RunTestsViaDelombok;
-
-import org.junit.runner.RunWith;
-
-@RunWith(DirectoryRunner.class)
-public class TestSourceFiles {
-	public static File getBeforeDirectory() {
-		RunTestsViaDelombok.printErrors(true);
-		return new File("test/pretty/resource/before");
-	}
-	
-	public static File getAfterDirectory() {
-		return new File("test/pretty/resource/after");
-	}
-}