X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FTestEmailReceiver.java;h=d7818312ec0a6829ec3c33a80fa355bbe8c03bce;hb=53d9194f480a4351e6b80551fc2aa537e7d5b039;hp=30e62e5ed5db9cd4c34be0998f81c2211da8b16e;hpb=39bf8d9363076e87bab590b9dec48cea36a2b872;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index 30e62e5e..d7818312 100644
--- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
@@ -21,12 +21,12 @@ import org.cacert.gigi.email.TestEmailProvider;
  * intercept the emails. This class resides in the VM that executes the
  * testcases and supplies the intercepted emails to the current test case.
  */
-public final class TestEmailReceiver extends EmailProvider implements Runnable {
+public final class TestEmailReceiver extends EmailProvider implements Runnable, MailReceiver {
 
     /**
      * An email that has been intercepted.
      */
-    public class TestMail {
+    public static class TestMail {
 
         String to;
 
@@ -74,7 +74,8 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
         }
 
         public void verify() throws IOException {
-            String[] parts = extractLink().split("\\?");
+            String link = extractLink();
+            String[] parts = link.split("\\?");
             URL u = new URL("https://" + ManagedTest.getServerName() + "/verify?" + parts[1]);
 
             URLConnection csrfConn = u.openConnection();
@@ -123,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<TestMail> mails = new LinkedBlockingQueue<TestEmailReceiver.TestMail>();
@@ -135,6 +136,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
      * @return The intercepted {@link TestMail}
      * @see #poll()
      */
+    @Override
     public TestMail receive() {
         TestMail poll;
 
@@ -142,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;
@@ -231,6 +233,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
     /**
      * Removes all queued mails.
      */
+    @Override
     public void clearMails() {
         mails.clear();
     }