Skip to content

Commit 61d6c27

Browse files
author
Matthew Sackman
committed
Merging heads
2 parents 8e133c3 + a849d7d commit 61d6c27

File tree

2 files changed

+63
-63
lines changed

2 files changed

+63
-63
lines changed

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,58 +41,58 @@
4141

4242
public class ExchangeDeclare extends BrokerTestCase {
4343

44-
static final String TYPE = "direct";
44+
static final String TYPE = "direct";
4545

46-
static final String NAME = "exchange_test";
46+
static final String NAME = "exchange_test";
4747

48-
public void releaseResources() throws IOException {
49-
channel.exchangeDelete(NAME);
50-
}
48+
public void releaseResources() throws IOException {
49+
channel.exchangeDelete(NAME);
50+
}
5151

52-
public static void verifyEquivalent(Channel channel, String name,
53-
String type, boolean durable, boolean autoDelete,
54-
Map<String, Object> args) throws IOException {
55-
channel.exchangeDeclarePassive(name);
56-
channel.exchangeDeclare(name, type, durable, autoDelete, args);
57-
}
52+
public static void verifyEquivalent(Channel channel, String name,
53+
String type, boolean durable, boolean autoDelete,
54+
Map<String, Object> args) throws IOException {
55+
channel.exchangeDeclarePassive(name);
56+
channel.exchangeDeclare(name, type, durable, autoDelete, args);
57+
}
5858

59-
// Note: this will close the channel
60-
public static void verifyNotEquivalent(Channel channel, String name,
61-
String type, boolean durable, boolean autoDelete,
62-
Map<String, Object> args) throws IOException {
63-
channel.exchangeDeclarePassive(name);
64-
try {
65-
channel.exchangeDeclare(name, type, durable, autoDelete, args);
66-
fail("Exchange was supposed to be not equivalent");
67-
} catch (IOException ioe) {
68-
return;
69-
}
70-
}
59+
// Note: this will close the channel
60+
public static void verifyNotEquivalent(Channel channel, String name,
61+
String type, boolean durable, boolean autoDelete,
62+
Map<String, Object> args) throws IOException {
63+
channel.exchangeDeclarePassive(name);
64+
try {
65+
channel.exchangeDeclare(name, type, durable, autoDelete, args);
66+
fail("Exchange was supposed to be not equivalent");
67+
} catch (IOException ioe) {
68+
return;
69+
}
70+
}
7171

72-
public void testExchangeNoArgsEquivalence() throws IOException {
73-
channel.exchangeDeclare(NAME, TYPE, false, false, null);
74-
verifyEquivalent(channel, NAME, TYPE, false, false, null);
75-
}
72+
public void testExchangeNoArgsEquivalence() throws IOException {
73+
channel.exchangeDeclare(NAME, TYPE, false, false, null);
74+
verifyEquivalent(channel, NAME, TYPE, false, false, null);
75+
}
7676

77-
public void testExchangeNonsenseArgsEquivalent() throws IOException {
78-
channel.exchangeDeclare(NAME, TYPE, false, false, null);
79-
Map<String, Object> args = new HashMap<String, Object>();
80-
args.put("nonsensical-argument-surely-not-in-use", "foo");
81-
verifyEquivalent(channel, NAME, TYPE, false, false, args);
82-
}
77+
public void testExchangeNonsenseArgsEquivalent() throws IOException {
78+
channel.exchangeDeclare(NAME, TYPE, false, false, null);
79+
Map<String, Object> args = new HashMap<String, Object>();
80+
args.put("nonsensical-argument-surely-not-in-use", "foo");
81+
verifyEquivalent(channel, NAME, TYPE, false, false, args);
82+
}
8383

84-
public void testExchangeDurableNotEquivalent() throws IOException {
85-
channel.exchangeDeclare(NAME, TYPE, false, false, null);
86-
verifyNotEquivalent(channel, NAME, TYPE, true, false, null);
87-
}
84+
public void testExchangeDurableNotEquivalent() throws IOException {
85+
channel.exchangeDeclare(NAME, TYPE, false, false, null);
86+
verifyNotEquivalent(channel, NAME, TYPE, true, false, null);
87+
}
8888

89-
public void testExchangeTypeNotEquivalent() throws IOException {
90-
channel.exchangeDeclare(NAME, "direct", false, false, null);
91-
verifyNotEquivalent(channel, NAME, "fanout", false, false, null);
92-
}
89+
public void testExchangeTypeNotEquivalent() throws IOException {
90+
channel.exchangeDeclare(NAME, "direct", false, false, null);
91+
verifyNotEquivalent(channel, NAME, "fanout", false, false, null);
92+
}
9393

94-
public void testExchangeAutoDeleteNotEquivalent() throws IOException {
95-
channel.exchangeDeclare(NAME, "direct", false, false, null);
96-
verifyNotEquivalent(channel, NAME, "direct", false, true, null);
97-
}
98-
}
94+
public void testExchangeAutoDeleteNotEquivalent() throws IOException {
95+
channel.exchangeDeclare(NAME, "direct", false, false, null);
96+
verifyNotEquivalent(channel, NAME, "direct", false, true, null);
97+
}
98+
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@
3939
import com.rabbitmq.client.test.functional.ExchangeDeclare;
4040

4141
public class ExchangeEquivalence extends BrokerTestCase {
42-
static Map<String, Object> args = new HashMap<String, Object>();
43-
{
44-
args.put("alternate-exchange", "UME");
45-
}
42+
static Map<String, Object> args = new HashMap<String, Object>();
43+
{
44+
args.put("alternate-exchange", "UME");
45+
}
4646

47-
public void testAlternateExchangeEquivalence() throws IOException {
48-
channel.exchangeDeclare("alternate", "direct", false, false, args);
49-
ExchangeDeclare.verifyEquivalent(channel, "alternate", "direct", false,
50-
false, args);
51-
}
47+
public void testAlternateExchangeEquivalence() throws IOException {
48+
channel.exchangeDeclare("alternate", "direct", false, false, args);
49+
ExchangeDeclare.verifyEquivalent(channel, "alternate", "direct", false,
50+
false, args);
51+
}
5252

53-
public void testAlternateExchangeNonEquivalence() throws IOException {
54-
channel.exchangeDeclare("alternate", "direct", false, false, args);
55-
Map<String, Object> altargs = new HashMap<String, Object>();
56-
altargs.put("alternate-exchange", "somewhere");
57-
ExchangeDeclare.verifyNotEquivalent(channel, "alternate", "direct",
58-
false, false, altargs);
59-
}
60-
}
53+
public void testAlternateExchangeNonEquivalence() throws IOException {
54+
channel.exchangeDeclare("alternate", "direct", false, false, args);
55+
Map<String, Object> altargs = new HashMap<String, Object>();
56+
altargs.put("alternate-exchange", "somewhere");
57+
ExchangeDeclare.verifyNotEquivalent(channel, "alternate", "direct",
58+
false, false, altargs);
59+
}
60+
}

0 commit comments

Comments
 (0)