ADD: cretaeVerifiedEmail fo testcases

diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
index 44bb5246b2f8fc4beb9f00bb48c14dcd349ac36d..119d4bc62216e93a626f7c03c4d150c497a70250 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java
+++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
@@ -12,7 +12,6 @@ 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.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.testUtils.ManagedTest;

-import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;

 import org.junit.Test;
 
 public class TestMailManagement extends ManagedTest {
 import org.junit.Test;
 
 public class TestMailManagement extends ManagedTest {


@@ -28,13 +27,7 @@ public class TestMailManagement extends ManagedTest {
 
        @Test
        public void testMailAddInternal() throws InterruptedException, GigiApiException {
 
        @Test
        public void testMailAddInternal() throws InterruptedException, GigiApiException {

-               EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u);
-               adrr.insert(Language.getInstance("en"));
-               TestMail testMail = getMailReciever().recieve();
-               assertTrue(adrr.getAddress().equals(testMail.getTo()));
-               String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
-               adrr.verify(hash);
-               getMailReciever().clearMails();
+               createVerifiedEmail(u);

        }
 
        @Test
        }
 
        @Test


@@ -77,15 +70,9 @@ public class TestMailManagement extends ManagedTest {
        @Test
        public void testMailSetDefaultWeb() throws MalformedURLException, UnsupportedEncodingException, IOException,
                InterruptedException, GigiApiException {
        @Test
        public void testMailSetDefaultWeb() throws MalformedURLException, UnsupportedEncodingException, IOException,
                InterruptedException, GigiApiException {

-               EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u);
-               adrr.insert(Language.getInstance("en"));
-               TestMail testMail = getMailReciever().recieve();
-               assertTrue(adrr.getAddress().equals(testMail.getTo()));
-               String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
-               adrr.verify(hash);
+               EmailAddress adrr = createVerifiedEmail(u);

                assertNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
                assertEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());
                assertNull(executeBasicWebInteraction(cookie, path, "makedefault&emailid=" + adrr.getId()));
                assertEquals(User.getById(u.getId()).getEmail(), adrr.getAddress());

-               getMailReciever().clearMails();

        }
 
        @Test
        }
 
        @Test


@@ -114,4 +101,5 @@ public class TestMailManagement extends ManagedTest {
                assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());
                getMailReciever().clearMails();
        }
                assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());
                getMailReciever().clearMails();
        }

+

 }
 }

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 1cca75aabab48cba6f7db728d3f88b17a81747d7..ec773a47f294104444a7e874b1359ce33b25f232 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -36,6 +36,10 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509KeyManager;
 
 import org.cacert.gigi.DevelLauncher;
 import javax.net.ssl.X509KeyManager;
 
 import org.cacert.gigi.DevelLauncher;

+import org.cacert.gigi.EmailAddress;
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.Language;
+import org.cacert.gigi.User;

 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;


@@ -423,4 +427,15 @@ public class ManagedTest {
                return error;
        }
 
                return error;
        }
 

+       public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
+               EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u);
+               adrr.insert(Language.getInstance("en"));
+               TestMail testMail = getMailReciever().recieve();
+               assertTrue(adrr.getAddress().equals(testMail.getTo()));
+               String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
+               adrr.verify(hash);
+               getMailReciever().clearMails();
+               return adrr;
+       }
+

 }
 }