Author: kkolinko Date: Thu Oct 20 11:58:57 2011 New Revision: 1186752 URL: http://svn.apache.org/viewvc?rev=1186752&view=rev Log: Merged revision 1186743 from tomcat/trunk: in TestFormAuthenticator: Replaced string concatenation with StringBuilder. Autoformatted the code. No functional change.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 11:58:57 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186752&r1=1186751&r2=1186752&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Thu Oct 20 11:58:57 2011 @@ -57,18 +57,17 @@ public class TestFormAuthenticator exten doTest("POST", "POST", true); } - private void doTest(String resourceMethod, String redirectMethod, boolean useContinue) throws Exception { FormAuthClient client = new FormAuthClient(); - // First request for authenticated resource + // First request for authenticated resource client.setUseContinue(useContinue); client.doResourceRequest(resourceMethod); assertTrue(client.isResponse200()); assertTrue(client.isResponseBodyOK()); client.reset(); - + // Second request for the login page client.setUseContinue(useContinue); client.doLoginRequest(); @@ -95,7 +94,6 @@ public class TestFormAuthenticator exten } } - private final class FormAuthClient extends SimpleHttpClient { private static final String LOGIN_PAGE = "j_security_check"; @@ -108,9 +106,9 @@ public class TestFormAuthenticator exten private FormAuthClient() throws Exception { Tomcat tomcat = getTomcatInstance(); File appDir = new File(getBuildDirectory(), "webapps/examples"); - Context ctx = - tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); - + Context ctx = tomcat.addWebapp(null, "/examples", + appDir.getAbsolutePath()); + MapRealm realm = new MapRealm(); realm.addUser("tomcat", "tomcat"); realm.addUserRole("tomcat", "tomcat"); @@ -120,61 +118,65 @@ public class TestFormAuthenticator exten tomcat.start(); } - + private void doResourceRequest(String method) throws Exception { - String request[] = new String[2]; - request [0] = method + " " + protectedLocation + protectedPage + - " HTTP/1.1" + CRLF; - request[0] = request[0] + - "Host: localhost" + CRLF + - "Connection: close" + CRLF; + StringBuilder requestHead = new StringBuilder(128); + String requestTail; + requestHead.append(method).append(" ").append(protectedLocation) + .append(protectedPage).append(" HTTP/1.1").append(CRLF); + requestHead.append("Host: localhost").append(CRLF); + requestHead.append("Connection: close").append(CRLF); if (getUseContinue()) { - request[0] = request[0] + - "Expect: 100-continue" + CRLF; + requestHead.append("Expect: 100-continue").append(CRLF); } if (sessionId != null) { - request[0] = request[0] + - "Cookie: JSESSIONID=" + sessionId + CRLF; + requestHead.append("Cookie: JSESSIONID=").append(sessionId) + .append(CRLF); } if ("POST".equals(method)) { - request[0] = request[0] + - "Content-Type: application/x-www-form-urlencoded" + CRLF + - "Content-length: 7" + CRLF + - CRLF; - request[1] = "foo=bar"; + requestHead.append( + "Content-Type: application/x-www-form-urlencoded") + .append(CRLF); + requestHead.append("Content-length: 7").append(CRLF); + requestHead.append(CRLF); + requestTail = "foo=bar"; } else { - request[1] = CRLF; + requestTail = CRLF; } + String request[] = new String[2]; + request[0] = requestHead.toString(); + request[1] = requestTail; doRequest(request); } private void doLoginRequest() throws Exception { - String request[] = new String[2]; - request [0] = "POST " + protectedLocation + LOGIN_PAGE + - " HTTP/1.1" + CRLF; - request[0] = request[0] + - "Host: localhost" + CRLF + - "Connection: close" + CRLF; + StringBuilder requestHead = new StringBuilder(128); + requestHead.append("POST ").append(protectedLocation) + .append(LOGIN_PAGE).append(" HTTP/1.1").append(CRLF); + requestHead.append("Host: localhost").append(CRLF); + requestHead.append("Connection: close").append(CRLF); if (getUseContinue()) { - request[0] = request[0] + - "Expect: 100-continue" + CRLF; + requestHead.append("Expect: 100-continue").append(CRLF); } if (sessionId != null) { - request[0] = request[0] + - "Cookie: JSESSIONID=" + sessionId + CRLF; + requestHead.append("Cookie: JSESSIONID=").append(sessionId) + .append(CRLF); } - request[0] = request[0] + - "Content-Type: application/x-www-form-urlencoded" + CRLF + - "Content-length: 35" + CRLF + - CRLF; + requestHead.append( + "Content-Type: application/x-www-form-urlencoded").append( + CRLF); + requestHead.append("Content-length: 35").append(CRLF); + requestHead.append(CRLF); + String request[] = new String[2]; + request[0] = requestHead.toString(); request[1] = "j_username=tomcat&j_password=tomcat"; - + doRequest(request); } private void doRequest(String request[]) throws Exception { setRequest(request); - + connect(); processRequest(); String newSessionId = getSessionId(); @@ -182,14 +184,14 @@ public class TestFormAuthenticator exten sessionId = newSessionId; } disconnect(); - + requestCount++; } @Override public boolean isResponseBodyOK() { String expected; - + if (requestCount == 1) { // First request should result in the login page expected = "<title>Login Page for Examples</title>"; @@ -197,11 +199,11 @@ public class TestFormAuthenticator exten // Second request should result in a redirect return true; } else { - // Subsequent requests should result in the protected page + // Subsequent requests should result in the protected page expected = "<title>Protected Page for Examples</title>"; } return getResponseBody().contains(expected); } - + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org