UPD: minor consistency cleanups

[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 582ecf33da24a4736ced0c3e1aa45ff8995cd7d1..5c242bef5ee57458ef395271711f50255416229b 100644 (file)
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -19,24 +19,27 @@ public class TestDomain extends ManagedTest {
     @Test
     public void testDomain() throws InterruptedException, GigiApiException {
         assertEquals(0, us.getDomains().length);
-        Domain d = new Domain(us, "v1.example.org");
+        Domain d = new Domain(us, "v1example.org");
         assertEquals(0, d.getId());
-        d.insert();
         Domain[] domains = us.getDomains();
         assertEquals(1, domains.length);
-        assertEquals("v1.example.org", domains[0].getSuffix());
+        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());
 
-        Domain d2 = new Domain(us, "v2.example.org");
+        Domain d2 = new Domain(us, "v2-example.org");
         assertEquals(0, d2.getId());
-        d2.insert();
 
         domains = us.getDomains();
         assertEquals(2, domains.length);
-        assertEquals("v2.example.org", domains[1].getSuffix());
+        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());
@@ -47,11 +50,9 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomain() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "dub.example.org");
-        d.insert();
+        Domain d = new Domain(us, "dub-example.org");
         try {
-            Domain d2 = new Domain(us, "dub.example.org");
-            d2.insert();
+            Domain d2 = new Domain(us, "dub-example.org");
             fail("expected exception");
         } catch (GigiApiException e) {
             // expected
@@ -60,43 +61,9 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomainDelete() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "del.example.org");
-        d.insert();
+        Domain d = new Domain(us, "delexample.org");
         d.delete();
-        Domain d2 = new Domain(us, "del.example.org");
-        d2.insert();
-    }
-
-    @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 testDoubleInsertDomain() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "dins.example.org");
-        d.insert();
-        try {
-            d.insert();
-            fail("expected exception");
-        } catch (GigiApiException e) {
-            // expected
-        }
+        Domain d2 = new Domain(us, "delexample.org");
     }
 
 }