Fix hamcrest deprecation warnings

This commit is contained in:
Richard Körber
2018-11-01 12:37:55 +01:00
parent 05841101fe
commit 45ddd96e3e
6 changed files with 12 additions and 12 deletions

View File

@@ -77,7 +77,7 @@ public class OrderHttpIT {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.until(auth::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING)));
.until(auth::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING)));
if (auth.getStatus() != Status.VALID) {
fail("Authorization failed");
@@ -97,7 +97,7 @@ public class OrderHttpIT {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.until(order::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING)));
.until(order::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING)));
Certificate certificate = order.getCertificate();
X509Certificate cert = certificate.getCertificate();

View File

@@ -196,7 +196,7 @@ public class OrderIT extends PebbleITBase {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.until(auth::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING)));
.until(auth::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING)));
if (auth.getStatus() != Status.VALID) {
fail("Authorization failed");
@@ -214,7 +214,7 @@ public class OrderIT extends PebbleITBase {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.until(order::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING, Status.READY)));
.until(order::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING, Status.READY)));
if (order.getStatus() != Status.VALID) {
fail("Order failed");

View File

@@ -99,7 +99,7 @@ public class OrderWildcardIT extends PebbleITBase {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.until(auth::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING)));
.until(auth::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING)));
if (auth.getStatus() != Status.VALID) {
fail("Authorization failed");
@@ -118,7 +118,7 @@ public class OrderWildcardIT extends PebbleITBase {
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.until(order::getStatus, not(isOneOf(Status.PENDING, Status.PROCESSING)));
.until(order::getStatus, not(oneOf(Status.PENDING, Status.PROCESSING)));
Certificate certificate = order.getCertificate();

View File

@@ -106,7 +106,7 @@ public abstract class PebbleITBase {
assertThat(url.getProtocol(), is("https"));
assertThat(url.getHost(), is(pebbleHost));
assertThat(url.getPort(), is(pebblePort));
assertThat(url.getPath(), not(isEmptyOrNullString()));
assertThat(url.getPath(), not(emptyOrNullString()));
}
/**