8000 Merge branch 'stable' · CassOnMars/rabbitmq-java-client@dfe24bc · GitHub
[go: up one dir, main page]
Skip to content

Commit dfe24bc

Browse files
michaelklishinmichaelklishin
committed
Merge branch 'stable'
Conflicts: Makefile pom.xml src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java src/test/java/com/rabbitmq/client/test/ClientTests.java src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java src/test/java/com/rabbitmq/client/test/server/HATests.java src/test/java/com/rabbitmq/client/test/server/ServerTests.java
2 parents 9a0d02f + cb1d363 commit dfe24bc

File tree

3 files changed

+77
-78
lines changed

3 files changed

+77
-78
lines changed

‎src/test/java/com/rabbitmq/client/test/ClientTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import junit.framework.TestSuite;
2020

2121
public class ClientTests extends AbstractRMQTestSuite {
22-
23-
public static TestSuite suite() {
22+
public static TestSuite suite() {
2423
TestSuite suite = new TestSuite("client");
2524
suite.addTest(TableTest.suite());
2625
suite.addTest(LongStringTest.suite());

‎src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java

Lines changed: 56 additions & 55 deletions
35
Original file line numberDiff line numberDiff line change
@@ -24,60 +24,61 @@
2424
import junit.framework.TestSuite;
2525

2626
public class FunctionalTests extends AbstractRMQTestSuite {
27-
public static TestSuite suite() {
28-
TestSuite suite = new TestSuite("functional");
29-
if (!requiredProperties()) return suite;
30-
add(suite);
31-
return suite;
32-
}
27+
public static TestSuite suite() {
28+
TestSuite suite = new TestSuite("functional");
29+
if (!requiredProperties()) return suite;
30+
add(suite);
31+
return suite;
32+
}
3333

34-
public static void add(TestSuite suite) {
35-
suite.addTestSuite(ConnectionOpen.class);
36-
suite.addTestSuite(Heartbeat.class);
37-
suite.addTestSuite(Tables.class);
38-
suite.addTestSuite(DoubleDeletion.class);
39-
suite.addTestSuite(Routing.class);
40-
suite.addTestSuite(BindingLifecycle.class);
41-
suite.addTestSuite(Recover.class);
42-
suite.addTestSuite(Reject.class);
43-
suite.addTestSuite(Transactions.class);
44-
suite.addTestSuite(RequeueOnConnectionClose.class);
45-
suite.addTestSuite(RequeueOnChannelClose.class);
46-
suite.addTestSuite(DurableOnTransient.class);
47-
suite.addTestSuite(NoRequeueOnCancel.class);
48-
suite.addTestSuite(Bug20004Test.class);
49-
suite.addTestSuite(ExchangeDeleteIfUnused.class);
50-
suite.addTestSuite(QosTests.class);
51-
suite.addTestSuite(AlternateExchange.class);
52-
suite.addTestSuite(ExchangeExchangeBindings.class);
53-
suite.addTestSuite(ExchangeExchangeBindingsAutoDelete.class);
54-
suite.addTestSuite(ExchangeDeclare.class);
55-
suite.addTestSuite(FrameMax.class);
56-
suite.addTestSuite(QueueLifecycle.class);
57-
suite.addTestSuite(QueueLease.class);
58-
suite.addTestSuite(QueueExclusivity.class);
59-
suite.addTestSuite(QueueSizeLimit.class);
60-
suite.addTestSuite(InvalidAcks.class);
61-
suite.addTestSuite(InvalidAcksTx.class);
62-
suite.addTestSuite(DefaultExchange.class);
63-
suite.addTestSuite(UnbindAutoDeleteExchange.class);
64-
suite.addTestSuite(Confirm.class);
65-
suite.addTestSuite(ConsumerCancelNotification.class);
66-
suite.addTestSuite(UnexpectedFrames.class);
67-
suite.addTestSuite(PerQueueTTL.class);
68-
suite.addTestSuite(PerMessageTTL.class);
69-
suite.addTestSuite(PerQueueVsPerMessageTTL.class);
70-
suite.addTestSuite(DeadLetterExchange.class);
71-
suite.addTestSuite(SaslMechanisms.class);
72-
suite.addTestSuite(InternalExchange.class);
73-
suite.addTestSuite(CcRoutes.class);
74-
suite.addTestSuite(WorkPoolTests.class);
75-
suite.addTestSuite(HeadersExchangeValidation.class);
76-
suite.addTestSuite(ConsumerPriorities.class);
77-
suite.addTestSuite(Policies.class);
78-
suite.addTestSuite(ConnectionRecovery.class);
79-
suite.addTestSuite(ExceptionHandling.class);
80-
suite.addTestSuite(PerConsumerPrefetch.class);
81-
suite.addTestSuite(DirectReplyTo.class);
82-
}
34+
public static void add(TestSuite suite) {
+
suite.addTestSuite(ConnectionOpen.class);
36+
suite.addTestSuite(Heartbeat.class);
37+
suite.addTestSuite(Tables.class);
38+
suite.addTestSuite(DoubleDeletion.class);
39+
suite.addTestSuite(Routing.class);
40+
suite.addTestSuite(BindingLifecycle.class);
41+
suite.addTestSuite(Recover.class);
42+
suite.addTestSuite(Reject.class);
43+
suite.addTestSuite(Transactions.class);
44+
suite.addTestSuite(RequeueOnConnectionClose.class);
45+
suite.addTestSuite(RequeueOnChannelClose.class);
46+
suite.addTestSuite(DurableOnTransient.class);
47+
suite.addTestSuite(NoRequeueOnCancel.class);
48+
suite.addTestSuite(Bug20004Test.class);
49+
suite.addTestSuite(ExchangeDeleteIfUnused.class);
50+
suite.addTestSuite(QosTests.class);
51+
suite.addTestSuite(AlternateExchange.class);
52+
suite.addTestSuite(ExchangeExchangeBindings.class);
53+
suite.addTestSuite(ExchangeExchangeBindingsAutoDelete.class);
54+
suite.addTestSuite(ExchangeDeclare.class);
55+
suite.addTestSuite(FrameMax.class);
56+
suite.addTestSuite(QueueLifecycle.class);
57+
suite.addTestSuite(QueueLease.class);
58+
suite.addTestSuite(QueueExclusivity.class);
59+
suite.addTestSuite(QueueSizeLimit.class);
60+
suite.addTestSuite(InvalidAcks.class);
61+
suite.addTestSuite(InvalidAcksTx.class);
62+
suite.addTestSuite(DefaultExchange.class);
63+
suite.addTestSuite(UnbindAutoDeleteExchange.class);
64+
suite.addTestSuite(Confirm.class);
65+
suite.addTestSuite(ConsumerCancelNotification.class);
66+
suite.addTestSuite(UnexpectedFrames.class);
67+
suite.addTestSuite(PerQueueTTL.class);
68+
suite.addTestSuite(PerMessageTTL.class);
69+
suite.addTestSuite(PerQueueVsPerMessageTTL.class);
70+
suite.addTestSuite(DeadLetterExchange.class);
71+
suite.addTestSuite(SaslMechanisms.class);
72+
suite.addTestSuite(UserIDHeader.class);
73+
suite.addTestSuite(InternalExchange.class);
74+
suite.addTestSuite(CcRoutes.class);
75+
suite.addTestSuite(WorkPoolTests.class);
76+
suite.addTestSuite(HeadersExchangeValidation.class);
77+
suite.addTestSuite(ConsumerPriorities.class);
78+
suite.addTestSuite(Policies.class);
79+
suite.addTestSuite(ConnectionRecovery.class);
80+
suite.addTestSuite(ExceptionHandling.class);
81+
suite.addTestSuite(PerConsumerPrefetch.class);
82+
suite.addTestSuite(DirectReplyTo.class);
83+
}
8384
}

‎src/test/java/com/rabbitmq/client/test/server/ServerTests.java

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,37 @@
1313
// If you have any questions regarding licensing, please contact us at
1414
// info@rabbitmq.com.
1515

16+
1617
package com.rabbitmq.client.test.server;
1718

1819
import junit.framework.TestSuite;
19-
import org.junit.runner.RunWith;
20-
import org.junit.runners.Suite;
2120

2221
import com.rabbitmq.client.test.AbstractRMQTestSuite;
2322

2423
public class ServerTests extends AbstractRMQTestSuite {
2524

26-
public static TestSuite suite() {
25+
public static TestSuite suite() {
2726
TestSuite suite = new TestSuite("server-tests");
28-
if (!requiredProperties()) return suite;
27+
if (!requiredProperties()) return suite;
2928
add(suite);
3029
return suite;
3130
}
3231

33-
public static void add(TestSuite suite) {
34-
suite.addTestSuite(Permissions.class);
35-
suite.addTestSuite(DurableBindingLifecycle.class);
36-
suite.addTestSuite(DeadLetterExchangeDurable.class);
37-
suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
38-
suite.addTestSuite(ExclusiveQueueDurability.class);
39-
suite.addTestSuite(AbsentQueue.class);
40-
suite.addTestSuite(AlternateExchangeEquivalence.class);
41-
suite.addTestSuite(MemoryAlarms.class);
42-
suite.addTestSuite(MessageRecovery.class);
43-
suite.addTestSuite(Firehose.class);
44-
suite.addTestSuite(PersistenceGuarantees.class);
45-
suite.addTestSuite(Shutdown.class);
46-
suite.addTestSuite(BlockedConnection.class);
47-
suite.addTestSuite(ChannelLimitNegotiation.class);
48-
suite.addTestSuite(LoopbackUsers.class);
49-
}
32+
public static void add(TestSuite suite) {
33+
suite.addTestSuite(Permissions.class);
34+
suite.addTestSuite(DurableBindingLifecycle.class);
35+
suite.addTestSuite(DeadLetterExchangeDurable.class);
36+
suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
37+
suite.addTestSuite(ExclusiveQueueDurability.class);
38+
suite.addTestSuite(AbsentQueue.class);
39+
suite.addTestSuite(AlternateExchangeEquivalence.class);
40+
suite.addTestSuite(MemoryAlarms.class);
41+
suite.addTestSuite(MessageRecovery.class);
42+
suite.addTestSuite(Firehose.class);
43+
suite.addTestSuite(PersistenceGuarantees.class);
44+
suite.addTestSuite(Shutdown.class);
45+
suite.addTestSuite(BlockedConnection.class);
46+
suite.addTestSuite(ChannelLimitNegotiation.class);
47+
suite.addTestSuite(LoopbackUsers.class);
48+
}
5049
}

0 commit comments

Comments
 (0)
0