fix: typo in receive

Change-Id: I8f89abd2afece11114873f81c8ac19b7a1000eff

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index cb575caf78190d3fb97bf33e0326beb242af57b6..3097062365111722586fc401c94dbc8926ec7343 100644 (file)
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -16,7 +16,7 @@ public class LoginTest extends ManagedTest {
     public void testLoginUnverified() throws IOException {
         String email = createUniqueName() + "@testmail.org";
         registerUser("an", "bn", email, TEST_PASSWORD);
     public void testLoginUnverified() throws IOException {
         String email = createUniqueName() + "@testmail.org";
         registerUser("an", "bn", email, TEST_PASSWORD);

-        getMailReciever().receive();
+        getMailReceiver().receive();

         assertFalse(isLoggedin(login(email, TEST_PASSWORD)));
     }
 
         assertFalse(isLoggedin(login(email, TEST_PASSWORD)));
     }
 

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index f3702b0457b8f3faa3d77d661cff3d9595a82db4..1a26f539f3c286edaf05d592b2c364e01cc63446 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -65,9 +65,9 @@ public class TestUser extends BusinessTest {
 
         User u = User.getById(id);
         new EmailAddress(u, uq + "b@email.org", Locale.ENGLISH);
 
         User u = User.getById(id);
         new EmailAddress(u, uq + "b@email.org", Locale.ENGLISH);

-        getMailReciever().receive().verify();
+        getMailReceiver().receive().verify();

         new EmailAddress(u, uq + "c@email.org", Locale.ENGLISH);
         new EmailAddress(u, uq + "c@email.org", Locale.ENGLISH);

-        getMailReciever().receive();// no-verify
+        getMailReceiver().receive();// no-verify

         verify(new Domain(u, u, uq + "a-testdomain.org"));
         verify(new Domain(u, u, uq + "b-testdomain.org"));
         verify(new Domain(u, u, uq + "c-testdomain.org"));
         verify(new Domain(u, u, uq + "a-testdomain.org"));
         verify(new Domain(u, u, uq + "b-testdomain.org"));
         verify(new Domain(u, u, uq + "c-testdomain.org"));

diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
index bf73cd38c9c2cd8ef63e729b964977ce46eb0147..fd4d4d499cc610fb341e04670653571c24df305e 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java
+++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
@@ -99,7 +99,7 @@ public class TestMailManagement extends ClientTest {
         EmailAddress addr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
         assertNotNull(executeBasicWebInteraction(cookie, path, "default=" + addr.getId()));
         assertNotEquals(User.getById(u.getId()).getEmail(), addr.getAddress());
         EmailAddress addr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
         assertNotNull(executeBasicWebInteraction(cookie, path, "default=" + addr.getId()));
         assertNotEquals(User.getById(u.getId()).getEmail(), addr.getAddress());

-        getMailReciever().clearMails();
+        getMailReceiver().clearMails();

     }
 
     @Test
     }
 
     @Test


@@ -115,7 +115,7 @@ public class TestMailManagement extends ClientTest {
         assertNotEquals(id, -1);
         assertNotNull(executeBasicWebInteraction(cookie, path, "default=" + id));
         assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());
         assertNotEquals(id, -1);
         assertNotNull(executeBasicWebInteraction(cookie, path, "default=" + id));
         assertNotEquals(User.getById(u.getId()).getEmail(), u2.getEmail());

-        getMailReciever().clearMails();
+        getMailReceiver().clearMails();

     }
 
     @Test
     }
 
     @Test

diff --git a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
index c40a5c20090c9a001582dd176176ea8eef3a335a..d39bfba2fe26c46f3c9bcbee70dce1daf588e9c2 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
+++ b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
@@ -33,7 +33,7 @@ public class TestPasswordResetExternal extends ClientTest {
         String error = fetchStartErrorMessage(IOUtils.readURL(uc));
         assertNull(error);
 
         String error = fetchStartErrorMessage(IOUtils.readURL(uc));
         assertNull(error);
 

-        TestMail mail = getMailReciever().receive();
+        TestMail mail = getMailReceiver().receive();

         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
         System.out.println(link);
         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
         System.out.println(link);

diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
index d1f0139f65d04927b69c2fd9c7156ac1a97bed8b..edcd43442c2646bd3bf0811d99320bd9e802a0c6 100644 (file)
--- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
+++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
@@ -52,7 +52,7 @@ public class TestSEAdminPageDetails extends ClientTest {
         int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
         String email2 = createUniqueName() + "@example.com";
         EmailAddress ea = new EmailAddress(User.getById(id), email2, Locale.ENGLISH);
         int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
         String email2 = createUniqueName() + "@example.com";
         EmailAddress ea = new EmailAddress(User.getById(id), email2, Locale.ENGLISH);

-        getMailReciever().receive().verify();
+        getMailReceiver().receive().verify();

         // Refresh email Object
         ObjectCache.clearAllCaches();
         ea = EmailAddress.getById(ea.getId());
         // Refresh email Object
         ObjectCache.clearAllCaches();
         ea = EmailAddress.getById(ea.getId());

diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index 7286f8a9beba78c4c42fe7b1e0338eac316b5aef..331aad38418c2ae012b3003fb11de8240deca262 100644 (file)
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -51,18 +51,18 @@ public class RegisterPageTest extends ManagedTest {
         assertNull(data);
         assertSuccessfullRegMail();
 
         assertNull(data);
         assertSuccessfullRegMail();
 

-        getMailReciever().setEmailCheckError("400 Greylisted");
-        getMailReciever().setApproveRegex(Pattern.compile("a"));
+        getMailReceiver().setEmailCheckError("400 Greylisted");
+        getMailReceiver().setApproveRegex(Pattern.compile("a"));

         query = defaultSignup + URLEncoder.encode("correct4_" + uniq + "@email.de", "UTF-8") + "&general=1&country=1&regional=1&radius=1";
         data = fetchStartErrorMessage(runRegister(query));
         assertNotNull(data);
 
         query = defaultSignup + URLEncoder.encode("correct4_" + uniq + "@email.de", "UTF-8") + "&general=1&country=1&regional=1&radius=1";
         data = fetchStartErrorMessage(runRegister(query));
         assertNotNull(data);
 

-        assertNull(getMailReciever().poll());
+        assertNull(getMailReceiver().poll());

 
     }
 
     private void assertSuccessfullRegMail() {
 
     }
 
     private void assertSuccessfullRegMail() {

-        String link = getMailReciever().receive().extractLink();
+        String link = getMailReceiver().receive().extractLink();

         assertTrue(link, link.startsWith("https://"));
     }
 
         assertTrue(link, link.startsWith("https://"));
     }
 


@@ -182,7 +182,7 @@ public class RegisterPageTest extends ManagedTest {
 
     @Test
     public void testInvalidMailbox() {
 
     @Test
     public void testInvalidMailbox() {

-        getMailReciever().setApproveRegex(Pattern.compile("a"));
+        getMailReceiver().setApproveRegex(Pattern.compile("a"));

         long uniq = System.currentTimeMillis();
         try {
             registerUser("RegisterTest", "User", "testInvalidMailbox" + uniq + "@cacert.org", TEST_PASSWORD);
         long uniq = System.currentTimeMillis();
         try {
             registerUser("RegisterTest", "User", "testInvalidMailbox" + uniq + "@cacert.org", TEST_PASSWORD);

diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/org/cacert/gigi/ping/TestDNS.java
index 8bb61461ecc745dddc8219919f445fd8cd2297e6..274fec0af15fc89f145f483671a1b8597d1fed5f 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestDNS.java
+++ b/tests/org/cacert/gigi/ping/TestDNS.java
@@ -73,7 +73,7 @@ public class TestDNS extends PingTest {
                 "&adddomain&csrf=" + csrf;
         String p2 = sendDomainForm(content);
 
                 "&adddomain&csrf=" + csrf;
         String p2 = sendDomainForm(content);
 

-        TestMail mail = getMailReciever().receive();
+        TestMail mail = getMailReceiver().receive();

         if (emailVariant == 0) {
             mail.verify();
         }
         if (emailVariant == 0) {
             mail.verify();
         }

diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java
index a1c5c7ae8e325700a20d2ab319f7c4965fb463d0..18dff3851e0219ab882e806f64d62d21f3c31028 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestHTTP.java
+++ b/tests/org/cacert/gigi/ping/TestHTTP.java
@@ -74,7 +74,7 @@ public class TestHTTP extends PingTest {
                 "&adddomain&csrf=" + csrf;
         String p2 = sendDomainForm(content);
 
                 "&adddomain&csrf=" + csrf;
         String p2 = sendDomainForm(content);
 

-        TestMail mail = getMailReciever().receive();
+        TestMail mail = getMailReceiver().receive();

         if (emailVariant == 0) {
             mail.verify();
         }
         if (emailVariant == 0) {
             mail.verify();
         }


@@ -172,7 +172,7 @@ public class TestHTTP extends PingTest {
         }
         waitForPings(2);
 
         }
         waitForPings(2);
 

-        TestMail mail = getMailReciever().receive();
+        TestMail mail = getMailReceiver().receive();

         mail.verify();
 
         String newcontent = IOUtils.readURL(get(p2));
         mail.verify();
 
         String newcontent = IOUtils.readURL(get(p2));

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index 85c74a414d7b5d717dc3d3df5d099c8132f1a490..e0c78bd0a0edae15ddc628cd5e471515422184d9 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestSSL.java
+++ b/tests/org/cacert/gigi/ping/TestSSL.java
@@ -205,7 +205,7 @@ public class TestSSL extends PingTest {
         boolean secondsSucceeds = sslVariant != 0;
         // assertTrue(secondsSucceeds ^ accept2);
 
         boolean secondsSucceeds = sslVariant != 0;
         // assertTrue(secondsSucceeds ^ accept2);
 

-        TestMail mail = getMailReciever().receive();
+        TestMail mail = getMailReceiver().receive();

         if (emailVariant == 0) {
             mail.verify();
         }
         if (emailVariant == 0) {
             mail.verify();
         }

diff --git a/tests/org/cacert/gigi/testUtils/BusinessTest.java b/tests/org/cacert/gigi/testUtils/BusinessTest.java
index dc62b3097cacc19a7145b3d8f1acea6dd3fca793..408b518bb50d0ee02de31561f34c64a3fbb93f41 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/BusinessTest.java
+++ b/tests/org/cacert/gigi/testUtils/BusinessTest.java
@@ -144,7 +144,7 @@ public abstract class BusinessTest extends ConfiguredTest {
     }
 
     @Override
     }
 
     @Override

-    public MailReceiver getMailReciever() {
+    public MailReceiver getMailReceiver() {

         return InVMEmail.getInstance();
     }
 }
         return InVMEmail.getInstance();
     }
 }

diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
index 808ddd678486dd0784e340d281aca7add3e3a4a1..1e4d49aee70417caae6ae9f85cb2127b9a1aa355 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
+++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
@@ -183,14 +183,14 @@ public abstract class ConfiguredTest {
         }
     }
 
         }
     }
 

-    public MailReceiver getMailReciever() {
+    public MailReceiver getMailReceiver() {

         throw new Error("Feature requires Business or ManagedTest.");
     }
 
     public void verify(Domain d) {
         try {
             d.addPing(DomainPingType.EMAIL, "admin");
         throw new Error("Feature requires Business or ManagedTest.");
     }
 
     public void verify(Domain d) {
         try {
             d.addPing(DomainPingType.EMAIL, "admin");

-            TestMail testMail = getMailReciever().receive();
+            TestMail testMail = getMailReceiver().receive();

             testMail.verify();
             assertTrue(d.isVerified());
         } catch (GigiApiException e) {
             testMail.verify();
             assertTrue(d.isVerified());
         } catch (GigiApiException e) {

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 1ea49cf404672be28a59b0175a91f36cc1cafe85..326cd975ab22e656c28c5fdd1344d1c98eeba937 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -215,7 +215,7 @@ public class ManagedTest extends ConfiguredTest {
     }
 
     @Override
     }
 
     @Override

-    public MailReceiver getMailReciever() {
+    public MailReceiver getMailReceiver() {

         return ter;
     }
 
         return ter;
     }
 


@@ -469,11 +469,11 @@ public class ManagedTest extends ConfiguredTest {
 
     public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
         EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
 
     public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
         EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);

-        TestMail testMail = getMailReciever().receive();
+        TestMail testMail = getMailReceiver().receive();

         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);
         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);

-        getMailReciever().clearMails();
+        getMailReceiver().clearMails();

         return adrr;
     }
 
         return adrr;
     }
 

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index 007fec32a5a91c1a5aec4bdd5c4365b68f9dbb80..d7818312ec0a6829ec3c33a80fa355bbe8c03bce 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
@@ -124,7 +124,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
      * @see #destroy()
      */
     public void start() {
      * @see #destroy()
      */
     public void start() {

-        new Thread(this, "Mail reciever").start();
+        new Thread(this, "Mail receiver").start();

     }
 
     private LinkedBlockingQueue<TestMail> mails = new LinkedBlockingQueue<TestEmailReceiver.TestMail>();
     }
 
     private LinkedBlockingQueue<TestMail> mails = new LinkedBlockingQueue<TestEmailReceiver.TestMail>();


@@ -144,10 +144,10 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
             poll = mails.poll(60, TimeUnit.SECONDS);
 
         } catch (InterruptedException e) {
             poll = mails.poll(60, TimeUnit.SECONDS);
 
         } catch (InterruptedException e) {

-            throw new AssertionError("Interrupted while recieving mails");
+            throw new AssertionError("Interrupted while receiving mails");

         }
         if (poll == null) {
         }
         if (poll == null) {

-            throw new AssertionError("Mail recieving timed out");
+            throw new AssertionError("Mail receiving timed out");

         }
 
         return poll;
         }
 
         return poll;