X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTestSEAdminPageDetails.java;h=d1f0139f65d04927b69c2fd9c7156ac1a97bed8b;hb=f39e1a18e4ceed8ad6edb7fc4b7e4d1879703dd5;hp=f27a26a4642af0557cf4be5a7d0f824e29a8277a;hpb=e9625bad15becfac8c9e0a616986c85f32b31dd9;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java index f27a26a4..d1f0139f 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java +++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java @@ -5,7 +5,6 @@ import static org.junit.Assert.*; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; import java.net.URLConnection; import java.util.Locale; import java.util.regex.Matcher; @@ -37,12 +36,11 @@ public class TestSEAdminPageDetails extends ClientTest { String fname = "Först"; String lname = "Secönd"; int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD); - URLConnection uc = new URL("https://" + getServerName() + SupportUserDetailsPage.PATH + id).openConnection(); - uc.addRequestProperty("Cookie", cookie); + URLConnection uc = get(SupportUserDetailsPage.PATH + id); uc.setDoOutput(true); String res = IOUtils.readURL(uc); - assertThat(res, containsString("")); - assertThat(res, containsString("")); + assertThat(res, containsString("type=\"text\" value=\"" + fname + "\" name=\"fname\">")); + assertThat(res, containsString("type=\"text\" value=\"" + lname + "\" name=\"lname\">")); assertThat(res, containsString(email)); } @@ -156,7 +154,7 @@ public class TestSEAdminPageDetails extends ClientTest { } private String getFname(String res) { - Pattern p = Pattern.compile(""); + Pattern p = Pattern.compile("type=\"text\" name=\"fname\" value=\"([^\"]*)\">"); Matcher m = p.matcher(res); if (m.find()) { return m.group(1); @@ -165,7 +163,7 @@ public class TestSEAdminPageDetails extends ClientTest { } private String getFnamePlain(String res) { - Pattern p = Pattern.compile("\\s*First Name: \\s*([^<]*)"); + Pattern p = Pattern.compile("\\s*]*>First Name: \\s*]*>([^<]*)"); Matcher m = p.matcher(res); if (m.find()) { return m.group(1);