Author: rmannibucau
Date: Sun Jun 17 15:45:17 2012
New Revision: 1351113
URL: http://svn.apache.org/viewvc?rev=1351113&view=rev
Log:
explaining a bit tests
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java?rev=1351113&r1=1351112&r2=1351113&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java
Sun Jun 17 15:45:17 2012
@@ -18,6 +18,9 @@
package org.apache.tomee.arquillian.remote;
import org.apache.openejb.cdi.ThreadSingletonServiceImpl;
+import
org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.arquillian.container.spi.context.annotation.DeploymentScoped;
+import org.jboss.arquillian.core.api.Instance;
import org.jboss.arquillian.core.api.InstanceProducer;
import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.arquillian.core.api.annotation.Observes;
@@ -33,6 +36,7 @@ public class RemoteTomEEObserver {
@Inject
@SuiteScoped
private InstanceProducer<BeanManager> beanManager;
+
@Inject
@SuiteScoped
private InstanceProducer<Context> context;
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1351113&r1=1351112&r2=1351113&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
Sun Jun 17 15:45:17 2012
@@ -53,6 +53,8 @@ public class TomEEContainerTest {
@Test
public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
+ // using this hook to get the url since we are deployed in the
container and we don't have metadata
+ // to get the url injected...we probably need 2 deployments for such a
test
URL url = new URL("http://127.0.0.1:"; +
System.getProperty("tomee.httpPort", "10080") + "/test/ejb");
InputStream is = url.openStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java?rev=1351113&r1=1351112&r2=1351113&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
Sun Jun 17 15:45:17 2012
@@ -17,12 +17,14 @@
package org.apache.openejb.arquillian.session;
+import java.net.URL;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.openejb.arquillian.TestServlet;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -40,9 +42,10 @@ import static org.junit.Assert.assertNot
@RunWith(Arquillian.class)
public class SessionScopeTest {
- public static final String TEST_SESSION_URL = "http://127.0.0.1:"; +
System.getProperty("tomee.httpPort", "10080") + "/SessionScopeTest/session";
+ @ArquillianResource
+ private URL webappUrl;
- @Deployment
+ @Deployment(testable = false)
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "SessionScopeTest.war")
.addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class)
@@ -57,16 +60,18 @@ public class SessionScopeTest {
@Test
public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
+ final String sessionUrl = webappUrl.toExternalForm() + "session";
+
String[] sessionResult = new String[2];
for (int i = 0; i < sessionResult.length; i++) {
HttpClient client = new HttpClient();
- HttpMethod get = new GetMethod(TEST_SESSION_URL);
+ HttpMethod get = new GetMethod(sessionUrl);
String[] contents = new String[2];
try {
for (int j = 0; j < contents.length; j++) {
int out = client.executeMethod(get);
if (out != 200) {
- throw new RuntimeException("get " + TEST_SESSION_URL +
" returned " + out);
+ throw new RuntimeException("get " + sessionUrl + "
returned " + out);
}
contents[j] = get.getResponseBodyAsString();
}
