X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FTestEmailReciever.java;fp=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FTestEmailReciever.java;h=93cd7e4540f17e0d3024b6216117cd3fa42530b7;hp=849bf927f234165190080c0ddba955a44a52cc76;hb=63d97b58fdda853ec712cba3e821a16e8daec401;hpb=be62d3da06430c2615c80a6313ade448072482a5

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index 849bf927..93cd7e45 100644
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -10,7 +10,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class TestEmailReciever implements Runnable {
+import org.cacert.gigi.email.EmailProvider;
+
+public class TestEmailReciever extends EmailProvider implements Runnable {
 	public class TestMail {
 		String to;
 		String subject;
@@ -67,6 +69,7 @@ public class TestEmailReciever implements Runnable {
 		dis = new DataInputStream(s.getInputStream());
 		dos = new DataOutputStream(s.getOutputStream());
 		new Thread(this).start();
+		setInstance(this);
 	}
 
 	LinkedBlockingQueue<TestMail> mails = new LinkedBlockingQueue<TestEmailReciever.TestMail>();
@@ -89,11 +92,7 @@ public class TestEmailReciever implements Runnable {
 					mails.add(new TestMail(to, subject, message, from, replyto));
 				} else if (type.equals("challengeAddrBox")) {
 					String email = dis.readUTF();
-					if (approveRegex.matcher(email).matches()) {
-						dos.writeUTF("OK");
-					} else {
-						dos.writeUTF(error);
-					}
+					dos.writeUTF(quickEmailCheck(email));
 					dos.flush();
 				} else if (type.equals("ping")) {
 				} else {
@@ -108,6 +107,14 @@ public class TestEmailReciever implements Runnable {
 
 	}
 
+	private String quickEmailCheck(String email) throws IOException {
+		if (approveRegex.matcher(email).matches()) {
+			return "OK";
+		} else {
+			return error;
+		}
+	}
+
 	String error = "FAIL";
 
 	public void setEmailCheckError(String error) {
@@ -141,4 +148,15 @@ public class TestEmailReciever implements Runnable {
 		}
 	}
 
+	@Override
+	public String checkEmailServer(int forUid, String address) throws IOException {
+		return quickEmailCheck(address);
+	}
+
+	@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));
+	}
+
 }