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 bf7118df4d52973a5d94c5082970ada7f1d6092c..91f29c7a0389daaab33e9c25be80806c69218905 100644 (file)
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -19,9 +19,7 @@ public class TestDomain extends ManagedTest {
     @Test
     public void testDomain() throws InterruptedException, GigiApiException {
         assertEquals(0, us.getDomains().length);
-        Domain d = new Domain(us, "v1example.org");
-        assertEquals(0, d.getId());
-        d.insert();
+        Domain d = new Domain(us, us, "v1example.org");
         Domain[] domains = us.getDomains();
         assertEquals(1, domains.length);
         assertEquals("v1example.org", domains[0].getSuffix());
@@ -30,9 +28,7 @@ public class TestDomain extends ManagedTest {
         assertNotEquals(0, d.getId());
         assertEquals(d.getId(), domains[0].getId());
 
-        Domain d2 = new Domain(us, "v2-example.org");
-        assertEquals(0, d2.getId());
-        d2.insert();
+        new Domain(us, us, "v2-example.org");
 
         domains = us.getDomains();
         assertEquals(2, domains.length);
@@ -52,36 +48,32 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomain() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "dub-example.org");
-        d.insert();
+        new Domain(us, us, "dub-example.org");
         try {
-            Domain d2 = new Domain(us, "dub-example.org");
-            d2.insert();
-            fail("expected exception");
+            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 testDoubleDomainDelete() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "delexample.org");
-        d.insert();
-        d.delete();
-        Domain d2 = new Domain(us, "delexample.org");
-        d2.insert();
-    }
-
-    @Test
-    public void testDoubleInsertDomain() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "dins-example.org");
-        d.insert();
+    public void testDoubleDomainCase() throws InterruptedException, GigiApiException {
+        Domain d = new Domain(us, us, "dub2-ExaMple.Org");
+        assertEquals("dub2-example.org", d.getSuffix());
         try {
-            d.insert();
-            fail("expected exception");
+            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 testDoubleDomainDelete() throws InterruptedException, GigiApiException {
+        Domain d = new Domain(us, us, "delexample.org");
+        d.delete();
+        new Domain(us, us, "delexample.org");
+    }
+
 }