[jboss-svn-commits] JBoss Common SVN: r4622 - in arquillian/trunk/containers/tomcat-embedded-6/src: main/java/org/jboss/arquillian/container/tomcat/embedded_6 and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 29 15:37:44 EDT 2010
Author: aslak
Date: 2010-06-29 15:37:43 -0400 (Tue, 29 Jun 2010)
New Revision: 4622
Added:
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatIntegrationTestCase.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/war/
arquillian/trunk/containers/tomcat-embedded-6/src/test/resources/org/jboss/arquillian/container/tomcat/embedded_6/
Removed:
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded/
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded/
arquillian/trunk/containers/tomcat-embedded-6/src/test/resources/org/jboss/arquillian/container/tomcat/embedded/
Modified:
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/war/HelloWorldServlet.java
Log:
ARQ-200 Renamed Tomcat 6 Embedded Container package
Copied: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6 (from rev 4586, arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded)
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded/TomcatConfiguration.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java 2010-06-29 19:37:43 UTC (rev 4622)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.container.tomcat.embedded;
+package org.jboss.arquillian.container.tomcat.embedded_6;
import org.jboss.arquillian.spi.ContainerConfiguration;
import org.jboss.arquillian.spi.ContainerProfile;
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded/TomcatContainer.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java 2010-06-29 19:37:43 UTC (rev 4622)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.container.tomcat.embedded;
+package org.jboss.arquillian.container.tomcat.embedded_6;
import java.io.File;
import java.io.IOException;
Copied: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatIntegrationTestCase.java (from rev 4586, arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded/TomcatIntegrationTestCase.java)
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatIntegrationTestCase.java (rev 0)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatIntegrationTestCase.java 2010-06-29 19:37:43 UTC (rev 4622)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.tomcat.embedded_6;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.logging.Logger;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.api.Run;
+import org.jboss.arquillian.api.RunModeType;
+import org.jboss.arquillian.container.tomcat.embedded_6.test.war.HelloWorldServlet;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests that Tomcat deployments into the Tomcat server work through the
+ * Arquillian lifecycle
+ *
+ * @author <a href="mailto:jean.deruelle at gmail.com">Jean Deruelle</a>
+ * @version $Revision: $
+ */
+ at RunWith(Arquillian.class)
+ at Run(RunModeType.AS_CLIENT)
+public class TomcatIntegrationTestCase {
+
+ private static final String HELLO_WORLD_URL = "http://127.0.0.1:8080/test.war/hello";
+
+ // -------------------------------------------------------------------------------------||
+ // Class Members
+ // ----------------------------------------------------------------------||
+ // -------------------------------------------------------------------------------------||
+
+ /**
+ * Logger
+ */
+ private static final Logger log = Logger
+ .getLogger(TomcatIntegrationTestCase.class.getName());
+
+ // -------------------------------------------------------------------------------------||
+ // Instance Members
+ // -------------------------------------------------------------------||
+ // -------------------------------------------------------------------------------------||
+
+ /**
+ * Define the deployment
+ */
+ @Deployment
+ public static WebArchive createDeployment() {
+ return ShrinkWrap.create("test.war", WebArchive.class).addClasses(
+ HelloWorldServlet.class).addWebResource(
+ HelloWorldServlet.class.getPackage(), "web.xml", "web.xml");
+ }
+
+ // -------------------------------------------------------------------------------------||
+ // Tests
+ // ------------------------------------------------------------------------------||
+ // -------------------------------------------------------------------------------------||
+
+ /**
+ * Ensures the {@link HelloWorldServlet} returns the expected response
+ */
+ @Test
+ public void testHelloWorldServlet() throws Exception {
+ // Define the input and expected outcome
+ final String expected = "Hello, world!";
+
+ URL url = new URL(HELLO_WORLD_URL);
+ InputStream in = url.openConnection().getInputStream();
+
+ byte[] buffer = new byte[10000];
+ int len = in.read(buffer);
+ String httpResponse = "";
+ for (int q = 0; q < len; q++)
+ httpResponse += (char) buffer[q];
+ System.out.println("Received the follwing HTTP response: " + httpResponse);
+
+ // Test
+ Assert.assertEquals("Expected output was not equal by value", expected,
+ httpResponse);
+ log.info("Got expected result from Http Servlet: " + httpResponse);
+ }
+}
Copied: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/war (from rev 4586, arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded/test/war)
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/war/HelloWorldServlet.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded/test/war/HelloWorldServlet.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/war/HelloWorldServlet.java 2010-06-29 19:37:43 UTC (rev 4622)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.container.tomcat.embedded.test.war;
+package org.jboss.arquillian.container.tomcat.embedded_6.test.war;
import java.io.IOException;
import java.io.PrintWriter;
Copied: arquillian/trunk/containers/tomcat-embedded-6/src/test/resources/org/jboss/arquillian/container/tomcat/embedded_6 (from rev 4586, arquillian/trunk/containers/tomcat-embedded-6/src/test/resources/org/jboss/arquillian/container/tomcat/embedded)
More information about the jboss-svn-commits
mailing list