[jbossws-commits] JBossWS SVN: r3835 - in trunk/jbossws-core/src: test/java/org/jboss/test/ws/interop/wsa and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-07-10 04:23:15 -0400 (Tue, 10 Jul 2007)
New Revision: 3835

Modified:
   trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
Log:
Fix addressing tests

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java	2007-07-10 08:16:13 UTC (rev 3834)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java	2007-07-10 08:23:15 UTC (rev 3835)
@@ -29,6 +29,7 @@
    public static AddressingProperties createRequestProperties()
    {
       AddressingProperties addrProps = BUILDER.newAddressingProperties();
+      addrProps.setMessageID(BUILDER.newURI(generateMessageID()));
       return addrProps;
    }
 
@@ -40,6 +41,7 @@
       try
       {
          AddressingProperties addrProps = createRequestProperties();
+         addrProps.setMessageID(BUILDER.newURI(generateMessageID()));
          addrProps.setAction(BUILDER.newURI(wsaAction));
          addrProps.setTo(BUILDER.newURI(wsaTo));
          return addrProps;
@@ -59,7 +61,6 @@
       try
       {
          AddressingProperties addrProps = createDefaultProps(wsaAction, wsaTo);
-         addrProps.setMessageID(BUILDER.newURI(generateMessageID()));
          addrProps.setReplyTo(BUILDER.newEndpointReference(new URI(CONSTANTS.getAnonymousURI())));
          return addrProps;
       }
@@ -78,7 +79,6 @@
       try
       {
          AddressingProperties addrProps = createDefaultProps(wsaAction, wsaTo);
-         addrProps.setMessageID(BUILDER.newURI(generateMessageID()));
          addrProps.setReplyTo(BUILDER.newEndpointReference(new URI(CONSTANTS.getNoneURI())));
          return addrProps;
       }
@@ -99,23 +99,22 @@
    /**
     * generate a UUID based message id.
     */
-   public static URI generateMessageID() throws URISyntaxException
+   public static URI generateMessageID()
    {
-      URI messageId = new URI("urn:uuid:" + UUIDGenerator.generateRandomUUIDString());
-      return messageId;
-   }
-
-   public static AttributedURI createMessageID()
-   {
-      AttributedURI msgId = null;
+      URI messageId = null;
       try
       {
-         msgId = BUILDER.newURI(generateMessageID());
+         messageId = new URI("urn:uuid:" + UUIDGenerator.generateRandomUUIDString());
       }
       catch (URISyntaxException e)
       {
-         //
+         // Doesnt happen
       }
-      return msgId;
+      return messageId;
    }
+
+   public static AttributedURI createMessageID()
+   {
+      return BUILDER.newURI(generateMessageID());
+   }
 }

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java	2007-07-10 08:16:13 UTC (rev 3834)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java	2007-07-10 08:23:15 UTC (rev 3835)
@@ -72,7 +72,7 @@
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war");
+      return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war");
    }
 
    protected void setUp() throws Exception