X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fclub%2Fwpia%2Fgigi%2FtestUtils%2FManagedTest.java;h=aa18a30482111b9a20b6d0fc49d9476ada1091aa;hb=010f5d1a8bb003834222e6d854194a6c6e5e5cb7;hp=3eeda2ca705b7df263a4843f45c41c04e51be71d;hpb=abf7680940d9965011660dc432d44e002d17c1d6;p=gigi.git diff --git a/tests/club/wpia/gigi/testUtils/ManagedTest.java b/tests/club/wpia/gigi/testUtils/ManagedTest.java index 3eeda2ca..aa18a304 100644 --- a/tests/club/wpia/gigi/testUtils/ManagedTest.java +++ b/tests/club/wpia/gigi/testUtils/ManagedTest.java @@ -278,7 +278,7 @@ public class ManagedTest extends ConfiguredTest { public static void registerUser(String firstName, String lastName, String email, String password) { try { - String query = "name-type=western&fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1"; + String query = "name-type=western&fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1&dp_agree=1"; String data = fetchStartErrorMessage(runRegister(query)); assertNull(data); } catch (UnsupportedEncodingException e) { @@ -291,7 +291,7 @@ public class ManagedTest extends ConfiguredTest { public static int createVerifiedUser(String firstName, String lastName, String email, String password) { registerUser(firstName, lastName, email, password); try { - ter.receive().verify(); + ter.receive(email).verify(); try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `users` WHERE `email`=?")) { ps.setString(1, email); @@ -496,11 +496,10 @@ public class ManagedTest extends ConfiguredTest { public EmailAddress createVerifiedEmail(User u, String email) throws InterruptedException, GigiApiException { EmailAddress addr = new EmailAddress(u, email, Locale.ENGLISH); - TestMail testMail = getMailReceiver().receive(); - assertEquals(addr.getAddress(), testMail.getTo()); + TestMail testMail = getMailReceiver().receive(addr.getAddress()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); addr.verify(hash); - getMailReceiver().clearMails(); + getMailReceiver().assertEmpty(); return addr; }