X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTestSEAdminPageUserDomainSearch.java;h=3229908f3be4754bdea315bd228967fd8022618c;hp=35e7bf743e902ea372a3fa9d35ddeffde9abc3fe;hb=b47144d6f3bf6b6eb1ec477de9d2af38256f074f;hpb=d0d120359b0de6a8ce4349d4ebbdb76d33b99942 diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java index 35e7bf74..3229908f 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java +++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java @@ -19,6 +19,7 @@ import org.cacert.gigi.pages.admin.support.FindDomainPage; import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; +import org.cacert.gigi.util.ServerConstants; import org.junit.Test; public class TestSEAdminPageUserDomainSearch extends ClientTest { @@ -33,8 +34,7 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD); User user = User.getById(id); String domainName = createUniqueName() + ".org"; - Domain d = new Domain(user, domainName); - d.insert(); + new Domain(user, domainName); URLConnection uc = new URL("https://" + getServerName() + FindDomainPage.PATH).openConnection(); uc.addRequestProperty("Cookie", cookie); String csrf = getCSRF(uc, 0); @@ -46,7 +46,7 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // + "process&domain=" + URLEncoder.encode(domainName, "UTF-8")).getBytes("UTF-8")); os.flush(); - assertEquals("https://" + getServerName() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); + assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); } @Test @@ -56,7 +56,6 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { User user = User.getById(id); String domainName = createUniqueName() + ".org"; Domain d = new Domain(user, domainName); - d.insert(); URLConnection uc = new URL("https://" + getServerName() + FindDomainPage.PATH).openConnection(); uc.addRequestProperty("Cookie", cookie); String csrf = getCSRF(uc, 0); @@ -68,7 +67,7 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // + "process&domain=#" + d.getId()).getBytes("UTF-8")); os.flush(); - assertEquals("https://" + getServerName() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); + assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); } @Test