X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FTestCertificateRequest.java;h=4430605442d398b9aac7cdea847f04fb4c506b1a;hp=4d668b74caba6b6740d0086613876ec6355078dc;hb=dc10b875c132eb7840a6b9827ec93916076d34f7;hpb=b47144d6f3bf6b6eb1ec477de9d2af38256f074f diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java index 4d668b74..44306054 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java @@ -11,13 +11,17 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.pages.account.certs.CertificateRequest; import org.cacert.gigi.testUtils.ClientTest; +import org.cacert.gigi.util.AuthorizationContext; import org.junit.Test; public class TestCertificateRequest extends ClientTest { KeyPair kp = generateKeypair(); + AuthorizationContext ac; + public TestCertificateRequest() throws GeneralSecurityException, IOException { + ac = new AuthorizationContext(u, u); makeAssurer(u.getId()); grant(email, Group.CODESIGNING); @@ -26,7 +30,7 @@ public class TestCertificateRequest extends ClientTest { @Test public void testIssuingOtherName() throws Exception { try { - new CertificateRequest(u, generatePEMCSR(kp, "CN=hansi")).draft(); + new CertificateRequest(ac, generatePEMCSR(kp, "CN=hansi")).draft(); fail(); } catch (GigiApiException e) { assertThat(e.getMessage(), containsString("name you entered was invalid")); @@ -35,18 +39,18 @@ public class TestCertificateRequest extends ClientTest { @Test public void testIssuingDefault() throws Exception { - new CertificateRequest(u, generatePEMCSR(kp, "CN=" + CertificateRequest.DEFAULT_CN + ",EMAIL=" + email)).draft(); + new CertificateRequest(ac, generatePEMCSR(kp, "CN=" + CertificateRequest.DEFAULT_CN + ",EMAIL=" + email)).draft(); } @Test public void testIssuingRealName() throws Exception { - new CertificateRequest(u, generatePEMCSR(kp, "CN=a b,EMAIL=" + email)).draft(); + new CertificateRequest(ac, generatePEMCSR(kp, "CN=a b,EMAIL=" + email)).draft(); } @Test public void testIssuingModifiedName() throws Exception { try { - new CertificateRequest(u, generatePEMCSR(kp, "CN=a ab")).draft(); + new CertificateRequest(ac, generatePEMCSR(kp, "CN=a ab")).draft(); fail(); } catch (GigiApiException e) { assertThat(e.getMessage(), containsString("name you entered was invalid")); @@ -58,7 +62,7 @@ public class TestCertificateRequest extends ClientTest { @Test public void testCodesignModifiedName() throws Exception { try { - CertificateRequest cr = new CertificateRequest(u, generatePEMCSR(kp, "CN=a ab")); + CertificateRequest cr = new CertificateRequest(ac, generatePEMCSR(kp, "CN=a ab")); cr.update("name", "SHA512", "code-a", null, null, "email:" + email, null, null); } catch (GigiApiException e) { assertThat(e.getMessage(), containsString("does not match the details"));