X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fmain%2FKeyCompromiseTestMessage.java;h=f9fb65641602f6412da5bcf4dbf34e2aa26ca398;hb=1fb06a8d7882c839d4b78319e96d1f5c01f261c2;hp=06a5ba5107c6418e7ab40799b2e59ce2c27fcbc2;hpb=079f745cc7a284e6964c568f83e1293929fd899f;p=gigi.git diff --git a/tests/club/wpia/gigi/pages/main/KeyCompromiseTestMessage.java b/tests/club/wpia/gigi/pages/main/KeyCompromiseTestMessage.java index 06a5ba51..f9fb6564 100644 --- a/tests/club/wpia/gigi/pages/main/KeyCompromiseTestMessage.java +++ b/tests/club/wpia/gigi/pages/main/KeyCompromiseTestMessage.java @@ -37,7 +37,7 @@ public class KeyCompromiseTestMessage extends ClientTest { KeyPair kp = generateKeypair(); priv = kp.getPrivate(); String csr = generatePEMCSR(kp, "CN=test"); - CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), csr); + CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u, false), csr); cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, null, "email:" + email + "\n"); cert = cr.draft(); Job j = cert.issue(null, "2y", u); @@ -92,7 +92,7 @@ public class KeyCompromiseTestMessage extends ClientTest { String data = IOUtils.readURL(rc); assertThat(data, hasError()); assertThat(data, CoreMatchers.containsString(HTMLEncoder.encodeHTML("message may not contain '---'"))); - assertNull(getMailReceiver().poll()); + assertNull(getMailReceiver().poll(null)); assertEquals(CertificateStatus.ISSUED, cert.getStatus()); } @@ -105,17 +105,17 @@ public class KeyCompromiseTestMessage extends ClientTest { assertEquals(CertificateStatus.ISSUED, cert.getStatus()); } - private TestMail reportCompromiseAndCheck(String params) throws IOException, UnsupportedEncodingException, CertificateEncodingException, GeneralSecurityException { + private TestMail reportCompromiseAndCheck(String params) throws IOException, UnsupportedEncodingException, CertificateEncodingException, GeneralSecurityException, GigiApiException { HttpURLConnection huc = reportCompromise(params); assertThat(IOUtils.readURL(huc), hasNoError()); - TestMail rc = getMailReceiver().receive(); + TestMail rc = getMailReceiver().receive(email); assertEquals(u.getEmail(), rc.getTo()); assertThat(rc.getMessage(), CoreMatchers.containsString(cert.getSerial())); assertEquals(CertificateStatus.REVOKED, cert.getStatus()); return rc; } - private HttpURLConnection reportCompromise(String params) throws IOException, UnsupportedEncodingException, CertificateEncodingException, GeneralSecurityException { + private HttpURLConnection reportCompromise(String params) throws IOException, UnsupportedEncodingException, CertificateEncodingException, GeneralSecurityException, GigiApiException { if ( !params.isEmpty() && !params.startsWith("&")) { params = "&" + params; }