[jboss-cvs] JBossAS SVN: r106481 - in trunk/resteasy-int/test/cdi-test-2: src/main/java/org/jboss/resteasy/cdi/test and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 7 02:55:59 EDT 2010
Author: jharting
Date: 2010-07-07 02:55:58 -0400 (Wed, 07 Jul 2010)
New Revision: 106481
Added:
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java
Removed:
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java
Modified:
trunk/resteasy-int/test/cdi-test-2/
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.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/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.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/InterceptorTest.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java
Log:
Improved tests for subresources plus minor changes
Property changes on: trunk/resteasy-int/test/cdi-test-2
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
.settings
Deleted: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,18 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-import java.io.Serializable;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-
- at Produces("text/plain")
-public class SubResource implements Serializable
-{
- private static final long serialVersionUID = 8722971164845596111L;
-
- @GET
- public String foo()
- {
- return "bar";
- }
-}
Copied: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java (from rev 106255, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -0,0 +1,129 @@
+package org.jboss.resteasy.cdi.test;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+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 Produces("text/plain")
+ at RequestScoped
+public class Subresource implements Serializable
+{
+ private static final long serialVersionUID = 8722971164845596111L;
+
+ @Inject
+ private Cat cat;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private UriInfo uriInfo;
+ @QueryParam("foo")
+ private String fieldQuery;
+ private UriInfo setterUriInfo;
+ @Inject
+ private Subresource subresource;
+
+ public Subresource()
+ {
+ }
+
+ @Inject
+ public Subresource(Cat cat)
+ {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat)
+ {
+ initializerCat = cat;
+ }
+
+ @GET
+ @Path("/fieldInjection")
+ public boolean fieldInjection()
+ {
+ return cat != null;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection2")
+ public String jaxrsFieldInjection2()
+ {
+ return fieldQuery;
+ }
+
+ @GET
+ @Path("/jaxrsSetterInjection")
+ public boolean jaxrsSetterInjection()
+ {
+ return setterUriInfo != null;
+ }
+
+ @GET
+ @Path("/constructorInjection")
+ public boolean constructorInjection()
+ {
+ return constructorCat != null;
+ }
+
+ @GET
+ @Path("/initializerInjection")
+ public boolean initializerInjection()
+ {
+ return initializerCat != null;
+ }
+
+ @GET
+ @Path("/jaxrsMethodInjection")
+ public String jaxrsMethodInjection(@QueryParam("foo") String query)
+ {
+ return query;
+ }
+
+ @GET
+ @Path("/toString")
+ @Override
+ public String toString()
+ {
+ return super.toString();
+ }
+
+ @GET
+ @Path("/providers")
+ public Dog testProviders()
+ {
+ return new Dog();
+ }
+
+ @Context
+ public void setSetterUriInfo(UriInfo setterUriInfo)
+ {
+ this.setterUriInfo = setterUriInfo;
+ }
+
+ @Path("/subresource")
+ public Subresource subresource()
+ {
+ return subresource;
+ }
+
+ @GET
+ public String getBar()
+ {
+ return "bar";
+ }
+}
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -11,7 +11,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Path("applicationResource")
@Produces("text/plain")
@@ -26,7 +26,7 @@
private UriInfo uriInfo;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public ApplicationScopedTestResource()
{
@@ -105,9 +105,9 @@
this.setterUriInfo = setterUriInfo;
}
- @Path("/subResource")
- public SubResource subResource()
+ @Path("/subresource")
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
}
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -10,7 +10,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Path("/resource")
@@ -27,7 +27,7 @@
private String fieldQuery;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public TestResource()
{
@@ -115,9 +115,9 @@
this.setterUriInfo = setterUriInfo;
}
- @Path("/subResource")
- public SubResource subResource()
+ @Path("/subresource")
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
}
Copied: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java (from rev 106255, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -0,0 +1,116 @@
+package org.jboss.resteasy.cdi.test.ejb;
+
+import javax.ejb.EJB;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Inject;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Cat;
+import org.jboss.resteasy.cdi.test.Dog;
+import org.jboss.resteasy.cdi.test.Subresource;
+
+ at Stateful
+public class StatefulSessionBeanResource implements StatefulSessionBeanResourceLocal
+{
+ private static int uniqueId = 0;
+ private int id = uniqueId++;
+
+ @Inject
+ private Cat cat;
+ @EJB
+ private InjectedStatelessEjbLocal statelessEjb;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private UriInfo uriInfo;
+ @QueryParam("foo")
+ String fieldQuery;
+ private UriInfo setterUriInfo;
+ @Inject
+ private Subresource subresource;
+
+ public StatefulSessionBeanResource()
+ {
+ }
+
+ @Inject
+ public StatefulSessionBeanResource(Cat cat)
+ {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat)
+ {
+ initializerCat = cat;
+ }
+
+ public boolean fieldInjection()
+ {
+ return cat != null;
+ }
+
+ public boolean ejbFieldInjection()
+ {
+ return statelessEjb.foo();
+ }
+
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
+
+ public String jaxrsFieldInjection2()
+ {
+ return fieldQuery;
+ }
+
+ public boolean jaxrsSetterInjection()
+ {
+ return setterUriInfo != null;
+ }
+
+ public boolean constructorInjection()
+ {
+ return constructorCat != null;
+ }
+
+ public boolean initializerInjection()
+ {
+ return initializerCat != null;
+ }
+
+ public String jaxrsMethodInjection(String query)
+ {
+ return query;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public Dog testProviders()
+ {
+ return new Dog();
+ }
+
+ @Context
+ public void setSetterUriInfo(UriInfo setterUriInfo)
+ {
+ this.setterUriInfo = setterUriInfo;
+ }
+
+ public Subresource subresource()
+ {
+ return subresource;
+ }
+
+ @Remove
+ public void remove()
+ {
+ }
+}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,116 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.EJB;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Stateful
-public class StatefulSessionBeanResource1 implements StatefulSessionBeanResource1Local
-{
- private static int uniqueId = 0;
- private int id = uniqueId++;
-
- @Inject
- private Cat cat;
- @EJB
- private InjectedStatelessEjbLocal statelessEjb;
- private Cat constructorCat;
- private Cat initializerCat;
- @Context
- private UriInfo uriInfo;
- @QueryParam("foo")
- String fieldQuery;
- private UriInfo setterUriInfo;
- @Inject
- private SubResource subResource;
-
- public StatefulSessionBeanResource1()
- {
- }
-
- @Inject
- public StatefulSessionBeanResource1(Cat cat)
- {
- constructorCat = cat;
- }
-
- @Inject
- public void init(Cat cat)
- {
- initializerCat = cat;
- }
-
- public boolean fieldInjection()
- {
- return cat != null;
- }
-
- public boolean ejbFieldInjection()
- {
- return statelessEjb.foo();
- }
-
- public boolean jaxrsFieldInjection()
- {
- return uriInfo != null;
- }
-
- public String jaxrsFieldInjection2()
- {
- return fieldQuery;
- }
-
- public boolean jaxrsSetterInjection()
- {
- return setterUriInfo != null;
- }
-
- public boolean constructorInjection()
- {
- return constructorCat != null;
- }
-
- public boolean initializerInjection()
- {
- return initializerCat != null;
- }
-
- public String jaxrsMethodInjection(String query)
- {
- return query;
- }
-
- public int getId()
- {
- return id;
- }
-
- public Dog testProviders()
- {
- return new Dog();
- }
-
- @Context
- public void setSetterUriInfo(UriInfo setterUriInfo)
- {
- this.setterUriInfo = setterUriInfo;
- }
-
- public SubResource subResource()
- {
- return subResource;
- }
-
- @Remove
- public void remove()
- {
- }
-}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,64 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.Local;
-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.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Local
- at Path("/statefulEjbResourceWithAnnotationsOnLocalInterface")
- at Produces("text/plain")
-public interface StatefulSessionBeanResource1Local
-{
- @GET
- @Path("/fieldInjection")
- public boolean fieldInjection();
-
- @GET
- @Path("/ejbFieldInjection")
- public boolean ejbFieldInjection();
-
- @GET
- @Path("/jaxrsFieldInjection")
- public boolean jaxrsFieldInjection();
-
- @GET
- @Path("/jaxrsFieldInjection2")
- public String jaxrsFieldInjection2();
-
- @GET
- @Path("/jaxrsSetterInjection")
- public boolean jaxrsSetterInjection();
-
- @GET
- @Path("/constructorInjection")
- public boolean constructorInjection();
-
- @GET
- @Path("/initializerInjection")
- public boolean initializerInjection();
-
- @GET
- @Path("/jaxrsMethodInjection")
- public String jaxrsMethodInjection(@QueryParam("foo") String query);
-
- @GET
- @Path("/toString")
- public int getId();
-
- @GET
- @Path("/providers")
- public Dog testProviders();
-
- public void setSetterUriInfo(UriInfo setterUriInfo);
-
- @Path("/subResource")
- public SubResource subResource();
-
- public void remove();
-}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,142 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.EJB;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-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;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Stateful
- at Path("/statefulEjbResourceWithAnnotationsOnBeanClass")
- at Produces("text/plain")
-public class StatefulSessionBeanResource2 implements StatefulSessionBeanResource2Local
-{
- private static int uniqueId = 0;
- private int id = uniqueId++;
-
- @Inject
- private Cat cat;
- @EJB
- private InjectedStatelessEjbLocal statelessEjb;
- private Cat constructorCat;
- private Cat initializerCat;
- @Context
- private UriInfo uriInfo;
- @QueryParam("foo")
- String fieldQuery;
- private UriInfo setterUriInfo;
- @Inject
- private SubResource subResource;
-
- public StatefulSessionBeanResource2()
- {
- }
-
- @Inject
- public StatefulSessionBeanResource2(Cat cat)
- {
- constructorCat = cat;
- }
-
- @Inject
- public void init(Cat cat)
- {
- initializerCat = cat;
- }
-
- @GET
- @Path("/fieldInjection")
- public boolean fieldInjection()
- {
- return cat != null;
- }
-
- @GET
- @Path("/ejbFieldInjection")
- public boolean ejbFieldInjection()
- {
- return statelessEjb.foo();
- }
-
- @GET
- @Path("/jaxrsFieldInjection")
- public boolean jaxrsFieldInjection()
- {
- return uriInfo != null;
- }
-
- @GET
- @Path("/jaxrsFieldInjection2")
- public String jaxrsFieldInjection2()
- {
- return fieldQuery;
- }
-
- @GET
- @Path("/jaxrsSetterInjection")
- public boolean jaxrsSetterInjection()
- {
- return setterUriInfo != null;
- }
-
- @GET
- @Path("/constructorInjection")
- public boolean constructorInjection()
- {
- return constructorCat != null;
- }
-
- @GET
- @Path("/initializerInjection")
- public boolean initializerInjection()
- {
- return initializerCat != null;
- }
-
- @GET
- @Path("/jaxrsMethodInjection")
- public String jaxrsMethodInjection(@QueryParam("foo") String query)
- {
- return query;
- }
-
- @GET
- @Path("/toString")
- public int getId()
- {
- return id;
- }
-
- @GET
- @Path("/providers")
- public Dog testProviders()
- {
- return new Dog();
- }
-
- @Context
- public void setSetterUriInfo(UriInfo setterUriInfo)
- {
- this.setterUriInfo = setterUriInfo;
- }
-
- @Path("/subResource")
- public SubResource subResource()
- {
- return subResource;
- }
-
- @Remove
- public void remove()
- {
- }
-}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,27 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.Local;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Local
-public interface StatefulSessionBeanResource2Local
-{
- void init(Cat cat);
- boolean fieldInjection();
- boolean ejbFieldInjection();
- boolean jaxrsFieldInjection();
- String jaxrsFieldInjection2();
- boolean jaxrsSetterInjection();
- boolean constructorInjection();
- boolean initializerInjection();
- String jaxrsMethodInjection(String query);
- int getId();
- Dog testProviders();
- void setSetterUriInfo(UriInfo setterUriInfo);
- SubResource subResource();
- void remove();
-}
Copied: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java (from rev 106255, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java)
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -0,0 +1,64 @@
+package org.jboss.resteasy.cdi.test.ejb;
+
+import javax.ejb.Local;
+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.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Dog;
+import org.jboss.resteasy.cdi.test.Subresource;
+
+ at Local
+ at Path("/statefulSessionBeanResource")
+ at Produces("text/plain")
+public interface StatefulSessionBeanResourceLocal
+{
+ @GET
+ @Path("/fieldInjection")
+ public boolean fieldInjection();
+
+ @GET
+ @Path("/ejbFieldInjection")
+ public boolean ejbFieldInjection();
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection();
+
+ @GET
+ @Path("/jaxrsFieldInjection2")
+ public String jaxrsFieldInjection2();
+
+ @GET
+ @Path("/jaxrsSetterInjection")
+ public boolean jaxrsSetterInjection();
+
+ @GET
+ @Path("/constructorInjection")
+ public boolean constructorInjection();
+
+ @GET
+ @Path("/initializerInjection")
+ public boolean initializerInjection();
+
+ @GET
+ @Path("/jaxrsMethodInjection")
+ public String jaxrsMethodInjection(@QueryParam("foo") String query);
+
+ @GET
+ @Path("/toString")
+ public int getId();
+
+ @GET
+ @Path("/providers")
+ public Dog testProviders();
+
+ public void setSetterUriInfo(UriInfo setterUriInfo);
+
+ @Path("/subresource")
+ public Subresource subresource();
+
+ public void remove();
+}
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-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -10,7 +10,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Stateless
@Dependent
@@ -29,7 +29,7 @@
private UriInfo uriInfo;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public StatelessSessionBeanResource()
{
@@ -98,9 +98,9 @@
this.setterUriInfo = setterUriInfo;
}
- public SubResource subResource()
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
@Remove
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -8,7 +8,7 @@
import javax.ws.rs.core.UriInfo;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Local
@Path("/statelessEjb")
@@ -53,8 +53,8 @@
public void setSetterUriInfo(UriInfo setterUriInfo);
- @Path("/subResource")
- public SubResource subResource();
+ @Path("/subresource")
+ public Subresource subresource();
public void remove();
}
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -3,6 +3,8 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
/**
* This test verifies that a JAX-RS resource method invocation
@@ -15,12 +17,23 @@
@Path("/interceptor")
@Produces("text/plain")
- at TestInterceptorBinding
public class TestResource
{
+ @Context
+ private UriInfo uriInfo;
+
@GET
+ @Path("/interceptedMethod")
+ @TestInterceptorBinding
public boolean getValue()
{
return false;
}
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
}
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-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -44,8 +44,8 @@
}
@Test
- public void testSubResource()
+ public void testSubresource()
{
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subResource", "bar");
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subresource", "bar");
}
}
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-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -8,6 +8,13 @@
@Test
public void testInterceptor()
{
- testPlainTextReadonlyResource(BASE_URI + "interceptor", true);
+ testPlainTextReadonlyResource(BASE_URI + "interceptor/interceptedMethod", true);
}
+
+ // @Test
+ // WELD-557
+ public void testJaxrsFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + "interceptor/jaxrsFieldInjection", true);
+ }
}
Deleted: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,34 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-import org.junit.Test;
-
-
-public class StatefulSessionBeanWithAnnotationsOnBeanClassTest extends ResourceTest
-{
-
- @Override
- protected String getTestPrefix()
- {
- return "statefulEjbResourceWithAnnotationsOnBeanClass/";
- }
-
- @Test
- public void testEjbFieldInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
- }
-
- @Override
- // WELDINT-31 This test is disabled temporarily
- public void testCdiConstructorInjection()
- {
- }
-
- @Override
- // This test is disabled temporarily
- public void testSubResource()
- {
- }
-
-
-}
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java 2010-07-07 06:16:16 UTC (rev 106480)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -1,17 +1,31 @@
package org.jboss.resteasy.cdi.test;
-public class StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest extends StatefulSessionBeanWithAnnotationsOnBeanClassTest
+import org.junit.Test;
+
+public class StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest extends ResourceTest
{
@Override
protected String getTestPrefix()
{
- return "statefulEjbResourceWithAnnotationsOnLocalInterface/";
+ return "statefulSessionBeanResource/";
}
+ @Test
+ public void testEjbFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
+ }
+
@Override
// WELDINT-31 This test is disabled temporarily
public void testCdiConstructorInjection()
{
}
+
+ @Override
+ // This test is disabled temporarily
+ public void testSubresource()
+ {
+ }
}
Added: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java (rev 0)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java 2010-07-07 06:55:58 UTC (rev 106481)
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.cdi.test;
+
+public class SubresourceTest extends ResourceTest
+{
+ @Override
+ protected String getTestPrefix()
+ {
+ return "resource/subresource/";
+ }
+}
More information about the jboss-cvs-commits
mailing list