Merge "upd: Reduce Boilerplate in translated SprintfCommands"

[gigi.git] / tests / org / cacert / gigi / testUtils / TestEmailReceiver.java

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index 2dd230cb308ed766fa8c98a1d2e8dd354aa207d1..77c3e2d6942e333e9a94ecc954a631a763a3c06d 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
@@ -26,7 +26,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
     /**
      * 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();
@@ -160,12 +161,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
      * @see #receive()
      */
     public TestMail poll() {
-        try {
-            return mails.poll(60, TimeUnit.SECONDS);
-
-        } catch (InterruptedException e) {
-            throw new AssertionError("Interrupted while recieving mails");
-        }
+        return mails.poll();
     }
 
     @Override