Remove unused imports
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java index 902107a..3045757 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,9 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.beannameelresolver; -import java.util.Properties; - - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.util.ELTestUtil; import com.sun.ts.tests.el.common.util.SimpleBean; @@ -61,11 +58,11 @@ /** * @testName: beanNameELResolverTest - * + * * @assertion_ids: EL:JAVADOC:152; EL:JAVADOC:153; EL:JAVADOC:154; * EL:JAVADOC:155; EL:JAVADOC:158; EL:JAVADOC:161; * EL:JAVADOC:164 - * + * * @test_Strategy: Verify the following method calls work as expected: * getValue() getType() setValue() isReadOnly() * getCommonPropertyType() getFeatureDescriptors() @@ -102,11 +99,11 @@ /** * @testName: beanNameELResolverInvokeMNFETest - * + * * @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13; * EL:JAVADOC:14; EL:JAVADOC:15; EL:JAVADOC:16; * EL:JAVADOC:143; EL:JAVADOC:237 - * + * * @test_Strategy: Verify that the invoke() method throws * MethodNotFoundException if no suitable method can be found. */ @@ -145,12 +142,12 @@ /** * @testName: beanNameELResolverInvokeTest - * + * * @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13; * EL:JAVADOC:14; EL:JAVADOC:15; EL:JAVADOC:16; * EL:JAVADOC:142; EL:JAVADOC:199; EL:JAVADOC:200; * EL:JAVADOC:202; EL:JAVADOC:203; EL:JAVADOC:236 - * + * * @test_Strategy: Verify that API calls work as expected for * BeanNameELResolver.invoke(). */ @@ -189,9 +186,9 @@ /** * @testName: beanNameELResolverGetTypeNPETest - * + * * @assertion_ids: EL:JAVADOC:156 - * + * * @test_Strategy: Validate a NullPointerException is thrown if context is * null. */ @@ -208,9 +205,9 @@ /** * @testName: beanNameELResolverGetValueNPETest - * + * * @assertion_ids: EL:JAVADOC:159 - * + * * @test_Strategy: Validate a NullPointerException is thrown if context is * null. */ @@ -227,9 +224,9 @@ /** * @testName: beanNameELResolverIsReadOnlyNPETest - * + * * @assertion_ids: EL:JAVADOC:162 - * + * * @test_Strategy: Validate a NullPointerException is thrown if context is * null. */ @@ -246,9 +243,9 @@ /** * @testName: beanNameELResolverSetValueNPETest - * + * * @assertion_ids: EL:JAVADOC:165 - * + * * @test_Strategy: Validate a NullPointerException is thrown if context is * null. */
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java index 8a01bed..996bfab 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,10 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.compositeelresolver; -import java.util.Properties; - - - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.elcontext.BareBonesELContext; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -67,11 +63,11 @@ /** * @testName: compositeELResolverTest - * + * * @assertion_ids: EL:JAVADOC:24; EL:JAVADOC:25; EL:JAVADOC:26; EL:JAVADOC:27; * EL:JAVADOC:28; EL:JAVADOC:29; EL:JAVADOC:30; EL:JAVADOC:31; * EL:JAVADOC:34 - * + * * @test_Strategy: Verify that API calls work as expected: * CompositeELResolver() add() getValue() getType() setValue() * isReadOnly() getCommonPropertyType() @@ -104,9 +100,9 @@ /** * @testName: compositeELResolverInvokeTest - * + * * @assertion_ids: EL:JAVADOC:24; EL:JAVADOC:25; EL:JAVADOC:181 - * + * * @test_Strategy: Verify that API calls work as expected for * BeanELResolver.invoke(). */ @@ -146,9 +142,9 @@ /** * @testName: compositeELResolverAddNPETest - * + * * @assertion_ids: EL:JAVADOC:24; EL:JAVADOC:25; EL:JAVADOC:174 - * + * * @test_Strategy: Verify that the CompositeELResolver.add method throws a * NullPointerException if the provided resolver is null. */ @@ -188,12 +184,12 @@ /** * @testName: compositeELResolverNPETest - * + * * @assertion_ids: EL:JAVADOC:25; EL:JAVADOC:26; EL:JAVADOC:27; EL:JAVADOC:28; * EL:JAVADOC:29; EL:JAVADOC:30; EL:JAVADOC:31; * EL:JAVADOC:175; EL:JAVADOC:178; EL:JAVADOC:175; * EL:JAVADOC:182; EL:JAVADOC:185 - * + * * @test_Strategy: Verify that API calls work as expected: getValue() * getType() setValue() isReadOnly() getCommonPropertyType() * getFeatureDescriptors() @@ -232,11 +228,11 @@ /** * @testName: compositeELResolverPNFETest - * + * * @assertion_ids: EL:JAVADOC:25; EL:JAVADOC:28; EL:JAVADOC:30; EL:JAVADOC:31; * EL:JAVADOC:176; EL:JAVADOC:179; EL:JAVADOC:183; * EL:JAVADOC:186 - * + * * @test_Strategy: Verify that API calls throw PropertyNotFoundException as * expected: getType() setValue() isReadOnly() */ @@ -272,13 +268,13 @@ /** * @testName: compositeELResolverPNWETest - * + * * @assertion_ids: EL:JAVADOC:25; EL:JAVADOC:187 - * + * * @test_Strategy: Verify that the setValue() method throws a * PropertyNotWritableException, if the resolver was * constructed in read-only mode. - * + * * setValue() */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elcontext/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elcontext/ELClientIT.java index 92894bd..bebf048 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elcontext/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elcontext/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -23,9 +23,6 @@ import java.util.List; import java.util.Locale; -import java.util.Properties; - - import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -65,7 +62,7 @@ * EL:JAVADOC:326; EL:JAVADOC:321 * @test_Strategy: Assert that we get back the expected value from * getContext() that we put in with putContext(). - * + * * @since: 3.0 */ @Test @@ -90,7 +87,7 @@ * @assertion_ids: EL:JAVADOC:36; EL:JAVADOC:40; EL:JAVADOC:328; * EL:JAVADOC:329 * @test_Strategy: Assert that we get back the Locale we set. - * + * * @since: 3.0 */ @Test @@ -117,7 +114,7 @@ * EL:JAVADOC:329; EL:JAVADOC:322 * @test_Strategy: Assert that when we call setPropertyResolved that * isPropertyResolved returns true. - * + * * @since: 3.0 */ @Test @@ -150,7 +147,7 @@ * EL:JAVADOC:329; EL:JAVADOC:327 * @test_Strategy: Validate that a NullPointerException is thrown if Class is * null or Object is null. - * + * * @since: 3.0 */ @Test @@ -176,7 +173,7 @@ * EL:JAVADOC:329; EL:JAVADOC:321 * @test_Strategy: Validate that a NullPointerException is thrown if key is * null. - * + * * @since: 3.0 */ @Test @@ -196,7 +193,7 @@ * EL:JAVADOC:328; EL:JAVADOC:329 * @test_Strategy: Validate that a NullPointerException is thrown if key is * null. - * + * * @since: 3.0 */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elprocessor/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elprocessor/ELClientIT.java index 1897942..b79294b 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elprocessor/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elprocessor/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2013, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,8 +22,6 @@ package com.sun.ts.tests.el.api.jakarta_el.elprocessor; import java.lang.reflect.Method; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -61,7 +59,7 @@ * @assertion_ids: EL:JAVADOC:220; EL:JAVADOC:216; EL:JAVADOC:219 * @test_Strategy: Assert that a NullPointerException is thrown if any of the * arguments is null. - * + * * @since: 3.0 */ @Test @@ -73,19 +71,19 @@ meth = elp.getClass().getMethod("toString", new Class<?>[] {}); // Tests for defineFunction(String, String, Method) - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "Testing: ELProcessor.defineFunction(null, " + "function, meth)"); ELTestUtil.checkForNPE(elp, "defineFunction", new Class<?>[] { String.class, String.class, Method.class }, new Object[] { null, "function", meth }); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "Testing: ELProcessor.defineFunction(prefix, " + "null, meth)"); ELTestUtil.checkForNPE(elp, "defineFunction", new Class<?>[] { String.class, String.class, Method.class }, new Object[] { "prefix", null, meth }); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "Testing: ELProcessor.defineFunction(prefix, " + "function, null)"); ELTestUtil.checkForNPE(elp, "defineFunction", new Class<?>[] { String.class, String.class, Method.class }, @@ -134,7 +132,7 @@ * @assertion_ids: EL:JAVADOC:220; EL:JAVADOC:214; EL:JAVADOC:217 * @test_Strategy: Assert that a ClassNotFoundException if the specified class * does not exists. - * + * * @since: 3.0 */ @Test @@ -156,7 +154,7 @@ * @test_Strategy: Assert that a NoSuchMethodException if the method (with or * without the signature) is not a declared method of the * class, or if the method signature is not valid. - * + * * @since: 3.0 */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java index dd42d03..b2f78b7 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,9 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.elresolver; -import java.util.Properties; - - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.elcontext.BarELContext; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -50,7 +47,7 @@ private static final String[] names = { "doug", "nick", "roger", "ryan", "ed" }; - + @AfterEach public void cleanup() throws Exception { logger.log(Logger.Level.INFO, "Cleanup method called"); @@ -68,10 +65,10 @@ /** * @testName: elResolverTest - * + * * @assertion_ids: EL:JAVADOC:50; EL:JAVADOC:51; EL:JAVADOC:52; EL:JAVADOC:53; * EL:JAVADOC:54; EL:JAVADOC:55; EL:JAVADOC:229 - * + * * @test_Strategy: Create an ELContext and get its ELResolver. Verify that API * calls work as expected: getValue() getType() setValue() * isReadOnly() getCommonPropertyType() @@ -104,13 +101,13 @@ /** * @testName: elResolverNPETest - * + * * @assertion_ids: EL:JAVADOC:233; EL:JAVADOC:239; EL:JAVADOC:242 - * + * * @test_Strategy: Verify that a NullPointerException is thrown as expected * for the following methods: getValue() getType() setValue() * isReadOnly() - * + * * @since: 3.0 */ @Test @@ -146,9 +143,9 @@ /** * @testName: elResolverPNFETest - * + * * @assertion_ids: EL:JAVADOC:231; EL:JAVADOC:234; EL:JAVADOC:240 - * + * * @test_Strategy: Verify that API calls throw PropertyNotFoundException as * expected: getType() setValue() isReadOnly() */ @@ -183,13 +180,13 @@ /** * @testName: elResolverPNWETest - * + * * @assertion_ids: EL:JAVADOC:50; EL:JAVADOC:244 - * + * * @test_Strategy: Verify that the setValue() method throws a * PropertyNotWritableException, if the resolver was * constructed in read-only mode. - * + * * setValue() */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/expression/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/expression/ELClientIT.java index 931f348..07dccd0 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/expression/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/expression/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,10 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.expression; -import java.util.Properties; - - - import com.sun.ts.tests.el.common.api.expression.ExpressionTest; import com.sun.ts.tests.el.common.elcontext.SimpleELContext; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -65,11 +61,11 @@ /** * @testName: negativeEqualsTest - * + * * @assertion_ids: EL:JAVADOC:56 - * + * * @test_Strategy: Validate the behavior of Expression API Expression.equals() - * + * * Verify that an Expression cannot equal null, and that a * ValueExpression and a MethodExpression cannot be equal. */ @@ -134,14 +130,14 @@ /** * @testName: expressionHashCodeTest - * + * * @assertion_ids: EL:JAVADOC:59 - * + * * @test_Strategy: Validate the if two objects are equal according to the * equals(Object) method, then calling the hashCode method on * each of the two objects must produce the same integer * result. - * + * */ @Test public void expressionHashCodeTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/functionmapper/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/functionmapper/ELClientIT.java index ce735ed..21416fa 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/functionmapper/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/functionmapper/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,8 +22,6 @@ package com.sun.ts.tests.el.api.jakarta_el.functionmapper; import java.lang.reflect.Method; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ELTestUtil; import com.sun.ts.tests.el.common.elcontext.FuncMapperELContext; @@ -40,7 +38,7 @@ public class ELClientIT { private static final Logger logger = System.getLogger(ELClientIT.class.getName()); - + @AfterEach public void cleanup() throws Exception { logger.log(Logger.Level.INFO, "Cleanup method called"); @@ -60,7 +58,7 @@ /** * @testName: functionMapperTest - * + * * @assertion_ids: EL:JAVADOC:35; EL:JAVADOC:67 * @test_Strategy: Validate the behavior of ELContext.getFunctionMapper() * FunctionMapper.resolveFunction()
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/lambdaexpression/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/lambdaexpression/ELClientIT.java index 7079b17..ca82893 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/lambdaexpression/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/lambdaexpression/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2013, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -60,9 +58,9 @@ /** * @testName: invokeNPETest - * + * * @assertion_ids: EL:JAVADOC:406 - * + * * @test_Strategy: Throws a NullPointerException if elContext is null. */ @Test @@ -78,9 +76,9 @@ /** * @testName: invokeELETest - * + * * @assertion_ids: EL:JAVADOC:408 - * + * * @test_Strategy: Throws a ELException if not enough arguments are provided. */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java index f49cf44..a810d54 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.elcontext.BareBonesELContext; @@ -53,7 +51,7 @@ names.add("ryan"); } - + @AfterEach public void cleanup() throws Exception { logger.log(Logger.Level.INFO, "Cleanup method called"); @@ -72,10 +70,10 @@ /** * @testName: listELResolverTest - * + * * @assertion_ids: EL:JAVADOC:68; EL:JAVADOC:69; EL:JAVADOC:70; EL:JAVADOC:71; * EL:JAVADOC:72; EL:JAVADOC:73; EL:JAVADOC:75 - * + * * @test_Strategy: Verify that API calls work as expected: ListELResolver() * getValue() getType() setValue() isReadOnly() * getCommonPropertyType() getFeatureDescriptors() @@ -104,14 +102,14 @@ /** * @testName: listELResolverNPETest - * + * * @assertion_ids: EL:JAVADOC:70; EL:JAVADOC:71; EL:JAVADOC:72; EL:JAVADOC:73; * EL:JAVADOC:75; EL:JAVADOC:276; EL:JAVADOC:279; * EL:JAVADOC:282; EL:JAVADOC:285 - * + * * @test_Strategy: Verify that the following methods throw a * NullPointerException, if context is null: - * + * * getType() getValue() isReadOnly() setValue() */ @Test @@ -135,13 +133,13 @@ /** * @testName: listELResolverPNFETest - * + * * @assertion_ids: EL:JAVADOC:70; EL:JAVADOC:72; EL:JAVADOC:73; EL:JAVADOC:75; * EL:JAVADOC:275; EL:JAVADOC:281; EL:JAVADOC:288 * @test_Strategy: Verify that the following methods throw a * PropertyNotFoundException, if the given index is out of * bounds for this list: - * + * * getType() isReadOnly() setValue() */ @Test @@ -168,14 +166,14 @@ /** * @testName: listELResolverIAETest - * + * * @assertion_ids: EL:JAVADOC:71; EL:JAVADOC:73; EL:JAVADOC:75; * EL:JAVADOC:278; EL:JAVADOC:286 - * + * * @test_Strategy: Verify that the following methods throw an * IllegalArgumentException, if the property could not be * coerced into an integer: - * + * * getValue() setValue() */ @Test @@ -202,15 +200,15 @@ /** * @testName: listELResolverPNWETest - * + * * @assertion_ids: EL:JAVADOC:74; EL:JAVADOC:75; EL:JAVADOC:287 - * + * * @test_Strategy: Verify that the single-parameter constructor for * listELResolver can be used to construct a read-only * resolver, and that the setValue() method throws a * PropertyNotWritableException, if the resolver was * constructed in read-only mode. - * + * * ListELResolver(boolean) setValue() */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java index 4858507..941abab 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,8 +22,6 @@ package com.sun.ts.tests.el.api.jakarta_el.mapelresolver; import java.util.HashMap; -import java.util.Properties; - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.elcontext.BareBonesELContext; @@ -52,7 +50,7 @@ animals.put("bird", "parrot"); } - + @AfterEach public void cleanup() throws Exception { logger.log(Logger.Level.INFO, "Cleanup method called"); @@ -72,7 +70,7 @@ /** * @testName: mapELResolverTest - * + * * @assertion_ids: EL:JAVADOC:76; EL:JAVADOC:77; EL:JAVADOC:78; EL:JAVADOC:79; * EL:JAVADOC:80; EL:JAVADOC:81; EL:JAVADOC:83 * @test_Strategy: Verify that API calls work as expected: MapELResolver() @@ -103,14 +101,14 @@ /** * @testName: mapELResolverNPETest - * + * * @assertion_ids: EL:JAVADOC:78; EL:JAVADOC:79; EL:JAVADOC:80; EL:JAVADOC:81; * EL:JAVADOC:83; EL:JAVADOC:293; EL:JAVADOC:295; * EL:JAVADOC:298; EL:JAVADOC:290 - * + * * @test_Strategy: Verify that the following methods throw a * NullPointerException, if context is null: - * + * * getType() getValue() isReadOnly() setValue() */ @Test @@ -135,15 +133,15 @@ /** * @testName: mapELResolverPNWETest - * + * * @assertion_ids: EL:JAVADOC:82; EL:JAVADOC:83; EL:JAVADOC:301 - * + * * @test_Strategy: Verify that the single-parameter constructor for * mapELResolver can be used to construct a read-only * resolver, and that the setValue() method throws a * PropertyNotWritableException, if the resolver was * constructed in read-only mode. - * + * * MapELResolver(boolean) setValue() */ @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/methodinfo/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/methodinfo/ELClientIT.java index 19d6f75..07d8a35 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/methodinfo/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/methodinfo/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,9 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.methodinfo; -import java.util.Properties; - - import com.sun.ts.tests.el.common.api.expression.ExpressionTest; import com.sun.ts.tests.el.common.elcontext.SimpleELContext; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -62,7 +59,7 @@ /** * @testName: methodInfoTest - * + * * @assertion_ids: EL:JAVADOC:411;EL:JAVADOC:412;EL:JAVADOC:413 * @test_Strategy: Validate the behavior of MethodInfo MethodInfo class * methods: MethodInfo.getName() MethodInfo.getReturnType()
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java index c1c4963..075b852 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.Enumeration; -import java.util.Properties; import java.util.ResourceBundle; import java.util.StringTokenizer;
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java index 10ba487..a227277 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,11 +21,6 @@ package com.sun.ts.tests.el.api.jakarta_el.staticfieldelresolver; -import java.util.Iterator; -import java.util.Properties; - - - import com.sun.ts.tests.el.common.api.resolver.ResolverTest; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -64,16 +59,16 @@ /** * @testName: staticFieldELResolverTest - * + * * @assertion_ids: EL:JAVADOC:330; EL:JAVADOC:331; EL:JAVADOC:332; * EL:JAVADOC:335; EL:JAVADOC:338; EL:JAVADOC:341; * EL:JAVADOC:343; EL:JAVADOC:346; EL:JAVADOC:189; * EL:JAVADOC:204 - * - * + * + * * @test_Strategy: Verify the following method calls work as expected: * getValue() getType() setValue() isReadOnly() - * getCommonPropertyType() + * getCommonPropertyType() */ @Test public void staticFieldELResolverTest() throws Exception { @@ -179,9 +174,9 @@ /** * @testName: staticFieldResolverInvokeMNFETest - * + * * @assertion_ids: EL:JAVADOC:339; EL:JAVADOC:189; EL:JAVADOC:204 - * + * * @test_Strategy: Verify that the invoke() method throws * MethodNotFoundException if no suitable method can be found. */ @@ -216,9 +211,9 @@ /** * @testName: staticFieldELResolverInvokeTest - * + * * @assertion_ids: EL:JAVADOC:338; EL:JAVADOC:189; EL:JAVADOC:204 - * + * * @test_Strategy: Verify that API calls work as expected for * BeanNameELResolver.invoke(). */ @@ -253,13 +248,13 @@ /** * @testName: staticFieldELResolverNPETest - * + * * @assertion_ids: EL:JAVADOC:333; EL:JAVADOC:336; EL:JAVADOC:342; * EL:JAVADOC:344; EL:JAVADOC:189 - * + * * @test_Strategy: Verify that the following methods throw a * NullPointerException, if context is null: - * + * * getType() getValue() isReadOnly() setValue() */ @Test @@ -289,9 +284,9 @@ /** * @testName: staticFieldResolverInvokePNFETest - * + * * @assertion_ids: EL:JAVADOC:334; EL:JAVADOC:337 - * + * * @test_Strategy: Verify that the invoke() method throws * PropertyNotFoundException the specified class does not * exist, or if the field is not a public static filed of the
diff --git a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTest.java b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTest.java index cc16e41..dc9cf10 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTest.java +++ b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTest.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024 Oracle and/or its affiliates and others. + * Copyright (c) 2007, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -24,7 +24,6 @@ import java.io.InputStream; import java.io.InputStreamReader; -import java.util.ArrayList; import java.util.Properties; import java.lang.System.Logger; @@ -127,7 +126,7 @@ SigTestResult results = null; String repositoryDir = System.getProperty("java.io.tmpdir"); String[] classes = getClasses(); - String testClasspath = testInfo.getTestClasspath(); + String testClasspath = testInfo.getTestClasspath(); // If testing with Java 9+, extract the JDK's modules so they can be used // on the testcase's classpath. @@ -157,7 +156,7 @@ logger.log(Logger.Level.INFO, "Exception while executing JImage! Some tests may fail."); e.printStackTrace(); } - + try { results = getSigTestDriver().executeSigTest(packageFile, mapFile,
diff --git a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTestDriver.java b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTestDriver.java index a4aeedf..df07891 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTestDriver.java +++ b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SigTestDriver.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025 Oracle and/or its affiliates. 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 @@ -17,7 +17,6 @@ package com.sun.ts.tests.el.signaturetest; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.PrintWriter; import java.lang.reflect.Method; import java.util.ArrayList; @@ -45,7 +44,7 @@ private static final String API_VERSION_FLAG = "-ApiVersion"; private static final String EXCLUDE_FLAG = "-Exclude"; - + private static final String STATIC_FLAG = "-Static"; private static final String CHECKVALUE_FLAG = "-CheckValue"; // only valid w/ @@ -59,7 +58,7 @@ private static final String DEBUG_FLAG = "-Debug"; private static final String FORMATPLAIN_FLAG = "-FormatPlain"; - + private static final String EXCLUDE_JDK_CLASS_FLAG = "-IgnoreJDKClass"; @Override @@ -112,7 +111,7 @@ } command.add(EXCLUDE_JDK_CLASS_FLAG); - + command.add(API_VERSION_FLAG); command.add(info.getVersion()); @@ -131,7 +130,7 @@ ByteArrayOutputStream output = new ByteArrayOutputStream(); // do some logging to help with troubleshooting - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); for (int ii = 0; ii < testArguments.length; ii++) { logger.log(Logger.Level.TRACE, " testArguments[" + ii + "] = " + testArguments[ii]); @@ -148,7 +147,7 @@ // currently, there is no way to determine if there are error msgs in // the rawmessages, so we will always dump this and call it a status. logger.log(Logger.Level.INFO, "********** Status Report '" + packageOrClassName + "' **********\n"); - logger.log(Logger.Level.INFO, rawMessages); + logger.log(Logger.Level.INFO, rawMessages); return sigTestInstance.toString().substring(7).startsWith("Passed."); } // END runSignatureTest
diff --git a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SignatureTestDriver.java b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SignatureTestDriver.java index 55603cc..0376379 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SignatureTestDriver.java +++ b/tck/src/main/java/com/sun/ts/tests/el/signaturetest/SignatureTestDriver.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024 Oracle and/or its affiliates and others. + * Copyright (c) 2007, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.ArrayList; import java.util.Enumeration; import java.util.Properties; @@ -82,7 +81,7 @@ logger.log(Logger.Level.INFO, "********** BEGIN VALIDATE PACKAGE '" + packagesUnderTest[i] + "' **********\n"); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "********** VALIDATE IN STATIC MODE - TO CHECK CONSANT VALUES ****"); logger.log(Logger.Level.INFO, "Static mode supports checks of static constants values "); @@ -102,7 +101,7 @@ logger.log(Logger.Level.INFO, "\n\n"); logger.log(Logger.Level.INFO, "********** VALIDATE IN REFLECTIVE MODE ****"); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "Reflective mode supports verification within containers (ie ejb, servlet, etc)"); String[] args2 = createTestArguments(packageListFile, mapFile, @@ -139,7 +138,7 @@ logger.log(Logger.Level.INFO, "********** BEGIN VALIDATE CLASS '" + classesUnderTest[i] + "' **********\n"); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "********** VALIDATE IN STATIC MODE - TO CHECK CONSANT VALUES ****"); logger.log(Logger.Level.INFO, "Static mode supports checks of static constants values "); @@ -159,7 +158,7 @@ logger.log(Logger.Level.INFO, "\n\n"); logger.log(Logger.Level.INFO, "********** VALIDATE IN REFLECTIVE MODE ****"); - logger.log(Logger.Level.INFO, + logger.log(Logger.Level.INFO, "Reflective mode supports verification within containers (ie ejb, servlet, etc)"); String[] args2 = createTestArguments(packageListFile, mapFile,
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/assignmentoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/assignmentoperator/ELClientIT.java index 1b0287c..399a75d 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/assignmentoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/assignmentoperator/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -26,8 +26,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.TypesBean; import com.sun.ts.tests.el.common.util.Validator; @@ -68,19 +66,19 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - BigDecimal - * + * * Variable B - Rotating through the following types: * BigDecimal, BigInteger, Integer, Float, Long, Short, * Double, Byte - * + * * Excluded: none - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorBigDecimalTest() throws Exception { @@ -143,18 +141,18 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Float - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorFloatTest() throws Exception { @@ -255,18 +253,18 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Double - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorDoubleTest() throws Exception { @@ -368,18 +366,18 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - BigInteger - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorBigIntegerTest() throws Exception { @@ -456,18 +454,18 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Integer - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorIntegerTest() throws Exception { @@ -545,18 +543,18 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Long - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorLongTest() throws Exception { @@ -635,19 +633,19 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Short - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorShortTest() throws Exception { @@ -727,19 +725,19 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - Byte - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long, Short - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorByteTest() throws Exception { @@ -820,15 +818,15 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - null - * + * * Variable B - null - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorNullTest() throws Exception { @@ -873,19 +871,19 @@ * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Variable A - BigDecimal - * + * * Variable B - Rotating through the following types: * BigDecimal, BigInteger, Integer, Float, Long, Short, * Double, Byte - * + * * Excluded: none - * + * * @since: 3.0 - * + * */ @Test public void elAssignmentOperatorMultiTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/binaryoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/binaryoperator/ELClientIT.java index ad7660d..dcd55a9 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/binaryoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/binaryoperator/ELClientIT.java
@@ -1,5 +1,6 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025 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 @@ -23,8 +24,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Iterator; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ExprEval; import com.sun.ts.tests.el.common.util.TestNum; @@ -153,7 +152,7 @@ * @assertion_ids: EL:SPEC:18.1 * @test_Strategy: Validate that if both of the operands in an EL "/" * (division) operation are null, the result is (Long) 0. - * + * */ @Test public void elNullOperandDivisionTest() throws Exception { @@ -184,7 +183,7 @@ * @assertion_ids: EL:SPEC:19.1 * @test_Strategy: Validate that if both of the operands in an EL "%" (mod) * operation are null, the result is (Long) 0. - * + * */ @Test public void elNullOperandModulusTest() throws Exception { @@ -216,7 +215,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a BigDecimal, the result is coerced * to BigDecimal and is the sum of the operands. - * + * * Equations tested: BigDecimal + BigDecimal BigDecimal + * Double BigDecimal + Float BigDecimal + String containing * ".", "e", or "E" BigDecimal + BigInteger BigDecimal + @@ -240,7 +239,7 @@ * (subtraction) operation is a BigDecimal, the result is * coerced to BigDecimal and is the difference of the * operands. - * + * * Equations tested: BigDecimal - BigDecimal BigDecimal - * Double BigDecimal - Float BigDecimal - String containing * ".", "e", or "E" BigDecimal - BigInteger BigDecimal - @@ -263,7 +262,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a BigDecimal, the result is * coerced to BigDecimal and is the product of the operands. - * + * * Equations tested: BigDecimal * BigDecimal BigDecimal * * Double BigDecimal * Float BigDecimal * String containing * ".", "e", or "E" BigDecimal * BigInteger BigDecimal * @@ -286,7 +285,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a BigDecimal, the result is coerced to * BigDecimal and is the quotient of the operands. - * + * * Equations tested: BigDecimal / BigDecimal BigDecimal / * Double BigDecimal / Float BigDecimal / String containing * ".", "e", or "E" BigDecimal / BigInteger BigDecimal / @@ -309,7 +308,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a BigDecimal, the result is coerced to Double * and is the remainder of the quotient of the operands. - * + * * Equations tested: BigDecimal % BigDecimal BigDecimal % * Double BigDecimal % Float BigDecimal % String containing * ".", "e", or "E" BigDecimal % BigInteger BigDecimal % @@ -332,7 +331,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a BigInteger, the result is coerced * to BigInteger and is the sum of the operands. - * + * * Equations tested: BigInteger + BigInteger BigInteger + * Integer BigInteger + Long BigInteger + Short BigInteger + * Byte @@ -354,7 +353,7 @@ * (subtraction) operation is a BigInteger, the result is * coerced to BigInteger and is the difference of the * operands. - * + * * Equations tested: BigInteger - BigInteger BigInteger - * Integer BigInteger - Long BigInteger - Short BigInteger - * Byte @@ -375,7 +374,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" operation * is a BigInteger, the result is coerced to BigInteger and is * the product of the operands. - * + * * BigInteger * BigInteger BigInteger * Integer BigInteger * * Long BigInteger * Short BigInteger * Byte */ @@ -395,7 +394,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a BigInteger, the result is coerced to * BigDecimal and is the quotient of the operands. - * + * * BigInteger / BigInteger BigInteger / Integer BigInteger / * Long BigInteger / Short BigInteger / Byte */ @@ -416,7 +415,7 @@ * operation is a BigInteger, the result is coerced to * BigInteger and is the remainder of the quotient of the * operands. - * + * * BigInteger % BigInteger BigInteger % Integer BigInteger % * Long BigInteger % Short BigInteger % Byte */ @@ -436,7 +435,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a Float, the result is coerced to * Double and is the sum of the operands. - * + * * Equations tested: Float + Double Float + Float Float + * String containing ".", "e", or "E" Float + BigInteger Float * + Integer Float + Long Float + Short Float + Byte @@ -460,7 +459,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a Float, the result is coerced * to Double and is the difference of the operands. - * + * * Equations tested: Float - Double Float - Float Float - * String containing ".", "e", or "E" Float - BigInteger Float * - Integer Float - Long Float - Short Float - Byte @@ -484,7 +483,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a Float, the result is * coerced to Double and is the product of the operands. - * + * * Equations tested: Float * Double Float * Float Float * * String containing ".", "e", or "E" Float * BigInteger Float * * Integer Float * Long Float * Short Float * Byte @@ -508,7 +507,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a Float, the result is coerced to Double and * is the quotient of the operands. - * + * * Equations tested: Float / Double Float / Float Float / * String containing ".", "e", or "E" Float / BigInteger Float * / Integer Float / Long Float / Short Float / Byte @@ -532,7 +531,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a Float, the result is coerced to Double and * is the remainder of the quotient of the operands. - * + * * Equations tested: Float % Double Float % Float Float % * String containing ".", "e", or "E" Float % BigInteger Float * % Integer Float % Long Float % Short Float % Byte @@ -556,7 +555,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a Double, the result is coerced to * Double and is the sum of the operands. - * + * * Equations tested: Double + Double Double + String * containing ".", "e", or "E" Double + BigInteger Double + * Integer Double + Long Double + Short Double + Byte @@ -577,7 +576,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a Double, the result is coerced * to Double and is the difference of the operands. - * + * * Equations tested: Double - Double Double - String * containing ".", "e", or "E" Double - BigInteger Double - * Integer Double - Long Double - Short Double - Byte @@ -598,7 +597,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a Double, the result is * coerced to Double and is the product of the operands. - * + * * Equations tested: Double * Double Double * String * containing ".", "e", or "E" Double * BigInteger Double * * Integer Double * Long Double * Short Double * Byte @@ -619,7 +618,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a Double, the result is coerced to Double and * is the quotient of the operands. - * + * * Equations tested: Double / Double Double / String * containing ".", "e", or "E" Double / BigInteger Double / * Integer Double / Long Double / Short Double / Byte @@ -640,7 +639,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a Double, the result is coerced to Double and * is the remainder of the quotient of the operands. - * + * * Equations tested: Double % Double Double % String * containing ".", "e", or "E" Double % BigInteger Double % * Integer Double % Long Double % Short Double % Byte @@ -660,7 +659,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a numeric string, the result is * coerced to Double and is the difference of the operands. - * + * * Equations tested: Numeric String - String containing ".", * "e", or "E" Numeric String - BigInteger Numeric String - * Integer Numeric String - Long Numeric String - Short @@ -682,7 +681,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a numeric string, the result * is coerced to Double and is the product of the operands. - * + * * Equations tested: Numeric String * String containing ".", * "e", or "E" Numeric String * BigInteger Numeric String * * Integer Numeric String * Long Numeric String * Short @@ -704,7 +703,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a numeric string, the result is coerced to * Double and is the quotient of the operands. - * + * * Equations tested: Numeric String / String containing ".", * "e", or "E" Numeric String / BigInteger Numeric String / * Integer Numeric String / Long Numeric String / Short @@ -727,7 +726,7 @@ * operation is a numeric string, the result is coerced to * Double and is the remainder of the quotient of the * operands. - * + * * Equations tested: Numeric String % String containing ".", * "e", or "E" Numeric String % BigInteger Numeric String % * Integer Numeric String % Long Numeric String % Short @@ -749,7 +748,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a Long, the result is coerced to * Long and is the sum of the operands. - * + * * Equations tested: Long + Integer Long + Long Long + Short * Long + Byte */ @@ -769,7 +768,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a Long, the result is coerced to * Long and is the difference of the operands. - * + * * Equations tested: Long - Integer Long - Long Long - Short * Long - Byte */ @@ -789,7 +788,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a Long, the result is coerced * to Long and is the product of the operands. - * + * * Equations tested: Long * Integer Long * Long Long * Short * Long * Byte */ @@ -809,7 +808,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a Long, the result is coerced to Double and is * the quotient of the operands. - * + * * Equations tested: Long / Integer Long / Long Long / Short * Long / Byte */ @@ -829,7 +828,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a Long, the result is coerced to Long and is * the remainder of the quotient of the operands. - * + * * Equations tested: Long % Integer Long % Long Long % Short * Long % Byte */ @@ -849,7 +848,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a Integer, the result is coerced to * Long and is the sum of the operands. - * + * * Equations tested: Integer + Integer Integer + Short Integer * + Byte */ @@ -869,7 +868,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a Integer, the result is coerced * to Long and is the difference of the operands. - * + * * Equations tested: Long - Integer Long - Short Long - Byte */ @Test @@ -888,7 +887,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a Integer, the result is * coerced to Long and is the product of the operands. - * + * * Equations tested: Integer * Integer Integer * Short Integer * * Byte */ @@ -908,7 +907,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a Integer, the result is coerced to Double and * is the quotient of the operands. - * + * * Equations tested: Integer / Integer Integer / Short Integer * / Byte */ @@ -928,7 +927,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a Integer, the result is coerced to Long and * is the remainder of the quotient of the operands. - * + * * Equations tested: Integer % Integer Integer % Short Integer * % Byte */ @@ -948,7 +947,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "+" * (addition) operation is a Short, the result is coerced to * Long and is the sum of the operands. - * + * * Equations tested: Short + Short Short + Byte */ @Test @@ -967,7 +966,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "-" * (subtraction) operation is a Short, the result is coerced * to Long and is the difference of the operands. - * + * * Equations tested: Short - Short Short - Byte */ @Test @@ -986,7 +985,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "*" * (multiplication) operation is a Short, the result is * coerced to Long and is the product of the operands. - * + * * Equations tested: Short * Short Short * Byte */ @Test @@ -1005,7 +1004,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "/" (div) * operation is a Short, the result is coerced to Double and * is the quotient of the operands. - * + * * Equations tested: Short / Short Short / Byte */ @Test @@ -1024,7 +1023,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "%" (mod) * operation is a Short, the result is coerced to Long and is * the remainder of the quotient of the operands. - * + * * Equations tested: Short % Short Short % Byte */ @Test @@ -1043,7 +1042,7 @@ * @test_Strategy: Validate that if both operands in an EL "+" (addition) * operation are Bytes, the result is coerced to Long and is * the sum of the operands. - * + * * Equations tested: Byte + Byte */ @Test @@ -1062,7 +1061,7 @@ * @test_Strategy: Validate that if both operands in an EL "-" (subtraction) * operation are Bytes, the result is coerced to Long and is * the difference of the operands. - * + * * Equations tested: Byte - Byte */ @Test @@ -1081,7 +1080,7 @@ * @test_Strategy: Validate that if both operands in an EL "*" * (multiplication) operation are Bytes, the result is coerced * to Long and is the product of the operands. - * + * * Equations tested: Byte * Byte */ @Test @@ -1100,7 +1099,7 @@ * @test_Strategy: Validate that if both operands in an EL "/" (div) operation * are Bytes, the result is coerced to Double and is the * quotient of the operands. - * + * * Equations tested: Byte / Byte */ @Test @@ -1119,7 +1118,7 @@ * @test_Strategy: Validate that if both operands in an EL "%" (mod) operation * are Bytes, the result is coerced to Long and is the * remainder of the quotient of the operands. - * + * * Equations tested: Byte % Byte */ @Test @@ -1137,10 +1136,10 @@ * @assertion_ids: EL:SPEC:23.1; EL:SPEC:24.2.1 * @test_Strategy: Validate that if one of the operands in an EL "&&", "and" * operation is a Boolean, the result is coerced to Boolean. - * + * * Equations tested: Boolean && String Boolean && Boolean * Boolean and String Boolean and Boolean - * + * */ @Test public void elBooleanAndTest() throws Exception { @@ -1158,10 +1157,10 @@ * @assertion_ids: EL:SPEC:23.1; EL:SPEC:24.2.1 * @test_Strategy: Validate that if one of the operands in an EL "||", "or" * operation is a Boolean, the result is coerced to Boolean. - * + * * Equations tested: Boolean || String Boolean || Boolean * Boolean or String Boolean or Boolean - * + * */ @Test public void elBooleanOrTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/collectionoperators/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/collectionoperators/ELClientIT.java index 6995d1f..a811f85 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/collectionoperators/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/collectionoperators/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates and others. + * Copyright (c) 2013, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,8 +22,6 @@ package com.sun.ts.tests.el.spec.collectionoperators; import java.lang.reflect.Array; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.DataBase; import com.sun.ts.tests.el.common.util.ELTestUtil; @@ -63,15 +61,15 @@ /** * @testName: elCollectionMapFilterTest - * + * * @assertion_ids: EL:SPEC:53; EL:SPEC:53.1; EL:SPEC:53.2; EL:SPEC:53.3; * EL:SPEC:59; EL:SPEC:59.1; EL:SPEC:58.1; EL:SPEC:58.2 - * + * * @test_Strategy: Test to make sure the 'map'& "filter' operator works * properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionMapFilterTest() throws Exception { @@ -95,13 +93,13 @@ /** * @testName: elCollectionMinTest - * + * * @assertion_ids: EL:SPEC:72; EL:SPEC:72.1; EL:SPEC:72.2 - * + * * @test_Strategy: Test to make sure the 'min' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionMinTest() throws Exception { @@ -123,13 +121,13 @@ /** * @testName: elCollectionMaxTest - * + * * @assertion_ids: EL:SPEC:71; EL:SPEC:71.1; EL:SPEC:71.2 - * + * * @test_Strategy: Test to make sure the 'max' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionMaxTest() throws Exception { @@ -150,13 +148,13 @@ /** * @testName: elCollectionDistinctTest - * + * * @assertion_ids: EL:SPEC:61; EL:SPEC:61.1 - * + * * @test_Strategy: Test to make sure the 'distinct' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionDistinctTest() throws Exception { @@ -170,13 +168,13 @@ /** * @testName: elCollectionForEachTest - * + * * @assertion_ids: EL:SPEC:63; EL:SPEC:63.1 - * + * * @test_Strategy: Test to make sure the 'forEach' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionForEachTest() throws Exception { @@ -192,14 +190,14 @@ /** * @testName: elCollectionFindFirstTest - * + * * @assertion_ids: EL:SPEC:78; EL:SPEC:78.1; EL:SPEC:62; EL:SPEC:62.1; * EL:SPEC:62.2 - * + * * @test_Strategy: Test to make sure the 'findFirst' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionFindFirstTest() throws Exception { @@ -214,13 +212,13 @@ /** * @testName: elCollectionLimitTest - * + * * @assertion_ids: EL:SPEC:66; EL:SPEC:66.1 - * + * * @test_Strategy: Test to make sure the 'limit' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionLimitTest() throws Exception { @@ -245,13 +243,13 @@ /** * testName: elCollectionAnyMatchTest - * + * * @assertion_ids: EL:SPEC:75; EL:SPEC:75.1 - * + * * @test_Strategy: Test to make sure the 'anyMatch' operator works properly. - * + * * @since: 3.0 - * + * * Bug 20438221 : Commented the test for now */ public void elCollectionAnyMatchTest() throws Exception { @@ -267,13 +265,13 @@ /** * testName: elCollectionNoneMatchTest - * + * * @assertion_ids: EL:SPEC:77; EL:SPEC:77.1 - * + * * @test_Strategy: Test to make sure the 'noneMatch' operator works properly. - * + * * @since: 3.0 - * + * * Bug 20438221 : Commented the test for now */ public void elCollectionNoneMatchTest() throws Exception { @@ -289,13 +287,13 @@ /** * testName: elCollectionAllMatchTest - * + * * @assertion_ids: EL:SPEC:76; EL:SPEC:76.1 - * + * * @test_Strategy: Test to make sure the 'allMatch' operator works properly. - * + * * @since: 3.0 - * + * * Bug 20438221 : Commented the test for now. */ public void elCollectionAllMatchTest() throws Exception { @@ -311,13 +309,13 @@ /** * @testName: elCollectionSumTest - * + * * @assertion_ids: EL:SPEC:74; EL:SPEC:74.1 - * + * * @test_Strategy: Test to make sure the 'sum' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionSumTest() throws Exception { @@ -332,13 +330,13 @@ /** * @testName: elCollectionCountTest - * + * * @assertion_ids: EL:SPEC:79; EL:SPEC:79.1 - * + * * @test_Strategy: Test to make sure the 'count' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionCountTest() throws Exception { @@ -350,13 +348,13 @@ /** * @testName: elCollectionAverageTest - * + * * @assertion_ids: EL:SPEC:73; EL:SPEC:73.1 - * + * * @test_Strategy: Test to make sure the 'average' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionAverageTest() throws Exception { @@ -370,13 +368,13 @@ /** * @testName: elCollectionToArrayTest - * + * * @assertion_ids: EL:SPEC:68; EL:SPEC:68.1 - * + * * @test_Strategy: Test to make sure the 'toArray' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionToArrayTest() throws Exception { @@ -396,14 +394,14 @@ /** * @testName: elCollectionReduceTest - * + * * @assertion_ids: EL:SPEC:70; EL:SPEC:70.1; EL:SPEC:70.2; EL:SPEC:56.2; * EL:SPEC:56.3 - * + * * @test_Strategy: Test to make sure the 'reduce' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionReduceTest() throws Exception { @@ -426,13 +424,13 @@ /** * @testName: elCollectionSubStreamTest - * + * * @assertion_ids: EL:SPEC:67; EL:SPEC:67.1; EL:SPEC:67.2 - * + * * @test_Strategy: Test to make sure the 'substream' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionSubStreamTest() throws Exception { @@ -449,13 +447,13 @@ /** * @testName: elCollectionPeekTest - * + * * @assertion_ids: EL:SPEC:4; EL:SPEC:64.1 - * + * * @test_Strategy: Test to make sure the 'peek' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionPeekTest() throws Exception { @@ -471,13 +469,13 @@ /** * @testName: elCollectionFlatMapTest - * + * * @assertion_ids: EL:SPEC:60; EL:SPEC:60.1 - * + * * @test_Strategy: Test to make sure the 'flatMap' operator works properly. - * + * * @since: 3.0 - * + * */ @Test public void elCollectionFlatMapTest() throws Exception { @@ -495,7 +493,7 @@ }// End elCollectionFlatMapTest() - + /** * @testName: elCollectionSetLiteralTest * @assertion_ids: EL:SPEC:51; EL:SPEC:51.1; EL:SPEC:51.2; EL:SPEC:51.3; @@ -505,18 +503,18 @@ @Test public void elCollectionSetLiteralTest() throws Exception { boolean pass = false; - + try { ELProcessor elp = new ELProcessor(); - + String valueA = "myValueA"; String valueB = "myValueB"; - + elp.setVariable("aaa", "'" + valueA + "'"); elp.setVariable("bbb", "'" + valueB + "'"); - + Boolean result = (Boolean) elp.eval("{aaa,bbb}.contains(aaa)"); - + pass = result.booleanValue(); } catch (Exception e) { pass = false; @@ -525,13 +523,13 @@ e.printStackTrace(); } - + if (!pass) { throw new Exception("TEST FAILED!"); } } - - + + /** * @testName: elCollectionListLiteralTest * @assertion_ids: EL:SPEC:52; EL:SPEC:52.1; EL:SPEC:52.2; EL:SPEC:52.3; @@ -541,18 +539,18 @@ @Test public void elCollectionListLiteralTest() throws Exception { boolean pass = false; - + try { ELProcessor elp = new ELProcessor(); - + String valueA = "myValueA"; String valueB = "myValueB"; - + elp.setVariable("aaa", "'" + valueA + "'"); elp.setVariable("bbb", "'" + valueB + "'"); - + Object result = elp.eval("[aaa,bbb].get(1)"); - + pass = valueB.equals(result); } catch (Exception e) { pass = false; @@ -561,13 +559,13 @@ e.printStackTrace(); } - + if (!pass) { throw new Exception("TEST FAILED!"); } } - - + + /** * @testName: elCollectionMapLiteralTest * @assertion_ids: EL:SPEC:53; EL:SPEC:53.1; EL:SPEC:53.2; EL:SPEC:53.3; @@ -577,18 +575,18 @@ @Test public void elCollectionMapLiteralTest() throws Exception { boolean pass = false; - + try { ELProcessor elp = new ELProcessor(); - + String key = "myKey"; String value = "myValue"; - + elp.setVariable("aaa", "'" + key + "'"); elp.setVariable("bbb", "'" + value + "'"); - + Object result = elp.eval("{aaa:bbb}.get(aaa)"); - + pass = value.equals(result); } catch (Exception e) { pass = false; @@ -597,13 +595,13 @@ e.printStackTrace(); } - + if (!pass) { throw new Exception("TEST FAILED!"); } } - - + + // --------------------------- private methods private void logLine(String s) { @@ -623,7 +621,7 @@ /** * Test a Collection query that returns an Iterable. - * + * * @param name * The Name of the test * @param query @@ -688,15 +686,15 @@ } /** - * + * * @param name * The Name of the test. - * + * * @param query * The EL query string * @param expected * The expected boolean value for the given query. - * + * * @throws Exception */ private void testIterable(String name, String query, Boolean expected) @@ -707,7 +705,7 @@ /** * Test a Collection query that returns a Array - * + * * @param name * The Name of the test * @param query
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/concatoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/concatoperator/ELClientIT.java index d257385..3271ac8 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/concatoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/concatoperator/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2013, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -24,8 +24,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Iterator; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ELTestUtil; import com.sun.ts.tests.el.common.util.TestNum; @@ -61,13 +59,13 @@ /** * @testName: elBigDecimalConcatenationTest - * + * * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 - * + * * @test_Strategy: Validate that if one of the operands is BigDecimal that the * operator is '+=' that both operands are coerced to type * String and concatenated. - * + * * Equations tested: BigDecimal += BigDecimal BigDecimal += * Double BigDecimal += Float BigDecimal += String * containing".", "e", or "E" BigDecimal += BigInteger @@ -92,7 +90,7 @@ * @test_Strategy: Validate that if one of the operands is BigInteger that the * operator is '+=' that both operands are coerced to type * String and concatenated. - * + * * Equations tested: BigInteger += BigInteger BigInteger += * Integer BigInteger += Long BigInteger += Short BigInteger * += Byte @@ -114,7 +112,7 @@ * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 * @test_Strategy: Validate when the operator is '+=' that the operands are * coerced to Strings and the result is a Concatenation. - * + * * Equations tested: Float + Double Float + Float Float + * String containing ".", "e", or "E" Float + BigInteger Float * + Integer Float + Long Float + Short Float + Byte @@ -139,7 +137,7 @@ * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 * @test_Strategy: Validate when the operator is '+=' that the operands are * coerced to Strings and the result is a Concatenation. - * + * * Equations tested: Double += Double Double += String * containing ".", "e", or "E" Double += BigInteger Double += * Integer Double += Long Double += Short Double += Byte @@ -161,7 +159,7 @@ * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 * @test_Strategy: Validate when the operator is '+=' that the operands are * coerced to Strings and the result is a Concatenation. - * + * * Equations tested: Long += Integer Long += Long Long += * Short Long += Byte */ @@ -182,7 +180,7 @@ * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 * @test_Strategy: Validate when the operator is '+=' that the operands are * coerced to Strings and the result is a Concatenation. - * + * * Equations tested: Integer += Integer Integer += Short * Integer += Byte */ @@ -203,7 +201,7 @@ * @assertion_ids: EL:SPEC:38; EL:SPEC:47.1; EL:SPEC:47.1.1; EL:SPEC:47.1.2 * @test_Strategy: Validate when the operator is '+=' that the operands are * coerced to Strings and the result is a Concatenation. - * + * * Equations tested: Short += Short Short += Byte */ @Test @@ -224,7 +222,7 @@ * @test_Strategy: Validate that if the operator is '+=' that both operands * are coerced to String and the result is a Concatenation of * the operands. - * + * * Equations tested: Byte += Byte */ @Test @@ -245,9 +243,9 @@ * @test_Strategy: Validate when the operator is '+=' that both operands are * coerced to Strings and that they result is a Concatenation * of the operands. - * + * * Equations tested: Boolean += String Boolean += Boolean - * + * */ @Test public void elBooleanConcatenationTest() throws Exception { @@ -268,7 +266,7 @@ /** * Test a query for the correct value. - * + * * @param name * The Name of the test * @param query
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/conditionaloperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/conditionaloperator/ELClientIT.java index 1d51df9..7c6be35 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/conditionaloperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/conditionaloperator/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates. 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 @@ -20,9 +20,6 @@ package com.sun.ts.tests.el.spec.conditionaloperator; -import java.util.Properties; - - import com.sun.ts.tests.el.common.util.ExprEval; import com.sun.ts.tests.el.common.util.NameValuePair; @@ -57,9 +54,9 @@ /* * @testName: elConditionalStringTest - * + * * @assertion_ids: EL:SPEC:26.1.1; EL:SPEC:26.1.2 - * + * * @test_Strategy: Validate that if a String is passed with the conditional * operator, the type is coerced to Boolean and the operator is applied. * @@ -75,9 +72,9 @@ /* * @testName: elConditionalBooleanTest - * + * * @assertion_ids: EL:SPEC:26.1.1; EL:SPEC:26.1.2 - * + * * @test_Strategy: Validate that if a Boolean is passed with the conditional * operator, that the operator is applied. *
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/emptyoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/emptyoperator/ELClientIT.java index 956c79d..05e630e 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/emptyoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/emptyoperator/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates. 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 @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ExprEval; import com.sun.ts.tests.el.common.util.NameValuePair; @@ -59,9 +57,9 @@ /* * @testName: elEmptyNullTest - * + * * @assertion_ids: EL:SPEC:25.1 - * + * * @test_Strategy: Validate that if "null" is passed with the Empty operator, * the correct Boolean result is returned. */ @@ -99,9 +97,9 @@ /* * @testName: elEmptyStringTest - * + * * @assertion_ids: EL:SPEC:25.2; EL:SPEC:25.6 - * + * * @test_Strategy: Validate that if a String is passed with the Empty * operator, the correct Boolean result is returned. */ @@ -116,9 +114,9 @@ /* * @testName: elEmptyArrayTest - * + * * @assertion_ids: EL:SPEC:25.3; EL:SPEC:25.6 - * + * * @test_Strategy: Validate that if a Array is passed with the Empty operator, * the correct Boolean result is returned. */ @@ -134,9 +132,9 @@ /* * @testName: elEmptyMapTest - * + * * @assertion_ids: EL:SPEC:25.4; EL:SPEC:25.6 - * + * * @test_Strategy: Validate that if a Map is passed with the Empty operator, * the correct Boolean result is returned. */ @@ -156,9 +154,9 @@ /* * @testName: elEmptyCollectionTest - * + * * @assertion_ids: EL:SPEC:25.5; EL:SPEC:25.6 - * + * * @test_Strategy: Validate that if a Collection is passed with the Empty * operator, the correct Boolean result is returned. */
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/lambda/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/lambda/ELClientIT.java index 20246a4..e9b6a92 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/lambda/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/lambda/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -26,8 +26,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.TypesBean; import com.sun.ts.tests.el.common.util.Validator; @@ -63,30 +61,30 @@ /** * @testName: elLambdaExprBigDecimalTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)", "func = (x,y)->x * [operator] y; func(a, b)", "(cond->[true/false]? a * [operator] b: a [operator] 2)(a)" - * + * * Variable A - BigDecimal - * + * * Variable B - Rotating through the following types: * BigDecimal, BigInteger, Integer, Float, Long, Short, * Double, Byte - * + * * Excluded: none - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprBigDecimalTest() throws Exception { @@ -132,29 +130,29 @@ /** * @testName: elLambdaExprFloatTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)", "func = (x,y)->x * [operator] y; func(a, b)", "(cond->[true/false]? a * [operator] b: a [operator] 2)(a)" - * + * * Variable A - Float - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprFloatTest() throws Exception { @@ -239,29 +237,29 @@ /** * @testName: elLambdaExprDoubleTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)", "func = (x,y)->x * [operator] y; func(a, b)", "(cond->[true/false]? a * [operator] b: a [operator] 2)(a)" - * + * * Variable A - Double - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprDoubleTest() throws Exception { @@ -346,27 +344,27 @@ /** * @testName: elLambdaExprBigIntegerTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)" - * + * * Variable A - BigInteger - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprBigIntegerTest() throws Exception { @@ -423,27 +421,27 @@ /** * @testName: elLambdaExprIntegerTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)" - * + * * Variable A - Integer - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprIntegerTest() throws Exception { @@ -501,27 +499,27 @@ /** * @testName: elLambdaExprLongTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)" - * + * * Variable A - Long - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprLongTest() throws Exception { @@ -580,28 +578,28 @@ /** * @testName: elLambdaExprShortTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)" - * + * * Variable A - Short - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprShortTest() throws Exception { @@ -661,28 +659,28 @@ /** * @testName: elLambdaExprByteTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expressions: "(((x, y)-> x [operator] y)(a, b))", "z = * (x,y)->x [operator] y" "z(a, b)" - * + * * Variable A - Byte - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long, Short - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprByteTest() throws Exception { @@ -743,23 +741,23 @@ /** * @testName: elLambdaExprStringTest - * + * * @assertion_ids: EL:SPEC:49.1; EL:JAVADOC:212 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: + - * + * * Expression: "(((x, y)-> x cat y)(a, b))" - * + * * Variable A - String - * + * * Variable B - String - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprStringTest() throws Exception { @@ -780,23 +778,23 @@ /** * @testName: elLambdaExprNullTest - * + * * @assertion_ids: EL:SPEC:50.1; EL:SPEC:50.2; EL:SPEC:50.3; EL:SPEC:50.4; * EL:SPEC:50.5; EL:SPEC:50.6; EL:JAVADOC:212 - * + * * @test_Strategy: Evaluate the Lambda Expression, making sure the coercion * rules are followed. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "(((x, y)-> x [operator] y)(a, b))" - * + * * Variable A - null - * + * * Variable B - null - * + * * @since: 3.0 - * + * */ @Test public void elLambdaExprNullTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/language/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/language/ELClientIT.java index 7824aef..08be456 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/language/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/language/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,8 +22,6 @@ package com.sun.ts.tests.el.spec.language; import java.util.Hashtable; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ELTestUtil; import com.sun.ts.tests.el.common.spec.Book; @@ -65,9 +63,9 @@ /* * @testName: poundDollarSameMeaning1Test - * + * * @assertion_ids: EL:SPEC:1 - * + * * @test_Strategy: Confirm that two EL expressions, identical except for the * '$' and '#' delimiters, are evaluated the same. Case 1: base is null. */ @@ -101,9 +99,9 @@ /* * @testName: poundDollarSameMeaning2Test - * + * * @assertion_ids: EL:SPEC:1 - * + * * @test_Strategy: Confirm that two EL expressions, identical except for the * '$' and '#' delimiters, are evaluated the same. Case 2: base is non-null. */ @@ -126,7 +124,7 @@ if (!(firstNamePound.toString().equals(firstNameDollar.toString()))) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "Dollar & Pound symbols return different" + "expression values!"); pass = false; @@ -142,9 +140,9 @@ /* * @testName: nestedEvalExpressionsTest - * + * * @assertion_ids: EL:SPEC:2 - * + * * @test_Strategy: Verify that nested eval-expressions are illegal. */ @Test @@ -182,9 +180,9 @@ /* * @testName: mixedCompositeExpressionsTest - * + * * @assertion_ids: EL:SPEC:12 - * + * * @test_Strategy: Verify that composite expressions that mix the '$' and '#' * delimiters are illegal. */ @@ -223,9 +221,9 @@ /* * @testName: compositeExprEval1Test - * + * * @assertion_ids: EL:SPEC:11 - * + * * @test_Strategy: Verify that in a composite expression eval-expressions are * coerced to Strings according to the EL type conversion rules and * concatenated with any intervening literal-expressions. @@ -261,9 +259,9 @@ /* * @testName: compositeExprEval2Test - * + * * @assertion_ids: EL:SPEC:11 - * + * * @test_Strategy: Verify that in a composite expression eval-expressions are * evaluated left to right, coerced to Strings according to the EL type * conversion rules, and concatenated with any intervening @@ -296,9 +294,9 @@ /* * @testName: dotAndIndexOperatorsSameTest - * + * * @assertion_ids: EL:SPEC:15 - * + * * @test_Strategy: [DotAndIndexOperatorsSame] Verify that the dot and index * operators are evaluated in the same way. */ @@ -330,9 +328,9 @@ /* * @testName: elSyntaxEscapeTest - * + * * @assertion_ids: EL:SPEC:8 - * + * * @test_Strategy: [ELSyntaxEscape] Verify that the EL special characters '$' * and '#' are treated as literals when preceded with '\'. */ @@ -367,9 +365,9 @@ /* * @testName: literalExprEval1Test - * + * * @assertion_ids: EL:SPEC:6 - * + * * @test_Strategy: [LiteralExprEval] Set the value of a ValueExpression to a * literal String type. Verify that the value retrieved when the expression is * evaluated is a String equal to the value set. @@ -399,9 +397,9 @@ /* * @testName: literalExprEval2Test - * + * * @assertion_ids: EL:SPEC:6 - * + * * @test_Strategy: [LiteralExprEval] Coerce a String literal to a Boolean in a * ValueExpression. Verify that the value retrieved when the expression is * evaluated is a Boolean of the expected value. @@ -431,9 +429,9 @@ /* * @testName: literalExprAsMethodExpr1Test - * + * * @assertion_ids: EL:SPEC:10 - * + * * @test_Strategy: [LiteralExprAsMethodExpr] Verify that a literal-expression * can also be used as a method expression that returns a non-void value. */ @@ -472,9 +470,9 @@ /* * @testName: literalExprAsMethodExpr2Test - * + * * @assertion_ids: EL:SPEC:10 - * + * * @test_Strategy: [LiteralExprAsMethodExpr] Verify that a literal-expression * can also be used as a method expression that returns a non-void value. * Verify that the standard coercion rules apply if the return type is not @@ -501,7 +499,7 @@ else if (((Integer) value).intValue() != testNum) { pass = false; - logger.log(Logger.Level.ERROR, + logger.log(Logger.Level.ERROR, "Expected: " + testNum + NLINE + "Received: " + value.toString()); } @@ -515,9 +513,9 @@ /* * @testName: rValueCoercion1Test - * + * * @assertion_ids: EL:SPEC:3 - * + * * @test_Strategy: [RValueCoercion] Set the value of a ValueExpression to a * String type and verify that the value retrieved when the expression is * evaluated is also a String type. @@ -545,9 +543,9 @@ /* * @testName: rValueCoercion2Test - * + * * @assertion_ids: EL:SPEC:3 - * + * * @test_Strategy: [RValueCoercion] Set the value of a ValueExpression to a * complex type and verify that the value retrieved when the expression is * evaluated is a String type in accordance with the coercion rules. @@ -578,9 +576,9 @@ /* * @testName: parseOnceEvalManyTest - * + * * @assertion_ids: EL:SPEC:45 - * + * * @test_Strategy: [ExprParsedEvalMany] Verify that once an expression is * parsed, it can be evaluated multiple times, and that the result of the * evaluation will be the same even when the EL context is modified.
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/literal/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/literal/ELClientIT.java index 56b98e0..0bf5954 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/literal/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/literal/ELClientIT.java
@@ -1,5 +1,6 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025 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 @@ -25,10 +26,8 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.Set; - import com.sun.ts.tests.el.common.util.ExprEval; import org.junit.jupiter.api.AfterEach;
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/operatorprecedence/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/operatorprecedence/ELClientIT.java index 6967543..1644b01 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/operatorprecedence/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/operatorprecedence/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -21,9 +21,6 @@ package com.sun.ts.tests.el.spec.operatorprecedence; -import java.util.Properties; - - import com.sun.ts.tests.el.common.elcontext.FuncMapperELContext; import com.sun.ts.tests.el.common.util.ExprEval; @@ -69,9 +66,9 @@ /* * @testName: elMultiPreBinaryTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -87,9 +84,9 @@ /* * @testName: elDivPreBinaryTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -108,9 +105,9 @@ /* * @testName: elModPreBinaryTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -129,9 +126,9 @@ /* * @testName: elMultiPreRelationalTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -164,9 +161,9 @@ /* * @testName: elDivPreRelationalTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -201,9 +198,9 @@ /* * @testName: elModPreRelationalTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -238,9 +235,9 @@ /* * @testName: elMultiEqualPreAndTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -258,9 +255,9 @@ /* * @testName: elDivEqualPreAndTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -282,9 +279,9 @@ /* * @testName: elModEqualPreAndTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -306,9 +303,9 @@ /* * @testName: elMultiEqualOrCondTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -327,9 +324,9 @@ /* * @testName: elDivEqualPreOrTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -353,9 +350,9 @@ /* * @testName: elModEqualPreOrTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -378,9 +375,9 @@ /* * @testName: elMultiEqualPreCondTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -397,9 +394,9 @@ /* * @testName: elDivEqualPreCondTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -417,9 +414,9 @@ /* * @testName: elModEqualPreCondTest - * + * * @assertion_ids: EL:SPEC:28 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -436,9 +433,9 @@ /* * @testName: elParenPreBinaryTest - * + * * @assertion_ids: EL:SPEC:28; EL:SPEC:27 - * + * * @test_Strategy: Validate that the order of precedence is followed when an * EL Expression is evaluated. * @@ -473,9 +470,9 @@ /* * @testName: functionPrecedenceTest - * + * * @assertion_ids: EL:SPEC:29 - * + * * @test_Strategy: Validate that qualified functions with a namespace prefix * have precedence over the operators by constructing an expression which * cannot be parsed due to this rule.
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/relationaloperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/relationaloperator/ELClientIT.java index 95d60e7..8e4043c 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/relationaloperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/relationaloperator/ELClientIT.java
@@ -1,5 +1,6 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025 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 @@ -23,8 +24,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ExprEval; import com.sun.ts.tests.el.common.util.NameValuePair; @@ -314,7 +313,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal "<" & "lt" BigDecimal * BigDecimal "<" & "lt" Double BigDecimal "<" & "lt" Float * BigDecimal "<" & "lt" BigInteger BigDecimal "<" & "lt" @@ -341,7 +340,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal "<=" & "le" BigDecimal * BigDecimal "<=" & "le" Double BigDecimal "<=" & "le" Float * BigDecimal "<=" & "le" BigInteger BigDecimal "<=" & "le" @@ -367,7 +366,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal ">" & "gt" BigDecimal * BigDecimal ">" & "gt" Double BigDecimal ">" & "gt" Float * BigDecimal ">" & "gt" BigInteger BigDecimal ">" & "gt" @@ -394,7 +393,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal ">=" & "ge" BigDecimal * BigDecimal ">=" & "ge" Double BigDecimal ">=" & "ge" Float * BigDecimal ">=" & "ge" BigInteger BigDecimal ">=" & "ge" @@ -421,7 +420,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal "==" & "eq" BigDecimal * BigDecimal "==" & "eq" Double BigDecimal "==" & "eq" Float * BigDecimal "==" & "eq" BigInteger BigDecimal "==" & "eq" @@ -445,7 +444,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is a BigDecimal, the result is coerced to * BigDecimal and the correct boolean value is returned. - * + * * Equations tested: BigDecimal "!=" & "ne" BigDecimal * BigDecimal "!=" & "ne" Double BigDecimal "!=" & "ne" Float * BigDecimal "!=" & "ne" BigInteger BigDecimal "!=" & "ne" @@ -469,7 +468,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float "<" & "lt" Double Float "<" & "lt" * Float Float "<" & "lt" BigInteger Float "<" & "lt" Integer * Float "<" & "lt" Long Float "<" & "lt" Short Float "<" & @@ -495,7 +494,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float "<=" & "le" Double Float "<=" & * "le" Float Float "<=" & "le" BigInteger Float "<=" & "le" * Integer Float "<=" & "le" Long Float "<=" & "le" Short @@ -520,7 +519,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float ">" & "gt" Double Float ">" & "gt" * Float Float ">" & "gt" BigInteger Float ">" & "gt" Integer * Float ">" & "gt" Long Float ">" & "gt" Short Float ">" & @@ -546,7 +545,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float ">=" & "ge" Double Float ">=" & * "ge" Float Float ">=" & "ge" BigInteger Float ">=" & "ge" * Integer Float ">=" & "ge" Long Float ">=" & "ge" Short @@ -572,7 +571,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float "==" & "eq" Double Float "==" & * "eq" Float Float "==" & "eq" BigInteger Float "==" & "eq" * Integer Float "==" & "eq" Long Float "==" & "eq" Short @@ -595,7 +594,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is a Float, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Float "!=" & "ne" Double Float "!=" & * "ne" Float Float "!=" & "ne" BigInteger Float "!=" & "ne" * Integer Float "!=" & "ne" Long Float "!=" & "ne" Short @@ -618,7 +617,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double "<" & "lt" Double Double "<" & * "lt" BigInteger Double "<" & "lt" Integer Double "<" & "lt" * Long Double "<" & "lt" Short Double "<" & "lt" Byte @@ -643,7 +642,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double "<=" & "le" Double Double "<=" & * "le" BigInteger Double "<=" & "le" Integer Double "<=" & * "le" Long Double "<=" & "le" Short Double "<=" & "le" Byte @@ -667,7 +666,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double ">" & "gt" Double Double ">" & * "gt" BigInteger Double ">" & "gt" Integer Double ">" & "gt" * Long Double ">" & "gt" Short Double ">" & "gt" Byte @@ -692,7 +691,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double ">=" & "ge" Double Double ">=" & * "ge" BigInteger Double ">=" & "ge" Integer Double ">=" & * "ge" Long Double ">=" & "ge" Short Double ">=" & "ge" Byte @@ -717,7 +716,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double "==" & "eq" Double Double "==" & * "eq" BigInteger Double "==" & "eq" Integer Double "==" & * "eq" Long Double "==" & "eq" Short Double "==" & "eq" Byte @@ -739,7 +738,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is a Double, the result is coerced to Double and * the correct boolean value is returned. - * + * * Equations tested: Double "!=" & "ne" Double Double "!=" & * "ne" BigInteger Double "!=" & "ne" Integer Double "!=" & * "ne" Long Double "!=" & "ne" Short Double "!=" & "ne" Byte @@ -761,7 +760,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger "<" & "lt" BigInteger * BigInteger "<" & "lt" Integer BigInteger "<" & "lt" Long * BigInteger "<" & "lt" Short BigInteger "<" & "lt" Byte @@ -786,7 +785,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger "<=" & "le" BigInteger * BigInteger "<=" & "le" Integer BigInteger "<=" & "le" Long * BigInteger "<=" & "le" Short BigInteger "<=" & "le" Byte @@ -810,7 +809,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger ">" & "gt" BigInteger * BigInteger ">" & "gt" Integer BigInteger ">" & "gt" Long * BigInteger ">" & "gt" Short BigInteger ">" & "gt" Byte @@ -835,7 +834,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger ">=" & "ge" BigInteger * BigInteger ">=" & "ge" Integer BigInteger ">=" & "ge" Long * BigInteger ">=" & "ge" Short BigInteger ">=" & "ge" Byte @@ -860,7 +859,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger "==" & "eq" BigInteger * BigInteger "==" & "eq" Integer BigInteger "==" & "eq" Long * BigInteger "==" & "eq" Short BigInteger "==" & "eq" Byte @@ -882,7 +881,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is a BigInteger, the result is coerced to * BigInteger and the correct boolean value is returned. - * + * * Equations tested: BigInteger "!=" & "ne" BigInteger * BigInteger "!=" & "ne" Integer BigInteger "!=" & "ne" Long * BigInteger "!=" & "ne" Short BigInteger "!=" & "ne" Byte @@ -904,7 +903,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long "<" & "lt" Integer Long "<" & "lt" * Long Long "<" & "lt" Short Long "<" & "lt" Byte */ @@ -928,7 +927,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long "<=" & "le" Integer Long "<=" & "le" * Long Long "<=" & "le" Short Long "<=" & "le" Byte */ @@ -951,7 +950,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long ">" & "gt" Integer Long ">" & "gt" * Long Long ">" & "gt" Short Long ">" & "gt" Byte */ @@ -975,7 +974,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long ">=" & "ge" Integer Long ">=" & "ge" * Long Long ">=" & "ge" Short Long ">=" & "ge" Byte */ @@ -999,7 +998,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long "==" & "eq" Integer Long "==" & "eq" * Long Long "==" & "eq" Short Long "==" & "eq" Byte */ @@ -1020,7 +1019,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is a Long, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Long "!=" & "ne" Integer Long "!=" & "ne" * Long Long "!=" & "ne" Short Long "!=" & "ne" Byte */ @@ -1041,7 +1040,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer "<" & "lt" Integer Integer "<" & * "lt" Short Integer "<" & "lt" Byte */ @@ -1065,7 +1064,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer "<=" & "le" Integer Integer "<=" * & "le" Short Integer "<=" & "le" Byte */ @@ -1088,7 +1087,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer ">" & "gt" Integer Integer ">" & * "gt" Short Integer ">" & "gt" Byte */ @@ -1112,7 +1111,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer ">=" & "ge" Integer Integer ">=" * & "ge" Short Integer ">=" & "ge" Byte */ @@ -1136,7 +1135,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer "==" & "eq" Integer Integer "==" * & "eq" Short Integer "==" & "eq" Byte */ @@ -1157,7 +1156,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an Integer, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Integer "!=" & "ne" Integer Integer "!=" * & "ne" Short Integer "!=" & "ne" Byte */ @@ -1178,7 +1177,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short "<" & "lt" Short Short "<" & "lt" * Byte */ @@ -1202,7 +1201,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short "<=" & "le" Short Short "<=" & "le" * Byte */ @@ -1225,7 +1224,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short ">" & "gt" Short Short ">" & "gt" * Byte */ @@ -1249,7 +1248,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short ">=" & "ge" Short Short ">=" & "ge" * Byte */ @@ -1273,7 +1272,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short "==" & "eq" Short Short "==" & "eq" * Byte */ @@ -1294,7 +1293,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an Short, the result is coerced to Long and * the correct boolean value is returned. - * + * * Equations tested: Short "!=" & "ne" Short Short "!=" & "ne" * Byte */ @@ -1315,7 +1314,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte "<" & "lt" Byte */ @Test @@ -1338,7 +1337,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte "<=" & "le" Byte */ @Test @@ -1360,7 +1359,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte ">" & "gt" Byte */ @Test @@ -1383,7 +1382,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte ">=" & "ge" Byte */ @Test @@ -1406,7 +1405,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte "==" & "eq" Byte */ @Test @@ -1426,7 +1425,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an Byte, the result is coerced to Long and the * correct boolean value is returned. - * + * * Equations tested: Byte "!=" & "ne" Byte */ @Test @@ -1446,7 +1445,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<" or "lt" * operation is an String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String "<" & "lt" String */ @Test @@ -1469,7 +1468,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "<=" or "le" * operation is a String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String "<=" & "le" String */ @Test @@ -1491,7 +1490,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">" or "gt" * operation is an String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String ">" & "gt" String */ @Test @@ -1514,7 +1513,7 @@ * @test_Strategy: Validate that if one of the operands in an EL ">=" or "ge" * operation is an String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String ">=" & "ge" String */ @Test @@ -1537,7 +1536,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String "==" & "eq" String */ @Test @@ -1557,7 +1556,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an String, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Equations tested: String "!=" & "ne" String */ @Test @@ -1576,7 +1575,7 @@ * @assertion_ids: EL:SPEC:21.8.2 * @test_Strategy: Validate that if operand A in an EL "<" or "lt" operation * is comparable, the result A.compareTo(B) is returned. - * + * * Equation example: DougType "<" & "lt" NickType */ @Test @@ -1598,7 +1597,7 @@ * @assertion_ids: EL:SPEC:21.8.2 * @test_Strategy: Validate that if operand A in an EL "<=" or "le" operation * is comparable, the result A.compareTo(B) is returned. - * + * * Equation example: DougType "<=" & "le" NickType */ @Test @@ -1619,7 +1618,7 @@ * @assertion_ids: EL:SPEC:21.8.2 * @test_Strategy: Validate that if operand A in an EL ">" or "gt" operation * is comparable, the result A.compareTo(B) is returned. - * + * * Equation example: DougType "<" & "gt" NickType */ @Test @@ -1641,7 +1640,7 @@ * @assertion_ids: EL:SPEC:21.8.2 * @test_Strategy: Validate that if operand A in an EL ">=" or "ge" operation * is comparable, the result A.compareTo(B) is returned. - * + * * Equations tested: DougType ">=" & "ge" NickType */ @Test @@ -1663,7 +1662,7 @@ * @assertion_ids: EL:SPEC:22.11 * @test_Strategy: Validate that if operand A in an EL "==" or "eq" operation * is comparable, the result A.equals(B) is returned. - * + * * Equations Example: DougType "==" & "eq" NickType */ @Test @@ -1682,7 +1681,7 @@ * @assertion_ids: EL:SPEC:22.11 * @test_Strategy: Validate that if operand A in an EL "!=" or "ne" operation * is comparable, the result A.equals(B) is returned. - * + * * Equation Example: DougType "!=" & "ne" NickType */ @Test @@ -1702,7 +1701,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an Boolean, that both operands are coerced to * type Boolean and the correct boolean value is returned. - * + * * Equations tested: Boolean "==" & "eq" String */ @Test @@ -1722,7 +1721,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an Boolean, that both operands are coerced to * type Boolean and the correct boolean value is returned. - * + * * Equations tested: String "!=" & "ne" String */ @Test @@ -1742,7 +1741,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "==" or "eq" * operation is an Enum, that both operands are coerced to * type Enum and the correct boolean value is returned. - * + * * Example Equation: Enum "==" String or Integer */ @Test @@ -1763,7 +1762,7 @@ * @test_Strategy: Validate that if one of the operands in an EL "!=" or "ne" * operation is an Enum, that both operands are coerced to * type String and the correct boolean value is returned. - * + * * Example Equation: Enum "!=" & "ne" Enum */ @Test @@ -1785,7 +1784,7 @@ * This method is used to validate an expression that has at least one * BigDecimal in it. We pass in one of the operands(testVal), the other * operand is automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -1800,7 +1799,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "BigDecimal" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -1831,7 +1830,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "BigDecimal" + "\"" + " Test Sequence ***"); } @@ -1845,7 +1844,7 @@ * This method is used to validate an expression that has at least one * BigInteger in it. We pass in one of the operands(testVal), the other * operand is automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -1860,7 +1859,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "BigInteger" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -1899,7 +1898,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "BigInteger" + "\"" + " Test Sequence ***"); } @@ -1913,7 +1912,7 @@ * This method is used to validate an expression that has at least one Float * in it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -1928,7 +1927,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "Float" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -1950,7 +1949,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Float" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -1966,7 +1965,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "Float" + "\"" + " Test Sequence ***"); } @@ -1980,7 +1979,7 @@ * This method is used to validate an expression that has at least one Double * in it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -1995,7 +1994,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "Double" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -2017,7 +2016,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Double" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -2033,7 +2032,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "Double" + "\"" + " Test Sequence ***"); } @@ -2047,7 +2046,7 @@ * This method is used to validate an expression that has at least one Long in * it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -2084,7 +2083,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Long" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -2113,7 +2112,7 @@ * This method is used to validate an expression that has at least one Integer * in it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -2128,7 +2127,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "Integer" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -2152,7 +2151,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Integer" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -2168,7 +2167,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "Integer" + "\"" + " Test Sequence ***"); } @@ -2182,7 +2181,7 @@ * This method is used to validate an expression that has at least one Short * in it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -2197,7 +2196,7 @@ boolean pass; for (int i = 0; numberList.size() > i; i++) { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "Short" + "\"" + " Test Sequence ***"); Object testNum = numberList.get(i); @@ -2215,7 +2214,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Short" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -2231,7 +2230,7 @@ } finally { ExprEval.cleanup(); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** End " + "\"" + "Short" + "\"" + " Test Sequence ***"); } @@ -2245,7 +2244,7 @@ * This method is used to validate an expression that has at least one Byte in * it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -2277,7 +2276,7 @@ try { String expr = ExprEval.buildElExpr(false, booleanOperator); logger.log(Logger.Level.TRACE, "expression to be evaluated is " + expr); - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "types are " + "Byte" + " and " + testNum.getClass().getName()); Object result = ExprEval.evaluateValueExpression(expr, values, @@ -2306,7 +2305,7 @@ * This method is used to validate an expression that has at least one String * in it. We pass in one of the operands(testVal), the other operand is * automatically picked up from the numberList. - * + * * @param testVal * - One of the operands used in the expression. * @param expectedVal @@ -2324,7 +2323,7 @@ testValTwo); try { - logger.log(Logger.Level.TRACE, + logger.log(Logger.Level.TRACE, "*** Start " + "\"" + "String" + "\"" + " Test Sequence ***"); String expr = ExprEval.buildElExpr(false, booleanOperator);
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/semicolonoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/semicolonoperator/ELClientIT.java index 1f33b49..23355d1 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/semicolonoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/semicolonoperator/ELClientIT.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates and others. + * Copyright (c) 2012, 2025 Oracle and/or its affiliates and others. * All rights reserved. * * This program and the accompanying materials are made available under the @@ -26,8 +26,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.TypesBean; import com.sun.ts.tests.el.common.util.Validator; @@ -54,7 +52,7 @@ void logStartTest(TestInfo testInfo) { logger.log(Logger.Level.INFO, "STARTING TEST : "+testInfo.getDisplayName()); } - + @AfterEach void logFinishTest(TestInfo testInfo) { logger.log(Logger.Level.INFO, "FINISHED TEST : "+testInfo.getDisplayName()); @@ -62,26 +60,26 @@ /** * @testName: elSemiColonOperatorBigDecimalTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: To evaluate A;B, A is first evaluated, and its value is * discarded. B is then evaluated and its value is returned. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckBigDecimal; a [operator] b" - * + * * Variable A - BigDecimal - * + * * Variable B - Rotating through the following types: * BigDecimal, BigInteger, Integer, Float, Long, Short, * Double, Byte - * + * * Excluded: none - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorBigDecimalTest() throws Exception { @@ -137,26 +135,26 @@ /** * @testName: elSemiColonOperatorFloatTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckFloat; a [operator] b" - * + * * Variable A - Float - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorFloatTest() throws Exception { @@ -249,26 +247,26 @@ /** * @testName: elSemiColonOperatorDoubleTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckDouble; a [operator] b" - * + * * Variable A - Double - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorDoubleTest() throws Exception { @@ -362,26 +360,26 @@ /** * @testName: elSemiColonOperatorBigIntegerTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckBigInteger; a [operator] b" - * + * * Variable A - BigInteger - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorBigIntegerTest() throws Exception { @@ -450,26 +448,26 @@ /** * @testName: elSemiColonOperatorIntegerTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckInteger; a [operator] b" - * + * * Variable A - Integer - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorIntegerTest() throws Exception { @@ -539,26 +537,26 @@ /** * @testName: elSemiColonOperatorLongTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckLong; a [operator] b" - * + * * Variable A - Long - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorLongTest() throws Exception { @@ -629,27 +627,27 @@ /** * @testName: elSemiColonOperatorShortTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckShort; a [operator] b" - * + * * Variable A - Short - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorShortTest() throws Exception { @@ -721,27 +719,27 @@ /** * @testName: elSemiColonOperatorByteTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = types.tckByte; a [operator] b" - * + * * Variable A - Byte - * + * * Variable B - Rotating through the following types: Integer, * Float, Long, Short, Double, Byte - * + * * Exclude: BigDecimal, BigInteger, Float, Double, Integer, * Long, Short - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorByteTest() throws Exception { @@ -814,23 +812,23 @@ /** * @testName: elSemiColonOperatorNullTest - * + * * @assertion_ids: EL:SPEC:49.1 - * + * * @test_Strategy: Validate that when we have variable A set to a specific * data type that we coerce and receive back the correct value * and Class type. - * + * * Operators: +, -, *, /, div, %, mod - * + * * Expression: "a = null; a [operator] b" - * + * * Variable A - null - * + * * Variable B - null - * + * * @since: 3.0 - * + * */ @Test public void elSemiColonOperatorNullTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/spec/unaryoperator/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/spec/unaryoperator/ELClientIT.java index 75c0dd9..f61a2e2 100644 --- a/tck/src/main/java/com/sun/ts/tests/el/spec/unaryoperator/ELClientIT.java +++ b/tck/src/main/java/com/sun/ts/tests/el/spec/unaryoperator/ELClientIT.java
@@ -1,5 +1,6 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 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 @@ -22,8 +23,6 @@ import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Properties; - import com.sun.ts.tests.el.common.util.ExprEval; import com.sun.ts.tests.el.common.util.NameValuePair; @@ -58,9 +57,9 @@ /* * @testName: elNullUnaryTest - * + * * @assertion_ids: EL:SPEC:20.1 - * + * * @test_Strategy: Validate that if null is passed with the unary minus * operator, the result is (Long) 0. Test both ${-null} & #{-null} */ @@ -94,9 +93,9 @@ /* * @testName: elBigDecimalUnaryTest - * + * * @assertion_ids: EL:SPEC:20.2 - * + * * @test_Strategy: Validate that if a BigDecimal A is passed with the unary * minus operator (-), the result is A.negate(). Test both ${- value} & #{- * value} @@ -133,9 +132,9 @@ /* * @testName: elBigIntegerUnaryTest - * + * * @assertion_ids: EL:SPEC:20.2 - * + * * @test_Strategy: Validate that if a BigInteger A is passed with the unary * minus operator (-), the result is A.negate(). Test both ${- value} & #{- * value} @@ -172,9 +171,9 @@ /* * @testName: elDoubleStringUnaryTest - * + * * @assertion_ids: EL:SPEC:20.3.1 - * + * * @test_Strategy: Validate that if a String is passed with the unary minus * operator (-), the result is as follows: - If the String contains ".", "e", * or "E" coerce to Double, apply operator. @@ -215,9 +214,9 @@ /* * @testName: elLongStringUnaryTest - * + * * @assertion_ids: EL:SPEC:20.3.2 - * + * * @test_Strategy: Validate that if a String is passed with the unary minus * operator (-), the result is as follows: - If the String does not contain * ".", "e", or "E" coerce to Long, apply operator. @@ -256,9 +255,9 @@ /* * @testName: elByteUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if a Byte is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -296,9 +295,9 @@ /* * @testName: elShortUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if a Short is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -336,9 +335,9 @@ /* * @testName: elIntegerUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if an Integer is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -376,9 +375,9 @@ /* * @testName: elLongUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if a Long is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -416,9 +415,9 @@ /* * @testName: elFloatUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if a Float is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -456,9 +455,9 @@ /* * @testName: elDoubleUnaryTest - * + * * @assertion_ids: EL:SPEC:20.4.1 - * + * * @test_Strategy: Validate that if a Double is passed with the unary minus * operator (-), the type is retained and the operator is applied. * @@ -496,9 +495,9 @@ /* * @testName: elBooleanUnaryFalseTest - * + * * @assertion_ids: EL:SPEC:24.1.1 - * + * * @test_Strategy: Validate that if a String("false") is passed with the unary * "not" operator, the type is coerced to Boolean and the operator is applied. * @@ -513,9 +512,9 @@ /* * @testName: elBooleanUnaryTrueTest - * + * * @assertion_ids: EL:SPEC:24.1.1 - * + * * @test_Strategy: Validate that if a String("true") is passed with the unary * "not" operator, the type is coerced to Boolean and the operator is applied. *