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

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-10-18 06:34:07 -0400 (Tue, 18 Oct 2011)
New Revision: 15122

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
fixing test for AS7 - exception message is different

Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java	2011-10-18 10:28:07 UTC (rev 15121)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java	2011-10-18 10:34:07 UTC (rev 15122)
@@ -79,7 +79,14 @@
       }
       catch (Exception ex)
       {
-          assertEquals("Caller unauthorized", ex.getMessage());
+          if (isTargetJBoss6())
+          {
+             assertEquals("Caller unauthorized", ex.getMessage());
+          }
+          else
+          {
+             assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed"));
+          }
       }
    }
 

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:28:07 UTC (rev 15121)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:34:07 UTC (rev 15122)
@@ -1320,7 +1320,6 @@
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 
                  <!-- TODO: investigate -->
-                 <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude>
 
                  <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->