From: INOPIAE <m.maengel@inopiae.de>
Date: Tue, 28 Jun 2016 09:05:49 +0000 (+0200)
Subject: upd: cleanup organisation test cases
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a515b0fa4bd4cb4f636d3a60c7f66ca9e16de67c

upd: cleanup organisation test cases

Change-Id: I281f57c04bdd2cc1316b6805d4aa1ed009b4b61a
---

diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java b/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java
index 806ec964..d1b930db 100644
--- a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java
+++ b/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java
@@ -7,18 +7,14 @@ import java.net.URLEncoder;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
-import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.Organisation;
-import org.cacert.gigi.testUtils.ClientTest;
+import org.cacert.gigi.testUtils.OrgTest;
 import org.junit.Test;
 
-public class TestOrgDomain extends ClientTest {
+public class TestOrgDomain extends OrgTest {
 
     public TestOrgDomain() throws IOException {
-        makeAssurer(u.getId());
-        u.grantGroup(u, Group.ORGASSURER);
-        clearCaches();
-        cookie = login(email, TEST_PASSWORD);
+
     }
 
     @Test
@@ -76,11 +72,6 @@ public class TestOrgDomain extends ClientTest {
         assertEquals(0, u.getDomains().length);
     }
 
-    private Organisation createUniqueOrg() throws GigiApiException {
-        Organisation o1 = new Organisation(createUniqueName(), "st", "pr", "city", "test@example.com", "", "", u);
-        return o1;
-    }
-
     @Test
     public void testBusinessAddInvalid() throws IOException, GigiApiException {
         Organisation o1 = createUniqueOrg();
diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
similarity index 87%
rename from tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java
rename to tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
index 7800d02f..4b8556c0 100644
--- a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java
+++ b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
@@ -11,23 +11,19 @@ import java.sql.SQLException;
 import java.util.List;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.Organisation.Affiliation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.account.MyDetails;
-import org.cacert.gigi.testUtils.ClientTest;
 import org.cacert.gigi.testUtils.IOUtils;
+import org.cacert.gigi.testUtils.OrgTest;
 import org.junit.After;
 import org.junit.Test;
 
-public class TestOrgaManagement extends ClientTest {
+public class TestOrgManagement extends OrgTest {
+
+    public TestOrgManagement() throws IOException {
 
-    public TestOrgaManagement() throws IOException {
-        u.grantGroup(u, Group.ORGASSURER);
-        makeAssurer(u.getId());
-        clearCaches();
-        cookie = login(email, TEST_PASSWORD);
     }
 
     @After
@@ -81,8 +77,8 @@ public class TestOrgaManagement extends ClientTest {
     @Test
     public void testNonAssurerSeeOnlyOwn() throws IOException, GigiApiException {
         User u2 = User.getById(createAssuranceUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
-        Organisation o1 = new Organisation("name21", "DE", "sder", "Rostov", "email", "", "", u);
-        Organisation o2 = new Organisation("name12", "DE", "sder", "Rostov", "email", "", "", u);
+        Organisation o1 = createUniqueOrg();
+        Organisation o2 = createUniqueOrg();
         o1.addAdmin(u2, u, false);
         String session2 = login(u2.getEmail(), TEST_PASSWORD);
 
@@ -91,8 +87,8 @@ public class TestOrgaManagement extends ClientTest {
 
         uc = get(session2, MyDetails.PATH);
         String content = IOUtils.readURL(uc);
-        assertThat(content, containsString("name21"));
-        assertThat(content, not(containsString("name12")));
+        assertThat(content, containsString(o1.getName()));
+        assertThat(content, not(containsString(o2.getName())));
         uc = get(session2, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId());
         assertEquals(403, ((HttpURLConnection) uc).getResponseCode());
         uc = get(session2, ViewOrgPage.DEFAULT_PATH + "/" + o2.getId());
@@ -100,8 +96,8 @@ public class TestOrgaManagement extends ClientTest {
 
         uc = get(ViewOrgPage.DEFAULT_PATH);
         content = IOUtils.readURL(uc);
-        assertThat(content, containsString("name21"));
-        assertThat(content, containsString("name12"));
+        assertThat(content, containsString(o1.getName()));
+        assertThat(content, containsString(o2.getName()));
         uc = get(ViewOrgPage.DEFAULT_PATH + "/" + o1.getId());
         assertEquals(200, ((HttpURLConnection) uc).getResponseCode());
         uc = get(ViewOrgPage.DEFAULT_PATH + "/" + o2.getId());
@@ -115,7 +111,7 @@ public class TestOrgaManagement extends ClientTest {
         User u2 = User.getById(createAssuranceUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
         User u3 = User.getById(createAssuranceUser("testmaster", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
         User u4_dummy = User.getById(createVerifiedUser("testmaster", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
-        Organisation o1 = new Organisation("name21", "DE", "sder", "Rostov", "email", "", "", u);
+        Organisation o1 = createUniqueOrg();
         o1.addAdmin(u3, u, true);
         try {
             // must fail because u4 is no assurer
diff --git a/tests/org/cacert/gigi/testUtils/OrgTest.java b/tests/org/cacert/gigi/testUtils/OrgTest.java
new file mode 100644
index 00000000..8ae7e2c9
--- /dev/null
+++ b/tests/org/cacert/gigi/testUtils/OrgTest.java
@@ -0,0 +1,22 @@
+package org.cacert.gigi.testUtils;
+
+import java.io.IOException;
+
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.Organisation;
+
+public class OrgTest extends ClientTest {
+
+    public OrgTest() throws IOException {
+        makeAssurer(u.getId());
+        u.grantGroup(u, Group.ORGASSURER);
+        clearCaches();
+        cookie = login(email, TEST_PASSWORD);
+    }
+
+    public Organisation createUniqueOrg() throws GigiApiException {
+        Organisation o1 = new Organisation(createUniqueName(), "st", "pr", "city", "test@example.com", "", "", u);
+        return o1;
+    }
+}