Author: mircea.markus Date: 2009-01-09 12:57:40 -0500 (Fri, 09 Jan 2009) New Revision: 7435 Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java Log: more detailed failure details Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-09 17:57:00 UTC (rev 7434) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-09 17:57:40 UTC (rev 7435) @@ -298,18 +298,23 @@ BuddyManager buddyBuddyManager = ((CacheSPI) buddy).getBuddyManager(); // lets test things on the data owner's side of things - if (onlyBuddy) assertEquals("Should only have one buddy", 1, dataOwnerBuddyManager.getBuddyAddresses().size()); + if (onlyBuddy) assertEquals("Should only have one buddy" + getViewsString(dataOwner, buddy), 1, dataOwnerBuddyManager.getBuddyAddresses().size()); - assertTrue(buddyLocalAddress + " should be a buddy to " + dataOwnerLocalAddress, dataOwnerBuddyManager.getBuddyAddresses().contains(buddyLocalAddress)); + assertTrue(buddyLocalAddress + " should be a buddy to " + dataOwnerLocalAddress + getViewsString(dataOwner, buddy), dataOwnerBuddyManager.getBuddyAddresses().contains(buddyLocalAddress)); // and now on the buddy end BuddyGroup group = buddyBuddyManager.buddyGroupsIParticipateIn.get(dataOwnerLocalAddress); - assertTrue("buddy's list of groups it participates in should contain data owner's group name", buddyBuddyManager.buddyGroupsIParticipateIn.containsKey(dataOwnerLocalAddress)); + assertTrue("buddy's list of groups it participates in should contain data owner's group name" + getViewsString(dataOwner, buddy), buddyBuddyManager.buddyGroupsIParticipateIn.containsKey(dataOwnerLocalAddress)); if (onlyBuddy) assertEquals(1, group.getBuddies().size()); - assertTrue(buddyLocalAddress + " should be a buddy to " + group.getGroupName(), group.getBuddies().contains(buddyLocalAddress)); + assertTrue(buddyLocalAddress + " should be a buddy to " + group.getGroupName() + getViewsString(dataOwner, buddy), group.getBuddies().contains(buddyLocalAddress)); } + private static String getViewsString(Cache dataOwner, Cache buddy) + { + return "[dataOwnerView: {" + dataOwner.getMembers()+ "}, buddyViewIs: {" + buddy.getMembers() + "}]"; + } + public static void waitForBuddy(Cache dataOwner, Cache buddy, boolean onlyBuddy) throws Exception { waitForBuddy(dataOwner, buddy, onlyBuddy, 60000);