X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FTestMailManagement.java;h=6659a1e115cbacb5467aca7c3cbe8e75267ee8b0;hp=053aa32f5c604714e4a7250fbbb4e8be188969d2;hb=8af6231b22da4fef795bcb54913faad6592b1a02;hpb=f33edafe624206a6fb4b2bf442fe3a615613c6bd

diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
index 053aa32f..6659a1e1 100644
--- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java
+++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
@@ -6,134 +6,136 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URLEncoder;
+import java.util.Locale;
 
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
-import org.cacert.gigi.User;
-import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.ObjectCache;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.pages.account.mail.MailOverview;
+import org.cacert.gigi.testUtils.ClientTest;
 import org.junit.Test;
 
-public class TestMailManagement extends ManagedTest {
-	private User u = User
-		.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@example.org", TEST_PASSWORD));
-	private String cookie;
-	private String path = MailOverview.DEFAULT_PATH;
-
-	public TestMailManagement() throws IOException {
-		cookie = login(u.getEmail(), TEST_PASSWORD);
-		assertTrue(isLoggedin(cookie));
-	}
-
-	@Test
-	public void testMailAddInternal() throws InterruptedException, GigiApiException {
-		createVerifiedEmail(u);
-	}
-
-	@Test
-	public void testMailAddInternalFaulty() {
-		try {
-			new EmailAddress("kurti ", u);
-			fail();
-		} catch (IllegalArgumentException e) {
-			// Intended.
-		}
-	}
-
-	@Test
-	public void testMailAddWeb() throws MalformedURLException, UnsupportedEncodingException, IOException {
-		String newMail = createUniqueName() + "uni@example.org";
-		assertNull(executeBasicWebInteraction(cookie, path, "addmail&newemail=" + URLEncoder.encode(newMail, "UTF-8"),
-			1));
-		EmailAddress[] addrs = u.getEmails();
-		for (int i = 0; i < addrs.length; i++) {
-			if (addrs[i].getAddress().equals(newMail)) {
-				return;
-			}
-		}
-		fail();
-	}
-
-	@Test
-	public void testMailAddWebFaulty() throws MalformedURLException, UnsupportedEncodingException, IOException {
-		String newMail = createUniqueName() + "uniexample.org";
-		assertNotNull(executeBasicWebInteraction(cookie, path,
-			"addmail&newemail=" + URLEncoder.encode(newMail, "UTF-8"), 1));
-		EmailAddress[] addrs = u.getEmails();
-		for (int i = 0; i < addrs.length; i++) {
-			if (addrs[i].getAddress().equals(newMail)) {
-				fail();
-			}
-		}
-	}
-
-	@Test
-	public void testMailSetDefaultWeb() throws MalformedURLException, UnsupportedEncodingException, IOException,
-		InterruptedException, GigiApiException {
-		EmailAddress adrr = createVerifiedEmail(u);
-		assertNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
-		assertEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());
-	}
-
-	@Test
-	public void testMailSetDefaultWebUnverified() throws MalformedURLException, UnsupportedEncodingException,
-		IOException, InterruptedException, GigiApiException {
-		EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u);
-		adrr.insert(Language.getInstance("en"));
-		assertNotNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
-		assertNotEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());
-		getMailReciever().clearMails();
-	}
-
-	@Test
-	public void testMailSetDefaultWebInvalidID() throws MalformedURLException, UnsupportedEncodingException,
-		IOException, InterruptedException, GigiApiException {
-		User u2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@example.org", TEST_PASSWORD));
-		int id = -1;
-		EmailAddress[] emails = u2.getEmails();
-		for (int i = 0; i < emails.length; i++) {
-			if (emails[i].getAddress().equals(u2.getEmail())) {
-				id = emails[i].getId();
-			}
-		}
-		assertNotEquals(id, -1);
-		assertNotNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + id));
-		assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());
-		getMailReciever().clearMails();
-	}
-
-	@Test
-	public void testMailDeleteWeb() throws InterruptedException, GigiApiException, MalformedURLException,
-		UnsupportedEncodingException, IOException {
-		EmailAddress addr = createVerifiedEmail(u);
-		assertNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + addr.getId(), 0));
-		User u = User.getById(this.u.getId());
-		EmailAddress[] addresses = u.getEmails();
-		for (int i = 0; i < addresses.length; i++) {
-			assertNotEquals(addresses[i].getAddress(), addr.getAddress());
-		}
-	}
-
-	@Test
-	public void testMailDeleteWebMulti() throws InterruptedException, GigiApiException, MalformedURLException,
-		UnsupportedEncodingException, IOException {
-		EmailAddress[] addr = new EmailAddress[] { createVerifiedEmail(u), createVerifiedEmail(u) };
-		assertNull(executeBasicWebInteraction(cookie, path,
-			"delete&delid[]=" + addr[0].getId() + "&delid[]=" + addr[1].getId(), 0));
-		User u = User.getById(this.u.getId());
-		EmailAddress[] addresses = u.getEmails();
-		for (int i = 0; i < addresses.length; i++) {
-			assertNotEquals(addresses[i].getAddress(), addr[0].getAddress());
-			assertNotEquals(addresses[i].getAddress(), addr[1].getAddress());
-		}
-	}
-
-	@Test
-	public void testMailDeleteWebFaulty() throws MalformedURLException, UnsupportedEncodingException, IOException {
-		User u2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@test.tld", TEST_PASSWORD));
-		EmailAddress em = u2.getEmails()[0];
-		assertNotNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + em.getId(), 0));
-		u2 = User.getById(u2.getId());
-		assertNotEquals(u2.getEmails().length, 0);
-	}
+public class TestMailManagement extends ClientTest {
+
+    private String path = MailOverview.DEFAULT_PATH;
+
+    public TestMailManagement() throws IOException {
+        cookie = login(u.getEmail(), TEST_PASSWORD);
+        assertTrue(isLoggedin(cookie));
+    }
+
+    @Test
+    public void testMailAddInternal() throws InterruptedException, GigiApiException {
+        createVerifiedEmail(u);
+    }
+
+    @Test
+    public void testMailAddInternalFaulty() {
+        try {
+            new EmailAddress(u, "kurti ");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // Intended.
+        }
+    }
+
+    @Test
+    public void testMailAddWeb() throws MalformedURLException, UnsupportedEncodingException, IOException {
+        String newMail = createUniqueName() + "uni@example.org";
+        assertNull(executeBasicWebInteraction(cookie, path, "addmail&newemail=" + URLEncoder.encode(newMail, "UTF-8"), 1));
+        EmailAddress[] addrs = u.getEmails();
+        for (int i = 0; i < addrs.length; i++) {
+            if (addrs[i].getAddress().equals(newMail)) {
+                return;
+            }
+        }
+        fail();
+    }
+
+    @Test
+    public void testMailAddWebFaulty() throws MalformedURLException, UnsupportedEncodingException, IOException {
+        String newMail = createUniqueName() + "uniexample.org";
+        assertNotNull(executeBasicWebInteraction(cookie, path, "addmail&newemail=" + URLEncoder.encode(newMail, "UTF-8"), 1));
+        EmailAddress[] addrs = u.getEmails();
+        for (int i = 0; i < addrs.length; i++) {
+            if (addrs[i].getAddress().equals(newMail)) {
+                fail();
+            }
+        }
+    }
+
+    @Test
+    public void testMailSetDefaultWeb() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+        EmailAddress adrr = createVerifiedEmail(u);
+        assertNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
+        ObjectCache.clearAllCaches();
+        assertEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());
+    }
+
+    @Test
+    public void testMailSetDefaultWebUnverified() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+        EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
+        adrr.insert(Language.getInstance(Locale.ENGLISH));
+        assertNotNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
+        assertNotEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());
+        getMailReciever().clearMails();
+    }
+
+    @Test
+    public void testMailSetDefaultWebInvalidID() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+        User u2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@example.org", TEST_PASSWORD));
+        int id = -1;
+        EmailAddress[] emails = u2.getEmails();
+        for (int i = 0; i < emails.length; i++) {
+            if (emails[i].getAddress().equals(u2.getEmail())) {
+                id = emails[i].getId();
+            }
+        }
+        assertNotEquals(id, -1);
+        assertNotNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + id));
+        assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());
+        getMailReciever().clearMails();
+    }
+
+    @Test
+    public void testMailDeleteWeb() throws InterruptedException, GigiApiException, MalformedURLException, UnsupportedEncodingException, IOException {
+        EmailAddress addr = createVerifiedEmail(u);
+        assertNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + addr.getId(), 0));
+        User u = User.getById(this.u.getId());
+        EmailAddress[] addresses = u.getEmails();
+        for (int i = 0; i < addresses.length; i++) {
+            assertNotEquals(addresses[i].getAddress(), addr.getAddress());
+        }
+    }
+
+    @Test
+    public void testMailDeleteWebMulti() throws InterruptedException, GigiApiException, MalformedURLException, UnsupportedEncodingException, IOException {
+        EmailAddress[] addr = new EmailAddress[] {
+                createVerifiedEmail(u), createVerifiedEmail(u)
+        };
+        assertNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + addr[0].getId() + "&delid[]=" + addr[1].getId(), 0));
+        User u = User.getById(this.u.getId());
+        EmailAddress[] addresses = u.getEmails();
+        for (int i = 0; i < addresses.length; i++) {
+            assertNotEquals(addresses[i].getAddress(), addr[0].getAddress());
+            assertNotEquals(addresses[i].getAddress(), addr[1].getAddress());
+        }
+    }
+
+    @Test
+    public void testMailDeleteWebFaulty() throws MalformedURLException, UnsupportedEncodingException, IOException {
+        User u2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@test.tld", TEST_PASSWORD));
+        EmailAddress em = u2.getEmails()[0];
+        assertNotNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + em.getId(), 0));
+        u2 = User.getById(u2.getId());
+        assertNotEquals(u2.getEmails().length, 0);
+    }
+
+    @Test
+    public void testMailDeleteWebPrimary() throws MalformedURLException, UnsupportedEncodingException, IOException {
+        assertNotNull(executeBasicWebInteraction(cookie, path, "delete&delid[]=" + u.getEmails()[0].getId(), 0));
+        assertNotEquals(u.getEmails().length, 0);
+    }
 }