Bugfix: arguments of a message send must be analyzed before checking against null contracts

1 files changed, 23 insertions, 1 deletions

diff --git a/contrib/org.eclipse.objectteams.jdt.nullity.tests/src/org/eclipse/objectteams/jdt/nullity/tests/NullAnnotationTest.java b/contrib/org.eclipse.objectteams.jdt.nullity.tests/src/org/eclipse/objectteams/jdt/nullity/tests/NullAnnotationTest.java
index 20f683718..0bbdce4e7 100644
--- a/contrib/org.eclipse.objectteams.jdt.nullity.tests/src/org/eclipse/objectteams/jdt/nullity/tests/NullAnnotationTest.java
+++ b/contrib/org.eclipse.objectteams.jdt.nullity.tests/src/org/eclipse/objectteams/jdt/nullity/tests/NullAnnotationTest.java
@@ -29,7 +29,7 @@ public NullAnnotationTest(String name) {
 // Static initializer to specify tests subset using TESTS_* static variables
 // All specified tests which do not belong to the class are skipped...
 static {
-//		TESTS_NAMES = new String[] { "test_default_nullness_003a" };
+//		TESTS_NAMES = new String[] { "test_nonnull_parameter_006" };
 //		TESTS_NUMBERS = new int[] { 561 };
 //		TESTS_RANGE = new int[] { 1, 2049 };
 }
@@ -234,6 +234,28 @@ public void test_nonnull_parameter_005() {
 		"",/* expected error */
 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
 }
+// a ternary non-null expression is passed to a nonnull parameter
+public void test_nonnull_parameter_006() {
+	Map customOptions = getCompilerOptions();
+	customOptions.put(NullCompilerOptions.OPTION_ReportNullContractInsufficientInfo, CompilerOptions.ERROR);
+	runConformTest(
+		false /* flush output directory */,
+		new String[] {
+			"X.java",
+			  "import org.eclipse.jdt.annotation.*;\n" +
+			  "public class X {\n" +
+			  "    	void m1(@NonNull String a) {}\n" + 
+			  "		void m2(@Nullable String b) {\n" + 
+			  "			m1(b == null ? \"\" : b);\n" + 
+			  "		}\n" +
+			  "}\n"},
+		null /* no class libraries */,
+		customOptions,
+		"",  /* compiler output */
+		"",/* expected output */
+		"",/* expected error */
+	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
+}
 
 // assigning potential null to a nonnull local variable
 public void test_nonnull_local_001() {