Author: rmannibucau
Date: Wed Oct 3 08:26:18 2012
New Revision: 1393343
URL: http://svn.apache.org/viewvc?rev=1393343&view=rev
Log:
fixing some arquillian tests
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/cdi/pojo/noapp/JAXRSCDIPojoTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/business/RestEjbBusinessLocalTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/localbean/RestEjbLocalBeanTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/pathparam/PathParamTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
Wed Oct 3 08:26:18 2012
@@ -42,7 +42,7 @@ public class MyFacesExtCdiDeploymentTest
@Inject
private ProjectStage projectStage;
- @Deployment(testable = true)
+ @Deployment
public static WebArchive getArchive() {
final WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class).version(WebAppVersionType._3_0);
// web.xml params is not supported by default
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class AnnotatedApplicationTest ex
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(AnnotatedApplicationTest.class).getArchive();
+ return new WebModule(AnnotatedApplicationTest.class,
AnnotatedApplicationTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class BasicAppilcationTest extend
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(BasicAppilcationTest.class).getArchive();
+ return new WebModule(BasicAppilcationTest.class,
BasicAppilcationTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/cdi/pojo/noapp/JAXRSCDIPojoTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/cdi/pojo/noapp/JAXRSCDIPojoTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/cdi/pojo/noapp/JAXRSCDIPojoTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/cdi/pojo/noapp/JAXRSCDIPojoTest.java
Wed Oct 3 08:26:18 2012
@@ -36,7 +36,7 @@ public class JAXRSCDIPojoTest extends Ja
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(JAXRSCDIPojoTest.class).getArchive()
+ return new WebModule(JAXRSCDIPojoTest.class,
JAXRSCDIPojoTest.class).getArchive()
.addAsWebInfResource(EmptyAsset.INSTANCE,
ArchivePaths.create("beans.xml"));
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/business/RestEjbBusinessLocalTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/business/RestEjbBusinessLocalTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/business/RestEjbBusinessLocalTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/business/RestEjbBusinessLocalTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class RestEjbBusinessLocalTest ex
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(RestEjbBusinessLocalTest.class).getArchive();
+ return new WebModule(RestEjbBusinessLocalTest.class,
RestEjbBusinessLocalTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/localbean/RestEjbLocalBeanTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/localbean/RestEjbLocalBeanTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/localbean/RestEjbLocalBeanTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/ejb/localbean/RestEjbLocalBeanTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class RestEjbLocalBeanTest extend
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(RestEjbLocalBeanTest.class).getArchive();
+ return new WebModule(RestEjbLocalBeanTest.class,
RestEjbLocalBeanTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
Wed Oct 3 08:26:18 2012
@@ -44,7 +44,7 @@ public class JAXRSHttpHeadersTest extend
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(JAXRSHttpHeadersTest.class).getArchive();
+ return new WebModule(JAXRSHttpHeadersTest.class,
JAXRSHttpHeadersTest.class).getArchive();
}
/**
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
Wed Oct 3 08:26:18 2012
@@ -35,7 +35,7 @@ public class ListedApplicationTest exten
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(ListedApplicationTest.class).getArchive();
+ return new WebModule(ListedApplicationTest.class,
ListedApplicationTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class NoAppTest extends JaxrsTest
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(NoAppTest.class).getArchive();
+ return new WebModule(NoAppTest.class, NoAppTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/pathparam/PathParamTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/pathparam/PathParamTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/pathparam/PathParamTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/pathparam/PathParamTest.java
Wed Oct 3 08:26:18 2012
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
public class PathParamTest extends JaxrsTest {
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(PathParamTest.class).getArchive();
+ return new WebModule(PathParamTest.class,
PathParamTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
Wed Oct 3 08:26:18 2012
@@ -33,7 +33,7 @@ public class ScannedApplicationTest exte
@Deployment(testable = false)
public static WebArchive archive() {
- return new WebModule(ScannedApplicationTest.class).getArchive();
+ return new WebModule(ScannedApplicationTest.class,
ScannedApplicationTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
Wed Oct 3 08:26:18 2012
@@ -36,7 +36,7 @@ public class OpenEJBJarForAddressDeploym
@Deployment(testable = false)
public static WebArchive createDeployment() {
- return new
WebModule(OpenEJBJarForAddressDeploymentTest.class).getArchive();
+ return new WebModule(OpenEJBJarForAddressDeploymentTest.class,
OpenEJBJarForAddressDeploymentTest.class).getArchive();
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java?rev=1393343&r1=1393342&r2=1393343&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java
Wed Oct 3 08:26:18 2012
@@ -46,7 +46,7 @@ public class JMSInjectionTest {
public static WebArchive getArchive() {
return ShrinkWrap.create(WebArchive.class, "jsf-jms-test.war")
- .addPackage(JMSInjectionTest.class.getPackage())
+ .addClasses(DummyManagedBean.class)
.addAsWebResource(new ClassLoaderAsset(
JMSInjectionTest.class.getPackage().getName().replace('.',
'/').concat("/").concat("dummy.xhtml")), "dummy.xhtml")
.setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class)
