X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fpages%2Faccount%2FTestCertificateRequest.java;h=bb6c575d7ed81d4457c0ac21951a8c3010ae2c3c;hp=da580ccf48cae58a5d4aac3db449dc5cb553266b;hb=6ffbf3917844ee6e20f65db7f0b15cfc42315e5e;hpb=be0c267ced95d9e08e179ad222439198b0176ac6 diff --git a/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java b/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java index da580ccf..bb6c575d 100644 --- a/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java +++ b/tests/club/wpia/gigi/pages/account/TestCertificateRequest.java @@ -16,7 +16,6 @@ import club.wpia.gigi.dbObjects.EmailAddress; import club.wpia.gigi.dbObjects.Group; import club.wpia.gigi.pages.account.certs.CertificateRequest; import club.wpia.gigi.testUtils.ClientTest; -import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; import club.wpia.gigi.util.AuthorizationContext; import club.wpia.gigi.util.TimeConditions; @@ -27,7 +26,7 @@ public class TestCertificateRequest extends ClientTest { AuthorizationContext ac; public TestCertificateRequest() throws GeneralSecurityException, IOException, GigiApiException { - ac = new AuthorizationContext(u, u); + ac = new AuthorizationContext(u, u, false); makeAgent(u.getId()); } @@ -95,8 +94,8 @@ public class TestCertificateRequest extends ClientTest { public void testPingPeriodOneAddress() throws IOException, GeneralSecurityException, GigiApiException { // get new email address with last ping in past String furtherEmail = createUniqueName() + "@example.org"; - EmailAddress ea = new EmailAddress(u, furtherEmail, Locale.ENGLISH); - TestMail mail = getMailReceiver().receive(furtherEmail); + new EmailAddress(u, furtherEmail, Locale.ENGLISH); + getMailReceiver().receive(furtherEmail); try (GigiPreparedStatement stmt = new GigiPreparedStatement("UPDATE `emailPinglog` SET `status`='success'::`pingState`, `when` = (now() - interval '1 months' * ?::INTEGER) WHERE `email`=? ")) { stmt.setInt(1, TimeConditions.getInstance().getEmailPingMonths()); stmt.setString(2, furtherEmail); @@ -109,7 +108,7 @@ public class TestCertificateRequest extends ClientTest { cr.draft(); fail(); } catch (GigiApiException e) { - assertThat(e.getMessage(), containsString("needs an email ping within the past")); + assertThat(e.getMessage(), containsString("needs a verification via email ping within the past")); } } @@ -118,8 +117,8 @@ public class TestCertificateRequest extends ClientTest { public void testPingPeriodTwoAddresses() throws IOException, GeneralSecurityException, GigiApiException { // get new email address with last ping in past String furtherEmail = createUniqueName() + "@example.org"; - EmailAddress ea = new EmailAddress(u, furtherEmail, Locale.ENGLISH); - TestMail mail = getMailReceiver().receive(furtherEmail); + new EmailAddress(u, furtherEmail, Locale.ENGLISH); + getMailReceiver().receive(furtherEmail); try (GigiPreparedStatement stmt = new GigiPreparedStatement("UPDATE `emailPinglog` SET `status`='success'::`pingState`, `when` = (now() - interval '1 months' * ?::INTEGER) WHERE `email`=? ")) { stmt.setInt(1, TimeConditions.getInstance().getEmailPingMonths()); stmt.setString(2, furtherEmail); @@ -132,7 +131,7 @@ public class TestCertificateRequest extends ClientTest { cr.draft(); fail(); } catch (GigiApiException e) { - assertThat(e.getMessage(), containsString("needs an email ping within the past")); + assertThat(e.getMessage(), containsString("needs a verification via email ping within the past")); } }