Fix implicit jakarta.servlet.http import test

The test previously used HttpUtils which has been removed in Servlet 6.0. Switch to using Cookie.
scottmarlow · Oct 6, 2021 · 1fc46b5 · 1fc46b5
1 parent 3b8a748
commit 1fc46b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java b/src/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java
@@ -596,7 +596,7 @@ public void implicitImportServletTest() throws Fault {
    * @assertion_ids: JSP:SPEC:35
    * 
    * @test_Strategy: Validate that classes from the jakarta.servlet.http package
-   * are implicitly imported by creating and using an instance of HttpUtils.
+   * are implicitly imported by creating and using an instance of Cookie.
    */
 
   public void implicitImportHttpTest() throws Fault {

diff --git a/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java b/src/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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
@@ -150,7 +151,7 @@ public void implicitImportServletTest() throws Fault {
    * @assertion_ids: JSP:SPEC:229.19.1
    * 
    * @test_Strategy: Validate that classes from the jakarta.servlet.http package
-   * are implicitly imported by creating and using an instance of HttpUtils.
+   * are implicitly imported by creating and using an instance of Cookie.
    */
 
   public void implicitImportHttpTest() throws Fault {

diff --git a/src/web/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp b/src/web/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2021 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,7 +23,7 @@
 	Description: Use jsp page directive with language="java" 
 		    Do not specify jakarta.servlet.http in the import attribute
 		    as it should be available implicitly.  Validate
-		    that an HttpUtils object can be created.
+		    that an Cookie object can be created.
 			    
 	Result:No error
 **/ %>
@@ -33,12 +34,12 @@
 
 <%
 
-  HttpUtils hu = new HttpUtils();
+  Cookie cookie = new Cookie("name","value");
     
   
 %>
 
-<%= hu instanceof jakarta.servlet.http.HttpUtils %>
+<%= cookie instanceof jakarta.servlet.http.Cookie %>
 
 </body>
 </html>
diff --git a/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag b/src/web/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2003, 2021 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
@@ -18,10 +19,10 @@
 
 <%@ tag language="java" %>
 <%
-    HttpUtils ex = new HttpUtils();
-    if(ex instanceof jakarta.servlet.http.HttpUtils) {
+    Cookie ex = new Cookie("name","value");
+    if(ex instanceof jakarta.servlet.http.Cookie) {
         out.println("Test PASSED.");
     } else {
-        out.println("Test FAILED. HttpUtils instance is not instance of jakarta.servlet.http.HttpUtils");
+        out.println("Test FAILED. Cookie instance is not instance of jakarta.servlet.http.Cookie");
     }
 %>