Author: alessio.soldano(a)jboss.com Date: 2010-03-16 13:51:42 -0400 (Tue, 16 Mar 2010) New Revision: 11794 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java Log: All WSConsumerPlugin tests can now run in src dist with native stack Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-16 17:36:32 UTC (rev 11793) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-16 17:51:42 UTC (rev 11794) @@ -277,37 +277,30 @@ consumer.setTarget("2.1"); consumer.setNoCompile(false); - //with Native stack, this test is run in binary distribution mode only because the way Maven builds classpath doesn't allow - //to run the wsimport tool in Native stack from a Surefire test (the jaxws classes are of course loaded from the included - //jaxws source module and that causes the Sun's ParallelWorldClassLoader to throw an exception as EndpointReference - //is not loaded from a jar resource) - if (!getIsNative() || Boolean.getBoolean("binary.distribution")) + consumeWSDL(); + ClassLoader loader = getArtefactClassLoader(); + Class<?> service = loader.loadClass("org.jboss.test.ws.tools.testTarget.TestService"); + + boolean featureSig = false; + for (Method m : service.getDeclaredMethods()) { - consumeWSDL(); - ClassLoader loader = getArtefactClassLoader(); - Class<?> service = loader.loadClass("org.jboss.test.ws.tools.testTarget.TestService"); - - boolean featureSig = false; - for (Method m : service.getDeclaredMethods()) + if (m.getName().equals("getEndpointInterfacePort")) { - if (m.getName().equals("getEndpointInterfacePort")) + for (Class<?> c : m.getParameterTypes()) { - for (Class<?> c : m.getParameterTypes()) + if (c.isArray() && c.getComponentType().equals(WebServiceFeature.class)) { - if (c.isArray() && c.getComponentType().equals(WebServiceFeature.class)) - { - featureSig = true; - break; - } + featureSig = true; + break; } } } - - assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig); - - Class<?> sei = loader.loadClass("org.jboss.test.ws.tools.testTarget.EndpointInterface"); - assertTrue("@XmlSeeAlso expected on SEI (types not referenced by the Port in the wsdl)", sei.isAnnotationPresent(XmlSeeAlso.class)); } + + assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig); + + Class<?> sei = loader.loadClass("org.jboss.test.ws.tools.testTarget.EndpointInterface"); + assertTrue("@XmlSeeAlso expected on SEI (types not referenced by the Port in the wsdl)", sei.isAnnotationPresent(XmlSeeAlso.class)); } /**