From 3d5c43d8e87b0b8451174c65a69fdb1627e924eb Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Tue, 27 Jul 2021 15:53:39 +0100
Subject: [PATCH] Fix deprecation warnings after update to Java 11

---
 .../java/org/glassfish/el/test/ELProcessorTest.java   | 11 ++++++-----
 .../java/org/glassfish/el/test/StaticRefTest.java     |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/glassfish/el/test/ELProcessorTest.java b/src/test/java/org/glassfish/el/test/ELProcessorTest.java
index e0cbf14b..9e6973df 100644
--- a/src/test/java/org/glassfish/el/test/ELProcessorTest.java
+++ b/src/test/java/org/glassfish/el/test/ELProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates and others.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
  * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -21,6 +21,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import jakarta.el.ELProcessor;
@@ -62,7 +63,7 @@ public void testMethExpr() {
                 ctxt, "#{'abc'.length()}", Object.class, null);
         Object result = meth.invoke(ctxt, new Object[] {"abcde"});
         System.out.println("'abc'.length() called, equals " + result);
-        assertEquals(result, new Integer(3));
+        assertEquals(result, Integer.valueOf(3));
     }
 
     @Test
@@ -79,7 +80,7 @@ public void testSetVariable () {
         Object result = elp.getValue("xx + 11", String.class);
         assertEquals(result, "111");
         elp.setVariable("xx", null);
-        assertEquals(elp.eval("xx"), null);
+        assertNull(elp.eval("xx"));
         elp.setVariable("yy", "abc");
         assertEquals(elp.eval("yy = 123; abc"), Long.valueOf(123));
         assertEquals(elp.eval("abc = 456; yy"), Long.valueOf(456));
@@ -172,9 +173,9 @@ public void testImport() {
         assertTrue(elp.eval("ELProcessorTest$MyBean.aaaa == 101"));
         assertTrue(elp.eval("ELProcessorTest$MyBean.getBar() == 64"));
         elm.importStatic("org.glassfish.el.test.ELProcessorTest$MyBean.aaaa");
-        assertEquals(new Integer(101), elp.eval("aaaa"));
+        assertEquals(Integer.valueOf(101), elp.eval("aaaa"));
         elm.importStatic("org.glassfish.el.test.ELProcessorTest$MyBean.getBar");
-        assertEquals(new Integer(64), elp.eval("getBar()"));
+        assertEquals(Integer.valueOf(64), elp.eval("getBar()"));
  /*
         elm.importStatic("a.b.NonExisting.foobar");
         elp.eval("foobar");
diff --git a/src/test/java/org/glassfish/el/test/StaticRefTest.java b/src/test/java/org/glassfish/el/test/StaticRefTest.java
index 653ad958..20b39150 100644
--- a/src/test/java/org/glassfish/el/test/StaticRefTest.java
+++ b/src/test/java/org/glassfish/el/test/StaticRefTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
+ * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -68,7 +69,7 @@ public void testClass() {
 
     @Test
     public void testConstructor() {
-        assertEquals(new Integer(1001), elp.eval("Integer(1001)"));
+        assertEquals(Integer.valueOf(1001), elp.eval("Integer(1001)"));
     }
 
     @Test