[jboss-cvs] JBossAS SVN: r68688 - trunk/testsuite/src/main/org/jboss/test/cluster/invokerha.

[jboss-cvs-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2008-01-08 15:26:28 -0500 (Tue, 08 Jan 2008)
New Revision: 68688

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java
Log:
[JBAS-5074] Assertion removed as it was based on incorrect MarshalledInvocation behaivor.

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java	2008-01-08 20:23:26 UTC (rev 68687)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java	2008-01-08 20:26:28 UTC (rev 68688)
@@ -222,14 +222,14 @@
          /* invoke on proxy passing the invocation */
          log.debug(timeTellerProxy.invoke(inv));
          /* assert post conditions after invocation */
-         chosenTargetsDateTimeTeller = assertSuccessfulPostConditions(inv, chosenTargetsDateTimeTeller, tx);
+         chosenTargetsDateTimeTeller = assertSuccessfulPostConditions(inv, chosenTargetsDateTimeTeller);
          
          /* create invocation to system time teller */
          inv = infrastructure.createSystemTimeTellerInvocation(tx, null);
          /* invoke on proxy passing the invocation */
          log.debug(systemTimeProxy.invoke(inv));
          /* assert post conditions after invocation */
-         chosenTargetsSystemTimeTeller = assertSuccessfulPostConditions(inv, chosenTargetsSystemTimeTeller, tx);
+         chosenTargetsSystemTimeTeller = assertSuccessfulPostConditions(inv, chosenTargetsSystemTimeTeller);
       }
       
       /* for the duration of a transaction, all chosen targets should be the same */
@@ -238,13 +238,11 @@
       chosenTargets = chosenTargetsDateTimeTeller;
    }
       
-   protected Set<Object> assertSuccessfulPostConditions(Invocation inv, Set<Object> chosenTargets, Transaction tx)
+   protected Set<Object> assertSuccessfulPostConditions(Invocation inv, Set<Object> chosenTargets)
    {
       assertEquals(0, inv.getAsIsValue("FAILOVER_COUNTER"));
       Object chosenTarget = inv.getTransientValue(invokerHaFactory.getChosenTargetKey());
       assertNotNull(chosenTarget);
-      /* if tx was null, invocation's tx should be null after invocation. */
-      assertEquals(tx, inv.getTransaction());
       /* check tx failover authorisations */
       assertTrue("transaction should have reached the server", invokerHaFactory.getTxFailoverAuthorizationsMap().containsKey(transactionalMockUtils.getTpcf().getUid()));
       /* add target to singleton set, there must only be one different target within a transaction */