EL 6.0 new tests

common/src/main/java/com/sun/ts/tests/common/el/api/resolver/ResolverTest.java

@@ -20,18 +20,12 @@
  */
 package com.sun.ts.tests.common.el.api.resolver;
 
-import java.beans.FeatureDescriptor;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.Objects;
 
-import jakarta.el.ArrayELResolver;
 import jakarta.el.BeanELResolver;
 import jakarta.el.CompositeELResolver;
 import jakarta.el.ELContext;
 import jakarta.el.ELResolver;
-import jakarta.el.ListELResolver;
-import jakarta.el.MapELResolver;
 import jakarta.el.MethodNotFoundException;
 import jakarta.el.PropertyNotFoundException;
 import jakarta.el.PropertyNotWritableException;
@@ -98,7 +92,7 @@ public static boolean testCompositeELResolver(ELContext elContext,
 
     // getType()
     elContext.setPropertyResolved(false);
-    Class type = compResolver.getType(elContext, null, "Bar");
+    Class<?> type = compResolver.getType(elContext, null, "Bar");
     if (!elContext.isPropertyResolved()) {
       buf.append("getType() did not resolve" + NL);
       pass = false;
@@ -126,8 +120,7 @@ public static boolean testCompositeELResolver(ELContext elContext,
 
     // getCommonPropertyType()
     elContext.setPropertyResolved(false);
-    Class commonPropertyType = (compResolver.getCommonPropertyType(elContext,
-        null));
+    Class<?> commonPropertyType = (compResolver.getCommonPropertyType(elContext, null));
     buf.append("getCommonPropertyType() returns ");
     buf.append(commonPropertyType.getName() + NL);
 
@@ -172,7 +165,7 @@ public static boolean testELResolver(ELContext elContext, ELResolver resolver,
       pass = false;
     }
 
-    if (!readOnly && valueRetrieved != value) {
+    if (!readOnly && !Objects.equals(valueRetrieved, value)) {
       if (valueRetrieved == null) {
         buf.append("null value returned from getValue() method call!" + NL);
         pass = false;
@@ -192,7 +185,7 @@ public static boolean testELResolver(ELContext elContext, ELResolver resolver,
 
     // getType()
     elContext.setPropertyResolved(false);
-    Class type = resolver.getType(elContext, base, property);
+    Class<?> type = resolver.getType(elContext, base, property);
     if (!elContext.isPropertyResolved()) {
       buf.append("getType() did not resolve" + NL);
       pass = false;
@@ -229,8 +222,7 @@ public static boolean testELResolver(ELContext elContext, ELResolver resolver,
 
     // getCommonPropertyType()
     elContext.setPropertyResolved(false);
-    Class commonPropertyType = (resolver.getCommonPropertyType(elContext,
-        base));
+    Class<?> commonPropertyType = (resolver.getCommonPropertyType(elContext, base));
     buf.append("getCommonPropertyType() returns ");
     buf.append(commonPropertyType.getName() + "" + NL);
 
@@ -259,7 +251,7 @@ public static boolean testELResolver(ELContext elContext, ELResolver resolver,
    * @return
    */
   public static boolean testELResolverInvoke(ELContext elContext,
-      ELResolver resolver, Object beanName, Object methodName, Class[] types,
+      ELResolver resolver, Object beanName, Object methodName, Class<?>[] types,
       Object[] values, Boolean negTest, StringBuffer buf) {
 
     boolean pass = true;
@@ -270,13 +262,13 @@ public static boolean testELResolverInvoke(ELContext elContext,
       Boolean nameMatch = (Boolean) resolver.invoke(elContext, beanName,
           methodName, types, values);
 
-      if (!nameMatch) {
+      if (!nameMatch.booleanValue()) {
         buf.append("invoke() did not Run properly." + NL);
         pass = false;
       }
 
     } catch (MethodNotFoundException mnfe) {
-      if (negTest) {
+      if (negTest.booleanValue()) {
         buf.append("Test Passed  invoke() threw MethodNotFoundException");
       } else {
         pass = false;
@@ -290,67 +282,6 @@ public static boolean testELResolverInvoke(ELContext elContext,
     return pass;
   }
 
-  public static boolean testFeatureDescriptors(Iterator i, ELResolver resolver,
-      Object base, StringBuffer buf) {
-
-    if (i == null) {
-      buf.append("getFeatureDescriptors() returns null" + NL);
-      if (resolver instanceof ArrayELResolver
-          || resolver instanceof ListELResolver) {
-        return true;
-      } else if (resolver instanceof MapELResolver && !(base instanceof Map)) {
-        return true;
-      } else if (resolver instanceof BeanELResolver && base != null) {
-        return true;
-      } else if (resolver instanceof BarELResolver) {
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    while (i.hasNext()) {
-      Object obj = i.next();
-      if (!(obj instanceof FeatureDescriptor)) {
-        buf.append("getFeatureDescriptors() ");
-        buf.append(
-            "does not return a collection of " + "FeatureDescriptors" + NL);
-        return false;
-      } else {
-        int numAttribs = 0;
-        FeatureDescriptor fd = (FeatureDescriptor) obj;
-        Enumeration e = fd.attributeNames();
-        while (e.hasMoreElements()) {
-          String attrib = (String) e.nextElement();
-          if (attrib.equals("type")) {
-            ++numAttribs;
-            if (!(fd.getValue(attrib) instanceof Class)) {
-              buf.append("getFeatureDescriptors(): ");
-              buf.append("Invalid attribute for type." + NL);
-              return false;
-            }
-          }
-          if (attrib.equals("resolvableAtDesignTime")) {
-            ++numAttribs;
-            if (!(fd.getValue(attrib) instanceof Boolean)) {
-              buf.append("getFeatureDescriptors(): ");
-              buf.append(
-                  "Invalid attribute for " + "resolvableAtDesignTime." + NL);
-              return false;
-            }
-          }
-        }
-        if (numAttribs < 2) {
-          buf.append("getFeatureDescriptors(): ");
-          buf.append("Required attribute missing." + NL);
-          return false;
-        }
-      } // else
-    } // while
-
-    buf.append("Passed all getFeatureDescriptors() tests" + NL);
-    return true;
-  }
 
   // --- Start Negative Method Tests ---
   public static boolean testELResolverNPE(ELResolver resolver, Object base,

el/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021  Contributors to the Eclipse Foundation
+    Copyright (c) 2024  Contributors to the Eclipse Foundation
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -116,6 +116,12 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>17</release>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others.
+ * Copyright (c) 2009, 2024 Oracle and/or its affiliates and others.
  * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -21,8 +21,6 @@
 
 package com.sun.ts.tests.el.api.jakarta_el.arrayelresolver;
 
-import java.util.Properties;
-
 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;
@@ -258,7 +256,7 @@ public void arrayELResolverOBETest() throws Exception {
     ELContext context = barebonesContext.getELContext();
 
     try {
-      Object value = resolver.getValue(context, names, 5);
+      Object value = resolver.getValue(context, names, Integer.valueOf(5));
 
       if (value != null) {
         pass = false;
@@ -310,4 +308,34 @@ public void arrayELResolverCCETest() throws Exception {
       throw new Exception("Failed: No exception thrown.");
     }
   }
+
+
+  /*
+   * @testName: arrayELResolverLengthTest
+   * 
+   * @test_Strategy: Verify that the length of an array is available as a read-only property.
+   */
+  @Test
+  public void arrayELResolverLengthTest() throws Exception {
+
+    boolean pass;
+    StringBuffer buf = new StringBuffer();
+    String[] colors = { "red", "blue", "green" };
+
+    try {
+      ArrayELResolver arrayResolver = new ArrayELResolver();
+      BareBonesELContext barebonesContext = new BareBonesELContext();
+      ELContext context = barebonesContext.getELContext();
+
+      pass = ResolverTest.testELResolver(context, arrayResolver, colors,
+          "length", "3", buf, true);
+    } catch (Exception ex) {
+      throw new Exception(ex);
+    }
+
+    if (!pass) {
+      throw new Exception(ELTestUtil.FAIL + buf.toString());
+    }
+    logger.log(Logger.Level.TRACE, buf.toString());
+  }
 }

el/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beanelresolver/ELClientIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021 Oracle and/or its affiliates and others.
+ * Copyright (c) 2009, 2024 Oracle and/or its affiliates and others.
  * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -15,15 +15,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-/*
- * $Id$
- */
-
 package com.sun.ts.tests.el.api.jakarta_el.beanelresolver;
 
-import java.util.Properties;
-
-
 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;
@@ -39,6 +32,7 @@
 import org.junit.jupiter.api.TestInfo;
 
 import java.lang.System.Logger;
+import java.util.TimeZone;
 
 public class ELClientIT {
 
@@ -195,8 +189,7 @@ public void beanELResolverInvokeTest() throws Exception {
       Class<?>[] types = { String.class, String.class };
       String[] values = { "Doug", "Donahue" };
 
-      pass = ResolverTest.testELResolverInvoke(context, beanResolver, sb,
-          "isName", types, values, false, buf);
+      pass = ResolverTest.testELResolverInvoke(context, beanResolver, sb, "isName", types, values, Boolean.FALSE, buf);
     } catch (Exception ex) {
       throw new Exception(ex);
     }
@@ -234,8 +227,8 @@ public void beanELResolverInvokeVoidTest() throws Exception {
 
       if (null == result) {
         // validate the new values.
-        pass = ResolverTest.testELResolverInvoke(context, beanResolver, sb,
-            "isName", types, values, false, buf);
+        pass = ResolverTest.testELResolverInvoke(
+            context, beanResolver, sb, "isName", types, values, Boolean.FALSE, buf);
       } else {
         pass = false;
         buf.append("Unexpected Value returned!" + TestUtil.NEW_LINE
@@ -275,8 +268,8 @@ public void beanELResolverInvokeMNFETest() throws Exception {
       Class<?>[] types = { String.class, String.class };
       String[] values = { "Doug", "Donahue" };
 
-      pass = ResolverTest.testELResolverInvoke(context, beanResolver, sb,
-          "bogus_Method", types, values, true, buf);
+      pass = ResolverTest.testELResolverInvoke(
+          context, beanResolver, sb, "bogus_Method", types, values, Boolean.TRUE, buf);
 
     } catch (Exception ex) {
       throw new Exception(ex);
@@ -396,4 +389,35 @@ public void beanELResolverPNWETest() throws Exception {
     }
     logger.log(Logger.Level.TRACE, buf.toString());
   }
+
+  /**
+   * @testName: beanELResolverMethodVisibilityTest
+   * 
+   * @test_Strategy: Verify that API calls work as expected for a property that is not visible via the implementing
+   *                 class (it is in an internal, non-exported class) but is visible via an interface method:
+   *                 beanELResolver() getValue() getType() setValue() isReadOnly() getCommonPropertyType()
+   *                 getFeatureDescriptors()
+   */
+  @Test
+  public void beanELResolverMethodVisibilityTest() throws Exception {
+
+    boolean pass = false;
+    StringBuffer buf = new StringBuffer();
+    TimeZone tz = TimeZone.getDefault();
+
+    try {
+      BeanELResolver beanResolver = new BeanELResolver();
+      BareBonesELContext barebonesContext = new BareBonesELContext();
+      ELContext context = barebonesContext.getELContext();
+
+      pass = ResolverTest.testELResolver(context, beanResolver, tz, "rawOffset", Integer.valueOf(0), buf, false);
+    } catch (Exception ex) {
+      throw new Exception(ex);
+    }
+
+    if (!pass) {
+      throw new Exception(ELTestUtil.FAIL + buf.toString());
+    }
+    logger.log(Logger.Level.TRACE, buf.toString());
+  }
 }