Author: jharting Date: 2011-01-05 08:06:58 -0500 (Wed, 05 Jan 2011) New Revision: 7171 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 cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml Log: CDITCK-201 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 2011-01-05 13:04:03 UTC (rev 7170) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2011-01-05 13:06:58 UTC (rev 7171) @@ -16,30 +16,27 @@ */ package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; -import javax.xml.ws.WebServiceRef; - import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; -@Artifact -(a)Packaging(PackagingType.EAR) -@IntegrationTest +@Artifact(addCurrentPackage = false) +(a)Packaging(PackagingType.WAR) +@IntegrationTest(runLocally = true) @SpecVersion(spec="cdi", version="20091101") @WebXml("web.xml") +@Classes({ Sheep.class, SheepWSEndPoint.class }) public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test { - @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl") - SheepWSEndPointService service; - - @Test + @Test(groups = "javaee-full-only") @SpecAssertions({ @SpecAssertion(section = "5.5", id = "ee"), @SpecAssertion(section = "5.5.2", id = "aq"), @@ -48,8 +45,8 @@ // JBAS-7046 public void testInjectionIntoWebServiceEndpoint() throws Exception { - service = new SheepWSEndPointService(); + SheepWSEndPointService service = new SheepWSEndPointService(); SheepWS ws = service.getSheepWSPort(); - assert ws.testSheepInjected(); + assert ws.isSheepInjected(); } } 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 2011-01-05 13:04:03 UTC (rev 7170) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java 2011-01-05 13:06:58 UTC (rev 7171) @@ -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 testSheepInjected(); + public boolean isSheepInjected(); } 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 2011-01-05 13:04:03 UTC (rev 7170) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2011-01-05 13:06:58 UTC (rev 7171) @@ -33,7 +33,7 @@ } @WebMethod - public boolean testSheepInjected() { + public boolean isSheepInjected() { return (sheep != null) && initializerCalled; } } Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml 2011-01-05 13:04:03 UTC (rev 7170) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml 2011-01-05 13:06:58 UTC (rev 7171) @@ -28,3 +28,33 @@ <session-timeout>10</session-timeout> </session-config> </web-app> +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>Dependency Injection Test</display-name> + + <listener> + <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> + <servlet> + <servlet-name>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPoint</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPoint</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPoint</servlet-name> + <url-pattern>/TestWebService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> +</web-app>