X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=3ae4ccd4afa204b61a93a514dc4cdb8f6ad4897c;hb=9efe305311c7e9f78a41093d2e2e9c57bfd10c7b;hp=55e0c6d9bf43bce0c2a362a4a510a6396cdecea1;hpb=e6c74ce9b83815f1f58f9987ce7c8996ce3f0914;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 55e0c6d9..3ae4ccd4 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -1,23 +1,31 @@ package org.cacert.gigi.pages.wot; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; 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.PreparedStatement; 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.DatabaseConnection; +import org.cacert.gigi.GigiApiException; +import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.dbObjects.Country; +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,67 +35,93 @@ 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 = createAssuranceUser("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("