Author: borges Date: 2011-08-11 13:09:49 -0400 (Thu, 11 Aug 2011) New Revision: 11190 Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java Log: HORNETQ-720 (test case) Restore original handler to channel after delayed backup is up-to-date. Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-08-11 17:09:12 UTC (rev 11189) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-08-11 17:09:49 UTC (rev 11190) @@ -381,7 +381,7 @@ ClientMessage message = consumer.receiveImmediate(); - Assert.assertNull("null message", message); + Assert.assertNull("message should be null! Was: " + message, message); session.close(); Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2011-08-11 17:09:12 UTC (rev 11189) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2011-08-11 17:09:49 UTC (rev 11190) @@ -94,7 +94,8 @@ for (int j = 0; j < LARGE_MESSAGE_SIZE; j++) { - Assert.assertEquals("equal at " + j, buffer.readByte(), UnitTestCase.getSamplebyte(j)); + Assert.assertTrue("expecting more bytes", buffer.readable()); + Assert.assertEquals("equal at " + j, UnitTestCase.getSamplebyte(j), buffer.readByte()); } } Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java 2011-08-11 17:09:12 UTC (rev 11189) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java 2011-08-11 17:09:49 UTC (rev 11190) @@ -111,6 +111,7 @@ finally { handler.setChannel(channel); + channel.setHandler(handler); onHold = null; } }