Merge "Suggestions to enhance the SQL call pattern."

[gigi.git] / tests / org / cacert / gigi / TestDomain.java

diff --git a/tests/org/cacert/gigi/TestDomain.java b/tests/org/cacert/gigi/TestDomain.java
index 3eecd03f7238af5c7242046afac39d6fb4736c7e..91f29c7a0389daaab33e9c25be80806c69218905 100644 (file)
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -2,98 +2,78 @@ package org.cacert.gigi;
 
 import static org.junit.Assert.*;
 
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
 public class TestDomain extends ManagedTest {
-       private User us;
 
-       public TestDomain() {
-               int uid = createVerifiedUser("fn", "ln", createUniqueName() + "pr@test-email.de", TEST_PASSWORD);
-               us = User.getById(uid);
-       }
+    private User us;
 
-       @Test
-       public void testDomain() throws InterruptedException, GigiApiException {
-               assertEquals(0, us.getDomains().length);
-               Domain d = new Domain(us, "v1.example.org");
-               assertEquals(0, d.getId());
-               d.insert();
-               Domain[] domains = us.getDomains();
-               assertEquals(1, domains.length);
-               assertEquals("v1.example.org", domains[0].getSuffix());
-               assertEquals(domains[0].getOwner().getId(), us.getId());
-               assertNotEquals(0, domains[0].getId());
-               assertNotEquals(0, d.getId());
-               assertEquals(d.getId(), domains[0].getId());
+    public TestDomain() {
+        int uid = createVerifiedUser("fn", "ln", createUniqueName() + "pr@test-email.de", TEST_PASSWORD);
+        us = User.getById(uid);
+    }
 
-               Domain d2 = new Domain(us, "v2.example.org");
-               assertEquals(0, d2.getId());
-               d2.insert();
+    @Test
+    public void testDomain() throws InterruptedException, GigiApiException {
+        assertEquals(0, us.getDomains().length);
+        Domain d = new Domain(us, us, "v1example.org");
+        Domain[] domains = us.getDomains();
+        assertEquals(1, domains.length);
+        assertEquals("v1example.org", domains[0].getSuffix());
+        assertEquals(domains[0].getOwner().getId(), us.getId());
+        assertNotEquals(0, domains[0].getId());
+        assertNotEquals(0, d.getId());
+        assertEquals(d.getId(), domains[0].getId());
 
-               domains = us.getDomains();
-               assertEquals(2, domains.length);
-               assertEquals("v2.example.org", domains[1].getSuffix());
-               assertEquals(domains[0].getOwner().getId(), us.getId());
-               assertEquals(domains[1].getOwner().getId(), us.getId());
-               assertNotEquals(0, domains[0].getId());
-               assertNotEquals(0, d.getId());
-               assertEquals(d.getId(), domains[0].getId());
+        new Domain(us, us, "v2-example.org");
 
-       }
+        domains = us.getDomains();
+        assertEquals(2, domains.length);
+        if ( !domains[1].getSuffix().equals("v2-example.org")) {
+            Domain d1 = domains[0];
+            domains[0] = domains[1];
+            domains[1] = d1;
+        }
+        assertEquals("v2-example.org", domains[1].getSuffix());
+        assertEquals(domains[0].getOwner().getId(), us.getId());
+        assertEquals(domains[1].getOwner().getId(), us.getId());
+        assertNotEquals(0, domains[0].getId());
+        assertNotEquals(0, d.getId());
+        assertEquals(d.getId(), domains[0].getId());
 
-       @Test
-       public void testDoubleDomain() throws InterruptedException, GigiApiException {
-               Domain d = new Domain(us, "dub.example.org");
-               d.insert();
-               try {
-                       Domain d2 = new Domain(us, "dub.example.org");
-                       d2.insert();
-                       fail("expected exception");
-               } catch (GigiApiException e) {
-                       // expected
-               }
-       }
+    }
 
-       @Test
-       public void testDoubleDomainDelete() throws InterruptedException, GigiApiException {
-               Domain d = new Domain(us, "del.example.org");
-               d.insert();
-               d.delete();
-               Domain d2 = new Domain(us, "del.example.org");
-               d2.insert();
-       }
+    @Test
+    public void testDoubleDomain() throws InterruptedException, GigiApiException {
+        new Domain(us, us, "dub-example.org");
+        try {
+            new Domain(us, us, "dub-example.org");
+            fail("expected exception, was able to insert domain (with different case) a second time");
+        } catch (GigiApiException e) {
+            // expected
+        }
+    }
 
-       @Test
-       public void testDoubleDomainPrefix() throws InterruptedException, GigiApiException {
-               Domain d = new Domain(us, "pref.aexample.org");
-               d.insert();
-               Domain d2 = new Domain(us, "a.pref.aexample.org");
-               try {
-                       d2.insert();
-                       fail("expected exception");
-               } catch (GigiApiException e) {
-                       // expected
-               }
-               Domain d3 = new Domain(us, "aexample.org");
-               try {
-                       d3.insert();
-                       fail("expected exception");
-               } catch (GigiApiException e) {
-                       // expected
-               }
-       }
+    @Test
+    public void testDoubleDomainCase() throws InterruptedException, GigiApiException {
+        Domain d = new Domain(us, us, "dub2-ExaMple.Org");
+        assertEquals("dub2-example.org", d.getSuffix());
+        try {
+            new Domain(us, us, "duB2-eXample.oRG");
+            fail("expected exception, was able to insert domain (with different case) a second time");
+        } catch (GigiApiException e) {
+            // expected
+        }
+    }
 
-       @Test
-       public void testDoubleInsertDomain() throws InterruptedException, GigiApiException {
-               Domain d = new Domain(us, "dins.example.org");
-               d.insert();
-               try {
-                       d.insert();
-                       fail("expected exception");
-               } catch (GigiApiException e) {
-                       // expected
-               }
-       }
+    @Test
+    public void testDoubleDomainDelete() throws InterruptedException, GigiApiException {
+        Domain d = new Domain(us, us, "delexample.org");
+        d.delete();
+        new Domain(us, us, "delexample.org");
+    }
 
 }