Merge branch 'master' of git@github.com:rzwitserloot/lombok

8 files changed, 93 insertions, 4 deletions

diff --git a/test/delombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java
index 0d253f1e..cbc5b447 100644
--- a/test/delombok/resource/before/CleanupName.java
+++ b/test/delombok/resource/before/CleanupName.java
@@ -1,6 +1,10 @@
-class Cleanup {
-	void test() throws Exception {
+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/DataPlain.java b/test/delombok/resource/before/DataPlain.java
new file mode 100644
index 00000000..680ae46f
--- /dev/null
+++ b/test/delombok/resource/before/DataPlain.java
@@ -0,0 +1,9 @@
+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
index 8fd9bcc7..413b888e 100644
--- a/test/delombok/resource/before/GetterAccessLevel.java
+++ b/test/delombok/resource/before/GetterAccessLevel.java
@@ -1,4 +1,4 @@
-class Getter {
+class GetterAccessLevel {
 	@lombok.Getter(lombok.AccessLevel.NONE)
 	boolean isNone;
 	@lombok.Getter(lombok.AccessLevel.PRIVATE)
@@ -9,4 +9,16 @@ class Getter {
 	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/SetterAccessLevel.java b/test/delombok/resource/before/SetterAccessLevel.java
index 767341ef..8a30a7de 100644
--- a/test/delombok/resource/before/SetterAccessLevel.java
+++ b/test/delombok/resource/before/SetterAccessLevel.java
@@ -1,4 +1,4 @@
-class Setter {
+class SetterAccessLevel {
 	@lombok.Setter(lombok.AccessLevel.NONE)
 	boolean isNone;
 	@lombok.Setter(lombok.AccessLevel.PRIVATE)
@@ -9,4 +9,6 @@ class Setter {
 	boolean isProtected;
 	@lombok.Setter(lombok.AccessLevel.PUBLIC)
 	boolean isPublic;
+	@lombok.Setter(value=lombok.AccessLevel.PUBLIC)
+	boolean value;
 }
diff --git a/test/delombok/resource/before/SneakyThrowsMultiple.java b/test/delombok/resource/before/SneakyThrowsMultiple.java
new file mode 100644
index 00000000..7e644f3d
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsMultiple.java
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000..97fecf8f
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsPlain.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000..e7b78ec7
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsSingle.java
@@ -0,0 +1,21 @@
+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
index 3aaec705..6d9ca5e9 100644
--- a/test/delombok/resource/before/SynchronizedName.java
+++ b/test/delombok/resource/before/SynchronizedName.java
@@ -15,4 +15,7 @@ class SynchronizedName {
 	@lombok.Synchronized("READ") void test4() {
 		System.out.println("four");
 	}	
+	@lombok.Synchronized(value="read") void test5() {
+		System.out.println("five");
+	}
 }