[jbosscache-commits] JBoss Cache SVN: r7512 - in core/trunk/src/test/java/org/jboss/cache: util/internals/replicationlisteners and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-19 10:43:55 -0500 (Mon, 19 Jan 2009)
New Revision: 7512

Modified:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java
   core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java
   core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java
Log:
fixed tests

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java	2009-01-19 15:42:36 UTC (rev 7511)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java	2009-01-19 15:43:55 UTC (rev 7512)
@@ -25,7 +25,7 @@
 public class Buddy3NodesNoPoolNoDataGravitationTest extends AbstractNodeBasedBuddyTest
 {
 
-   List<ReplicationListener> replListener = new ArrayList<ReplicationListener>();
+   protected List<ReplicationListener> replListener = new ArrayList<ReplicationListener>();
 
    @BeforeClass
    public void createCaches() throws Exception
@@ -66,6 +66,7 @@
       finally
       {
          caches.get(2).start();
+         replListener.set(2, ReplicationListener.getReplicationListener(caches.get(2)));
       }
    }
 

Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java	2009-01-19 15:42:36 UTC (rev 7511)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java	2009-01-19 15:43:55 UTC (rev 7512)
@@ -27,7 +27,7 @@
     */
    public void expect(Class<? extends ReplicableCommand>... expectedCommands)
    {
-      //in the case of optimistic replication, an prepare and an commit is expected foe each node
+      //in the case of optimistic replication, an prepare and an commit is expected for each node
       for (Class<? extends ReplicableCommand> command : expectedCommands)
       {
          if (isRemoteCommand(command))

Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java	2009-01-19 15:42:36 UTC (rev 7511)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java	2009-01-19 15:43:55 UTC (rev 7512)
@@ -194,8 +194,8 @@
          }
          finally
          {
-            System.out.println("Processed command: " + realOne);
-            if (realOne instanceof ReplicateCommand)
+           log("Processed command: " + realOne);
+           if (realOne instanceof ReplicateCommand)
             {
                postReplicateExecution((ReplicateCommand)realOne);
             }
@@ -210,7 +210,7 @@
          }
       }
 
-      public int getCommandId()
+     public int getCommandId()
       {
          return realOne.getCommandId();
       }
@@ -324,9 +324,9 @@
     */
    public void waitForReplicationToOccur(long timeoutMillis)
    {
-      System.out.println("enter... ReplicationListener.waitForReplicationToOccur");
+      log("enter... ReplicationListener.waitForReplicationToOccur");
       waitForReplicationToOccur(timeoutMillis, TimeUnit.MILLISECONDS);
-      System.out.println("exit... ReplicationListener.waitForReplicationToOccur");
+      log("exit... ReplicationListener.waitForReplicationToOccur");
    }
 
    /**
@@ -389,4 +389,9 @@
             clazz.equals(ClusteredGetCommand.class) || clazz.equals(DataGravitationCleanupCommand.class) ||
             clazz.equals(RemoveFromBuddyGroupCommand.class) || clazz.equals(ReplicateCommand.class);
    }
+
+   private void log(String msg)
+   {
+      System.out.println("[" + localAddress + "]" + msg);
+   }
 }