[jbossws-commits] JBossWS SVN: r16471 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 1 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-07-16 14:24:36 -0400 (Mon, 16 Jul 2012) New Revision: 16471 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3475] Enabling tests Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2012-07-16 18:05:28 UTC (rev 16470) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2012-07-16 18:24:36 UTC (rev 16471) @@ -188,11 +188,9 @@ } private static void rethrowAndHandleAuthWarning(Exception e) throws Exception { - final String msg = "Authentication failed"; - if (e.getMessage().contains(msg) || e.getCause().getMessage().contains(msg)) { - System.out.println("This test requires an user with 'guest' role to be available on the application server; " + - "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); - } + System.out.println("This test requires a testQueue JMS queue and a user with 'guest' role to be available on the application server; " + + "queue are easily added using jboss-cli.sh/bat, while users are added using add-user.sh/bat. When running test please specify user " + + "and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); throw e; } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2012-07-16 18:05:28 UTC (rev 16470) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2012-07-16 18:24:36 UTC (rev 16471) @@ -71,10 +71,9 @@ try { assertEquals("Hi", proxy.echo("Hi")); } catch (Exception e) { - if (e.getMessage().contains("Authentication failed")) { - System.out.println("This test requires an user with 'guest' role to be available on the application server; " + - "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); - } + System.out.println("This test requires a testQueue JMS queue and a user with 'guest' role to be available on the application server; " + + "queue are easily added using jboss-cli.sh/bat, while users are added using add-user.sh/bat. When running test please specify user " + + "and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); throw e; } } Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-16 18:05:28 UTC (rev 16470) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-16 18:24:36 UTC (rev 16471) @@ -1174,10 +1174,6 @@ <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - <!-- # [JBWS-3475] SOAP-over-JMS tests require test queue on target AS --> - <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> @@ -1378,10 +1374,6 @@ <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - <!-- # [JBWS-3475] SOAP-over-JMS tests require test queue on target AS --> - <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>