fix: several testcases to the new configuration/structure

[gigi.git] / tests / org / cacert / gigi / pages / account / TestCertificateRequest.java

diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java
index ecea2326f0556cee5668b56fbcdd9fb9660abae9..4d668b74caba6b6740d0086613876ec6355078dc 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java
+++ b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java
@@ -3,10 +3,12 @@ package org.cacert.gigi.pages.account;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
 
 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.junit.Test;
@@ -15,31 +17,49 @@ public class TestCertificateRequest extends ClientTest {
 
     KeyPair kp = generateKeypair();
 
-    public TestCertificateRequest() throws GeneralSecurityException {}
+    public TestCertificateRequest() throws GeneralSecurityException, IOException {
+        makeAssurer(u.getId());
+        grant(email, Group.CODESIGNING);
+
+    }
 
     @Test
     public void testIssuingOtherName() throws Exception {
         try {
             new CertificateRequest(u, generatePEMCSR(kp, "CN=hansi")).draft();
+            fail();
         } catch (GigiApiException e) {
-            assertThat(e.getMessage(), containsString("does not match the details"));
+            assertThat(e.getMessage(), containsString("name you entered was invalid"));
         }
     }
 
     @Test
     public void testIssuingDefault() throws Exception {
-        new CertificateRequest(u, generatePEMCSR(kp, "CN=" + CertificateRequest.DEFAULT_CN)).draft();
+        new CertificateRequest(u, generatePEMCSR(kp, "CN=" + CertificateRequest.DEFAULT_CN + ",EMAIL=" + email)).draft();
     }
 
     @Test
     public void testIssuingRealName() throws Exception {
-        new CertificateRequest(u, generatePEMCSR(kp, "CN=a b")).draft();
+        new CertificateRequest(u, generatePEMCSR(kp, "CN=a b,EMAIL=" + email)).draft();
     }
 
     @Test
     public void testIssuingModifiedName() throws Exception {
         try {
             new CertificateRequest(u, generatePEMCSR(kp, "CN=a ab")).draft();
+            fail();
+        } catch (GigiApiException e) {
+            assertThat(e.getMessage(), containsString("name you entered was invalid"));
+        }
+
+    }
+
+    // TODO annotate that this depends on default config
+    @Test
+    public void testCodesignModifiedName() throws Exception {
+        try {
+            CertificateRequest cr = new CertificateRequest(u, 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"));
         }