Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Test Timing Issues

Browse Source 
`template.getUnconfirmed(0)` won't return confirms pending in the
current millisecond. Change age to `-1`.
This commit is contained in:
Gary Russell
2014-11-13 13:06:21 -05:00
parent eda0540c8b
commit 5f45c3ee8a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplatePublisherCallbacksIntegrationTests.java
View File

@@ -150,7 +150,7 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
templateWithConfirmsEnabled.convertAndSend(ROUTE, (Object) "message", new CorrelationData("abc"));
}
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(0));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(-1));
this.templateWithConfirmsEnabled.execute(new ChannelCallback<Void>() {
@Override
@@ -212,7 +212,7 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
templateWithConfirmsEnabled.convertAndSend(ROUTE, (Object) "message", new CorrelationData("abc"));
threadLatch.countDown();
assertTrue(latch.await(5000, TimeUnit.MILLISECONDS));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(0));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(-1));
}
@Test
@@ -238,8 +238,8 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
secondTemplate.convertAndSend(ROUTE, (Object) "message", new CorrelationData("def"));
assertTrue(latch1.await(10, TimeUnit.SECONDS));
assertTrue(latch2.await(10, TimeUnit.SECONDS));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(0));
assertNull(secondTemplate.getUnconfirmed(0));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(-1));
assertNull(secondTemplate.getUnconfirmed(-1));
}
@Test
@@ -308,7 +308,7 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
});
template.convertAndSend(ROUTE, (Object) "message", new CorrelationData("abc"));
Thread.sleep(5);
Collection<CorrelationData> unconfirmed = template.getUnconfirmed(0);
Collection<CorrelationData> unconfirmed = template.getUnconfirmed(-1);
assertEquals(1, unconfirmed.size());
assertEquals("abc", unconfirmed.iterator().next().getId());
assertFalse(confirmed.get());
@@ -474,7 +474,7 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
template.convertAndSend(ROUTE, (Object) "message", new CorrelationData("def"));
callbackChannel.handleAck(2, true);
assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
Collection<CorrelationData> unconfirmed = template.getUnconfirmed(0);
Collection<CorrelationData> unconfirmed = template.getUnconfirmed(-1);
assertNull(unconfirmed);
}
@@ -537,9 +537,9 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
callbackChannel.handleAck(3, true);
assertTrue(latch1.await(1000, TimeUnit.MILLISECONDS));
assertTrue(latch2.await(1000, TimeUnit.MILLISECONDS));
Collection<CorrelationData> unconfirmed1 = template1.getUnconfirmed(0);
Collection<CorrelationData> unconfirmed1 = template1.getUnconfirmed(-1);
assertNull(unconfirmed1);
Collection<CorrelationData> unconfirmed2 = template2.getUnconfirmed(0);
Collection<CorrelationData> unconfirmed2 = template2.getUnconfirmed(-1);
assertNull(unconfirmed2);
assertTrue(confirms.contains("abc1"));
assertTrue(confirms.contains("def2"));
@@ -740,7 +740,7 @@ public class RabbitTemplatePublisherCallbacksIntegrationTests {
}
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(0));
assertNull(templateWithConfirmsEnabled.getUnconfirmed(-1));
}
}