You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/30 10:09:02 UTC
qpid-broker-j git commit: QPID-6933: [System Tests] Clean up tests
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 170b03cac -> dd1e90d66
QPID-6933: [System Tests] Clean up tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/dd1e90d6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/dd1e90d6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/dd1e90d6
Branch: refs/heads/master
Commit: dd1e90d663a4dc4c068d55c8ed2ed55cc48666fa
Parents: 170b03c
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Nov 30 10:08:42 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Nov 30 10:08:54 2017 +0000
----------------------------------------------------------------------
.../jms_1_1/acknowledge/AcknowledgeTest.java | 2 +-
.../jms_1_1/message/StreamMessageTest.java | 2 +-
.../jms_1_1/transaction/CommitRollbackTest.java | 92 +-------------------
3 files changed, 3 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd1e90d6/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/acknowledge/AcknowledgeTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/acknowledge/AcknowledgeTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/acknowledge/AcknowledgeTest.java
index ea50e38..5574176 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/acknowledge/AcknowledgeTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/acknowledge/AcknowledgeTest.java
@@ -42,7 +42,7 @@ public class AcknowledgeTest extends JmsTestBase
{
@Test
- public void testClientAckWithLargeFlusherPeriod() throws Exception
+ public void messageAcknowledgement() throws Exception
{
assumeThat(getBrokerAdmin().supportsRestart(), is(true));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd1e90d6/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/StreamMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/StreamMessageTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/StreamMessageTest.java
index 07b8926..a15fd4f 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/StreamMessageTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/StreamMessageTest.java
@@ -105,7 +105,7 @@ public class StreamMessageTest extends JmsTestBase
{
Queue queue = createQueue(getTestName());
final CountDownLatch awaitMessages = new CountDownLatch(1);
- final AtomicReference<Throwable> listenerCaughtException = new AtomicReference<Throwable>();
+ final AtomicReference<Throwable> listenerCaughtException = new AtomicReference<>();
Connection consumerConnection = getConnection();
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd1e90d6/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/transaction/CommitRollbackTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/transaction/CommitRollbackTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/transaction/CommitRollbackTest.java
index de11b97..b731eb7 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/transaction/CommitRollbackTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/transaction/CommitRollbackTest.java
@@ -20,20 +20,14 @@
*/
package org.apache.qpid.systests.jms_1_1.transaction;
-import static junit.framework.TestCase.fail;
import static org.apache.qpid.systests.Utils.INDEX;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -45,10 +39,6 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -552,7 +542,7 @@ public class CommitRollbackTest extends JmsTestBase
{
Message remaining = consumer.receive(getReceiveTimeout());
assertNotNull(String.format("Expected remaining message '%d' is not received", m), message);
- assertEquals("Received remained message out of order", m, remaining.getIntProperty(INDEX));
+ assertEquals("Received remaining message out of order", m, remaining.getIntProperty(INDEX));
}
LOGGER.debug(String.format("Rolling back transaction for message with index %d", expectedIndex));
@@ -574,84 +564,4 @@ public class CommitRollbackTest extends JmsTestBase
}
}
- @Test
- public void testRollbackSoak() throws Exception
- {
- final int messageNumber = 20;
- final int maximumRollbacks = messageNumber * 2;
- final int numberOfConsumers = 2;
- long timeout = getReceiveTimeout() * (maximumRollbacks + messageNumber);
- final AtomicInteger rollbackCounter = new AtomicInteger();
- final AtomicInteger commitCounter = new AtomicInteger();
- final AtomicBoolean shutdown = new AtomicBoolean();
- List<ListenableFuture<Void>> consumerFutures = new ArrayList<>(numberOfConsumers);
- final Queue queue = createQueue(getTestName());
- final Connection connection = getConnectionBuilder().setPrefetch(messageNumber / numberOfConsumers).build();
- try
- {
- Utils.sendMessages(connection, queue, messageNumber);
- final ListeningExecutorService threadPool =
- MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(numberOfConsumers));
- try
- {
- for (int i = 0; i < numberOfConsumers; ++i)
- {
- final Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
- final MessageConsumer consumer = session.createConsumer(queue);
- consumerFutures.add(threadPool.submit(() -> {
- do
- {
- Message m = consumer.receive(getReceiveTimeout());
- if (m != null)
- {
- if (rollbackCounter.incrementAndGet() <= maximumRollbacks)
- {
- session.rollback();
- }
- else
- {
- session.commit();
- commitCounter.incrementAndGet();
- }
- }
- }
- while (commitCounter.get() < messageNumber
- && !Thread.currentThread().isInterrupted()
- && !shutdown.get());
- return null;
- }));
- }
- connection.start();
-
- final ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(consumerFutures);
- try
- {
- combinedFuture.get(timeout, TimeUnit.MILLISECONDS);
- }
- catch (TimeoutException e)
- {
- fail(String.format(
- "Test took more than %.1f seconds. All consumers probably starved."
- + " Performed %d rollbacks, consumed %d/%d messages",
- timeout / 1000.,
- rollbackCounter.get(),
- commitCounter.get(),
- messageNumber));
- }
- finally
- {
- shutdown.set(true);
- }
- }
- finally
- {
- threadPool.shutdown();
- threadPool.awaitTermination(timeout, TimeUnit.MILLISECONDS);
- }
- }
- finally
- {
- connection.close();
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org