QPID-8334: [Broker-J] Stop using hamcrest deprecated matchers
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
index 5be5482..8e4f676 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
@@ -28,8 +28,8 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
@@ -79,7 +79,7 @@
if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -119,7 +119,7 @@
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -159,7 +159,7 @@
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -205,7 +205,7 @@
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
index dea12a3..ca7d4a7 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
@@ -29,8 +29,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
@@ -80,7 +80,7 @@
if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
index 0a45410..126c882 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
@@ -26,7 +26,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.oneOf;
import java.net.InetSocketAddress;
import java.util.HashMap;
@@ -127,7 +127,7 @@
payload.dispose();
}
assertThat(disposition.getFirst(), is(equalTo(deliveryId)));
- assertThat(disposition.getLast(), isOneOf(null, deliveryId));
+ assertThat(disposition.getLast(), oneOf(null, deliveryId));
assertThat(disposition.getSettled(), is(equalTo(false)));
}
}
@@ -187,7 +187,7 @@
payload.dispose();
}
assertThat(disposition.getFirst(), is(equalTo(deliveryId)));
- assertThat(disposition.getLast(), isOneOf(null, deliveryId));
+ assertThat(disposition.getLast(), oneOf(null, deliveryId));
assertThat(disposition.getSettled(), is(equalTo(false)));
assertThat(disposition.getState(), is(instanceOf(Accepted.class)));
}
@@ -327,7 +327,7 @@
.getLatestResponse(Disposition.class);
dispositionMap.put(disposition.getFirst(), disposition);
- assertThat(disposition.getLast(), isOneOf(null, disposition.getFirst()));
+ assertThat(disposition.getLast(), oneOf(null, disposition.getFirst()));
assertThat(disposition.getSettled(), is(equalTo(false)));
assertThat(disposition.getState(), is(instanceOf(Accepted.class)));
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
index da7f82a..53a8af6 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
@@ -29,10 +29,10 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.oneOf;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
@@ -706,7 +706,7 @@
Transfer second = interaction.consumeResponse(Transfer.class)
.getLatestResponse(Transfer.class);
- assertThat(second.getMore(), isOneOf(false, null));
+ assertThat(second.getMore(), oneOf(false, null));
messageDecoder.addTransfer(second);
assertThat(messageDecoder.getData(), is(equalTo(testMessageData)));
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
index ad56ea9..a98d76f 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
@@ -27,7 +27,7 @@
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isIn;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.typeCompatibleWith;
@@ -245,7 +245,7 @@
assertThat(remoteUnsettled.keySet(), is(not(empty())));
for (Binary deliveryTag : remoteUnsettled.keySet())
{
- assertThat(deliveryTag, isIn(localUnsettled.keySet()));
+ assertThat(deliveryTag, in(localUnsettled.keySet()));
}
assertThat(responseAttach2.getIncompleteUnsettled(), is(equalTo(true)));
}
@@ -428,7 +428,7 @@
assertThat(remoteUnsettled.keySet(), is(not(empty())));
for (Binary deliveryTag : remoteUnsettled.keySet())
{
- assertThat(deliveryTag, isIn(localUnsettled.keySet()));
+ assertThat(deliveryTag, in(localUnsettled.keySet()));
}
assertThat(resumingAttach.getIncompleteUnsettled(), is(equalTo(true)));
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
index 8dda12b..ac4e897 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
@@ -30,7 +30,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.oneOf;
import static org.junit.Assume.assumeThat;
import java.io.ByteArrayInputStream;
@@ -321,7 +321,7 @@
Map<String, Object> parentAttrs = Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE);
int response = getHelper().submitRequest(parentUrl, "PUT", parentAttrs);
- assertThat(response, is(isOneOf(SC_CREATED, SC_OK)));
+ assertThat(response, is(oneOf(SC_CREATED, SC_OK)));
final String childUrl = String.format("virtualhostloginclusionrule/%s/%s", loggerName, inclusionRuleName);
Map<String, Object> childAttrs = Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostNameAndLevelLogInclusionRule.TYPE);
