X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestOrga.java;h=ff3a56cc82fd3bc998101d1fd400fe78edde5b2e;hp=91afa2e76b5fb34c969c3f189da4847b66fda711;hb=d0470c5987aaecbc444c7100319df69b6f740680;hpb=1198a01aa75975da0af93ec8928ce416e4da323b diff --git a/tests/org/cacert/gigi/TestOrga.java b/tests/org/cacert/gigi/TestOrga.java index 91afa2e7..ff3a56cc 100644 --- a/tests/org/cacert/gigi/TestOrga.java +++ b/tests/org/cacert/gigi/TestOrga.java @@ -4,25 +4,27 @@ import static org.junit.Assert.*; import java.io.IOException; +import org.cacert.gigi.dbObjects.Country; +import org.cacert.gigi.dbObjects.Country.CountryCodeType; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.Organisation; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.BusinessTest; import org.junit.Test; -public class TestOrga extends ManagedTest { +public class TestOrga extends BusinessTest { @Test public void testAddRm() throws GigiApiException, IOException { User u1 = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD)); - u1.grantGroup(u1, Group.ORGASSURER); + u1.grantGroup(getSupporter(), Group.ORGASSURER); User u2 = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD)); - u2.grantGroup(u1, Group.ORGASSURER); + u2.grantGroup(getSupporter(), Group.ORGASSURER); User u3 = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD)); - u3.grantGroup(u1, Group.ORGASSURER); + u3.grantGroup(getSupporter(), Group.ORGASSURER); User u4 = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD)); - u4.grantGroup(u1, Group.ORGASSURER); - Organisation o1 = new Organisation("name", "ST", "prov", "city", "email", "optional name", "postal address", u1); + u4.grantGroup(getSupporter(), Group.ORGASSURER); + Organisation o1 = new Organisation("name", Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), "prov", "city", "email", "optional name", "postal address", u1); assertEquals(0, o1.getAllAdmins().size()); o1.addAdmin(u2, u1, false); assertEquals(1, o1.getAllAdmins().size());