From 53d9194f480a4351e6b80551fc2aa537e7d5b039 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 11 Jul 2016 10:33:03 +0200 Subject: [PATCH] fix: typo in receive Change-Id: I8f89abd2afece11114873f81c8ac19b7a1000eff --- tests/org/cacert/gigi/LoginTest.java | 2 +- tests/org/cacert/gigi/TestUser.java | 4 ++-- .../cacert/gigi/pages/account/TestMailManagement.java | 4 ++-- .../gigi/pages/account/TestPasswordResetExternal.java | 2 +- .../gigi/pages/admin/TestSEAdminPageDetails.java | 2 +- tests/org/cacert/gigi/pages/main/RegisterPageTest.java | 10 +++++----- tests/org/cacert/gigi/ping/TestDNS.java | 2 +- tests/org/cacert/gigi/ping/TestHTTP.java | 4 ++-- tests/org/cacert/gigi/ping/TestSSL.java | 2 +- tests/org/cacert/gigi/testUtils/BusinessTest.java | 2 +- tests/org/cacert/gigi/testUtils/ConfiguredTest.java | 4 ++-- tests/org/cacert/gigi/testUtils/ManagedTest.java | 6 +++--- tests/org/cacert/gigi/testUtils/TestEmailReceiver.java | 6 +++--- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java index cb575caf..30970623 100644 --- 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); - getMailReciever().receive(); + getMailReceiver().receive(); assertFalse(isLoggedin(login(email, TEST_PASSWORD))); } diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index f3702b04..1a26f539 100644 --- 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); - getMailReciever().receive().verify(); + getMailReceiver().receive().verify(); 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")); diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java index bf73cd38..fd4d4d49 100644 --- 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()); - getMailReciever().clearMails(); + getMailReceiver().clearMails(); } @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()); - getMailReciever().clearMails(); + getMailReceiver().clearMails(); } @Test diff --git a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java index c40a5c20..d39bfba2 100644 --- 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); - TestMail mail = getMailReciever().receive(); + TestMail mail = getMailReceiver().receive(); 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 d1f0139f..edcd4344 100644 --- 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); - getMailReciever().receive().verify(); + getMailReceiver().receive().verify(); // 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 7286f8a9..331aad38 100644 --- 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(); - 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®ional=1&radius=1"; data = fetchStartErrorMessage(runRegister(query)); assertNotNull(data); - assertNull(getMailReciever().poll()); + assertNull(getMailReceiver().poll()); } private void assertSuccessfullRegMail() { - String link = getMailReciever().receive().extractLink(); + String link = getMailReceiver().receive().extractLink(); assertTrue(link, link.startsWith("https://")); } @@ -182,7 +182,7 @@ public class RegisterPageTest extends ManagedTest { @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); diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/org/cacert/gigi/ping/TestDNS.java index 8bb61461..274fec0a 100644 --- 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); - TestMail mail = getMailReciever().receive(); + TestMail mail = getMailReceiver().receive(); if (emailVariant == 0) { mail.verify(); } diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java index a1c5c7ae..18dff385 100644 --- 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); - TestMail mail = getMailReciever().receive(); + TestMail mail = getMailReceiver().receive(); if (emailVariant == 0) { mail.verify(); } @@ -172,7 +172,7 @@ public class TestHTTP extends PingTest { } waitForPings(2); - TestMail mail = getMailReciever().receive(); + TestMail mail = getMailReceiver().receive(); 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 85c74a41..e0c78bd0 100644 --- 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); - TestMail mail = getMailReciever().receive(); + TestMail mail = getMailReceiver().receive(); if (emailVariant == 0) { mail.verify(); } diff --git a/tests/org/cacert/gigi/testUtils/BusinessTest.java b/tests/org/cacert/gigi/testUtils/BusinessTest.java index dc62b309..408b518b 100644 --- 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 - public MailReceiver getMailReciever() { + public MailReceiver getMailReceiver() { return InVMEmail.getInstance(); } } diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java index 808ddd67..1e4d49ae 100644 --- 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"); - TestMail testMail = getMailReciever().receive(); + TestMail testMail = getMailReceiver().receive(); 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 1ea49cf4..326cd975 100644 --- 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 - public MailReceiver getMailReciever() { + public MailReceiver getMailReceiver() { 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); - 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); - getMailReciever().clearMails(); + getMailReceiver().clearMails(); return adrr; } diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java index 007fec32..d7818312 100644 --- 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() { - new Thread(this, "Mail reciever").start(); + new Thread(this, "Mail receiver").start(); } private LinkedBlockingQueue mails = new LinkedBlockingQueue(); @@ -144,10 +144,10 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable, 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) { - throw new AssertionError("Mail recieving timed out"); + throw new AssertionError("Mail receiving timed out"); } return poll; -- 2.39.2