Bug 533339 - incorrect Null type mismatch warning when using Guava's

checkNotNull, even with severity set to Ignore

- fix back-to-back testing w/ javac

Change-Id: Ie117ba425f75816181a8d61bcf7f699a4ba49ed7

1 files changed, 8 insertions, 4 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
index 4e6725bf70..00b4e3e243 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
@@ -17478,7 +17478,8 @@ public void testBug531040() {
 	);
 }
 public void testBug533339() {
-	runNegativeTestWithLibs(
+	Runner runner = new Runner();
+	runner.testFiles =
 		new String[] {
 			"Test.java",
 			"import org.eclipse.jdt.annotation.NonNull;\n" + 
@@ -17511,8 +17512,9 @@ public void testBug533339() {
 			"		return reference;\n" +
 			"	}\n" + 
 			"}\n"
-		}, 
-		getCompilerOptions(),
+		};
+	runner.classLibraries = this.LIBS;
+	runner.expectedCompilerLog =
 		"----------\n" + 
 		"1. WARNING in Test.java (at line 19)\n" + 
 		"	@NonNull String s = checkNotNull(foo.getString());\n" + 
@@ -17523,6 +17525,8 @@ public void testBug533339() {
 		"	return new Bar(checkNotNull(foo.getString()));// no warning when s is inlined\n" + 
 		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
 		"Null type safety (type annotations): The expression of type \'String\' needs unchecked conversion to conform to \'@NonNull String\'\n" + 
-		"----------\n");
+		"----------\n";
+	runner.javacTestOptions = JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings;
+	runner.runWarningTest();
 }
 }