[jboss-cvs] JBossAS SVN: r84923 - branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 2 04:17:03 EST 2009
Author: wolfc
Date: 2009-03-02 04:17:03 -0500 (Mon, 02 Mar 2009)
New Revision: 84923
Removed:
branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java
Modified:
branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java
Log:
JBAS-6556: removed org.jboss.test.ejb3.servlet.unit.HttpUtils
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java 2009-03-02 09:06:46 UTC (rev 84922)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java 2009-03-02 09:17:03 UTC (rev 84923)
@@ -31,6 +31,7 @@
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.web.HttpUtils;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Deleted: branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java 2009-03-02 09:06:46 UTC (rev 84922)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java 2009-03-02 09:17:03 UTC (rev 84923)
@@ -1,180 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ejb3.servlet.unit;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.methods.OptionsMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.TraceMethod;
-import org.jboss.logging.Logger;
-
-/** Utilities for client http requests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HttpUtils
-{
- private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
-
- public static final int GET = 1;
- public static final int POST = 2;
- public static final int HEAD = 3;
- public static final int OPTIONS = 4;
- public static final int PUT = 5;
- public static final int DELETE = 6;
- public static final int TRACE = 7;
-
- public static String getBaseURL()
- {
- return baseURL;
- }
- public static String getBaseURL(String username, String password)
- {
- String url = "http://"+username+":"+password+"@localhost:"
- + Integer.getInteger("web.port", 8080) + "/";
- return url;
- }
- public static String getBaseURLNoAuth()
- {
- return baseURLNoAuth;
- }
-
- /** Perform a get on the indicated URL and assert an HTTP_OK response code
- *
- * @param url
- * @return The commons HttpClient used to perform the get
- * @throws Exception on any failure
- */
- public static HttpMethodBase accessURL(URL url) throws Exception
- {
- return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
- }
- /** Perform a get on the indicated URL and assert that the response code
- * matches the expectedHttpCode argument.
- *
- * @param url
- * @param expectedHttpCode the http response code expected
- * @return The commons HttpClient used to perform the get
- * @throws Exception on any failure
- */
- public static HttpMethodBase accessURL(URL url, String realm,
- int expectedHttpCode)
- throws Exception
- {
- return accessURL(url, realm, expectedHttpCode, null);
- }
- public static HttpMethodBase accessURL(URL url, String realm,
- int expectedHttpCode, int type)
- throws Exception
- {
- return accessURL(url, realm, expectedHttpCode, null, type);
- }
- public static HttpMethodBase accessURL(URL url, String realm,
- int expectedHttpCode, Header[] hdrs)
- throws Exception
- {
- return accessURL(url, realm, expectedHttpCode, hdrs, GET);
- }
- public static HttpMethodBase accessURL(URL url, String realm,
- int expectedHttpCode, Header[] hdrs, int type)
- throws Exception
- {
- HttpClient httpConn = new HttpClient();
- HttpMethodBase request = createMethod(url, type);
-
- int hdrCount = hdrs != null ? hdrs.length : 0;
- for(int n = 0; n < hdrCount; n ++)
- request.addRequestHeader(hdrs[n]);
- try
- {
- log.debug("Connecting to: "+url);
- String userInfo = url.getUserInfo();
-
- if( userInfo != null )
- {
- UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
- httpConn.getState().setCredentials(realm, url.getHost(), auth);
- }
- log.debug("RequestURI: "+request.getURI());
- int responseCode = httpConn.executeMethod(request);
- String response = request.getStatusText();
- log.debug("responseCode="+responseCode+", response="+response);
- String content = request.getResponseBodyAsString();
- log.debug(content);
- // Validate that we are seeing the requested response code
- if( responseCode != expectedHttpCode )
- {
- throw new IOException("Expected reply code:"+expectedHttpCode
- +", actual="+responseCode);
- }
- }
- catch(IOException e)
- {
- throw e;
- }
- return request;
- }
-
- public static HttpMethodBase createMethod(URL url, int type)
- {
- HttpMethodBase request = null;
- switch( type )
- {
- case GET:
- request = new GetMethod(url.toString());
- break;
- case POST:
- request = new PostMethod(url.toString());
- break;
- case HEAD:
- request = new HeadMethod(url.toString());
- break;
- case OPTIONS:
- request = new OptionsMethod(url.toString());
- break;
- case PUT:
- request = new PutMethod(url.toString());
- break;
- case DELETE:
- request = new DeleteMethod(url.toString());
- break;
- case TRACE:
- request = new TraceMethod(url.toString());
- break;
- }
- return request;
- }
-}
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java 2009-03-02 09:06:46 UTC (rev 84922)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java 2009-03-02 09:17:03 UTC (rev 84923)
@@ -31,6 +31,7 @@
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.web.HttpUtils;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
More information about the jboss-cvs-commits
mailing list