Skip to content

Stabilizing JMS tests #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2019
Merged

Stabilizing JMS tests #663

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a862b15
Increase timeouts to 3 seconds
eyalkoren Jun 12, 2019
7399079
Adding a loop on receiveNoWait API test
eyalkoren Jun 12, 2019
53d19b7
Merge remote-tracking branch 'upstream/master' into increase-jms-time…
eyalkoren Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions ...t-plugins/apm-jms-plugin/src/test/java/co/elastic/apm/agent/jms/JmsInstrumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -122,7 +123,7 @@ public void testQueueSendReceiveOnTracedThread() throws Exception {
@Test
public void testQueueSendReceiveNoWaitOnTracedThread() throws Exception {
final Queue queue = brokerFacade.createQueue(TEST_Q_NAME);
testQueueSendReceiveOnTracedThread(() -> brokerFacade.receiveNoWait(queue), queue);
testQueueSendReceiveOnTracedThread(() -> loopReceive(() -> brokerFacade.receiveNoWait(queue), 3000), queue);
}

@Test
Expand All @@ -134,7 +135,23 @@ public void testQueueSendReceiveOnNonTracedThread() throws Exception {
@Test
public void testQueueSendReceiveNoWaitOnNonTracedThread() throws Exception {
final Queue queue = brokerFacade.createQueue(TEST_Q_NAME);
testQueueSendReceiveOnNonTracedThread(() -> brokerFacade.receiveNoWait(queue), queue);
testQueueSendReceiveOnNonTracedThread(() -> loopReceive(() -> brokerFacade.receiveNoWait(queue), 3000), queue);
}

// A utility method for testing the receiveNoWait API consistently
private Message loopReceive(Callable<Message> receiveMethod, @SuppressWarnings("SameParameterValue") long timeout) throws Exception {
Copy link
Member

@felixbarny felixbarny Jun 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consider using Awaitility

Copy link
Contributor Author

@eyalkoren eyalkoren Jun 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! But let's merge this now, and consider next time?

long start = System.currentTimeMillis();
long curr = start;
while (curr - start < timeout) {
Message ret = receiveMethod.call();
if (ret != null) {
return ret;
} else {
Thread.sleep(100);
curr = System.currentTimeMillis();
}
}
throw new TimeoutException();
}

private void testQueueSendReceiveOnTracedThread(Callable<Message> receiveMethod, Queue queue) throws Exception {
Expand Down