X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FtestUtils%2FTestEmailReceiver.java;h=9bba9b31b637d666d558c9576dbed02b5560a1e8;hb=HEAD;hp=01dbe78ec7e77b17fd2ce2618106513fa5d4a214;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git

diff --git a/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java b/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java
index 01dbe78e..9bba9b31 100644
--- a/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/club/wpia/gigi/testUtils/TestEmailReceiver.java
@@ -1,5 +1,7 @@
 package club.wpia.gigi.testUtils;
 
+import static org.junit.Assert.*;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -83,6 +85,10 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
             uc.getInputStream().close();
         }
 
+        @Override
+        public String toString() {
+            return "TestMail: " + subject + " for " + to;
+        }
     }
 
     private Socket s;
@@ -130,7 +136,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
      * @see #poll()
      */
     @Override
-    public TestMail receive() {
+    public TestMail receive(String to) {
         TestMail poll;
 
         try {
@@ -142,6 +148,9 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
         if (poll == null) {
             throw new AssertionError("Mail receiving timed out");
         }
+        if (to != null) {
+            assertEquals(to, poll.getTo());
+        }
 
         return poll;
     }
@@ -154,8 +163,12 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
      *         has been sent.
      * @see #receive()
      */
-    public TestMail poll() {
-        return mails.poll();
+    public TestMail poll(String to) {
+        TestMail tm = mails.poll();
+        if (tm != null && to != null) {
+            assertEquals(to, tm.getTo());
+        }
+        return tm;
     }
 
     @Override
@@ -226,19 +239,21 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
      * Removes all queued mails.
      */
     @Override
-    public void clearMails() {
+    public void assertEmpty() {
+        int originalSize = mails.size();
         mails.clear();
+        assertEquals("test case should consume all produced emails", 0, originalSize);
     }
 
     /**
      * Resets this class to its initial state
      * 
-     * @see #clearMails()
+     * @see #assertEmpty()
      * @see #setApproveRegex(Pattern)
      * @see #setEmailCheckError(String)
      */
     public void reset() {
-        clearMails();
+        assertEmpty();
         error = "FAIL";
         approveRegex = Pattern.compile(".*");
     }