EL TCK Refactoring using Junit

el/pom.xml

@@ -27,11 +27,11 @@
         <version>10.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>el</artifactId>
+    <artifactId>el-tck</artifactId>
     <packaging>jar</packaging>
 
-    <name>el</name>
-    <description>el</description>
+    <name>el-tck</name>
+    <description>EL TCK</description>
 
     <dependencies>
         <dependency>
@@ -46,6 +46,11 @@
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
         </dependency>
+       <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

el/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClient.java → el/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClientIT.java

@@ -23,8 +23,6 @@
 
 import java.util.Properties;
 
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.ServiceEETest;
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
 import com.sun.ts.tests.el.common.elcontext.BareBonesELContext;
@@ -33,26 +31,34 @@
 import jakarta.el.ArrayELResolver;
 import jakarta.el.ELContext;
 
-public class ELClient extends ServiceEETest {
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
-  private Properties testProps;
+import java.lang.System.Logger;
+
+
+public class ELClientIT {
+
+  private static final Logger logger = System.getLogger(ELClientIT.class.getName());
 
   private static final String[] names = { "doug", "nick", "roger", "ryan",
       "ed" };
 
-  public static void main(String[] args) {
-    ELClient theTests = new ELClient();
-    Status s = theTests.run(args, System.out, System.err);
-    s.exit();
+  @AfterEach
+  public void cleanup() throws Exception {
+    logger.log(Logger.Level.INFO, "Cleanup method called");
   }
 
-  public void setup(String[] args, Properties p) throws Exception {
-    TestUtil.logTrace("Setup method called");
-    this.testProps = p;
+  @BeforeEach
+  void logStartTest(TestInfo testInfo) {
+    logger.log(Logger.Level.INFO, "STARTING TEST : "+testInfo.getDisplayName());
   }
 
-  public void cleanup() throws Exception {
-    TestUtil.logTrace("Cleanup method called");
+  @AfterEach
+  void logFinishTest(TestInfo testInfo) {
+    logger.log(Logger.Level.INFO, "FINISHED TEST : "+testInfo.getDisplayName());
   }
 
   /**
@@ -65,6 +71,7 @@ public void cleanup() throws Exception {
    *                 getValue() getType() setValue() isReadOnly()
    *                 getCommonPropertyType() getFeatureDescriptors()
    */
+  @Test
   public void arrayELResolverTest() throws Exception {
 
     boolean pass;
@@ -85,7 +92,7 @@ public void arrayELResolverTest() throws Exception {
     if (!pass) {
       throw new Exception(ELTestUtil.FAIL + buf.toString());
     }
-    TestUtil.logTrace(buf.toString());
+    logger.log(Logger.Level.TRACE, buf.toString());
   }
 
   /**
@@ -100,6 +107,7 @@ public void arrayELResolverTest() throws Exception {
    * 
    *                 getValue() getType() setValue() isReadOnly()
    */
+  @Test
   public void arrayELResolverNPETest() throws Exception {
 
     boolean pass;
@@ -117,7 +125,7 @@ public void arrayELResolverNPETest() throws Exception {
     if (!pass) {
       throw new Exception(ELTestUtil.FAIL + buf.toString());
     }
-    TestUtil.logTrace(buf.toString());
+    logger.log(Logger.Level.TRACE, buf.toString());
   }
 
   /**
@@ -132,6 +140,7 @@ public void arrayELResolverNPETest() throws Exception {
    * 
    *                 getType() isReadOnly() setValue()
    */
+  @Test
   public void arrayELResolverPNFETest() throws Exception {
 
     boolean pass;
@@ -152,7 +161,7 @@ public void arrayELResolverPNFETest() throws Exception {
     if (!pass) {
       throw new Exception(ELTestUtil.FAIL + buf.toString());
     }
-    TestUtil.logTrace(buf.toString());
+    logger.log(Logger.Level.TRACE, buf.toString());
   }
 
   /**
@@ -167,6 +176,7 @@ public void arrayELResolverPNFETest() throws Exception {
    * 
    *                 getValue() setValue()
    */
+  @Test
   public void arrayELResolverIAETest() throws Exception {
 
     boolean pass;
@@ -186,7 +196,7 @@ public void arrayELResolverIAETest() throws Exception {
     if (!pass) {
       throw new Exception(ELTestUtil.FAIL + buf.toString());
     }
-    TestUtil.logTrace(buf.toString());
+    logger.log(Logger.Level.INFO, buf.toString());
   }
 
   /**
@@ -202,6 +212,7 @@ public void arrayELResolverIAETest() throws Exception {
    * 
    *                 ArrayELResolver(boolean) setValue()
    */
+  @Test
   public void arrayELResolverPNWETest() throws Exception {
 
     boolean pass;
@@ -222,7 +233,7 @@ public void arrayELResolverPNWETest() throws Exception {
     if (!pass) {
       throw new Exception(ELTestUtil.FAIL + buf.toString());
     }
-    TestUtil.logTrace(buf.toString());
+    logger.log(Logger.Level.TRACE, buf.toString());
   }
 
   /*
@@ -235,6 +246,7 @@ public void arrayELResolverPNWETest() throws Exception {
    * 
    * getValue()
    */
+  @Test
   public void arrayELResolverOBETest() throws Exception {
 
     boolean pass = true;
@@ -273,6 +285,7 @@ public void arrayELResolverOBETest() throws Exception {
    * 
    * setValue()
    */
+  @Test
   public void arrayELResolverCCETest() throws Exception {
 
     boolean pass = false;
@@ -288,7 +301,7 @@ public void arrayELResolverCCETest() throws Exception {
       pass = true;
 
     } catch (Exception e) {
-      TestUtil.logErr(
+      logger.log(Logger.Level.ERROR,
           "Failed: Exception thrown but was not a " + "ClassCastException");
       throw new Exception(e);
     }