Expand Cookie tests for new generic attribute support

See jakartaee/servlet#175

Author: markt-asf

src/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/TestServlet.java

@@ -3,7 +3,7 @@
  *  *
  *  * The Apache Software License, Version 1.1
  *  *
- *  * Copyright (c) 2001, 2020 Oracle and/or its affiliates and others.
+ *  * Copyright (c) 2001, 2021 Oracle and/or its affiliates and others.
  *  * All rights reserved.
  *  * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  *  * reserved.
@@ -63,8 +63,11 @@
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
 import java.util.TimeZone;
 
+import javax.management.AttributeValueExp;
+
 import com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet;
 import com.sun.ts.tests.servlet.common.util.ServletTestUtil;
 
@@ -672,4 +675,65 @@ public void setVersionVer1Test(HttpServletRequest request,
     }
     ServletTestUtil.printResult(pw, passed);
   }
+
+  public void setAttributeTest(HttpServletRequest request,
+      HttpServletResponse response) throws IOException {
+
+    PrintWriter pw = response.getWriter();
+    boolean passed = true;
+    Cookie testCookie = new Cookie("name1", "value1");
+
+    String attrName = "some-name";
+    String attrValue = "some-value";
+    testCookie.setAttribute(attrName, attrValue);
+    String result = testCookie.getAttribute(attrName);
+
+    response.addCookie(testCookie);
+    if (result != null) {
+      if (!result.equalsIgnoreCase(attrValue)) {
+        passed = false;
+        pw.println("setAttribute(" + attrName + "," + attrValue +
+            ") did not set the attribute properly ");
+        pw.println("Expected value = " + attrValue + " ");
+        pw.println("Actual value = |" + result + "| ");
+      }
+    } else {
+      passed = false;
+      pw.println("getAttribute(" + attrName + ") returned a null result ");
+    }
+    ServletTestUtil.printResult(pw, passed);
+  }
+
+  public void getAttributesTest(HttpServletRequest request,
+      HttpServletResponse response) throws IOException {
+
+    PrintWriter pw = response.getWriter();
+    boolean passed = true;
+    String name = "name1";
+    String value = "value1";
+    Cookie testCookie = new Cookie(name, value);
+
+    String attrName = "some-name";
+    String attrValue = "some-value";
+    testCookie.setAttribute(attrName, attrValue);
+    Map<String,String> result = testCookie.getAttributes();
+
+    response.addCookie(testCookie);
+    if (result != null) {
+      if (result.size() == 1) {
+        if (!result.get(attrName).equals(attrValue)) {
+          passed = false;
+          pw.println("getAttributes() returned a map that contained [" + result.get(attrName) +
+              "] as the value for key [" + attrName + "] rather than [" + attrValue + "]");
+        }
+      } else {
+        passed = false;
+        pw.println("getAttributes() returned a map of size [" + result.size() + "] rather than 1.");
+      }
+    } else {
+      passed = false;
+      pw.println("getAttributes() returned a null result ");
+    }
+    ServletTestUtil.printResult(pw, passed);
+  }
 }

src/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java

@@ -438,4 +438,28 @@ public void setVersionTest() throws Fault {
     TEST_PROPS.setProperty(APITEST, "setVersionVer1Test");
     invoke();
   }
+  
+  /*
+   * @testName: setAttributeTest
+   * 
+   * @assertion_ids:
+   * 
+   * @test_Strategy: Servlet tests method and returns result to client
+   */
+  public void setAttributeTest() throws Fault {
+    TEST_PROPS.setProperty(APITEST, "setAttributeTest");
+    invoke();
+  }
+  
+  /*
+   * @testName: getAttributesTest
+   * 
+   * @assertion_ids:
+   * 
+   * @test_Strategy: Servlet tests method and returns result to client
+   */
+  public void getAttributesTest() throws Fault {
+    TEST_PROPS.setProperty(APITEST, "getAttributesTest");
+    invoke();
+  }
 }

src/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java

@@ -31,6 +31,7 @@
 import org.apache.commons.httpclient.cookie.CookieSpec;
 
 import com.sun.javatest.Status;
+import com.sun.ts.lib.harness.EETest.Fault;
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.common.webclient.http.HttpRequest;
 import com.sun.ts.tests.common.webclient.http.HttpResponse;
@@ -477,4 +478,30 @@ public void setVersionTest() throws Fault {
     TEST_PROPS.setProperty(APITEST, "setVersionVer1Test");
     invoke();
   }
+
+  /*
+   * @testName: setAttributeTest
+   * 
+   * @assertion_ids:
+   * 
+   * @test_Strategy: Create a web application with no web.xml and one fragment;
+   * Define everything in web-fragment.xml; Package everything in the fragment;
+   * Servlet tests method Cookie.setAttribute
+   */
+  public void setAttributeTest() throws Fault {
+    TEST_PROPS.setProperty(APITEST, "setAttributeTest");
+    invoke();
+  }
+  
+  /*
+   * @testName: getAttributesTest
+   * 
+   * @assertion_ids:
+   * 
+   * @test_Strategy: Servlet tests method and returns result to client
+   */
+  public void getAttributesTest() throws Fault {
+    TEST_PROPS.setProperty(APITEST, "getAttributesTest");
+    invoke();
+  }
 }