github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix hamcrest deprecation warnings

pull/81/head
Richard Körber 2018-11-01 12:37:55 +01:00
parent 05841101fe
commit 45ddd96e3e
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java
View File

@ -603,7 +603,7 @@ public class DefaultConnectionTest {
conn.sendSignedRequest(requestUrl, new JSONBuilder(), login); conn.sendSignedRequest(requestUrl, new JSONBuilder(), login);
fail("Expected to fail"); fail("Expected to fail");
} catch (AcmeProtocolException ex) { } catch (AcmeProtocolException ex) {
assertThat(ex.getMessage(), not(isEmptyOrNullString())); assertThat(ex.getMessage(), not(emptyOrNullString()));
} catch (AcmeException ex) { } catch (AcmeException ex) {
fail("Did not expect an AcmeException"); fail("Did not expect an AcmeException");
} }
@ -735,7 +735,7 @@ public class DefaultConnectionTest {
assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString()));
assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}")); assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}"));
assertThat(encodedSignature, not(isEmptyOrNullString())); assertThat(encodedSignature, not(emptyOrNullString()));
JsonWebSignature jws = new JsonWebSignature(); JsonWebSignature jws = new JsonWebSignature();
jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature));
@ -808,7 +808,7 @@ public class DefaultConnectionTest {
assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString()));
assertThat(Base64Url.decodeToUtf8String(encodedPayload), is("")); assertThat(Base64Url.decodeToUtf8String(encodedPayload), is(""));
assertThat(encodedSignature, not(isEmptyOrNullString())); assertThat(encodedSignature, not(emptyOrNullString()));
JsonWebSignature jws = new JsonWebSignature(); JsonWebSignature jws = new JsonWebSignature();
jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature));
@ -937,7 +937,7 @@ public class DefaultConnectionTest {
assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString())); assertThat(Base64Url.decodeToUtf8String(encodedHeader), sameJSONAs(expectedHeader.toString()));
assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}")); assertThat(Base64Url.decodeToUtf8String(encodedPayload), sameJSONAs("{\"foo\":123,\"bar\":\"a-string\"}"));
assertThat(encodedSignature, not(isEmptyOrNullString())); assertThat(encodedSignature, not(emptyOrNullString()));
JsonWebSignature jws = new JsonWebSignature(); JsonWebSignature jws = new JsonWebSignature();
jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature)); jws.setCompactSerialization(CompactSerializer.serialize(encodedHeader, encodedPayload, encodedSignature));

2
acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java
View File

@ -406,7 +406,7 @@ public class JSONTest {
} }
assertThat(testJson, not(sameInstance(originalJson))); assertThat(testJson, not(sameInstance(originalJson)));
assertThat(testJson.toString(), not(isEmptyOrNullString())); assertThat(testJson.toString(), not(emptyOrNullString()));
assertThat(testJson.toString(), is(sameJSONAs(originalJson.toString()))); assertThat(testJson.toString(), is(sameJSONAs(originalJson.toString())));
} }

4
acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java
View File

@ -77,7 +77,7 @@ public class OrderHttpIT {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth)) .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) { if (auth.getStatus() != Status.VALID) {
fail("Authorization failed"); fail("Authorization failed");
@ -97,7 +97,7 @@ public class OrderHttpIT {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order)) .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(); Certificate certificate = order.getCertificate();
X509Certificate cert = certificate.getCertificate(); X509Certificate cert = certificate.getCertificate();

4
acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java
View File

@ -196,7 +196,7 @@ public class OrderIT extends PebbleITBase {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth)) .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) { if (auth.getStatus() != Status.VALID) {
fail("Authorization failed"); fail("Authorization failed");
@ -214,7 +214,7 @@ public class OrderIT extends PebbleITBase {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order)) .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) { if (order.getStatus() != Status.VALID) {
fail("Order failed"); fail("Order failed");

4
acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java
View File

@ -99,7 +99,7 @@ public class OrderWildcardIT extends PebbleITBase {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth)) .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) { if (auth.getStatus() != Status.VALID) {
fail("Authorization failed"); fail("Authorization failed");
@ -118,7 +118,7 @@ public class OrderWildcardIT extends PebbleITBase {
.pollInterval(1, SECONDS) .pollInterval(1, SECONDS)
.timeout(30, SECONDS) .timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order)) .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(); Certificate certificate = order.getCertificate();

2
acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/PebbleITBase.java
View File

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