From 8c9012b3054bc5785c68ca17e1372e88a9120c70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 27 Jun 2016 00:21:25 +0200 Subject: [PATCH] add: yet another org-domain testcase (org-add while in other org) Change-Id: Ic461858b6af635a09f346b8fd5f62754f2a8f743 --- .../cacert/gigi/pages/orga/TestOrgDomain.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java b/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java index 6d59f5ea..15eec419 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java +++ b/tests/org/cacert/gigi/pages/orga/TestOrgDomain.java @@ -23,7 +23,7 @@ public class TestOrgDomain extends ClientTest { @Test public void testAdd() throws IOException, GigiApiException { - Organisation o1 = new Organisation(createUniqueName(), "st", "pr", "city", "test@example.com", u); + Organisation o1 = createUniqueOrg(); String dom = createUniqueName() + ".de"; assertNull(executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId(), "addDomain&domain=" + URLEncoder.encode(dom, "UTF-8"), 3)); Domain[] d = o1.getDomains(); @@ -33,7 +33,7 @@ public class TestOrgDomain extends ClientTest { @Test public void testDel() throws IOException, GigiApiException { - Organisation o1 = new Organisation(createUniqueName(), "st", "pr", "city", "test@example.com", u); + Organisation o1 = createUniqueOrg(); String dom = createUniqueName() + ".de"; Domain d = new Domain(u, o1, dom); assertEquals(1, o1.getDomains().length); @@ -43,7 +43,7 @@ public class TestOrgDomain extends ClientTest { @Test public void testBusinessAddWhileUser() throws IOException, GigiApiException { - Organisation o1 = new Organisation(createUniqueName(), "st", "pr", "city", "test@example.com", u); + Organisation o1 = createUniqueOrg(); String dom = createUniqueName() + ".de"; new Domain(u, u, dom); try { @@ -58,8 +58,32 @@ public class TestOrgDomain extends ClientTest { } @Test - public void testBusinessAddInvalid() throws IOException, GigiApiException { + public void testBusinessAddWhileOtherOrg() throws IOException, GigiApiException { + Organisation o1 = createUniqueOrg(); + Organisation o2 = createUniqueOrg(); + + String dom = createUniqueName() + ".de"; + new Domain(u, o1, dom); + try { + new Domain(u, o2, dom); + fail("Was able to add domain twice."); + } catch (GigiApiException e) { + assertEquals("Domain could not be inserted. Domain is already known to the system.", e.getMessage()); + // expected + } + assertEquals(1, o1.getDomains().length); + assertEquals(0, o2.getDomains().length); + 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(); String dom = createUniqueName() + ".invalid-tld"; try { new Domain(u, o1, dom); -- 2.39.2