X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestDomain.java;h=bf7118df4d52973a5d94c5082970ada7f1d6092c;hb=9136e3e03b6881b32aada896be3241e46cbd33d9;hp=3eecd03f7238af5c7242046afac39d6fb4736c7e;hpb=0663237420a5ff2d138b9688a8634fcf37d1ac82;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestDomain.java b/tests/org/cacert/gigi/TestDomain.java
index 3eecd03f..bf7118df 100644
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -2,98 +2,86 @@ 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, "v1example.org");
+        assertEquals(0, d.getId());
+        d.insert();
+        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());
+        Domain d2 = new Domain(us, "v2-example.org");
+        assertEquals(0, d2.getId());
+        d2.insert();
 
-	}
+        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 {
+        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 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 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();
-		try {
-			d.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
+        }
+    }
 
 }