X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=eb488e5df8e83965008de5c5d7b585498d0556ce;hb=265b98aed618c4b153f9c96580fb619ab7ce70ec;hp=ccbe1774139894fd73d607ed26391352815075c2;hpb=6d40d3daddfd612250c4e59b55cbd07e65804b8d;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index ccbe1774..eb488e5d 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -7,17 +7,23 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; -import java.net.URL; 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.database.GigiPreparedStatement; +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.util.DayDate; +import org.cacert.gigi.util.Notary; +import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; @@ -27,50 +33,59 @@ public class TestAssurance extends ManagedTest { private String assureeM; - private int assurer; - - private int assuree; + private int assureeName; private String cookie; @Before public void setup() throws IOException { + clearCaches(); assurerM = createUniqueName() + "@cacert-test.org"; assureeM = createUniqueName() + "@cacert-test.org"; - assurer = createAssuranceUser("a", "b", assurerM, TEST_PASSWORD); - assuree = createVerifiedUser("a", "c", assureeM, TEST_PASSWORD); + + createAssuranceUser("a", "b", assurerM, 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("