[weld-commits] Weld SVN: r7127 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws.

Author: pete.muir(a)jboss.org Date: 2010-12-10 13:03:20 -0500 (Fri, 10 Dec 2010) New Revision: 7127 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java Log: CDITCK-197 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-12-10 17:36:52 UTC (rev 7126) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-12-10 18:03:20 UTC (rev 7127) @@ -28,7 +28,7 @@ import org.testng.annotations.Test; @Artifact -@IntegrationTest(runLocally = true) +@IntegrationTest @SpecVersion(spec="cdi", version="20091101") @WebXml("web.xml") public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test @@ -47,6 +47,6 @@ { service = new SheepWSEndPointService(); SheepWS ws = service.getSheepWSPort(); - assert ws.isSheepInjected(); + assert ws.testSheepInjected(); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java 2010-12-10 17:36:52 UTC (rev 7126) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java 2010-12-10 18:03:20 UTC (rev 7127) @@ -41,6 +41,6 @@ @WebResult(targetNamespace = "") @RequestWrapper(localName = "isSheepInjected", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", className = "org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.IsSheepInjected") @ResponseWrapper(localName = "isSheepInjectedResponse", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", className = "org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.IsSheepInjectedResponse") - public boolean isSheepInjected(); + public boolean testSheepInjected(); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2010-12-10 17:36:52 UTC (rev 7126) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2010-12-10 18:03:20 UTC (rev 7127) @@ -33,7 +33,7 @@ } @WebMethod - public boolean isSheepInjected() { + public boolean testSheepInjected() { return (sheep != null) && initializerCalled; } }