8 files changed, 85 insertions, 11 deletions
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 3f2698bb..775e825c 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -137,7 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 				i.remove();
 			}
 		}
-		classpath.add("bin");
+		if (new File("bin").exists()) classpath.add("bin");
 		classpath.add("dist/lombok.jar");
 		classpath.add("lib/test/commons-logging-commons-logging.jar");
 		classpath.add("lib/test/org.slf4j-slf4j-api.jar");
diff --git a/test/core/src/lombok/core/TestSingulars.java b/test/core/src/lombok/core/TestSingulars.java
index 1134af08..4560615d 100644
--- a/test/core/src/lombok/core/TestSingulars.java
+++ b/test/core/src/lombok/core/TestSingulars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Project Lombok Authors.
+ * Copyright (C) 2015-2017 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,31 +22,35 @@
 package lombok.core;
 
 import static lombok.core.handlers.Singulars.autoSingularize;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 
 public class TestSingulars {
 	@Test
 	public void testSingulars() {
-		assertEquals(null, autoSingularize("axes"));
+		assertNull("axes", autoSingularize("axes"));
 		assertEquals("adjective", autoSingularize("adjectives"));
 		assertEquals("bus", autoSingularize("buses"));
 		assertEquals("octopus", autoSingularize("octopodes"));
-		assertEquals(null, autoSingularize("octopi"));
+		assertNull("octopi", autoSingularize("octopi"));
 		assertEquals("elf", autoSingularize("elves"));
 		assertEquals("jack", autoSingularize("jacks"));
 		assertEquals("colloquy", autoSingularize("colloquies"));
-		assertEquals(null, autoSingularize("series"));
+		assertNull("series", autoSingularize("series"));
 		assertEquals("man", autoSingularize("men"));
-		assertEquals(null, autoSingularize("highwaymen"));
+		assertNull("highwaymen", autoSingularize("highwaymen"));
 		assertEquals("caveMan", autoSingularize("caveMen"));
-		assertEquals(null, autoSingularize("jackss"));
-		assertEquals(null, autoSingularize("virus"));
+		assertNull("jackss", autoSingularize("jackss"));
+		assertNull("virus", autoSingularize("virus"));
 		assertEquals("quiz", autoSingularize("quizzes"));
 		assertEquals("database", autoSingularize("databases"));
 		assertEquals("dataBase", autoSingularize("dataBases"));
 		assertEquals("Query", autoSingularize("Queries"));
 		assertEquals("Movie", autoSingularize("Movies"));
+		assertEquals("cafe", autoSingularize("cafes"));
+		assertNull("caves", autoSingularize("caves"));
+		assertEquals("leaf", autoSingularize("leaves"));
+		assertEquals("autosave", autoSingularize("autosaves"));
 	}
 }
diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index 43c0ea66..94ccde08 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -14,3 +14,36 @@ class ConstructorsWithAccessors {
 		this.__huh2 = _huh2;
 	}
 }
+
+class ConstructorsWithAccessorsNonNull {
+	@lombok.NonNull
+	Integer plower;
+	@lombok.NonNull
+	Integer pUpper;
+	@lombok.NonNull
+	Integer _huh;
+	@lombok.NonNull
+	final Integer __huh2;
+
+	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
+	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
+	public ConstructorsWithAccessorsNonNull(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) {
+		if (plower == null) {
+			throw new java.lang.NullPointerException("plower");
+		}
+		if (upper == null) {
+			throw new java.lang.NullPointerException("upper");
+		}
+		if (huh == null) {
+			throw new java.lang.NullPointerException("huh");
+		}
+		if (_huh2 == null) {
+			throw new java.lang.NullPointerException("_huh2");
+		}
+		this.plower = plower;
+		this.pUpper = upper;
+		this._huh = huh;
+		this.__huh2 = _huh2;
+	}
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java
index 8b9888e9..8b9888e9 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java
diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
index 7c691b42..0876a5e4 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
@@ -11,3 +11,32 @@
     this.__huh2 = _huh2;
   }
 }
+@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix = {"p", "_"}) class ConstructorsWithAccessorsNonNull {
+  @lombok.NonNull Integer plower;
+  @lombok.NonNull Integer pUpper;
+  @lombok.NonNull Integer _huh;
+  final @lombok.NonNull Integer __huh2;
+  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) {
+    super();
+    if ((plower == null))
+        {
+          throw new java.lang.NullPointerException("plower");
+        }
+    if ((upper == null))
+        {
+          throw new java.lang.NullPointerException("upper");
+        }
+    if ((huh == null))
+        {
+          throw new java.lang.NullPointerException("huh");
+        }
+    if ((_huh2 == null))
+        {
+          throw new java.lang.NullPointerException("_huh2");
+        }
+    this.plower = plower;
+    this.pUpper = upper;
+    this._huh = huh;
+    this.__huh2 = _huh2;
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java
index 283c5430..30de15cf 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java
@@ -43,4 +43,4 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude
     result = ((result * PRIME) + this.x);
     return result;
   }
-}
-\ No newline at end of file
+}
diff --git a/test/transform/resource/before/ConstructorsWithAccessors.java b/test/transform/resource/before/ConstructorsWithAccessors.java
index e5d2939f..e67a47ce 100644
--- a/test/transform/resource/before/ConstructorsWithAccessors.java
+++ b/test/transform/resource/before/ConstructorsWithAccessors.java
@@ -4,3 +4,11 @@
 	int _huh;
 	int __huh2;
 }
+
+@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix={"p", "_"}) class ConstructorsWithAccessorsNonNull {
+	@lombok.NonNull Integer plower;
+	@lombok.NonNull Integer pUpper;
+	@lombok.NonNull Integer _huh;
+	@lombok.NonNull final Integer __huh2;
+}
+
diff --git a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java
index 0625ba52..b8ba21fb 100644
--- a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java
+++ b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java
@@ -8,4 +8,4 @@ final class EqualsAndHashCodeOf {
 final class EqualsAndHashCodeExclude {
 	int x;
 	int y;
-}
-\ No newline at end of file
+}