[jboss-cvs] JBossAS SVN: r108384 - in trunk/resteasy-int/test/cdi-test-2: src/main/java/org/jboss/resteasy/cdi/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 30 04:52:46 EDT 2010
Author: jharting
Date: 2010-09-30 04:52:45 -0400 (Thu, 30 Sep 2010)
New Revision: 108384
Added:
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/noncdi/
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/noncdi/NonCdiResource.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractCdiResourceTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractProviderTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbProviderTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/NonCdiEnabledResourceTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanResourceTest.java
Removed:
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResteasyCdiTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanTest.java
Modified:
trunk/resteasy-int/test/cdi-test-2/pom.xml
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjb.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ApplicationScopedResourceTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java
Log:
new tests for resteasy-cdi, refactoring
Modified: trunk/resteasy-int/test/cdi-test-2/pom.xml
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/pom.xml 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/pom.xml 2010-09-30 08:52:45 UTC (rev 108384)
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>resteasy-cdi-test</artifactId>
@@ -20,14 +20,15 @@
<version>1.0-SP1</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
+ <version>1.0.0.CR2</version>
</dependency>
+
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
@@ -47,7 +48,7 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.interceptor</groupId>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
@@ -118,7 +119,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -148,4 +149,45 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>resin</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-cdi</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjb.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjb.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjb.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -2,7 +2,6 @@
import javax.ejb.EJB;
import javax.ejb.Stateless;
-import javax.enterprise.context.Dependent;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -105,6 +104,13 @@
{
return id;
}
+
+ @GET
+ @Path("/providers")
+ public void testProviders()
+ {
+ throw new NullPointerException();
+ }
@Context
public void setSetterUriInfo(UriInfo setterUriInfo)
Added: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,67 @@
+package org.jboss.resteasy.cdi.test.ejb;
+
+import javax.ejb.EJB;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.Providers;
+
+import org.jboss.resteasy.cdi.test.Cat;
+
+ at Provider
+ at Produces("text/plain")
+ at Stateless
+ at LocalBean
+public class BeanClassLocalViewEjbProvider implements ExceptionMapper<NullPointerException>
+{
+
+ @Inject
+ private Cat cat;
+ @EJB
+ private InjectedStatelessEjbLocal statelessEjb;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private Providers providers;
+
+ public BeanClassLocalViewEjbProvider()
+ {
+ }
+
+ @Inject
+ public BeanClassLocalViewEjbProvider(Cat cat)
+ {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat)
+ {
+ initializerCat = cat;
+ }
+
+ public Response toResponse(NullPointerException exception)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("CDI field injection: ");
+ builder.append(cat != null);
+ builder.append("\nCDI constructor injection: ");
+ builder.append(constructorCat != null);
+ builder.append("\nCDI initializer injection: ");
+ builder.append(initializerCat != null);
+ builder.append("\nEJB injection: ");
+ builder.append(statelessEjb != null);
+ builder.append("\nJAX-RS field injection: ");
+ builder.append(providers != null);
+ builder.append("\nProvider toString(): ");
+ builder.append(toString());
+
+ return Response.status(Status.OK).entity(builder.toString()).build();
+ }
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -1,9 +1,7 @@
package org.jboss.resteasy.cdi.test.ejb;
import javax.ejb.EJB;
-import javax.ejb.Remove;
import javax.ejb.Stateless;
-import javax.enterprise.context.Dependent;
import javax.inject.Inject;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
Added: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/noncdi/NonCdiResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/noncdi/NonCdiResource.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/noncdi/NonCdiResource.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,74 @@
+package org.jboss.resteasy.cdi.test.noncdi;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+ at Path("/nonCdiResource")
+ at Produces("text/plain")
+public class NonCdiResource
+{
+ private UriInfo constructorInjectedField;
+ @Context
+ private UriInfo uriInfo;
+ @QueryParam("foo")
+ private String fieldQuery;
+ private UriInfo setterUriInfo;
+
+ public NonCdiResource(@Context UriInfo constructorInjectedField)
+ {
+ this.constructorInjectedField = constructorInjectedField;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection2")
+ public String jaxrsFieldInjection2()
+ {
+ return fieldQuery;
+ }
+
+ @GET
+ @Path("/jaxrsConstructorInjection")
+ public boolean jaxrsConstructorInjection()
+ {
+ return constructorInjectedField != null;
+ }
+
+ @GET
+ @Path("/jaxrsSetterInjection")
+ public boolean jaxrsSetterInjection()
+ {
+ return setterUriInfo != null;
+ }
+
+ @GET
+ @Path("/jaxrsMethodInjection")
+ public String jaxrsMethodInjection(@QueryParam("foo") String query)
+ {
+ return query;
+ }
+
+ @GET
+ @Path("/toString")
+ @Override
+ public String toString()
+ {
+ return super.toString();
+ }
+
+ @Context
+ public void setSetterUriInfo(UriInfo setterUriInfo)
+ {
+ this.setterUriInfo = setterUriInfo;
+ }
+}
Copied: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractCdiResourceTest.java (from rev 108200, trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractCdiResourceTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractCdiResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.junit.Test;
+
+/**
+ * Contains general tests executed against every CDI-enabled JAX-RS resource.
+ * @author Jozef Hartinger
+ *
+ */
+public abstract class AbstractCdiResourceTest extends AbstractResourceTest
+{
+ @Test
+ public void testCdiFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "fieldInjection", true);
+ }
+
+ @Test
+ public void testCdiConstructorInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "constructorInjection", true);
+ }
+
+ @Test
+ public void testCdiInitializerInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "initializerInjection", true);
+ }
+
+ @Test
+ public void testSubresource()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subresource", "bar");
+ }
+}
Added: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractProviderTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractProviderTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractProviderTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.junit.Test;
+
+/**
+ * Contains general tests executed against every JAX-RS provider.
+ * @author Jozef Hartinger
+ *
+ */
+public abstract class AbstractProviderTest extends AbstractTest
+{
+
+ abstract protected String getTestPrefix();
+
+ @Test
+ public void testCdiFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "providers", "CDI field injection: true");
+ }
+
+ @Test
+ public void testCdiInitializerInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "providers", "CDI initializer injection: true");
+ }
+
+ @Test
+ public void testJaxrsFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "providers", "JAX-RS field injection: true");
+ }
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -2,50 +2,30 @@
import org.junit.Test;
-public abstract class AbstractResourceTest extends AbstractResteasyCdiTest
+/**
+ * Contains general tests executed against every JAX-RS resource.
+ * @author Jozef Hartinger
+ *
+ */
+public abstract class AbstractResourceTest extends AbstractTest
{
abstract protected String getTestPrefix();
-
+
@Test
- public void testCdiFieldInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "fieldInjection", true);
- }
-
- @Test
- public void testCdiConstructorInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "constructorInjection", true);
- }
-
- @Test
- public void testCdiInitializerInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "initializerInjection", true);
- }
-
- @Test
public void testJaxrsFieldInjection()
{
testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsFieldInjection", true);
}
-
-
+
@Test
public void testJaxrsSetterInjection()
{
testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsSetterInjection", true);
}
-
+
@Test
public void testJaxrsMethodInjection()
{
testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsMethodInjection?foo=bar", "bar");
}
-
- @Test
- public void testSubresource()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subresource", "bar");
- }
}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResteasyCdiTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResteasyCdiTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResteasyCdiTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -1,38 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public abstract class AbstractResteasyCdiTest
-{
- private HttpClient client = new HttpClient();
- public static final String BASE_URI = "http://localhost:8080/resteasy-cdi/";
-
- public void testPlainTextReadonlyResource(String uri, String body)
- {
- GetMethod get = new GetMethod(uri);
- get.addRequestHeader("Accept", "text/plain");
- try
- {
- int status = client.executeMethod(get);
- assertEquals(status, 200);
- assertTrue(get.getResponseBodyAsString().contains(body));
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- finally
- {
- get.releaseConnection();
- }
- }
-
- public void testPlainTextReadonlyResource(String uri, boolean body)
- {
- testPlainTextReadonlyResource(uri, String.valueOf(body));
- }
-}
Copied: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java (from rev 108200, trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResteasyCdiTest.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,42 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Contains utility methods used heavily in tests.
+ * @author Jozef Hartinger
+ *
+ */
+public abstract class AbstractTest
+{
+ private HttpClient client = new HttpClient();
+ public static final String BASE_URI = "http://localhost:8080/resteasy-cdi/";
+
+ public void testPlainTextReadonlyResource(String uri, String body)
+ {
+ GetMethod get = new GetMethod(uri);
+ get.addRequestHeader("Accept", "text/plain");
+ try
+ {
+ int status = client.executeMethod(get);
+ assertEquals(200, status);
+ assertTrue(get.getResponseBodyAsString().contains(body));
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ get.releaseConnection();
+ }
+ }
+
+ public void testPlainTextReadonlyResource(String uri, boolean body)
+ {
+ testPlainTextReadonlyResource(uri, String.valueOf(body));
+ }
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -3,7 +3,7 @@
import org.junit.Test;
-public class AlternativeTest extends AbstractResteasyCdiTest
+public class AlternativeTest extends AbstractTest
{
@Test
public void testAlternative()
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ApplicationScopedResourceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ApplicationScopedResourceTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ApplicationScopedResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -6,7 +6,7 @@
import static org.junit.Assert.assertEquals;
-public class ApplicationScopedResourceTest extends AbstractResourceTest
+public class ApplicationScopedResourceTest extends AbstractCdiResourceTest
{
@Override
protected String getTestPrefix()
Added: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbProviderTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbProviderTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbProviderTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.junit.Test;
+
+public class BeanClassLocalViewEjbProviderTest extends AbstractProviderTest
+{
+ @Override
+ protected String getTestPrefix()
+ {
+ return "beanClassLocalViewEjb/";
+ }
+
+ @Test
+ public void testEjbInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "providers", "EJB injection: true");
+ }
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/BeanClassLocalViewEjbTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -1,6 +1,6 @@
package org.jboss.resteasy.cdi.test;
-public class BeanClassLocalViewEjbTest extends StatelessSessionBeanTest
+public class BeanClassLocalViewEjbTest extends StatelessSessionBeanResourceTest
{
@Override
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -3,7 +3,7 @@
import org.junit.Test;
-public class InterceptorTest extends AbstractResteasyCdiTest
+public class InterceptorTest extends AbstractTest
{
@Test
public void testInterceptor()
Added: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/NonCdiEnabledResourceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/NonCdiEnabledResourceTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/NonCdiEnabledResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.jboss.resteasy.cdi.test.noncdi.NonCdiResource;
+import org.junit.Test;
+
+/**
+ * This test tests that JAX-RS dependency injection is performed on a JAX-RS resource {@link NonCdiResource}
+ * which is not a CDI Bean (because of innapropriate constructor).
+ *
+ * @author Jozef Hartinger
+ *
+ */
+public class NonCdiEnabledResourceTest extends AbstractResourceTest
+{
+
+ @Override
+ protected String getTestPrefix()
+ {
+ return "nonCdiResource/";
+ }
+
+ @Test
+ public void testJaxrsConstructorInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsConstructorInjection", true);
+ }
+
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -2,30 +2,17 @@
import org.junit.Test;
-
-public class ProviderTest extends AbstractResteasyCdiTest
+public class ProviderTest extends AbstractProviderTest
{
- @Test
- public void testCdiFieldInjection()
+ @Override
+ protected String getTestPrefix()
{
- testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI field injection: true");
+ return "resource/";
}
-
+
@Test
public void testCdiConstructorInjection()
{
- testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI constructor injection: true");
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "providers", "CDI constructor injection: true");
}
-
- @Test
- public void testCdiInitializerInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI initializer injection: true");
- }
-
- @Test
- public void testJaxrsFieldInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + "resource/providers", "JAX-RS field injection: true");
- }
}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -7,7 +7,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class ResourceTest extends AbstractResourceTest
+public class ResourceTest extends AbstractCdiResourceTest
{
protected String getTestPrefix()
{
Copied: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanResourceTest.java (from rev 108200, trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanTest.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanResourceTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanResourceTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.junit.Test;
+
+
+public class StatelessSessionBeanResourceTest extends AbstractCdiResourceTest
+{
+
+ @Override
+ protected String getTestPrefix()
+ {
+ return "statelessEjb/";
+ }
+
+ @Test
+ public void testEjbFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
+ }
+
+ @Override
+ // WELDINT-31 This test is disabled temporarily
+ public void testCdiConstructorInjection()
+ {
+ }
+
+
+}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanTest.java 2010-09-30 06:21:00 UTC (rev 108383)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatelessSessionBeanTest.java 2010-09-30 08:52:45 UTC (rev 108384)
@@ -1,28 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-import org.junit.Test;
-
-
-public class StatelessSessionBeanTest extends AbstractResourceTest
-{
-
- @Override
- protected String getTestPrefix()
- {
- return "statelessEjb/";
- }
-
- @Test
- public void testEjbFieldInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
- }
-
- @Override
- // WELDINT-31 This test is disabled temporarily
- public void testCdiConstructorInjection()
- {
- }
-
-
-}
More information about the jboss-cvs-commits
mailing list