From 79cab6fa86097b5ff3934e826a8ee689820e2eb1 Mon Sep 17 00:00:00 2001
From: Stephan Herrmann
Date: Sat, 24 Aug 2019 22:34:00 +0200
Subject: Bug 481931 - [compiler][null] Null analysis should consider public
 static final fields with constructor calls as @NonNull w/o annotations

- adjust tests for run.javac comparison

Change-Id: I965d6e3f155f6ce19fa0b04e734cb66f7e1dba43
---
 .../eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java  | 2 ++
 .../eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java
index 7000f3fd5d..571e5f4400 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import junit.framework.Test;
 
 import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.tests.compiler.regression.AbstractRegressionTest.JavacTestOptions.Excuse;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
@@ -10753,6 +10754,7 @@ public void testBug481931_binary() {
 			"	                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
 			"Dead code\n" + 
 			"----------\n";
+	runner.javacTestOptions = Excuse.EclipseWarningConfiguredAsError;
 	runner.runNegativeTest();
 }
 }
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
index ed6a8d63f0..20134ad43b 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
@@ -17467,7 +17467,7 @@ public void testBug435528_orig() {
 		"Statement unnecessarily nested within else clause. The corresponding then clause does not complete normally\n" + 
 		"----------\n";
 	runner.customOptions = getCompilerOptions();
-	runner.javacTestOptions = JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings;
+	runner.javacTestOptions = JavacTestOptions.Excuse.EclipseWarningConfiguredAsError;
 	runner.runNegativeTest();
 }
 public void testBug435528_notaconstant() {
-- 
cgit v1.2.3