From 75fb61d3c3bb51d2bb43c0b28c12d521c32bed02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 15 Mar 2015 10:48:31 +0100 Subject: [PATCH] Fix: update testcase, only assurers may become org admins. Therefore the testcase should test with assurers. --- tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java | 3 ++- tests/org/cacert/gigi/testUtils/ManagedTest.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java index f0a07a80..ccb94145 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java +++ b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java @@ -22,6 +22,7 @@ public class TestOrgaManagement extends ClientTest { public TestOrgaManagement() throws IOException { u.grantGroup(u, Group.getByString("orgassurer")); + makeAssurer(u.getId()); clearCaches(); cookie = login(email, TEST_PASSWORD); } @@ -36,7 +37,7 @@ public class TestOrgaManagement extends ClientTest { assertEquals("Köln", orgs[0].getCity()); assertEquals("ÜÖÄß", orgs[0].getProvince()); - User u2 = User.getById(createVerifiedUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD)); + User u2 = User.getById(createAssuranceUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD)); executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1); List allAdmins = orgs[0].getAllAdmins(); assertEquals(1, allAdmins.size()); diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 584b10e4..45b90442 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -311,6 +311,12 @@ public class ManagedTest extends ConfiguredTest { public static int createAssuranceUser(String firstName, String lastName, String email, String password) { int uid = createVerifiedUser(firstName, lastName, email, password); + makeAssurer(uid); + + return uid; + } + + public static void makeAssurer(int uid) { GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?"); ps1.setInt(1, uid); ps1.setInt(2, 0); @@ -320,8 +326,6 @@ public class ManagedTest extends ConfiguredTest { ps2.setInt(1, uid); ps2.setInt(2, uid); ps2.execute(); - - return uid; } static String stripCookie(String headerField) { -- 2.39.2