Author: alessio.soldano(a)jboss.com Date: 2011-03-25 11:57:05 -0400 (Fri, 25 Mar 2011) New Revision: 13943 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java Log: Minor testsuite changing for checking default bus usage Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2011-03-25 15:56:54 UTC (rev 13942) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2011-03-25 15:57:05 UTC (rev 13943) @@ -27,8 +27,8 @@ import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.frontend.ClientProxyFactoryBean; +import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; public class AegisTestCase extends JBossWSTest { @@ -36,7 +36,7 @@ public static Test suite() { - return new JBossWSTestSetup(AegisTestCase.class, "jaxws-aegis.war"); + return new JBossWSCXFTestSetup(AegisTestCase.class, "jaxws-aegis.war"); } public void testAccess() throws Exception @@ -46,9 +46,10 @@ proxyFactory.setServiceClass(AegisGroupQuery.class); proxyFactory.setAddress(endpointURL); AegisGroupQuery query = (AegisGroupQuery)proxyFactory.create(); + @SuppressWarnings("unchecked") Map<Integer, String> members = query.getMembers(); - this.assertEquals(2, members.size()); - this.assertEquals(true, members.containsKey(2)); + assertEquals(2, members.size()); + assertEquals(true, members.containsKey(2)); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2011-03-25 15:56:54 UTC (rev 13942) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2011-03-25 15:57:05 UTC (rev 13943) @@ -38,8 +38,8 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; +import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; /** * WS-Security sign & encrypt test case @@ -53,7 +53,7 @@ public static Test suite() { - return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war"); + return new JBossWSCXFTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war"); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2011-03-25 15:56:54 UTC (rev 13942) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2011-03-25 15:57:05 UTC (rev 13943) @@ -37,8 +37,8 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; +import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; /** * WS-Security sign test case @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSTestSetup(SignTestCase.class,"jaxws-samples-wsse-sign-client.jar jaxws-samples-wsse-sign.war"); + return new JBossWSCXFTestSetup(SignTestCase.class,"jaxws-samples-wsse-sign-client.jar jaxws-samples-wsse-sign.war"); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-03-25 15:56:54 UTC (rev 13942) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-03-25 15:57:05 UTC (rev 13943) @@ -49,8 +49,8 @@ @Override protected void setUp() throws Exception { + defaultBus = BusFactory.getDefaultBus(false); super.setUp(); - defaultBus = BusFactory.getDefaultBus(false); } @Override