Merge pull request #764 from apache/gh-actions-sonar-21

Add JDK 21 build
apache · Oct 13, 2023 · f2834d2 · f2834d2
2 parents 913f6bf + b736eb2
commit f2834d2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 51 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java b/core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
@@ -18,27 +18,34 @@
  */
 package com.opensymphony.xwork2.inject;
 
-import junit.framework.TestCase;
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.security.Permission;
 import java.util.concurrent.Callable;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
 /**
  * ContainerImpl Tester.
  *
  * @author Lukasz Lenart
  * @version 1.0
  * @since <pre>11/26/2008</pre>
  */
-public class ContainerImplTest extends TestCase {
+public class ContainerImplTest {
 
     private Container c;
 
-    @Override
-    protected void setUp() throws Exception {
-        System.setSecurityManager(null);
-
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         ContainerBuilder cb = new ContainerBuilder();
         cb.constant("methodCheck.name", "Lukasz");
         cb.constant("fieldCheck.name", "Lukasz");
@@ -57,70 +64,43 @@ protected void setUp() throws Exception {
         Class.forName(ContainerImpl.FieldInjector.class.getName());
     }
 
-    /**
-     * Inject values into field
-     */
-    public void testFieldInjector() throws Exception {
-
+    @Test
+    public void fieldInjector() throws Exception {
         FieldCheck fieldCheck = new FieldCheck();
-
-        try {
-            c.inject(fieldCheck);
-            assertTrue(true);
-        } catch (DependencyException expected) {
-            fail("No exception expected!");
-        }
-
+        c.inject(fieldCheck);
         assertEquals(fieldCheck.getName(), "Lukasz");
     }
 
-    /**
-     * Inject values into method
-     */
-    public void testMethodInjector() throws Exception {
-
-        MethodCheck methodCheck = new MethodCheck();
-
-        try {
-            c.inject(methodCheck);
-            assertTrue(true);
-        } catch (DependencyException expected) {
-            fail("No exception expected!");
-        }
+    @Test
+    public void methodInjector() throws Exception {
+        c.inject(new MethodCheck());
     }
 
     /**
      * Inject values into field under SecurityManager
      */
+    @Test
     public void testFieldInjectorWithSecurityEnabled() throws Exception {
+        assumeTrue(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_20));
         System.setSecurityManager(new TestSecurityManager());
+        assertThrows(DependencyException.class, () -> c.inject(new FieldCheck()));
 
-        FieldCheck fieldCheck = new FieldCheck();
-
-        try {
-            c.inject(fieldCheck);
-            fail("Exception should be thrown!");
-        } catch (Error | DependencyException expected) {
-            assertTrue(true);
-        }
+        System.setSecurityManager(null);
     }
 
     /**
      * Inject values into method under SecurityManager
      */
+    @Test
     public void testMethodInjectorWithSecurityEnabled() throws Exception {
+        assumeTrue(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_20));
         System.setSecurityManager(new TestSecurityManager());
+        assertThrows(DependencyException.class, () -> c.inject(new MethodCheck()));
 
-        MethodCheck methodCheck = new MethodCheck();
-
-        try {
-            c.inject(methodCheck);
-            fail("Exception should be thrown!");
-        } catch (DependencyException | Error expected) {
-            assertTrue(true);
-        }
+        System.setSecurityManager(null);
     }
 
+    @Test
     public void testEarlyInitializable() throws Exception {
         assertTrue("should being initialized already", EarlyInitializableBean.initializedEarly);
 
@@ -141,6 +121,7 @@ public void testEarlyInitializable() throws Exception {
                 earlyInitializableCheck.getPrototypeEarlyInitializable(), earlyInitializableCheck2.getPrototypeEarlyInitializable());
     }
 
+    @Test
     public void testInitializable() throws Exception {
         assertFalse("should not being initialized already", InitializableBean.initialized);
 

diff --git a/pom.xml b/pom.xml
@@ -777,7 +777,7 @@
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymock</artifactId>
-                <version>4.3</version>
+                <version>5.2.0</version>
                 <scope>test</scope>
             </dependency>