X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fapi%2FIssueCert.java;h=f7ae0ed9d056135607369031c07722298e81c04e;hb=6ffbf3917844ee6e20f65db7f0b15cfc42315e5e;hp=d5302f9263f429d0e4e064d7687fbf9adae4771c;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git

diff --git a/tests/club/wpia/gigi/api/IssueCert.java b/tests/club/wpia/gigi/api/IssueCert.java
index d5302f92..f7ae0ed9 100644
--- a/tests/club/wpia/gigi/api/IssueCert.java
+++ b/tests/club/wpia/gigi/api/IssueCert.java
@@ -17,16 +17,16 @@ import java.security.cert.X509Certificate;
 
 import org.junit.Test;
 
-import club.wpia.gigi.api.CreateCertificate;
 import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.CSRType;
+import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
 import club.wpia.gigi.dbObjects.Country;
+import club.wpia.gigi.dbObjects.Country.CountryCodeType;
 import club.wpia.gigi.dbObjects.Digest;
 import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.Group;
 import club.wpia.gigi.dbObjects.Organisation;
-import club.wpia.gigi.dbObjects.Certificate.CSRType;
-import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
-import club.wpia.gigi.dbObjects.Country.CountryCodeType;
+import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.pages.account.certs.CertificateRequest;
 import club.wpia.gigi.testUtils.ClientTest;
 import club.wpia.gigi.testUtils.IOUtils;
@@ -73,8 +73,8 @@ public class IssueCert extends ClientTest {
     }
 
     @Test
-    public void testIssueCertAssured() throws Exception {
-        makeAssurer(id);
+    public void testIssueCertVerified() throws Exception {
+        makeAgent(id);
 
         String intendedName = "a b";
         String cert = issueCert(generatePEMCSR(kp, "EMAIL=" + email + ",CN=" + intendedName), "profile=client-a");
@@ -87,11 +87,12 @@ public class IssueCert extends ClientTest {
 
     @Test
     public void testIssueOrgCert() throws Exception {
-        makeAssurer(id);
-        u.grantGroup(getSupporter(), Group.ORGASSURER);
+        makeAgent(id);
+        User u2 = User.getById(createVerificationUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
+        u2.grantGroup(getSupporter(), Group.ORG_AGENT);
 
-        Organisation o1 = new Organisation("name", Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "pr", "st", "test@mail", "", "", u);
-        o1.addAdmin(u, u, false);
+        Organisation o1 = new Organisation("name", Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "pr", "st", "test@mail", "", "", u2);
+        o1.addAdmin(u, u2, false);
         String testdom = createUniqueName() + "-example.com";
         Domain d2 = new Domain(u, o1, testdom);
         verify(d2);