Merge pull request #330 from arjantijms/master

arjantijms · arjantijms · commit 3f52c35985b7 · 2015-11-13T01:29:44.000+01:00
Updated JASPIC and JACC tests for better Liberty compatibility
diff --git a/README.md b/README.md
@@ -52,22 +52,20 @@ There are 5 available container profiles:
     
     ``-DlibertyManagedArquillian_wlpHome=/opt/wlp``
     
-    This profile also requires the localConnector feature to be configured in server.xml, and if all tests are to be run at least the
-    javaee-7.0 feature and jaspic-1.1 (even though this is part of Java EE 7 already). E.g.
+    This profile also requires the localConnector feature to be configured in server.xml, and if all tests are to be run the
+    javaee-7.0 feature E.g.
     
     ```xml
     <featureManager>
         <feature>javaee-7.0</feature>
-        <feature>jaspic-1.1</feature>
         <feature>localConnector-1.0</feature>
     </featureManager>
     ```
     
-    For the JASPIC tests to even be attempted to be executed a cheat is needed that creates a user in Liberty's internal user registry:
+    For the JASPIC tests to even be attempted to be executed a cheat is needed that creates a group in Liberty's internal user registry:
     
     ```xml
     <basicRegistry id="basic">
-        <user name="test" password="not needed"/>
         <group name="architect"/>
     </basicRegistry>
     ```
diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java
@@ -56,7 +56,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testCanObtainRequestInServlet() throws IOException, SAXException {
 
-        String response = getFromServerPath("subjectServlet?doLogin");
+        String response = getFromServerPath("subjectServlet?doLogin=true");
 
         assertTrue(response.contains("Obtained subject from context."));
     }
@@ -68,7 +68,7 @@ public void testCanObtainRequestInServlet() throws IOException, SAXException {
     @Test
     public void testCanObtainRolesFromSubjectInServlet() throws IOException, SAXException {
 
-        String response = getFromServerPath("subjectServlet?doLogin");
+        String response = getFromServerPath("subjectServlet?doLogin=true");
 
         // The role that was assigned to the user in TestServerAuthModule
         assertTrue(response.contains("User has role architect"));
diff --git a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java
@@ -49,7 +49,7 @@ public void testPublicPageLoggedin() throws IOException, SAXException {
 
         // JASPIC has to be able to authenticate a user when accessing a public (non-protected) resource.
 
-        String response = getFromServerPath("public/servlet?doLogin");
+        String response = getFromServerPath("public/servlet?doLogin=true");
 
         // Now has to be logged-in
         assertTrue(
diff --git a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java
@@ -51,7 +51,7 @@ public void testProtectedAccessIsStateless() throws IOException, SAXException {
         // we're not authenticated and it will deny further attempts to authenticate. This may happen when
         // the container does not correctly recognize the JASPIC protocol for "do nothing".
 
-        response = getFromServerPath("protected/servlet?doLogin");
+        response = getFromServerPath("protected/servlet?doLogin=true");
 
         // Now has to be logged-in so page is accessible
         assertTrue(
@@ -87,7 +87,7 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException {
         // -------------------- Request 1 ---------------------------
 
         // Start with doing a login
-        String response = getFromServerPath("protected/servlet?doLogin");
+        String response = getFromServerPath("protected/servlet?doLogin=true");
 
         
         // -------------------- Request 2 ---------------------------
@@ -134,7 +134,7 @@ public void testPublicAccessIsStateless() throws IOException, SAXException {
         
         // -------------------- Request 2 ---------------------------
 
-        response = getFromServerPath("public/servlet?doLogin");
+        response = getFromServerPath("public/servlet?doLogin=true");
 
         // Now has to be logged-in
         assertTrue(
@@ -173,7 +173,7 @@ public void testProtectedThenPublicAccessIsStateless() throws IOException, SAXEx
         // -------------------- Request 1 ---------------------------
 
         // Accessing protected page with login
-        String response = getFromServerPath("protected/servlet?doLogin");
+        String response = getFromServerPath("protected/servlet?doLogin=true");
 
         
         // -------------------- Request 2 ---------------------------
diff --git a/jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalPublicTest.java b/jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalPublicTest.java
@@ -32,7 +32,7 @@ public void testPublicPageLoggedin() throws IOException, SAXException {
 
         // JASPIC has to be able to authenticate a user when accessing a public (non-protected) resource.
 
-        String response = getFromServerPath("public/servlet?doLogin");
+        String response = getFromServerPath("public/servlet?doLogin=true");
 
         // Has to be logged-in with the right principal
         assertTrue(
diff --git a/jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalStatelessTest.java b/jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalStatelessTest.java
@@ -52,7 +52,7 @@ public void testProtectedAccessIsStateless() throws IOException, SAXException {
         // we're not authenticated and it will deny further attempts to authenticate. This may happen when
         // the container does not correctly recognize the JASPIC protocol for "do nothing".
 
-        response = getFromServerPath("protected/servlet?doLogin");
+        response = getFromServerPath("protected/servlet?doLogin=true");
 
         // Now has to be logged-in so page is accessible
         assertTrue("Could not access protected page, but should be able to. "
@@ -83,7 +83,7 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException {
         // -------------------- Request 1 ---------------------------
 
         // Start with doing a login
-        String response = getFromServerPath("protected/servlet?doLogin");
+        String response = getFromServerPath("protected/servlet?doLogin=true");
 
         // -------------------- Request 2 ---------------------------
 
@@ -116,7 +116,7 @@ public void testPublicAccessIsStateless() throws IOException, SAXException {
 
         // -------------------- Request 2 ---------------------------
 
-        response = getFromServerPath("public/servlet?doLogin");
+        response = getFromServerPath("public/servlet?doLogin=true");
 
         // Now has to be logged-in
         assertTrue(
@@ -153,7 +153,7 @@ public void testProtectedThenPublicAccessIsStateless() throws IOException, SAXEx
         // -------------------- Request 1 ---------------------------
 
         // Accessing protected page with login
-        String response = getFromServerPath("protected/servlet?doLogin");
+        String response = getFromServerPath("protected/servlet?doLogin=true");
 
         // -------------------- Request 2 ---------------------------
 
diff --git a/jaspic/dispatching/src/test/java/org/javaee7/jaspic/dispatching/BasicIncludeTest.java b/jaspic/dispatching/src/test/java/org/javaee7/jaspic/dispatching/BasicIncludeTest.java
@@ -27,7 +27,7 @@ public static Archive<?> createDeployment() {
     }
 
     @Test
-    public void testBasicForwardViaPublicResource() throws IOException, SAXException {
+    public void testBasicIncludeViaPublicResource() throws IOException, SAXException {
 
         String response = getFromServerPath("public/servlet?dispatch=include");
         
diff --git a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java
@@ -30,7 +30,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXException {
 
-        String response = getFromServerPath("protected/servlet-protected-ejb?doLogin");
+        String response = getFromServerPath("protected/servlet-protected-ejb?doLogin=true");
 
         // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same
         // user name.
@@ -52,7 +52,7 @@ public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXExc
     @Test
     public void testPublicServletWithLoginCallingEJB() throws IOException, SAXException {
 
-        String response = getFromServerPath("public/servlet-protected-ejb?doLogin");
+        String response = getFromServerPath("public/servlet-protected-ejb?doLogin=true");
 
         // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same
         // user name.
diff --git a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationLogoutTest.java b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationLogoutTest.java
@@ -33,7 +33,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXException {
 
-        String response = getFromServerPath("public/servlet-public-ejb-logout?doLogin");
+        String response = getFromServerPath("public/servlet-public-ejb-logout?doLogin=true");
 
         System.out.println(response);
 
diff --git a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java
@@ -30,7 +30,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXException {
 
-        String response = getFromServerPath("protected/servlet-public-ejb?doLogin");
+        String response = getFromServerPath("protected/servlet-public-ejb?doLogin=true");
 
         // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same
         // user name.
diff --git a/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java b/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java
@@ -36,12 +36,14 @@ public void testRemembersSession() throws IOException, SAXException {
 
         // We access the protected page again and now login
 
-        response = getFromServerPath("protected/servlet?doLogin");
+        response = getFromServerPath("protected/servlet?doLogin=true");
 
         // Now has to be logged-in so page is accessible
-        assertTrue("Could not access protected page, but should be able to. "
-            + "Did the container remember the previously set 'unauthenticated identity'?",
-            response.contains("This is a protected servlet"));
+        assertTrue(
+            "Could not access protected page, but should be able to. " + 
+            "Did the container remember the previously set 'unauthenticated identity'?",
+            response.contains("This is a protected servlet")
+        );
 
         // -------------------- Request 3 ---------------------------
 
@@ -51,9 +53,11 @@ public void testRemembersSession() throws IOException, SAXException {
         response = getFromServerPath("protected/servlet?continueSession");
 
         // Logged-in thus should be accessible.
-        assertTrue("Could not access protected page, but should be able to. "
-            + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?",
-            response.contains("This is a protected servlet"));
+        assertTrue(
+            "Could not access protected page, but should be able to. " + 
+            "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?",
+            response.contains("This is a protected servlet")
+        );
 
         // Both the user name and roles/groups have to be restored
 
@@ -87,12 +91,14 @@ public void testJoinSessionIsOptional() throws IOException, SAXException {
         // We access a protected page and login
         //
 
-        String response = getFromServerPath("protected/servlet?doLogin");
+        String response = getFromServerPath("protected/servlet?doLogin=true");
 
-        // Now has to be logged-in so page is accessible
-        assertTrue("Could not access protected page, but should be able to. "
-            + "Did the container remember the previously set 'unauthenticated identity'?",
-            response.contains("This is a protected servlet"));
+		// Now has to be logged-in so page is accessible
+		assertTrue(
+			"Could not access protected page, but should be able to. " + 
+	        "Did the container remember the previously set 'unauthenticated identity'?",
+			response.contains("This is a protected servlet")
+		);
 
         // -------------------- Request 2 ---------------------------
 
@@ -102,9 +108,11 @@ public void testJoinSessionIsOptional() throws IOException, SAXException {
         response = getFromServerPath("protected/servlet?continueSession");
 
         // Logged-in thus should be accessible.
-        assertTrue("Could not access protected page, but should be able to. "
-            + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?",
-            response.contains("This is a protected servlet"));
+        assertTrue(
+            "Could not access protected page, but should be able to. " + 
+            "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?",
+            response.contains("This is a protected servlet")
+        );
 
         // Both the user name and roles/groups have to be restored
 
@@ -129,8 +137,6 @@ public void testJoinSessionIsOptional() throws IOException, SAXException {
         // Access to a public page is unaffected by joining or not joining the session, but if we do not join the
         // session we shouldn't see the user's name and roles.
 
-        // THIS NOW FAILS ON GLASSFISH 4.0. CHECKED WITH RON MONZILLO THAT THIS IS INDEED AN ERROR AND FILED A BUG
-
         response = getFromServerPath("public/servlet");
 
         assertTrue(response.contains("This is a public servlet"));

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static Archive<?> createDeployment() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Test`
`30`		`- public void testBasicForwardViaPublicResource() throws IOException, SAXException {`
	`30`	`+ public void testBasicIncludeViaPublicResource() throws IOException, SAXException {`
`31`	`31`
`32`	`32`	`String response = getFromServerPath("public/servlet?dispatch=include");`
`33`	`33`