You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/12 10:59:57 UTC
svn commit: r1325162 - in /openejb/trunk/openejb/itests/openejb-tomee-itest:
./ src/main/java/org/apache/openejb/itest/tomee/
src/test/java/org/apache/openejb/itest/tomee/ src/test/resources/
src/test/resources/webapp/
Author: rmannibucau
Date: Thu Apr 12 08:59:56 2012
New Revision: 1325162
URL: http://svn.apache.org/viewvc?rev=1325162&view=rev
Log:
adding a unit test for tomee itest module
Added:
openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/java/org/apache/openejb/itest/tomee/ServerWithAWebappTest.java
openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/
openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/
openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/index.html
Modified:
openejb/trunk/openejb/itests/openejb-tomee-itest/pom.xml
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/Server.java
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/SimpleTweaker.java
Modified: openejb/trunk/openejb/itests/openejb-tomee-itest/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/pom.xml?rev=1325162&r1=1325161&r2=1325162&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-tomee-itest/pom.xml (original)
+++ openejb/trunk/openejb/itests/openejb-tomee-itest/pom.xml Thu Apr 12 08:59:56 2012
@@ -57,5 +57,11 @@
<type>zip</type>
<classifier>webprofile</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/Server.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/Server.java?rev=1325162&r1=1325161&r2=1325162&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/Server.java (original)
+++ openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/Server.java Thu Apr 12 08:59:56 2012
@@ -15,6 +15,6 @@ public @interface Server {
int shutdown() default -1;
int ajp() default -1;
boolean cleanWebapp() default true;
- Class<? extends ServerTweaker> tweaker() default org.apache.openejb.itest.tomee.SimpleTweaker.class;
- Artifact artifact() default @org.apache.openejb.itest.tomee.Artifact(groupId = "org.apache.openejb", artifactId = "apache-tomee", version = "1.0.0-beta-3-SNAPSHOT", type = "zip", classifier = "webprofile");
+ Class<? extends ServerTweaker> tweaker() default SimpleTweaker.class;
+ Artifact artifact() default @Artifact;
}
Modified: openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/SimpleTweaker.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/SimpleTweaker.java?rev=1325162&r1=1325161&r2=1325162&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/SimpleTweaker.java (original)
+++ openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/SimpleTweaker.java Thu Apr 12 08:59:56 2012
@@ -12,11 +12,19 @@ public class SimpleTweaker implements Se
protected void addLib(final File home, final String groupId, final String artifactId, final String version) {
final File jar = findJar(groupId, artifactId, version);
+ addLib(home, jar);
+ }
+
+ protected void addLib(final File home, final File jar) {
copy(jar, new File(home, "lib/" + jar.getName()));
}
protected void addWebapp(final File home, final String groupId, final String artifactId, final String version) {
final File war = findWebapp(groupId, artifactId, version);
+ addWebapp(home, war);
+ }
+
+ protected void addWebapp(final File home, final File war) {
copy(war, new File(home, "webapps/" + war.getName()));
}
Added: openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/java/org/apache/openejb/itest/tomee/ServerWithAWebappTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/java/org/apache/openejb/itest/tomee/ServerWithAWebappTest.java?rev=1325162&view=auto
==============================================================================
--- openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/java/org/apache/openejb/itest/tomee/ServerWithAWebappTest.java (added)
+++ openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/java/org/apache/openejb/itest/tomee/ServerWithAWebappTest.java Thu Apr 12 08:59:56 2012
@@ -0,0 +1,46 @@
+package org.apache.openejb.itest.tomee;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import org.apache.openejb.loader.IO;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.matchers.JUnitMatchers.containsString;
+
+@RunWith(ITTomEERunner.class)
+@Server(name = "server-webapp", cleanWebapp = true, tweaker = ServerWithAWebappTest.WebappTweaker.class)
+public class ServerWithAWebappTest {
+ @Test
+ public void assertWebappIsDeployed() throws IOException {
+ final URL url = new URL("http://localhost:" + System.getProperty("tomee.it.server-webapp.http") + "/sample");
+ final String str = IO.slurp(url);
+
+ assertNotNull(str);
+ System.out.println(str);
+ assertThat(str, containsString("Server With A Webapp"));
+ }
+
+ public static class WebappTweaker extends SimpleTweaker {
+ @Override
+ public void tweak(final File home) {
+ // to debug:
+ // System.setProperty("openejb.server.debug", "true");
+
+ // here we use shrinkwrap to make a quick webapp but
+ // maven can be used to retrieved an existing webapp too
+ final File warFile = new File("target/sample.war");
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "sample.war")
+ .addAsWebResource(new ClassLoaderAsset("webapp/index.html"), "index.html");
+ war.as(ZipExporter.class).exportTo(warFile, true);
+ addWebapp(home, warFile);
+ }
+ }
+}
Added: openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/index.html?rev=1325162&view=auto
==============================================================================
--- openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/index.html (added)
+++ openejb/trunk/openejb/itests/openejb-tomee-itest/src/test/resources/webapp/index.html Thu Apr 12 08:59:56 2012
@@ -0,0 +1 @@
+Server With A Webapp