svn commit: r1297158 - in /tomcat/trunk/test/org/apache/catalina/authenticator: TestDigestAuthenticator.java TestNonLoginAndBasicAuthenticator.java TestSSOnonLoginAndBasicAuthenticator.java

[markt]

Author: markt
Date: Mon Mar  5 18:45:27 2012
New Revision: 1297158

URL: http://svn.apache.org/viewvc?rev=1297158&view=rev
Log:
Fix some test failures now response bodies are available for error
responses.

Modified:
    
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
    
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
    
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1297158&r1=1297157&r2=1297158&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
 Mon Mar  5 18:45:27 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -190,7 +190,8 @@ public class TestDigestAuthenticator ext
         int rc = getUrl("http://localhost:"; + getPort() + uri, bc, reqHeaders,
                 respHeaders);
         assertEquals(401, rc);
-        assertNull(bc.toString());
+        assertTrue(bc.getLength() > 0);
+        bc.recycle();
 
         // Second request should succeed (if we use the server nonce)
         auth.clear();
@@ -215,7 +216,7 @@ public class TestDigestAuthenticator ext
             assertEquals("OK", bc.toString());
         } else {
             assertEquals(401, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
 
         // Third request should succeed if we increment nc
@@ -233,7 +234,7 @@ public class TestDigestAuthenticator ext
             assertEquals("OK", bc.toString());
         } else {
             assertEquals(401, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
     }
 

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1297158&r1=1297157&r2=1297158&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
 Mon Mar  5 18:45:27 2012
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -154,7 +154,7 @@ public class TestNonLoginAndBasicAuthent
 
         if (expectedReject) {
             assertEquals(expectedRC, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
         else {
             assertEquals(200, rc);
@@ -178,7 +178,7 @@ public class TestNonLoginAndBasicAuthent
 
         if (expectedReject1) {
             assertEquals(expectedRC1, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
         else {
             assertEquals(200, rc);
@@ -200,13 +200,13 @@ public class TestNonLoginAndBasicAuthent
         Map<String,List<String>> respHeaders2 =
             new HashMap<String,List<String>>();
 
-        bc.reset();
+        bc.recycle();
         rc = getUrl(HTTP_PREFIX + getPort() + uri, bc, reqHeaders2,
                 respHeaders2);
 
         if (expectedReject2) {
             assertEquals(expectedRC2, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
         else {
             assertEquals(200, rc);

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java?rev=1297158&r1=1297157&r2=1297158&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
 Mon Mar  5 18:45:27 2012
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -202,7 +203,7 @@ public class TestSSOnonLoginAndBasicAuth
 
         if (expectedReject) {
             assertEquals(expectedRC, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
         else {
             assertEquals(200, rc);
@@ -227,7 +228,7 @@ public class TestSSOnonLoginAndBasicAuth
 
         if (expectedReject1) {
             assertEquals(expectedRC1, rc);
-            assertNull(bc.toString());
+            assertTrue(bc.getLength() > 0);
         }
         else {
             assertEquals(200, rc);
@@ -249,7 +250,7 @@ public class TestSSOnonLoginAndBasicAuth
         Map<String,List<String>> respHeaders2 =
             new HashMap<String,List<String>>();
 
-        bc.reset();
+        bc.recycle();
         rc = getUrl(HTTP_PREFIX + getPort() + uri, bc, reqHeaders2,
                 respHeaders2);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org