X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=0af859ccc979ad664a0cc47a682ae9365ce25bba;hp=02831cc36842878dce7175d009addbcd4970f221;hb=ccac61faa88e98f12aaa3b5c5e64d26f3fc003c9;hpb=ee6876a6b2a79171aa9a83ec9ee56f17b8ad0c0b diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 02831cc3..0af859cc 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -10,14 +10,23 @@ import java.net.MalformedURLException; import java.net.URLConnection; import java.net.URLEncoder; import java.sql.SQLException; +import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.regex.Pattern; +import org.cacert.gigi.GigiApiException; +import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.dbObjects.Country; +import org.cacert.gigi.dbObjects.Group; +import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; +import org.cacert.gigi.util.DayDate; +import org.cacert.gigi.util.Notary; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; @@ -28,6 +37,8 @@ public class TestAssurance extends ManagedTest { private String assureeM; + private int assureeName; + private String cookie; @Before @@ -37,13 +48,14 @@ public class TestAssurance extends ManagedTest { assureeM = createUniqueName() + "@cacert-test.org"; createAssuranceUser("a", "b", assurerM, TEST_PASSWORD); - createVerifiedUser("a", "c", assureeM, TEST_PASSWORD); + int assureeId = createVerifiedUser("a", "c", assureeM, TEST_PASSWORD); + assureeName = User.getById(assureeId).getPreferredName().getId(); cookie = login(assurerM, TEST_PASSWORD); } private Matcher isAssuranceForm() { - return containsString("type=\"checkbox\" name=\"tos_agree\""); + return containsString("