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

Remove status GOOD

pull/55/head
Richard Körber 2017-04-30 16:37:36 +02:00
parent 710e876585
commit 203c986522
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acme4j-client/src/main/java/org/shredzone/acme4j/Status.java
View File

@ -20,7 +20,7 @@ import java.util.Arrays;
*/ */
public enum Status { public enum Status {
PENDING, PROCESSING, VALID, INVALID, REVOKED, DEACTIVATED, GOOD, UNKNOWN; PENDING, PROCESSING, VALID, INVALID, REVOKED, DEACTIVATED, UNKNOWN;
/** /**
* Parses the string and returns a corresponding Status object. * Parses the string and returns a corresponding Status object.

4
acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java
View File

@ -132,7 +132,7 @@ public class RegistrationTest {
assertThat(registration.getTermsOfServiceAgreed(), is(true)); assertThat(registration.getTermsOfServiceAgreed(), is(true));
assertThat(registration.getContacts(), hasSize(1)); assertThat(registration.getContacts(), hasSize(1));
assertThat(registration.getContacts().get(0), is(URI.create("mailto:foo2@example.com"))); assertThat(registration.getContacts().get(0), is(URI.create("mailto:foo2@example.com")));
assertThat(registration.getStatus(), is(Status.GOOD)); assertThat(registration.getStatus(), is(Status.VALID));
Iterator<Authorization> authIt = registration.getAuthorizations(); Iterator<Authorization> authIt = registration.getAuthorizations();
assertThat(authIt, not(nullValue())); assertThat(authIt, not(nullValue()));
@ -202,7 +202,7 @@ public class RegistrationTest {
// Subsequent queries do not trigger another load // Subsequent queries do not trigger another load
requestWasSent.set(false); requestWasSent.set(false);
assertThat(registration.getTermsOfServiceAgreed(), is(true)); assertThat(registration.getTermsOfServiceAgreed(), is(true));
assertThat(registration.getStatus(), is(Status.GOOD)); assertThat(registration.getStatus(), is(Status.VALID));
assertThat(requestWasSent.get(), is(false)); assertThat(requestWasSent.get(), is(false));
provider.close(); provider.close();

2
acme4j-client/src/test/resources/json/updateRegistrationResponse.json
View File

@ -2,7 +2,7 @@
"contact": [ "contact": [
"mailto:foo2@example.com" "mailto:foo2@example.com"
], ],
"status": "good", "status": "valid",
"terms-of-service-agreed": true, "terms-of-service-agreed": true,
"authorizations": "https://example.com/acme/reg/1/authz", "authorizations": "https://example.com/acme/reg/1/authz",
"certificates": "https://example.com/acme/reg/1/cert" "certificates": "https://example.com/acme/reg/1/cert"

8
acme4j-it/src/test/java/org/shredzone/acme4j/it/RegistrationIT.java
View File

@ -51,8 +51,8 @@ public class RegistrationIT extends PebbleITBase {
// Check registered data // Check registered data
assertThat(reg.getContacts(), contains(URI.create("mailto:acme@example.com"))); assertThat(reg.getContacts(), contains(URI.create("mailto:acme@example.com")));
// TODO PEBBLE: Sends UNKNOWN instead of GOOD // TODO PEBBLE: Sends UNKNOWN instead of VALID
// assertThat(reg.getStatus(), is(Status.GOOD)); // assertThat(reg.getStatus(), is(Status.VALID));
assertThat(reg.getTermsOfServiceAgreed(), is(true)); assertThat(reg.getTermsOfServiceAgreed(), is(true));
// Bind another Registration object // Bind another Registration object
@ -61,7 +61,7 @@ public class RegistrationIT extends PebbleITBase {
// Registration reg2 = Registration.bind(session2, location); // Registration reg2 = Registration.bind(session2, location);
// assertThat(reg2.getLocation(), is(location)); // assertThat(reg2.getLocation(), is(location));
// assertThat(reg2.getContacts(), contains(URI.create("mailto:acme@example.com"))); // assertThat(reg2.getContacts(), contains(URI.create("mailto:acme@example.com")));
// assertThat(reg2.getStatus(), is(Status.GOOD)); // assertThat(reg2.getStatus(), is(Status.VALID));
// assertThat(reg2.getTermsOfServiceAgreed(), is(true)); // assertThat(reg2.getTermsOfServiceAgreed(), is(true));
} }
@ -114,7 +114,7 @@ public class RegistrationIT extends PebbleITBase {
Session sessionNewKey = new Session(pebbleURI(), newKeyPair); Session sessionNewKey = new Session(pebbleURI(), newKeyPair);
Registration newRegistration = Registration.bind(sessionNewKey, location); Registration newRegistration = Registration.bind(sessionNewKey, location);
assertThat(newRegistration.getStatus(), is(Status.GOOD)); assertThat(newRegistration.getStatus(), is(Status.VALID));
} }
@Test @Test