add: ensure that for Org Agent actions certificate login is used

[gigi.git] / tests / club / wpia / gigi / testUtils / OrgTest.java

diff --git a/tests/club/wpia/gigi/testUtils/OrgTest.java b/tests/club/wpia/gigi/testUtils/OrgTest.java
index e7360fe2a5c2ae6e55652dd27ecbff1203ee9beb..6c3ba7c4621651952aa12dcdc04b737481a6ef66 100644 (file)
--- a/tests/club/wpia/gigi/testUtils/OrgTest.java
+++ b/tests/club/wpia/gigi/testUtils/OrgTest.java
@@ -4,21 +4,28 @@ import java.io.IOException;
 
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.dbObjects.Country;
+import club.wpia.gigi.dbObjects.Country.CountryCodeType;
 import club.wpia.gigi.dbObjects.Group;
 import club.wpia.gigi.dbObjects.Organisation;
-import club.wpia.gigi.dbObjects.Country.CountryCodeType;
+import club.wpia.gigi.dbObjects.User;
 
 public class OrgTest extends ClientTest {
 
     public OrgTest() throws IOException, GigiApiException {
-        makeAssurer(u.getId());
-        u.grantGroup(getSupporter(), Group.ORGASSURER);
+        makeAgent(u.getId());
+        u.grantGroup(getSupporter(), Group.ORG_AGENT);
         clearCaches();
-        cookie = login(email, TEST_PASSWORD);
+        cookie = cookieWithCertificateLogin(u);
     }
 
     public Organisation createUniqueOrg() throws GigiApiException {
         Organisation o1 = new Organisation(createUniqueName(), Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "pr", "city", "test@example.com", "", "", u);
         return o1;
     }
+
+    public User createOrgAdmin(Organisation o) throws GigiApiException {
+        User ua = User.getById(createVerificationUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
+        o.addAdmin(ua, u, true);
+        return ua;
+    }
 }