diff --git a/jsp/pom.xml b/jsp/pom.xml index 8b26faad43..aee30b5e5e 100644 --- a/jsp/pom.xml +++ b/jsp/pom.xml @@ -35,8 +35,6 @@ 1.7.0.Alpha14 5.9.1 - 11 - 11 @@ -55,6 +53,7 @@ jakarta.servlet.jsp jakarta.servlet.jsp-api + 4.0.0-M1 jakarta.servlet @@ -71,6 +70,7 @@ jakarta.el jakarta.el-api + 6.0.0-M1 jakarta.mail @@ -103,7 +103,10 @@ maven-compiler-plugin - 2.3.2 + 3.10.1 + + 17 + maven-surefire-plugin @@ -112,7 +115,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java deleted file mode 100644 index 9f6dd51f89..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2007, 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elexception; - - -import com.sun.ts.tests.jsp.common.client.AbstractUrlClient; -import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.jboss.shrinkwrap.api.asset.UrlAsset; - - -@ExtendWith(ArquillianExtension.class) -public class URLClientIT extends AbstractUrlClient { - - - - - public URLClientIT() throws Exception { - - setContextRoot("/jsp_elexc_web"); - setTestJsp("ELExceptionTest"); - - } - - @Deployment(testable = false) - public static WebArchive createDeployment() throws IOException { - - String packagePath = URLClientIT.class.getPackageName().replace(".", "/"); - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elexc_web.war"); - archive.addClasses(JspTestUtil.class); - archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elexc_web.xml")); - archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELExceptionTest.jsp")), "ELExceptionTest.jsp"); - - - return archive; - } - - - /* Run tests */ - - // ============================================ Tests ====== - - /* - * @testName: elExceptionDefaultCtorTest - * - * @assertion_ids: JSP:JAVADOC:159 - * - * @test_Strategy: Validate default constructor of ELException - */ - @Test - public void elExceptionDefaultCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionDefaultCtorTest"); - invoke(); - } - - /* - * @testName: elExceptionMessageCtorTest - * - * @assertion_ids: JSP:JAVADOC:160 - * - * @test_Strategy: Validate contructor taking single string argument as the - * message of the Exception. - */ - @Test - public void elExceptionMessageCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionMessageCtorTest"); - invoke(); - } - - /* - * @testName: elExceptionCauseCtorTest - * - * @assertion_ids: JSP:JAVADOC:161 - * - * @test_Strategy: Validate constructor taking a Throwable signifying the root - * cause of the this ELException. - */ - @Test - public void elExceptionCauseCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionCauseCtorTest"); - invoke(); - } - - /* - * @testName: elExceptionCauseMessageCtorTest - * - * @assertion_ids: JSP:JAVADOC:162 - * - * @test_Strategy: Validate constructor taking both a message and a Throwable - * signifying the root cause of the ELException. - */ - @Test - public void elExceptionCauseMessageCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionCauseMessageCtorTest"); - invoke(); - } - - /* - * @testName: elExceptionGetRootCauseTest - * - * @assertion_ids: JSP:JAVADOC:163 - * - * @test_Strategy: Validate the behavior of ELException.getRootCause(). - */ - @Test - public void elExceptionGetRootCauseTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionGetRootCauseTest"); - invoke(); - } - - /* - * @testName: elExceptionToStringTest - * - * @assertion_ids: JSP:JAVADOC:164 - * - * @test_Strategy: Validate the behavior of ELException.toString(). - */ - @Test - public void elExceptionToStringTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elExceptionToStringTest"); - invoke(); - } -} diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java deleted file mode 100644 index 767bea1265..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2007, 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elparseexception; - - -import com.sun.ts.tests.jsp.common.client.AbstractUrlClient; -import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import com.sun.ts.tests.jsp.common.tags.tck.SetTag; -import com.sun.ts.tests.common.el.api.expression.ExpressionTest; - -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.jboss.shrinkwrap.api.asset.UrlAsset; - - -@ExtendWith(ArquillianExtension.class) -public class URLClientIT extends AbstractUrlClient { - - - - - public URLClientIT() throws Exception { - - setContextRoot("/jsp_elparseexc_web"); - setTestJsp("ELParseExceptionTest"); - - } - - @Deployment(testable = false) - public static WebArchive createDeployment() throws IOException { - - String packagePath = URLClientIT.class.getPackageName().replace(".", "/"); - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elparseexc_web.war"); - archive.addClasses( - JspTestUtil.class, - SetTag.class, - ExpressionTest.class); - archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elparseexc_web.xml")); - archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELParseExceptionTest.jsp")), "ELParseExceptionTest.jsp"); - - - return archive; - } - - - /* Run tests */ - - // ============================================ Tests ====== - - /* - * @testName: elParseExceptionDefaultCtorTest - * - * @assertion_ids: JSP:JAVADOC:157 - * - * @test_Strategy: Validate default constructor of ELParseException - */ - @Test - public void elParseExceptionDefaultCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elParseExceptionDefaultCtorTest"); - invoke(); - } - - /* - * @testName: elParseExceptionMessageCtorTest - * - * @assertion_ids: JSP:JAVADOC:158 - * - * @test_Strategy: Validate contructor taking single string argument as the - * message of the Exception. - */ - @Test - public void elParseExceptionMessageCtorTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "elParseExceptionMessageCtorTest"); - invoke(); - } -} diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml deleted file mode 100644 index f14210dd09..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/build.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml deleted file mode 100644 index a6197dec86..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ELParseException - - 5 - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java deleted file mode 100644 index 2ebba4db8b..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2007, 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expression; - - -import com.sun.ts.tests.jsp.common.client.AbstractUrlClient; -import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import com.sun.ts.tests.jsp.common.util.TSFunctionMapper; -import com.sun.ts.tests.jsp.common.util.JspFunctions; - -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.jboss.shrinkwrap.api.asset.UrlAsset; - - -@ExtendWith(ArquillianExtension.class) -public class URLClientIT extends AbstractUrlClient { - - - - - public URLClientIT() throws Exception { - - setContextRoot("/jsp_expr_web"); - setTestJsp("ExpressionTest"); - - } - - @Deployment(testable = false) - public static WebArchive createDeployment() throws IOException { - - String packagePath = URLClientIT.class.getPackageName().replace(".", "/"); - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expr_web.war"); - archive.addClasses( - JspTestUtil.class, - TSFunctionMapper.class, - JspFunctions.class); -archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expr_web.xml")); - archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionTest.jsp")), "ExpressionTest.jsp"); - - - return archive; - } - - - /* Run tests */ - - // ============================================ Tests ====== - - /* - * @testName: expressionEvaluateTest - * - * @assertion_ids: JSP:JAVADOC:174 - * - * @test_Strategy: Validate the behavior of Expression.evaluate(). - */ - @Test - public void expressionEvaluateTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "expressionEvaluateTest"); - invoke(); - } -} diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml deleted file mode 100644 index 98e0f722db..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml deleted file mode 100644 index 7ba5c0055a..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Expression - - 5 - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java deleted file mode 100644 index d4548bf62b..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2007, 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expressionevaluator; - - -import com.sun.ts.tests.jsp.common.client.AbstractUrlClient; -import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import com.sun.ts.tests.jsp.common.util.TSFunctionMapper; -import com.sun.ts.tests.jsp.common.util.JspFunctions; - -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.jboss.shrinkwrap.api.asset.UrlAsset; - - -@ExtendWith(ArquillianExtension.class) -public class URLClientIT extends AbstractUrlClient { - - - public URLClientIT() throws Exception { - - setContextRoot("/jsp_expreval_web"); - setTestJsp("ExpressionEvaluatorTest"); - - } - - @Deployment(testable = false) - public static WebArchive createDeployment() throws IOException { - - String packagePath = URLClientIT.class.getPackageName().replace(".", "/"); - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expreval_web.war"); - archive.addClasses( - JspTestUtil.class, - TSFunctionMapper.class, - JspFunctions.class); - archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expreval_web.xml")); - archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionEvaluatorTest.jsp")), "ExpressionEvaluatorTest.jsp"); - - - return archive; - } - - - /* Run tests */ - - // ============================================ Tests ====== - - /* - * @testName: expressionEvaluatorParseExpressionTest - * - * @assertion_ids: JSP:JAVADOC:168 - * - * @test_Strategy: Validate the following: - An expression can be prepared - * using a FunctionMapper. - An expression can be prepared passing a null - * reference for the FunctionMapper - If the expression uses a function an no - * prefix is provided, the default prefix will be used. - */ - @Test - public void expressionEvaluatorParseExpressionTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "expressionEvaluatorParseExpressionTest"); - invoke(); - } - - /* - * @testName: expressionEvaluatorEvaluateTest - * - * @assertion_ids: JSP:JAVADOC:171;JSP:JAVADOC:165 - * - * @test_Strategy: Validate the following: - Evaluation can occur using a - * FunctionMapper. - Evaluation can occur when a null reference passed as the - * FunctionMapper - If the expression uses a function an no prefix is - * provided, the default prefix will be used. - When the FunctionMapper is - * used, the resolveFunction method must be called. - Validate the the - * provided VariableResolver is used. - Validate the result of the - * expressions. - */ - @Test - public void expressionEvaluatorEvaluateTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "expressionEvaluatorEvaluateTest"); - invoke(); - } -} diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml deleted file mode 100644 index b2c0c59136..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml deleted file mode 100644 index 011f0c5eeb..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ExpressionEvaluator - - 5 - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java deleted file mode 100644 index 4dd8531ec6..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2007, 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.variableresolver; - - -import com.sun.ts.tests.jsp.common.client.AbstractUrlClient; -import com.sun.ts.tests.jsp.common.util.JspTestUtil; -import com.sun.ts.tests.jsp.common.tags.tck.SetTag; -import com.sun.ts.tests.common.el.api.expression.ExpressionTest; - -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.jboss.shrinkwrap.api.asset.UrlAsset; - - -@ExtendWith(ArquillianExtension.class) -public class URLClientIT extends AbstractUrlClient { - - - - - public URLClientIT() throws Exception { - - setContextRoot("/jsp_varresolver_web"); - setTestJsp("VariableResolverTest"); - - } - - @Deployment(testable = false) - public static WebArchive createDeployment() throws IOException { - - String packagePath = URLClientIT.class.getPackageName().replace(".", "/"); - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_varresolver_web.war"); - archive.addClasses( - JspTestUtil.class, - SetTag.class, - ExpressionTest.class); - archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_varresolver_web.xml")); - archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/VariableResolverTest.jsp")), "VariableResolverTest.jsp"); - - - return archive; - } - - - /* Run tests */ - - // ============================================ Tests ====== - - /* - * @testName: variableResolverResolveVariableTest - * - * @assertion_ids: JSP:JAVADOC:384 - * - * @test_Strategy: Validate behavior of VariableResolver.resolveVariable(). - */ - @Test - public void variableResolverResolveVariableTest() throws Exception { - TEST_PROPS.setProperty(APITEST, "variableResolverResolveVariableTest"); - invoke(); - } -} diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml deleted file mode 100644 index 9fe37d13c5..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/build.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml deleted file mode 100644 index 59006b8121..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - VariableResolver - - 5 - - diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspResolverTest.java b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspResolverTest.java index 9cb45afa82..f051d0da5a 100644 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspResolverTest.java +++ b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspResolverTest.java @@ -131,24 +131,25 @@ public static boolean testImplicitObjELResolver(ELContext elContext, buf.append("getCommonPropertyType() returns Class java.lang.String\n"); } + // avoid the usage of removed method getFeatureDescriptors from EL 6.0(EE11) // getFeatureDescriptors() - elContext.setPropertyResolved(false); - Iterator i = resolver.getFeatureDescriptors(elContext, base); - if (base != null) { - if (i == null) { - buf.append("getFeatureDescriptors() returned null for "); - buf.append("a non-null base as expected\n"); - } else { - buf.append("getFeatureDescriptors() returned non-null "); - buf.append("value for a non-null base\n"); - pass = false; - } - } else { - boolean fdPass = ResolverTest.testFeatureDescriptors(i, resolver, base, - buf); - if (!fdPass) - pass = false; - } + // elContext.setPropertyResolved(false); + // Iterator i = resolver.getFeatureDescriptors(elContext, base); + // if (base != null) { + // if (i == null) { + // buf.append("getFeatureDescriptors() returned null for "); + // buf.append("a non-null base as expected\n"); + // } else { + // buf.append("getFeatureDescriptors() returned non-null "); + // buf.append("value for a non-null base\n"); + // pass = false; + // } + // } else { + // boolean fdPass = ResolverTest.testFeatureDescriptors(i, resolver, base, + // buf); + // if (!fdPass) + // pass = false; + // } return pass; } @@ -249,24 +250,25 @@ public static boolean testScopedAttrELResolver(ELContext elContext, buf.append("getCommonPropertyType() returns Class java.lang.String\n"); } + // avoid the usage of removed method getFeatureDescriptors from EL 6.0(EE11) // getFeatureDescriptors() - elContext.setPropertyResolved(false); - Iterator i = resolver.getFeatureDescriptors(elContext, base); - if (base != null) { - if (i == null) { - buf.append("getFeatureDescriptors() returned null for "); - buf.append("a non-null base as expected\n"); - } else { - buf.append("getFeatureDescriptors() returned non-null "); - buf.append("value for a non-null base\n"); - pass = false; - } - } else { - boolean fdPass = ResolverTest.testFeatureDescriptors(i, resolver, base, - buf); - if (!fdPass) - pass = false; - } + // elContext.setPropertyResolved(false); + // Iterator i = resolver.getFeatureDescriptors(elContext, base); + // if (base != null) { + // if (i == null) { + // buf.append("getFeatureDescriptors() returned null for "); + // buf.append("a non-null base as expected\n"); + // } else { + // buf.append("getFeatureDescriptors() returned non-null "); + // buf.append("value for a non-null base\n"); + // pass = false; + // } + // } else { + // boolean fdPass = ResolverTest.testFeatureDescriptors(i, resolver, base, + // buf); + // if (!fdPass) + // pass = false; + // } return pass; } } diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspTestUtil.java b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspTestUtil.java index 46cb325c66..8953af3d83 100644 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspTestUtil.java +++ b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/JspTestUtil.java @@ -39,12 +39,12 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.jsp.JspWriter; import jakarta.servlet.jsp.PageContext; -import jakarta.servlet.jsp.el.ELException; import jakarta.servlet.jsp.tagext.BodyTag; import jakarta.servlet.jsp.tagext.IterationTag; import jakarta.servlet.jsp.tagext.Tag; import jakarta.servlet.jsp.tagext.ValidationMessage; - +//replacing the removed jakarta.servlet.jsp.el.ELException class from JSP 4.0 +import jakarta.el.ELException; /** * JSP TCK Utility class. */ @@ -122,7 +122,7 @@ public static void handleThrowable(Throwable t, JspWriter out, out.println("Type: " + t.getClass().getName()); out.println("Message: " + t.getMessage()); if (t instanceof ELException) { - Throwable sub = ((ELException) t).getRootCause(); + Throwable sub = ((ELException) t).getCause(); if (sub != null) { out.println("Root Cause: " + sub); out.println("Root Cause Message: " + sub.getMessage()); diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/SimpleContext.java b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/SimpleContext.java index 1b68f0f70e..bb6e676a37 100644 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/SimpleContext.java +++ b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/SimpleContext.java @@ -32,8 +32,6 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.jsp.JspWriter; import jakarta.servlet.jsp.PageContext; -import jakarta.servlet.jsp.el.ExpressionEvaluator; -import jakarta.servlet.jsp.el.VariableResolver; /** * Simple class to validate release is called on the PageContext object provide @@ -115,24 +113,6 @@ public HttpSession getSession() { return null; } - /** - * Returns null. - * - * @return null - */ - public VariableResolver getVariableResolver() { - return null; - } - - /** - * Returns null. - * - * @return null - */ - public ExpressionEvaluator getExpressionEvaluator() { - return null; - } - /** * Returns null. * diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java b/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java deleted file mode 100644 index 435d73c6c5..0000000000 --- a/jsp/src/main/java/com/sun/ts/tests/jsp/common/util/TSFunctionMapper.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2007, 2020 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jsp.common.util; - -import java.lang.reflect.Method; - -import jakarta.servlet.jsp.el.FunctionMapper; - -/** - * Simple Function mapper. - */ - -public class TSFunctionMapper implements FunctionMapper { - - private boolean _resolveCalled = false; - - private String _prefixUsed = null; - - private String _methodCalled = null; - - private static final Class FUNCTIONS = com.sun.ts.tests.jsp.common.util.JspFunctions.class; - - /** - * Creates a new FuntionMapper instance. - */ - public TSFunctionMapper() { - } - - /** - * Resolves the specified local name and prefix into a java.lang.Method. - * Returns null if the prefix and local name are not found. - * - * This class does nothing more than perform refection against the - * JspFunctions class and return the methods. - * - * @param prefix - * - method refernce prefix - * @param localName - * - local name to identify the method - * @return - Resolve function as a java.lang.Method or null if unresolvable. - */ - public Method resolveFunction(String prefix, String localName) { - System.out.println("FUNCTION MAPPER CALLED"); - _resolveCalled = true; - _prefixUsed = prefix; - _methodCalled = localName; - if (prefix != null || localName != null) { - try { - System.out.println("RETURNING METHOD"); - Method meth = FUNCTIONS.getMethod(localName, - new Class[] { java.lang.String.class }); - return meth; - } catch (Throwable t) { - return null; - } - } - return null; - } - - /** - * Has the resolveFunction method been called? - * - * @return - true if resolveFunction has been called otherwise false. - */ - public boolean hasResolved() { - return _resolveCalled; - } - - /** - * Returns the prefix provided to the resolveFunction call. - * - * @return the prefix of the most recent resolveFunction call - */ - public String getPrefixUsed() { - return _prefixUsed; - } - - /** - * Returns the method provided to the resolveFunction call. - * - * @return the method of the most recent resolveFunction call - */ - public String getMethodCalled() { - return _methodCalled; - } - - /** - * Resets the state of this FunctionMapper - */ - public void reset() { - _resolveCalled = false; - _prefixUsed = null; - _methodCalled = null; - } - -} diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp deleted file mode 100644 index 145689b7b1..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp +++ /dev/null @@ -1,159 +0,0 @@ -<%-- - - Copyright (c) 2003, 2020 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, - java.io.IOException, - jakarta.servlet.jsp.el.ELException, - java.io.PrintWriter" %> -<%@ page contentType="text/plain" %> - -<%-- Begin test definitions --%> - -<%! - public void elExceptionDefaultCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException(); - if (ee != null) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. No Exception created."); - } - } -%> - -<%! - public void elExceptionMessageCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException("Exception Message"); - if (ee != null) { - String message = ee.getMessage(); - if (message != null && message.equals("Exception Message")) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Expected a message of 'Exception Message'"); - out.println("Received: " + message); - } - } else { - out.println("Test FAILED. No Exception created."); - } - } -%> - -<%! - public void elExceptionCauseCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException(new NullPointerException()); - if (ee != null) { - Throwable t = ee.getRootCause(); - if (t != null && t instanceof NullPointerException) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Expected a Throwable of type NullPointerException"); - out.println("Received: " + t); - } - } else { - out.println("Test FAILED. No Exception created."); - } - } -%> - -<%! - public void elExceptionCauseMessageCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException("Exception Message", - new ServletException()); - if (ee != null) { - String message = ee.getMessage(); - if (message != null && message.equals("Exception Message")) { - Throwable t = ee.getRootCause(); - if (t != null && t instanceof ServletException) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Expected a Throwable of type ServletException"); - out.println("Received: " + t); - } - } else { - out.println("Test FAILED. Expected a message of 'Exception Message'"); - out.println("Received: " + message); - } - } else { - out.println("Test FAILED. No Exception created."); - } - } -%> - -<%! - public void elExceptionGetRootCauseTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException(new ServletException()); - ELException ee1 = new ELException("exception", new NullPointerException()); - - Throwable t = ee.getRootCause(); - Throwable t1 = ee1.getRootCause(); - if (t != null) { - if (t instanceof ServletException) { - if (t1 != null) { - if (t1 instanceof NullPointerException) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. ELException.getRootCause returned unexpected" + - " exception: " + t.getClass().getName()); - out.println("Expected: NullPointerException"); - } - } else { - out.println("Test FAILED. ELException.getRootCause returned null."); - } - } else { - out.println("Test FAILED. ELException.getRootCause returned unexpected" + - " exception: " + t.getClass().getName()); - out.println("Expected: ServletException"); - } - } else { - out.println("Test FAILED. ELException.getRootCause returned null."); - } - } -%> - -<%! - public void elExceptionToStringTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELException ee = new ELException(); - String str = ee.toString(); - if (str != null) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Result of ELException.toString() was null."); - } - } -%> - -<%-- Test invocation --%> - -<% JspTestUtil.invokeTest(this, request, response, out); %> diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml deleted file mode 100644 index 0f4155484a..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ELException - - 5 - - diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp deleted file mode 100644 index 61268b599c..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp +++ /dev/null @@ -1,64 +0,0 @@ -<%-- - - Copyright (c) 2003, 2020 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, - java.io.IOException, - jakarta.servlet.jsp.el.ELParseException" %> -<%@ page contentType="text/plain" %> - -<%-- Begin test definitions --%> - -<%! - public void elParseExceptionDefaultCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELParseException epe = new ELParseException(); - if (epe != null) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Unable to create an ELParseException" + - " with the default constructor."); - } - - } -%> - -<%! - public void elParseExceptionMessageCtorTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - ELParseException epe = new ELParseException("message"); - if (epe != null) { - String epeMess = epe.getMessage(); - if (epeMess.equals("message")) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Unexpected message returned by " + - "ELParseException.getMessage(). \nExpected 'message'"); - out.println("Received: " + epeMess); - } - } else { - out.println("Test FAILED. Unable to create an ELParseException" + - " with the default constructor."); - } - } -%> - -<% JspTestUtil.invokeTest(this, request, response, out); %> diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml deleted file mode 100644 index a6197dec86..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ELParseException - - 5 - - diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp deleted file mode 100644 index 284af93bbf..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp +++ /dev/null @@ -1,134 +0,0 @@ -<%-- - - Copyright (c) 2003, 2020 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, - java.io.IOException, - jakarta.servlet.jsp.el.ExpressionEvaluator, - com.sun.ts.tests.jsp.common.util.TSFunctionMapper, - jakarta.servlet.jsp.el.Expression, - jakarta.servlet.jsp.el.ELException, - jakarta.servlet.jsp.el.VariableResolver, - java.io.PrintWriter"%> -<%@ page contentType="text/plain" %> - -<%! - private static final String PAGECONTEXT_ATTR = - "com.sun.ts.tests.jsp.api.pageContext"; - private static final String QUAL_METHOD_EXPR = - "${ns:lowerCase('STRING')}"; - private static final String UNQUAL_METHOD_EXPR = - "${lowerCase('STRING')}"; - private static final String VARIABLE_EXPR = - "${requestScope['com.sun.ts.tests.jsp.api.pageContext']}"; -%> - -<%-- Begin test definitions --%> - -<%! - public void expressionEvaluateTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR); - if (pc != null) { - TSFunctionMapper mapper = new TSFunctionMapper(); - ExpressionEvaluator eval = pc.getExpressionEvaluator(); - VariableResolver resolver = pc.getVariableResolver(); - if (eval != null) { - try { - Expression expr = eval.parseExpression(QUAL_METHOD_EXPR, - java.lang.String.class, mapper); - - if (expr != null) { - String result = (String) expr.evaluate(resolver); - - if (result != null) { - if (result.equals("string")) { - try { - Expression expr2 = eval.parseExpression(VARIABLE_EXPR, - jakarta.servlet.jsp.PageContext.class, null); - if (expr2 != null) { - - PageContext pageContext = (PageContext) expr2.evaluate(resolver); - if (pageContext != pc) { - out.println("Test FAILED. Resolution didn't return expected value."); - out.println("PageContext returned is not the same instance as expected."); - } - try { - mapper.reset(); - Expression expr3 = eval.parseExpression(UNQUAL_METHOD_EXPR, - java.lang.String.class, mapper); - if (expr3 != null) { - result = (String) expr3.evaluate(resolver); - if (result != null) { - if (result.equals("string")) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. (l3) Expression evaluation returned unexpected value."); - out.println("Expected 'string', received '" + result + "'"); - return; - } - } else { - out.println("Test FAILED. (l3) Expression evaluation returned null."); - } - } else { - out.println("Test FAILED. (l3) ExpressionEvaluator.parseExpression" + - " returned null."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l3)"); - return; - } - } else { - out.println("Test FAILED. (l2) ExpressionEvaluator returned null."); - } - } catch (Throwable t) { - JspTestUtil.handleThrowable(t, out, "(l2)"); - return; - } - } else { - out.println("Test FAILED. (l1) Expression evaluation returned unexpected result."); - out.println("Expected 'string', Received '" + result + "'"); - } - } else { - out.println("Test FAILED. (l1) Expression evaluation returned null."); - } - } else { - out.println("Test FAILED. (l1) ExpressionEvaluator.parseExpression" + - "returned null."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l1)"); - return; - } - } else { - out.println("Unable to obtain ExpressionEvaluator"); - } - } else { - out.println("Test FAILED. Unable to obtain PageContext."); - } - } -%> - - -<%-- test invocation --%> - -<% - request.setAttribute(PAGECONTEXT_ATTR, pageContext); - JspTestUtil.invokeTest(this, request, response, out); -%> diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml deleted file mode 100644 index 7ba5c0055a..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Expression - - 5 - - diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp deleted file mode 100644 index 3a9cc801ba..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp +++ /dev/null @@ -1,227 +0,0 @@ -<%-- - - Copyright (c) 2003, 2020 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, - java.io.IOException, - jakarta.servlet.jsp.el.ExpressionEvaluator, - com.sun.ts.tests.jsp.common.util.TSFunctionMapper, - jakarta.servlet.jsp.el.Expression, - jakarta.servlet.jsp.el.ELException, - jakarta.servlet.jsp.el.VariableResolver, - java.io.PrintWriter"%> -<%@ page contentType="text/plain" %> - -<%! - private static final String PAGECONTEXT_ATTR = - "com.sun.ts.tests.jsp.api.pageContext"; - private static final String QUAL_METHOD_EXPR = - "${ns:lowerCase('STRING')}"; - private static final String UNQUAL_METHOD_EXPR = - "${lowerCase('STRING')}"; - private static final String DEFAULT_PREFIX =""; - private static final String METHOD_PREFIX = "ns"; - private static final String METHOD_NAME = "lowerCase"; - private static final String VARIABLE_EXPR = - "${requestScope['com.sun.ts.tests.jsp.api.pageContext']}"; -%> - -<%-- Begin test definitions --%> - -<%! - public void expressionEvaluatorParseExpressionTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR); - if (pc != null) { - TSFunctionMapper mapper = new TSFunctionMapper(); - ExpressionEvaluator eval = pc.getExpressionEvaluator(); - if (eval != null) { - try { - Expression expr = eval.parseExpression(QUAL_METHOD_EXPR, - java.lang.String.class, mapper); - if (expr != null) { - try { - Expression expr2 = eval.parseExpression(VARIABLE_EXPR, - jakarta.servlet.jsp.PageContext.class, null); - if (expr2 != null) { - try { - Expression expr3 = eval.parseExpression(UNQUAL_METHOD_EXPR, - java.lang.String.class, mapper); - if (expr3 != null) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. (l3) ExpressionEvaluator.parseExpression" + - " returned null."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l3)"); - return; - } - } else { - out.println("Test FAILED. (l2) ExpressionEvaluator.parseExpression" + - " returned null."); - } - } catch (Throwable t) { - JspTestUtil.handleThrowable(t, out, "(l2)"); - return; - } - - } else { - out.println("Test FAILED. (l1) ExpressionEvaluator.parseExpression" + - " returned null."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l1)"); - return; - } - } - } else { - out.println("Test FAILED. Unable to obtain PageContext."); - } - } -%> - -<%! - public void expressionEvaluatorEvaluateTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR); - if (pc != null) { - ExpressionEvaluator eval = pc.getExpressionEvaluator(); - VariableResolver resolver = pc.getVariableResolver(); - if (eval != null) { - TSFunctionMapper mapper = new TSFunctionMapper(); - - // first part of this test will validate that - // the FunctionMapper is used property during - // the evaluation of the expression. - try { - Object o1 = eval.evaluate(QUAL_METHOD_EXPR, - java.lang.String.class, resolver, mapper); - if (!mapper.hasResolved()) { - out.println("Test FAILED. FunctionMapper.resolveFunction" + - " was not called on the provided FunctionMapper (l1)."); - return; - } - String prefix = mapper.getPrefixUsed(); - String method = mapper.getMethodCalled(); - - if (prefix == null || !prefix.equals(METHOD_PREFIX)) { - out.println("Test FAILED. FunctionMapper called with " + - "unexpected prefix: " + prefix + ". Expected 'ns'."); - return; - } - - if (method == null || !method.equals(METHOD_NAME)) { - out.println("Test FAILED. FunctionMapper called with " + - "unexpected method: " + method + ". Expected: lowerCase"); - return; - } - - if (o1 != null) { - - if (!o1.equals("string")) { - out.println("Test FAILED. (o1) Method return value was incorrect."); - out.println("Expected 'string', received: '" + o1.toString() +"'"); - return; - } - // next verify that a null FunctionMapper can be - // passed without an Exception occuring. This also - // validates that the VariableResolver is used properly. - try { - Object o2 = eval.evaluate(VARIABLE_EXPR, - jakarta.servlet.jsp.PageContext.class, resolver, null); - if (o2 != null) { - if (o2 != pc) { - out.println("Test FAILED. Variable resolution and thus expression evaluation failed."); - out.println("The request scoped PageContext returned by expression was not correct."); - return; - } - // next verify that the default namespace is used - // if no namespace is provided. - try { - mapper.reset(); - Object o3 = eval.evaluate(UNQUAL_METHOD_EXPR, - java.lang.String.class, resolver, mapper); - if (!mapper.hasResolved()) { - out.println("Test FAILED. FunctionMapper.resolveFunction" + - " was not called on the provided FunctionMapper (l2)."); - return; - } - - prefix = mapper.getPrefixUsed(); - method = mapper.getMethodCalled(); - - if (prefix == null || !prefix.equals(DEFAULT_PREFIX)) { - out.println("Test FAILED. FunctionMapper called with " + - "unexpected prefix: '" + prefix + "'. Expected ''."); - return; - } - - if (method == null || !method.equals(METHOD_NAME)) { - out.println("Test FAILED. FunctionMapper called with " + - "unexpected method: '" + method + "'. Expected 'lowerCase'."); - return; - } - - if (o3 != null) { - if (o3.equals("string")) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. (o3) Method return value was incorrect."); - out.println("Expected 'meth', received: '" + o3.toString() + "'"); - return; - } - } else { - out.println("Test FAILED. Null expression (expr2) returned."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l3)"); - return; - } - } else { - out.println("Test FAILED. Null expression (expr1) returned."); - } - } catch (Throwable t) { - JspTestUtil.handleThrowable(t, out, "(l2)"); - return; - } - } else { - out.println("Test FAILED. Null expression (expr) returned."); - } - } catch (ELException ele) { - JspTestUtil.handleThrowable(ele, out, "(l1)"); - return; - } - } else { - out.println("Test FAILED. Unable to obtain ExpressionEvaluator."); - } - } else { - out.println("Test FAILED. Unable to obtain PageContext."); - } - } -%> - -<%-- test invocation --%> - -<% - request.setAttribute(PAGECONTEXT_ATTR, pageContext); - JspTestUtil.invokeTest(this, request, response, out); -%> diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml deleted file mode 100644 index 011f0c5eeb..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ExpressionEvaluator - - 5 - - diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp deleted file mode 100644 index c0c678b417..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp +++ /dev/null @@ -1,97 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil, - java.io.IOException, - jakarta.servlet.jsp.el.VariableResolver, - jakarta.servlet.jsp.el.ELException" %> -<%@ page contentType="text/plain" %> - -<%! - private static final String PAGECONTEXT_ATTR = - "com.sun.ts.tests.jsp.api.pageContext"; -%> - -<%-- Begin test definitions --%> - -<%! - public void variableResolverResolveVariableTest(HttpServletRequest req, - HttpServletResponse res, - JspWriter out) - throws ServletException, IOException { - PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR); - if (pc != null) { - pc.setAttribute("myObj", "value"); - pc.setAttribute("myObj1", "value", PageContext.REQUEST_SCOPE); - VariableResolver resolver = pc.getVariableResolver(); - if (resolver != null) { - try { - String res1 = (String) - resolver.resolveVariable("myObj"); - if (res1.equals("value")) { - try { - String res2 = (String) - resolver.resolveVariable("myObj1"); - if (res2.equals("value")) { - try { - Object res3 = resolver.resolveVariable( - "com.sun.ts.tests.jsp.api.nonAttr"); - if (res3 == null) { - out.println("Test PASSED"); - } else { - out.println("Test FAILED. Expected null, but " + - "VariableResolver returned a non-null value."); - } - } catch (ELException elenn) { - out.println("Test FAILED. Unexpected Exception."); - } - - } else { - out.println("Test FAILED. Resolution failed."); - out.println("Expected a value of 'value'"); - out.println("Received: " + res2); - } - } catch (ELException elen) { - out.println("Test FAILED. Unable to resolve 'myObj1'"); - return; - } - } else { - out.println("Test FAILED. Resolution failed."); - out.println("Expected a value of 'value'"); - out.println("Received: " + res1); - } - } catch (ELException ele) { - out.println("Test FAILED. Unable to resolve 'myObj'"); - return; - } - } else { - out.println("Test FAILED. VariableResolver was null"); - } - } else { - out.println("Test FAILED. Unable to obtain PageContext."); - } - } -%> - - -<%-- Test invocation --%> - -<% - request.setAttribute(PAGECONTEXT_ATTR, pageContext); - JspTestUtil.invokeTest(this, request, response, out); -%> diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml deleted file mode 100644 index 59006b8121..0000000000 --- a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - VariableResolver - - 5 - -