upd: refactor tests to use convenience get-stuff

[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 5c242bef5ee57458ef395271711f50255416229b..00919975224b3cb9bd3740c624ab107008767559 100644 (file)
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -19,8 +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());
+        Domain d = new Domain(us, us, "v1example.org");
         Domain[] domains = us.getDomains();
         assertEquals(1, domains.length);
         assertEquals("v1example.org", domains[0].getSuffix());
@@ -29,8 +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());
+        new Domain(us, us, "v2-example.org");
 
         domains = us.getDomains();
         assertEquals(2, domains.length);
@@ -50,9 +48,9 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomain() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "dub-example.org");
+        new Domain(us, us, "dub-example.org");
         try {
-            Domain d2 = new Domain(us, "dub-example.org");
+            new Domain(us, us, "dub-example.org");
             fail("expected exception");
         } catch (GigiApiException e) {
             // expected
@@ -61,9 +59,9 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomainDelete() throws InterruptedException, GigiApiException {
-        Domain d = new Domain(us, "delexample.org");
+        Domain d = new Domain(us, us, "delexample.org");
         d.delete();
-        Domain d2 = new Domain(us, "delexample.org");
+        new Domain(us, us, "delexample.org");
     }
 
 }