Merge "add: show more certificates on the "roots" page"

[gigi.git] / tests / club / wpia / gigi / pages / account / TestPasswordResetExternal.java

diff --git a/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java b/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java
index 872fc7467fca4b7f45ecc8f91a94f0a1f5cb665a..1efc5f73b85ab34f88cb5ec62ef2fcd34437ea18 100644 (file)
--- a/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java
+++ b/tests/club/wpia/gigi/pages/account/TestPasswordResetExternal.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 
 import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.pages.PasswordResetPage;
-import club.wpia.gigi.pages.wot.TestAssurance;
+import club.wpia.gigi.pages.wot.TestVerification;
 import club.wpia.gigi.testUtils.ClientTest;
 import club.wpia.gigi.testUtils.IOUtils;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
@@ -25,20 +25,19 @@ import club.wpia.gigi.util.RandomToken;
 public class TestPasswordResetExternal extends ClientTest {
 
     @Test
-    public void testByAssurance() throws IOException {
-        User u = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@example.com", TEST_PASSWORD));
+    public void testByVerification() throws IOException {
+        User u = User.getById(createVerificationUser("fn", "ln", createUniqueName() + "@example.com", TEST_PASSWORD));
         String cookie2 = login(u.getEmail(), TEST_PASSWORD);
-        URLConnection uc = TestAssurance.buildupAssureFormConnection(cookie2, email, true);
+        URLConnection uc = TestVerification.buildupVerifyFormConnection(cookie2, email, true);
         String avalue = RandomToken.generateToken(32);
-        uc.getOutputStream().write(("assuredName=" + this.u.getPreferredName().getId() + "&date=" + TestAssurance.validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10&passwordReset=1&passwordResetValue=" + URLEncoder.encode(avalue, "UTF-8")).getBytes("UTF-8"));
+        uc.getOutputStream().write(("verifiedName=" + this.u.getPreferredName().getId() + "&date=" + TestVerification.validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10&passwordReset=1&passwordResetValue=" + URLEncoder.encode(avalue, "UTF-8")).getBytes("UTF-8"));
         uc.getOutputStream().flush();
         String error = fetchStartErrorMessage(IOUtils.readURL(uc));
         assertNull(error);
 
-        TestMail mail = getMailReceiver().receive();
+        TestMail mail = getMailReceiver().receive(this.u.getEmail());
         assertThat(mail.getSubject(), containsString("Verification"));
-        mail = getMailReceiver().receive();
-        assertEquals(mail.getTo(), this.u.getEmail());
+        mail = getMailReceiver().receive(this.u.getEmail());
         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
         System.out.println(link);