X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FTestEmailReceiver.java;h=155539c798b1ed0c0e18ba7807e26b8df7610b89;hb=34daecdb56cd063819e3e2913b9b17a6dc0229d2;hp=cdbf9321f46d33c8739d5e156365daa0da2465c4;hpb=8ce4c06234094d2a10df9ef3ef398a8ed4318e9e;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index cdbf9321..155539c7 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;
 
@@ -34,15 +34,12 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
 
         String message;
 
-        String from;
-
         String replyto;
 
-        public TestMail(String to, String subject, String message, String from, String replyto) {
+        public TestMail(String to, String subject, String message, String replyto) {
             this.to = to;
             this.subject = subject;
             this.message = message;
-            this.from = from;
             this.replyto = replyto;
         }
 
@@ -58,10 +55,6 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
             return message;
         }
 
-        public String getFrom() {
-            return from;
-        }
-
         public String getReplyto() {
             return replyto;
         }
@@ -124,7 +117,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>();
@@ -136,6 +129,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
      * @return The intercepted {@link TestMail}
      * @see #poll()
      */
+    @Override
     public TestMail receive() {
         TestMail poll;
 
@@ -143,10 +137,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;
@@ -173,9 +167,8 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
                     String to = dis.readUTF();
                     String subject = dis.readUTF();
                     String message = dis.readUTF();
-                    String from = dis.readUTF();
                     String replyto = dis.readUTF();
-                    mails.add(new TestMail(to, subject, message, from, replyto));
+                    mails.add(new TestMail(to, subject, message, replyto));
                 } else if (type.equals("challengeAddrBox")) {
                     String email = dis.readUTF();
                     dos.writeUTF(quickEmailCheck(email));
@@ -232,6 +225,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
     /**
      * Removes all queued mails.
      */
+    @Override
     public void clearMails() {
         mails.clear();
     }
@@ -271,8 +265,8 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
     }
 
     @Override
-    public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
-        mails.add(new TestMail(to, subject, message, from, replyto));
+    public void sendMail(String to, String subject, String message, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+        mails.add(new TestMail(to, subject, message, replyto));
     }
 
 }