Naming, formatting and moved one test method

Author: arjantijms

jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java

@@ -168,7 +168,7 @@ public void testPublicAccessIsStateless() throws IOException, SAXException {
      * authenticated identity are remembered
      */
     @Test
-    public void testUserIdentityIsStateless() throws IOException, SAXException {
+    public void testProtectedThenPublicAccessIsStateless() throws IOException, SAXException {
 
         // -------------------- Request 1 ---------------------------
 

jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalPublicTest.java

@@ -39,53 +39,13 @@ public void testPublicPageLoggedin() throws IOException, SAXException {
             "Username is not the expected one 'test'",
             response.contains("web username: test")
         );
-        assertTrue(
-            "Username is correct, but the expected role 'architect' is not present.",
-            response.contains("web user has role \"architect\": true"));
-        
-        assertTrue(
-            "Username and roles are correct, but principal type is not the expected custom type.",
-            response.contains("isCustomPrincipal: true")
-        );
-    }
-
-    @Test
-    public void testPublicPageNotRememberLogin() throws IOException, SAXException {
-
-        // -------------------- Request 1 ---------------------------
-
-        String response = getFromServerPath("public/servlet");
-
-        // Not logged-in
-        assertTrue(response.contains("web username: null"));
-        assertTrue(response.contains("web user has role \"architect\": false"));
-
-        // -------------------- Request 2 ---------------------------
-
-        response = getFromServerPath("public/servlet?doLogin");
-
-        // Now has to be logged-in
-        assertTrue(
-            "Username is not the expected one 'test'",
-            response.contains("web username: test")
-        );
         assertTrue(
             "Username is correct, but the expected role 'architect' is not present.",
             response.contains("web user has role \"architect\": true")
         );
-
-        // -------------------- Request 3 ---------------------------
-
-        response = getFromServerPath("public/servlet");
-
-        // Not logged-in
-        assertTrue(
-            "Should not be authenticated, but username was not null. Did the container remember it from previous request?",
-            response.contains("web username: null")
-        );
         assertTrue(
-            "Request was not authenticated (username correctly null), but unauthenticated user incorrectly has role 'architect'",
-            response.contains("web user has role \"architect\": false")
+            "Username and roles are correct, but principal type is not the expected custom type.",
+            response.contains("isCustomPrincipal: true")
         );
     }
 

jaspic/custom-principal/src/test/java/org/javaee7/jaspictest/customprincipal/CustomPrincipalStatelessTest.java

@@ -14,7 +14,7 @@
 import org.xml.sax.SAXException;
 
 /**
- * Idential test as in basic-authentication, but not performed against a SAM which sets a custom principal.
+ * Idential test as in basic-authentication, but now performed against a SAM which sets a custom principal.
  * Therefore tests that for this kind of usage of the PrincipalCallback JASPIC is stateless just as well.
  * 
  * @author Arjan Tijms
@@ -96,17 +96,59 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException {
         response = getFromServerPath("protected/servlet");
 
         // Not logged-in thus should not be accessible.
-        assertFalse("Could access protected page, but should not be able to. "
-            + "Did the container remember the authenticated identity that was set in previous request?",
-            response.contains("This is a protected servlet"));
+        assertFalse(
+            "Could access protected page, but should not be able to. " +
+	        "Did the container remember the authenticated identity that was set in previous request?",
+            response.contains("This is a protected servlet")
+        );
+    }
+    
+    @Test
+    public void testPublicAccessIsStateless() throws IOException, SAXException {
+
+        // -------------------- Request 1 ---------------------------
+
+        String response = getFromServerPath("public/servlet");
+
+        // Not logged-in
+        assertTrue(response.contains("web username: null"));
+        assertTrue(response.contains("web user has role \"architect\": false"));
+
+        // -------------------- Request 2 ---------------------------
+
+        response = getFromServerPath("public/servlet?doLogin");
+
+        // Now has to be logged-in
+        assertTrue(
+            "Username is not the expected one 'test'",
+            response.contains("web username: test")
+        );
+        assertTrue(
+            "Username is correct, but the expected role 'architect' is not present.",
+            response.contains("web user has role \"architect\": true")
+        );
+
+        // -------------------- Request 3 ---------------------------
+
+        response = getFromServerPath("public/servlet");
+
+        // Not logged-in
+        assertTrue(
+            "Should not be authenticated, but username was not null. Did the container remember it from previous request?",
+            response.contains("web username: null")
+        );
+        assertTrue(
+            "Request was not authenticated (username correctly null), but unauthenticated user incorrectly has role 'architect'",
+            response.contains("web user has role \"architect\": false")
+        );
     }
 
     /**
      * Tests independently from being able to access a protected resource if any details of a previously established
      * authenticated identity are remembered
      */
     @Test
-    public void testUserIdentityIsStateless() throws IOException, SAXException {
+    public void testProtectedThenPublicAccessIsStateless() throws IOException, SAXException {
 
         // -------------------- Request 1 ---------------------------
 
@@ -119,14 +161,20 @@ public void testUserIdentityIsStateless() throws IOException, SAXException {
         response = getFromServerPath("public/servlet");
 
         // No details should linger around
-        assertFalse("User principal was 'test', but it should be null here. "
-            + "The container seemed to have remembered it from the previous request.",
-            response.contains("web username: test"));
-        assertTrue("User principal was not null, but it should be null here. ",
-            response.contains("web username: null"));
-        assertTrue("The unauthenticated user has the role 'architect', which should not be the case. "
-            + "The container seemed to have remembered it from the previous request.",
-            response.contains("web user has role \"architect\": false"));
+        assertFalse(
+            "User principal was 'test', but it should be null here. " + 
+            "The container seemed to have remembered it from the previous request.",
+            response.contains("web username: test")
+        );
+        assertTrue(
+            "User principal was not null, but it should be null here. ",
+            response.contains("web username: null")
+        );
+        assertTrue(
+            "The unauthenticated user has the role 'architect', which should not be the case. " + 
+            "The container seemed to have remembered it from the previous request.",
+            response.contains("web user has role \"architect\": false")
+        );
     }
 
 }