import org.cacert.gigi.pages.Manager;
import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.pages.main.RegisterPage;
-import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
+import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
import org.cacert.gigi.util.DatabaseManager;
import org.cacert.gigi.util.ServerConstants;
import org.cacert.gigi.util.SimpleSigner;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
/**
*/
protected static final String TEST_PASSWORD = "xvXV12°§";
- private static TestEmailReciever ter;
+ private static TestEmailReceiver ter;
private static Process gigi;
if (type.equals("local")) {
url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
String[] parts = testProps.getProperty("mail").split(":", 2);
- ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
+ ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
ter.start();
return;
}
if (line == null) {
throw new Error("Server startup failed");
}
- ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473));
+ ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473));
ter.start();
SimpleSigner.runSigner();
} catch (IOException e) {
ManagedTest.setAcceptLanguage(null);
}
- public TestMail waitForMail() {
- TestMail mail = null;
- while (null == mail) {
- try {
- mail = ter.recieve();
- } catch (InterruptedException e) {
- throw new Error(e);
- }
- }
- return mail;
- }
-
- public static TestEmailReciever getMailReciever() {
+ public static TestEmailReceiver getMailReciever() {
return ter;
}
public static int createVerifiedUser(String firstName, String lastName, String email, String password) {
registerUser(firstName, lastName, email, password);
try {
- TestMail tm = ter.recieve();
- Assert.assertNotNull(tm);
- tm.verify();
+ ter.receive().verify();
GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
ps.setString(1, email);
}
throw new Error();
- } catch (InterruptedException e) {
- throw new Error(e);
} catch (IOException e) {
throw new Error(e);
}
public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
adrr.insert(Language.getInstance(Locale.ENGLISH));
- TestMail testMail = getMailReciever().recieve();
- Assert.assertNotNull(testMail);
+ TestMail testMail = getMailReciever().receive();
assertEquals(adrr.getAddress(), testMail.getTo());
String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
adrr.verify(hash);