X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=f104c67e81a7c161f7974bb25799c30b7ae18c48;hp=94f194a3a7bd7aa1a330e30c1f67e8e4b86d6fd5;hb=4ffc462f4cfc470a8ad8bfc867d07a2b14adcf11;hpb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16 diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 94f194a3..f104c67e 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -1,92 +1,108 @@ 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.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.pages.account.MyDetails; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.ManagedTest; +import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; - public class TestAssurance extends ManagedTest { private String assurerM; private String assureeM; - private int assurer; - - private int assuree; - 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); + createVerifiedUser("a", "c", assureeM, TEST_PASSWORD); + cookie = login(assurerM, TEST_PASSWORD); + } + private Matcher isAssuranceForm() { + return containsString("