[jboss-svn-commits] JBL Code SVN: r25142 - in labs/jbosstm/trunk/XTS: WS-C/tests/src/com/arjuna/wsc11/tests/junit and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Feb 6 11:02:27 EST 2009


Author: adinn
Date: 2009-02-06 11:02:26 -0500 (Fri, 06 Feb 2009)
New Revision: 25142

Modified:
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestContextFactory.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestRegistrar.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
Log:
updated unit tests to conform with changes introduced when fixing JBTM-347

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestContextFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestContextFactory.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestContextFactory.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -54,7 +54,7 @@
     }
 
     public CoordinationContext create(final String coordinationTypeURI,
-        final Long expires, final CoordinationContextType currentContext)
+        final Long expires, final CoordinationContextType currentContext, boolean isSecure)
         throws InvalidCreateParametersException
     {
         if (coordinationTypeURI.equals(TestUtil.INVALID_CREATE_PARAMETERS_COORDINATION_TYPE)) {

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestRegistrar.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestRegistrar.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestRegistrar.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -42,7 +42,7 @@
     {
     }
 
-    public W3CEndpointReference register(W3CEndpointReference participantProtocolService, String protocolIdentifier, InstanceIdentifier instanceIdentifier)
+    public W3CEndpointReference register(W3CEndpointReference participantProtocolService, String protocolIdentifier, InstanceIdentifier instanceIdentifier, boolean isSecure)
         throws AlreadyRegisteredException, InvalidProtocolException, InvalidStateException, NoActivityException
     {
         if (protocolIdentifier.equals(TestUtil.ALREADY_REGISTERED_PROTOCOL_IDENTIFIER))

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -44,9 +44,11 @@
     final private static String PROTOCOL_COORDINATOR_ENDPOINT_NAME ="ProtocolCoordinatorEndpoint";
     final private static String PROTOCOL_COORDINATOR_SERVICE_NAME ="ProtocolCoordinatorService";
 
-    final public static String activationCoordinatorService = "http://localhost:8080/ws-c11/ActivationService";
-    final public static String registrationCoordinatorService = "http://localhost:8080/ws-c11/RegistrationService";
+    final private static String bindHost = System.getProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_ADDRESS);
 
+    final public static String activationCoordinatorService = "http://" + bindHost + ":8080/ws-c11/ActivationService";
+    final public static String registrationCoordinatorService = "http://" + bindHost + ":8080/ws-c11/RegistrationService";
+
     final public static QName PROTOCOL_PARTICIPANT_SERVICE_QNAME = new QName(NAMESPACE, PROTOCOL_PARTICIPANT_SERVICE_NAME, TAG);
     final public static QName PROTOCOL_PARTICIPANT_ENDPOINT_QNAME = new QName(NAMESPACE, PROTOCOL_PARTICIPANT_ENDPOINT_NAME, TAG);
     final public static QName PROTOCOL_COORDINATOR_SERVICE_QNAME = new QName(NAMESPACE, PROTOCOL_COORDINATOR_SERVICE_NAME, TAG);

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -52,7 +52,7 @@
     private Map messageIdMap = new HashMap() ;
 
     public CreateCoordinationContextResponseType createCoordinationContext(final CreateCoordinationContextType createCoordinationContext,
-        final AddressingProperties addressingProperties)
+        final AddressingProperties addressingProperties, boolean isSecure)
     {
         final String messageId = addressingProperties.getMessageID().getURI().toString() ;
         synchronized(messageIdMap)

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -44,7 +44,7 @@
 {
     private Map messageIdMap = new HashMap() ;
 
-    public RegisterResponseType register(final RegisterType register, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+    public RegisterResponseType register(final RegisterType register, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext, boolean isSecure)
     {
         final String messageId = addressingProperties.getMessageID().getURI().toString() ;
         synchronized(messageIdMap)

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java	2009-02-06 15:49:56 UTC (rev 25141)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java	2009-02-06 16:02:26 UTC (rev 25142)
@@ -61,17 +61,19 @@
 
     public static final String NONEXISTENT_PARTICIPANT_IDENTIFIER                    = "NONE123456PI";
 
-    public static String participantServiceURI = "http://127.0.0.1:8080/ws-t11/ParticipantService";
-    public static String coordinatorServiceURI = "http://127.0.0.1:8080/ws-t11/CoordinatorService";
-    public static String completionInitiatorServiceURI = "http://127.0.0.1:8080/ws-t11/CompletionInitiatorService";
-    public static String completionCoordinatorServiceURI = "http://127.0.0.1:8080/ws-t11/CompletionCoordinatorService";
+    final private static String bindHost = System.getProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_ADDRESS);
+
+    public static String participantServiceURI = "http://" + bindHost + ":8080/ws-t11/ParticipantService";
+    public static String coordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CoordinatorService";
+    public static String completionInitiatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionInitiatorService";
+    public static String completionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionCoordinatorService";
     private static AttributedURI atomicTransactionFaultAction = null;
     private static AttributedURI businessActivityFaultAction = null;
 
-    public static String participantCompletionParticipantServiceURI = "http://127.0.0.1:8080/ws-t11/BusinessAgreementWithParticipantCompletionParticipantService";
-    public static String participantCompletionCoordinatorServiceURI = "http://127.0.0.1:8080/ws-t11/BusinessAgreementWithParticipantCompletionCoordinatorService";
-    public static String coordinatorCompletionParticipantServiceURI = "http://127.0.0.1:8080/ws-t11/BusinessAgreementWithCoordinatorCompletionParticipantService";
-    public static String coordinatorCompletionCoordinatorServiceURI = "http://127.0.0.1:8080/ws-t11/BusinessAgreementWithCoordinatorCompletionCoordinatorService";
+    public static String participantCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionParticipantService";
+    public static String participantCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionCoordinatorService";
+    public static String coordinatorCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionParticipantService";
+    public static String coordinatorCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionCoordinatorService";
 
     public static synchronized AttributedURI getAtomicTransactionFaultAction()
     {




More information about the jboss-svn-commits mailing list