X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FTestOrgaManagement.java;fp=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FTestOrgaManagement.java;h=6fe4f1828d57d79b771d3ac2d6b414e0feff00ab;hb=1c7e27416fbfffcacf7b6f9a8765e9dd9671c2b7;hp=3ecc7a21dbb6705525db623b206c21390adba97e;hpb=23054bdbb774546f53385a54a0b161b20c0fccb9;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java index 3ecc7a21..6fe4f182 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java +++ b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java @@ -5,7 +5,6 @@ import static org.junit.Assert.*; import java.io.IOException; import java.net.HttpURLConnection; -import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; import java.sql.SQLException; @@ -87,28 +86,25 @@ public class TestOrgaManagement extends ClientTest { o1.addAdmin(u2, u, false); String session2 = login(u2.getEmail(), TEST_PASSWORD); - URLConnection uc = new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH).openConnection(); - uc.addRequestProperty("Cookie", session2); + URLConnection uc = get(session2, ViewOrgPage.DEFAULT_PATH); assertEquals(403, ((HttpURLConnection) uc).getResponseCode()); - uc = new URL("https://" + getServerName() + MyDetails.PATH).openConnection(); - uc.addRequestProperty("Cookie", session2); + uc = get(session2, MyDetails.PATH); String content = IOUtils.readURL(uc); assertThat(content, containsString("name21")); assertThat(content, not(containsString("name12"))); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()).openConnection(), session2); + uc = get(session2, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()); assertEquals(403, ((HttpURLConnection) uc).getResponseCode()); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()).openConnection(), session2); + uc = get(session2, ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()); assertEquals(403, ((HttpURLConnection) uc).getResponseCode()); - uc = new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH).openConnection(); - uc.addRequestProperty("Cookie", cookie); + uc = get(ViewOrgPage.DEFAULT_PATH); content = IOUtils.readURL(uc); assertThat(content, containsString("name21")); assertThat(content, containsString("name12")); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()).openConnection(), cookie); + uc = get(ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()); assertEquals(200, ((HttpURLConnection) uc).getResponseCode()); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()).openConnection(), cookie); + uc = get(ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()); assertEquals(200, ((HttpURLConnection) uc).getResponseCode()); o1.delete(); o2.delete();