Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78599 invoked from network); 1 Oct 2007 05:50:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Oct 2007 05:50:49 -0000 Received: (qmail 83759 invoked by uid 500); 1 Oct 2007 05:50:39 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 83618 invoked by uid 500); 1 Oct 2007 05:50:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 83605 invoked by uid 99); 1 Oct 2007 05:50:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Sep 2007 22:50:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2007 05:50:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 53CA61A9832; Sun, 30 Sep 2007 22:49:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r580849 - in /geronimo/server/trunk/testsuite/web-testsuite/test-jetty: pom.xml src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java Date: Mon, 01 Oct 2007 05:49:49 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071001054950.53CA61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Sun Sep 30 22:49:49 2007 New Revision: 580849 URL: http://svn.apache.org/viewvc?rev=580849&view=rev Log: selenium requires special option to deal with virutal hosts so switched the test to use URLConnection Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=580849&r1=580848&r2=580849&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original) +++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Sun Sep 30 22:49:49 2007 @@ -49,11 +49,6 @@ child - - org.codehaus.mojo - selenium-maven-plugin - - org.apache.maven.plugins maven-surefire-plugin Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java?rev=580849&r1=580848&r2=580849&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java (original) +++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java Sun Sep 30 22:49:49 2007 @@ -19,18 +19,72 @@ package org.apache.geronimo.testsuite.jetty; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; -import org.apache.geronimo.testsupport.SeleniumTestSupport; +import org.apache.geronimo.testsupport.TestSupport; import org.testng.annotations.Test; -public class TestJetty extends SeleniumTestSupport +public class TestJetty extends TestSupport { @Test - public void testJetty() throws Exception { - selenium.open("http://testhost.com:8080/JettyWeb/"); - selenium.waitForPageToLoad("30000"); - assertEquals("Testing Jetty.", selenium.getText("xpath=/html/body")); + public void testJettyHost() throws Exception { + URL url = new URL("http://localhost:8080/JettyWeb/"); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + try { + String reply = doGET(conn, "testhost.com"); + + assertEquals("responseCode", 200, conn.getResponseCode()); + + assertTrue( reply.indexOf("Testing Jetty.") != -1 ); + } finally { + conn.disconnect(); + } + } + + @Test + public void testJettyNoHost() throws Exception { + URL url = new URL("http://localhost:8080/JettyWeb/"); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + try { + String reply = doGET(conn, null); + + assertEquals("responseCode", 404, conn.getResponseCode()); + } finally { + conn.disconnect(); + } } + private String doGET(HttpURLConnection conn, String host) throws IOException { + conn.setDoOutput(true); + conn.setUseCaches(false); + if (host != null) { + conn.setRequestProperty("Host", host); + } + + InputStream is = null; + + try { + is = conn.getInputStream(); + } catch (IOException e) { + is = conn.getErrorStream(); + } + + StringBuffer buf = new StringBuffer(); + BufferedReader in = new BufferedReader(new InputStreamReader(is)); + String inputLine; + while ((inputLine = in.readLine()) != null) { + System.out.println(inputLine); + buf.append(inputLine); + } + in.close(); + + return buf.toString(); + } -} \ No newline at end of file +}