From 45ddd96e3eb616ea416535203139949046ce947f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Thu, 1 Nov 2018 12:37:55 +0100 Subject: [PATCH] Fix hamcrest deprecation warnings --- .../shredzone/acme4j/connector/DefaultConnectionTest.java | 8 ++++---- .../test/java/org/shredzone/acme4j/toolbox/JSONTest.java | 2 +- .../java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java | 4 ++-- .../test/java/org/shredzone/acme4j/it/pebble/OrderIT.java | 4 ++-- .../org/shredzone/acme4j/it/pebble/OrderWildcardIT.java | 4 ++-- .../java/org/shredzone/acme4j/it/pebble/PebbleITBase.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java index 62f91f17..9034be17 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java @@ -603,7 +603,7 @@ public class DefaultConnectionTest { conn.sendSignedRequest(requestUrl, new JSONBuilder(), login); fail("Expected to fail"); } catch (AcmeProtocolException ex) { - assertThat(ex.getMessage(), not(isEmptyOrNullString())); + assertThat(ex.getMessage(), not(emptyOrNullString())); } catch (AcmeException ex) { fail("Did not expect an AcmeException"); } @@ -735,7 +735,7 @@ public class DefaultConnectionTest { assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}")); - assertThat(encodedSignature, not(isEmptyOrNullString())); + assertThat(encodedSignature, not(emptyOrNullString())); JsonWebSignature jws = new JsonWebSignature(); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); @@ -808,7 +808,7 @@ public class DefaultConnectionTest { assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedPayload), is("")); - assertThat(encodedSignature, not(isEmptyOrNullString())); + assertThat(encodedSignature, not(emptyOrNullString())); JsonWebSignature jws = new JsonWebSignature(); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); @@ -937,7 +937,7 @@ public class DefaultConnectionTest { assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}")); - assertThat(encodedSignature, not(isEmptyOrNullString())); + assertThat(encodedSignature, not(emptyOrNullString())); JsonWebSignature jws = new JsonWebSignature(); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java index 05b183bd..541a35e4 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java @@ -406,7 +406,7 @@ public class JSONTest { } assertThat(testJson, not(sameInstance(originalJson))); - assertThat(testJson.toString(), not(isEmptyOrNullString())); + assertThat(testJson.toString(), not(emptyOrNullString())); assertThat(testJson.toString(), is(sameJSONAs(originalJson.toString()))); } diff --git a/acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java b/acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java index 33b314dc..476aab3b 100644 --- a/acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java +++ b/acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java @@ -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(); diff --git a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java index 0362cab0..dd24573e 100644 --- a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java +++ b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java @@ -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"); diff --git a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java index f272c6c1..1e21adc2 100644 --- a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java +++ b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java @@ -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(); diff --git a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/PebbleITBase.java b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/PebbleITBase.java index ff233d7b..b904ad4b 100644 --- a/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/PebbleITBase.java +++ b/acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/PebbleITBase.java @@ -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())); } /**