From d890f14c5d2cb88fdb1129ceb233b4ebb722a58d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 18 Jan 2018 15:20:47 -0500 Subject: [PATCH] More JMS Test speed improvements - reduce timeouts for tests that expect to time out - reduce iterations --- ...questReplyScenariosWithCachedConsumersTests.java | 5 ++--- ...stReplyScenariosWithNonCachedConsumersTests.java | 5 ++--- ...questReplyScenariosWithTempReplyQueuesTests.java | 13 ++++--------- .../jms/request_reply/producer-cached-consumers.xml | 4 ++-- .../request_reply/producer-no-cached-consumers.xml | 4 ++-- 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java index 297acf55ec..bc2c55221c 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -166,8 +166,7 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti return message; }); }).start(); - org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); - assertEquals("bar", siReplyMessage.getPayload()); + gateway.exchange(new GenericMessage("foo")); } finally { context.close(); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java index 352f32ffb6..60313a5fe9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,8 +149,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu return message; }); }).start(); - org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); - assertEquals("bar", siReplyMessage.getPayload()); + gateway.exchange(new GenericMessage("foo")); } finally { context.close(); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java index 4da7cf00bc..7c0cf84290 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java @@ -17,6 +17,7 @@ package org.springframework.integration.jms.request_reply; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.ArrayList; @@ -25,6 +26,7 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.ConnectionFactory; @@ -211,7 +213,7 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti new ClassPathXmlApplicationContext("mult-producer-and-consumers-temp-reply.xml", this.getClass()); final RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class); ExecutorService executor = Executors.newFixedThreadPool(10); - final int testNumbers = 100; + final int testNumbers = 30; final CountDownLatch latch = new CountDownLatch(testNumbers); final AtomicInteger failures = new AtomicInteger(); final AtomicInteger timeouts = new AtomicInteger(); @@ -234,18 +236,11 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti failures.incrementAndGet(); } } -// if (latch.getCount()%100 == 0){ -// long count = testNumbers-latch.getCount(); -// if (count > 0){ -// print(failures, timeouts, missmatches, testNumbers-latch.getCount()); -// } -// } latch.countDown(); }); } - latch.await(); + assertTrue(latch.await(30, TimeUnit.SECONDS)); print(failures, timeouts, missmatches, testNumbers); - Thread.sleep(5000); assertEquals(0, missmatches.get()); assertEquals(0, failures.get()); assertEquals(0, timeouts.get()); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml index 84047847a5..78aa2c1a58 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml @@ -12,7 +12,7 @@ connection-factory="jmsConnectionFactory" request-destination="siOutQueueOptimizedA" reply-destination="siInQueueOptimizedA" - receive-timeout="10000" + receive-timeout="100" correlation-key="JMSCorrelationID"> @@ -73,7 +73,7 @@ diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml index d499f47cc4..f01b8125b9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml @@ -31,7 +31,7 @@ @@ -52,7 +52,7 @@