From: Felix Dörre Date: Sun, 1 Feb 2015 01:03:49 +0000 (+0100) Subject: UPD: clean up/document/beatufy testcases. X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=8af6231b22da4fef795bcb54913faad6592b1a02 UPD: clean up/document/beatufy testcases. --- diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java index e1cc64fd..ba36830b 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java @@ -31,11 +31,10 @@ import java.util.regex.Pattern; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.pages.account.certs.CertificateAdd; import org.cacert.gigi.pages.account.certs.CertificateIssueForm; +import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.cacert.gigi.util.PEM; import org.junit.Test; @@ -53,18 +52,14 @@ import sun.security.x509.RFC822Name; import sun.security.x509.SubjectAlternativeNameExtension; import sun.security.x509.X509Key; -public class TestCertificateAdd extends ManagedTest { +public class TestCertificateAdd extends ClientTest { KeyPair kp = generateKeypair(); - User u = User.getById(createVerifiedUser("testuser", "testname", uniq + "@testdom.com", TEST_PASSWORD)); - - String session = login(uniq + "@testdom.com", TEST_PASSWORD); - String csrf; public TestCertificateAdd() throws GeneralSecurityException, IOException { - TestDomain.addDomain(session, uniq + ".tld"); + TestDomain.addDomain(cookie, uniq + ".tld"); } @@ -86,13 +81,13 @@ public class TestCertificateAdd extends ManagedTest { public void testSimpleMail() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { CertificateIssueForm.OID_KEY_USAGE_EMAIL_PROTECTION - }, new DNSName("a." + uniq + ".tld"), new DNSName("b." + uniq + ".tld"), new RFC822Name(uniq + "@testdom.com")); + }, new DNSName("a." + uniq + ".tld"), new DNSName("b." + uniq + ".tld"), new RFC822Name(email)); - String pem = generatePEMCSR(kp, "CN=testuser testname", atts, "SHA384WithRSA"); + String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA384WithRSA"); String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8")); assertArrayEquals(new String[] { - "mail", "testuser testname", "dns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\nemail:" + uniq + "@testdom.com\n", Digest.SHA384.toString() + "mail", "a b", "dns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\nemail:" + email + "\n", Digest.SHA384.toString() }, res); } @@ -100,13 +95,13 @@ public class TestCertificateAdd extends ManagedTest { public void testSimpleClient() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT - }, new RFC822Name(uniq + "@testdom.com")); + }, new RFC822Name(email)); - String pem = generatePEMCSR(kp, "CN=testuser testname,email=" + uniq + "@testdom.com", atts, "SHA512WithRSA"); + String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA"); String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8")); assertArrayEquals(new String[] { - "client", "testuser testname", "email:" + uniq + "@testdom.com\n", Digest.SHA512.toString() + "client", "a b", "email:" + email + "\n", Digest.SHA512.toString() }, res); } @@ -120,21 +115,21 @@ public class TestCertificateAdd extends ManagedTest { public void testIssue() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT - }, new RFC822Name(uniq + "@testdom.com")); + }, new RFC822Name(email)); - String pem = generatePEMCSR(kp, "CN=testuser testname,email=" + uniq + "@testdom.com", atts, "SHA512WithRSA"); + String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA"); String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8")); assertArrayEquals(new String[] { - "client", "testuser testname", "email:" + uniq + "@testdom.com\n", Digest.SHA512.toString() + "client", "a b", "email:" + email + "\n", Digest.SHA512.toString() }, res); HttpURLConnection huc = (HttpURLConnection) ncert.openConnection(); - huc.setRequestProperty("Cookie", session); + huc.setRequestProperty("Cookie", cookie); huc.setDoOutput(true); OutputStream out = huc.getOutputStream(); out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes()); - out.write(("&profile=client&CN=testuser+testname&SANs=" + URLEncoder.encode("email:" + uniq + "@testdom.com\n", "UTF-8")).getBytes()); + out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes()); out.write(("&hash_alg=SHA512&CCA=y").getBytes()); URLConnection uc = authenticate(new URL(huc.getHeaderField("Location") + ".crt")); String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8")); @@ -151,9 +146,9 @@ public class TestCertificateAdd extends ManagedTest { uc = authenticate(new URL(huc.getHeaderField("Location"))); String gui = IOUtils.readURL(uc); assertThat(gui, containsString("clientAuth")); - assertThat(gui, containsString("CN=testuser testname")); + assertThat(gui, containsString("CN=a b")); assertThat(gui, containsString("SHA512withRSA")); - assertThat(gui, containsString("RFC822Name: " + uniq + "@testdom.com")); + assertThat(gui, containsString("RFC822Name: " + email)); } @@ -207,17 +202,17 @@ public class TestCertificateAdd extends ManagedTest { private X509Certificate createCertWithValidity(String validity) throws IOException, GeneralSecurityException, UnsupportedEncodingException, MalformedURLException, CertificateException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT - }, new RFC822Name(uniq + "@testdom.com")); + }, new RFC822Name(email)); - String pem = generatePEMCSR(kp, "CN=testuser testname", atts, "SHA512WithRSA"); + String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA512WithRSA"); fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8")); HttpURLConnection huc = (HttpURLConnection) ncert.openConnection(); - huc.setRequestProperty("Cookie", session); + huc.setRequestProperty("Cookie", cookie); huc.setDoOutput(true); OutputStream out = huc.getOutputStream(); out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes()); - out.write(("&profile=client&CN=testuser+testname&SANs=" + URLEncoder.encode("email:" + uniq + "@testdom.com\n", "UTF-8")).getBytes()); + out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes()); out.write(("&hash_alg=SHA512&CCA=y&").getBytes()); out.write(validity.getBytes()); @@ -235,13 +230,13 @@ public class TestCertificateAdd extends ManagedTest { private URLConnection authenticate(URL url) throws IOException { URLConnection uc = url.openConnection(); - uc.setRequestProperty("Cookie", session); + uc.setRequestProperty("Cookie", cookie); return uc; } protected String testSPKAC(boolean correctChallange) throws GeneralSecurityException, IOException { HttpURLConnection uc = (HttpURLConnection) ncert.openConnection(); - uc.setRequestProperty("Cookie", session); + uc.setRequestProperty("Cookie", cookie); String s = IOUtils.readURL(uc); csrf = extractPattern(s, Pattern.compile("]*name='csrf' [^>]*value='([^']*)'>")); @@ -285,7 +280,7 @@ public class TestCertificateAdd extends ManagedTest { private String[] fillOutForm(String pem) throws IOException { HttpURLConnection uc = (HttpURLConnection) ncert.openConnection(); - uc.setRequestProperty("Cookie", session); + uc.setRequestProperty("Cookie", cookie); csrf = getCSRF(uc); return fillOutFormDirect(pem); @@ -294,7 +289,7 @@ public class TestCertificateAdd extends ManagedTest { private String[] fillOutFormDirect(String pem) throws IOException { HttpURLConnection uc = (HttpURLConnection) ncert.openConnection(); - uc.setRequestProperty("Cookie", session); + uc.setRequestProperty("Cookie", cookie); uc.setDoOutput(true); uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes()); uc.getOutputStream().flush(); diff --git a/tests/org/cacert/gigi/pages/account/TestChangePassword.java b/tests/org/cacert/gigi/pages/account/TestChangePassword.java index 21be9c15..89d318e6 100644 --- a/tests/org/cacert/gigi/pages/account/TestChangePassword.java +++ b/tests/org/cacert/gigi/pages/account/TestChangePassword.java @@ -6,15 +6,10 @@ import java.io.IOException; import java.net.URLEncoder; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; -public class TestChangePassword extends ManagedTest { - - User u = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@example.org", TEST_PASSWORD)); - - String cookie; +public class TestChangePassword extends ClientTest { String path = ChangePasswordPage.PATH; diff --git a/tests/org/cacert/gigi/pages/account/TestContactInformation.java b/tests/org/cacert/gigi/pages/account/TestContactInformation.java index 6360578b..c63e36d2 100644 --- a/tests/org/cacert/gigi/pages/account/TestContactInformation.java +++ b/tests/org/cacert/gigi/pages/account/TestContactInformation.java @@ -7,17 +7,14 @@ import java.io.IOException; import java.net.URL; import java.net.URLConnection; +import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -public class TestContactInformation extends ManagedTest { +public class TestContactInformation extends ClientTest { @Test public void testDirectoryListingToggle() throws IOException { - String email = createUniqueName() + "@e.fg"; - createVerifiedUser("Kurti", createUniqueName(), email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=1&contactinfo=&processContact", 1)); URLConnection url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection(); url.setRequestProperty("Cookie", cookie); @@ -34,9 +31,6 @@ public class TestContactInformation extends ManagedTest { @Test public void testContactinfoSet() throws IOException { - String email = createUniqueName() + "@e.fg"; - createVerifiedUser("Kurti", createUniqueName(), email, TEST_PASSWORD); - String cookie = login(email, TEST_PASSWORD); String text = createUniqueName(); assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=1&contactinfo=" + text + "&processContact", 1)); URLConnection url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection(); diff --git a/tests/org/cacert/gigi/pages/account/TestDomain.java b/tests/org/cacert/gigi/pages/account/TestDomain.java index faa9ac8b..1a3a5a08 100644 --- a/tests/org/cacert/gigi/pages/account/TestDomain.java +++ b/tests/org/cacert/gigi/pages/account/TestDomain.java @@ -5,23 +5,18 @@ import static org.junit.Assert.*; import java.io.IOException; import java.net.URLEncoder; -import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.pages.account.domain.DomainOverview; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; -public class TestDomain extends ManagedTest { - - User u = User.getById(createVerifiedUser("testuser", "testname", uniq + "@testdom.com", TEST_PASSWORD)); - - String session = login(uniq + "@testdom.com", TEST_PASSWORD); +public class TestDomain extends ClientTest { public TestDomain() throws IOException {} @Test public void testAdd() throws IOException { - assertNull(addDomain(session, uniq + ".de")); - assertNotNull(addDomain(session, uniq + ".de")); + assertNull(addDomain(cookie, uniq + ".de")); + assertNotNull(addDomain(cookie, uniq + ".de")); } public static String addDomain(String session, String domain) throws IOException { diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java index 3d813ec9..6659a1e1 100644 --- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java +++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java @@ -14,14 +14,10 @@ import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.pages.account.mail.MailOverview; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; -public class TestMailManagement extends ManagedTest { - - private User u = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "uni@example.org", TEST_PASSWORD)); - - private String cookie; +public class TestMailManagement extends ClientTest { private String path = MailOverview.DEFAULT_PATH; diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java index 2623fa02..f0a07a80 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java +++ b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java @@ -14,25 +14,21 @@ import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.Organisation; import org.cacert.gigi.dbObjects.Organisation.Affiliation; import org.cacert.gigi.dbObjects.User; +import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -public class TestOrgaManagement extends ManagedTest { - - public User u = User.getById(createVerifiedUser("testuser", "testname", uniq + "@testdom.com", TEST_PASSWORD)); - - public String session; +public class TestOrgaManagement extends ClientTest { public TestOrgaManagement() throws IOException { u.grantGroup(u, Group.getByString("orgassurer")); clearCaches(); - session = login(uniq + "@testdom.com", TEST_PASSWORD); + cookie = login(email, TEST_PASSWORD); } @Test public void testAdd() throws IOException { - executeBasicWebInteraction(session, CreateOrgPage.DEFAULT_PATH, "O=name&contact=mail&L=K%C3%B6ln&ST=%C3%9C%C3%96%C3%84%C3%9F&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6", 0); + executeBasicWebInteraction(cookie, CreateOrgPage.DEFAULT_PATH, "O=name&contact=mail&L=K%C3%B6ln&ST=%C3%9C%C3%96%C3%84%C3%9F&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6", 0); Organisation[] orgs = Organisation.getOrganisations(0, 30); assertEquals(1, orgs.length); assertEquals("mail", orgs[0].getContactEmail()); @@ -41,14 +37,14 @@ public class TestOrgaManagement extends ManagedTest { assertEquals("ÜÖÄß", orgs[0].getProvince()); User u2 = User.getById(createVerifiedUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD)); - executeBasicWebInteraction(session, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1); + executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1); List allAdmins = orgs[0].getAllAdmins(); assertEquals(1, allAdmins.size()); Affiliation affiliation = allAdmins.get(0); assertSame(u2, affiliation.getTarget()); assertTrue(affiliation.isMaster()); - executeBasicWebInteraction(session, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u.getEmail(), "UTF-8") + "&do_affiliate=y", 1); + executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u.getEmail(), "UTF-8") + "&do_affiliate=y", 1); allAdmins = orgs[0].getAllAdmins(); assertEquals(2, allAdmins.size()); Affiliation affiliation2 = allAdmins.get(0); @@ -58,13 +54,13 @@ public class TestOrgaManagement extends ManagedTest { assertSame(u.getId(), affiliation2.getTarget().getId()); assertFalse(affiliation2.isMaster()); - executeBasicWebInteraction(session, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "del=" + URLEncoder.encode(u.getEmail(), "UTF-8") + "&email=&do_affiliate=y", 1); + executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "del=" + URLEncoder.encode(u.getEmail(), "UTF-8") + "&email=&do_affiliate=y", 1); assertEquals(1, orgs[0].getAllAdmins().size()); - executeBasicWebInteraction(session, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "del=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&email=&do_affiliate=y", 1); + executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "del=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&email=&do_affiliate=y", 1); assertEquals(0, orgs[0].getAllAdmins().size()); - executeBasicWebInteraction(session, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "O=name1&contact=&L=K%C3%B6ln&ST=%C3%9C%C3%96%C3%84%C3%9F&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6", 0); + executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "O=name1&contact=&L=K%C3%B6ln&ST=%C3%9C%C3%96%C3%84%C3%9F&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6", 0); clearCaches(); orgs = Organisation.getOrganisations(0, 30); assertEquals("name1", orgs[0].getName()); @@ -89,13 +85,13 @@ public class TestOrgaManagement extends ManagedTest { assertEquals(404, ((HttpURLConnection) uc).getResponseCode()); uc = new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH).openConnection(); - uc.addRequestProperty("Cookie", session); + uc.addRequestProperty("Cookie", cookie); content = IOUtils.readURL(uc); assertThat(content, containsString("name21")); assertThat(content, containsString("name12")); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()).openConnection(), session); + uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o1.getId()).openConnection(), cookie); assertEquals(200, ((HttpURLConnection) uc).getResponseCode()); - uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()).openConnection(), session); + uc = cookie(new URL("https://" + getServerName() + ViewOrgPage.DEFAULT_PATH + "/" + o2.getId()).openConnection(), cookie); assertEquals(200, ((HttpURLConnection) uc).getResponseCode()); o1.delete(); o2.delete(); diff --git a/tests/org/cacert/gigi/pages/wot/TestTTP.java b/tests/org/cacert/gigi/pages/wot/TestTTP.java index 9f5aae30..7c8884ba 100644 --- a/tests/org/cacert/gigi/pages/wot/TestTTP.java +++ b/tests/org/cacert/gigi/pages/wot/TestTTP.java @@ -10,15 +10,11 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; +import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; -import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -public class TestTTP extends ManagedTest { - - User u = User.getById(createVerifiedUser("fn", "ln", "test-" + createUniqueName() + "@example.org", TEST_PASSWORD)); - - String cookie = login(u.getEmail(), TEST_PASSWORD); +public class TestTTP extends ClientTest { URL ttpPage = new URL("https://" + getServerName() + RequestTTPPage.PATH); diff --git a/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java b/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java index b1cbf9ab..32c4268a 100644 --- a/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java +++ b/tests/org/cacert/gigi/pages/wot/TestTTPAdmin.java @@ -10,21 +10,14 @@ import java.net.URL; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.pages.admin.TTPAdminPage; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; -public class TestTTPAdmin extends ManagedTest { - - User us; - - String cookie; +public class TestTTPAdmin extends ClientTest { User us2; public TestTTPAdmin() throws IOException { - String email = uniq + "@example.com"; - us = User.getById(createVerifiedUser("fn", "ln", email, TEST_PASSWORD)); - cookie = login(email, TEST_PASSWORD); us2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.com", TEST_PASSWORD)); } @@ -40,14 +33,14 @@ public class TestTTPAdmin extends ManagedTest { public void testTTPAdmin(boolean hasRight) throws IOException { if (hasRight) { - grant(us.getEmail(), Group.getByString("ttp-assurer")); + grant(email, Group.getByString("ttp-assurer")); } - grant(us.getEmail(), TTPAdminPage.TTP_APPLICANT); - cookie = login(us.getEmail(), TEST_PASSWORD); + grant(u.getEmail(), TTPAdminPage.TTP_APPLICANT); + cookie = login(u.getEmail(), TEST_PASSWORD); assertEquals( !hasRight ? 403 : 200, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH)); assertEquals( !hasRight ? 403 : 200, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH + "/")); - assertEquals( !hasRight ? 403 : 200, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH + "/" + us.getId())); + assertEquals( !hasRight ? 403 : 200, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH + "/" + u.getId())); assertEquals( !hasRight ? 403 : 404, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH + "/" + us2.getId())); assertEquals( !hasRight ? 403 : 404, fetchStatusCode("https://" + getServerName() + TTPAdminPage.PATH + "/" + 100)); } diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java index 007d570b..610e1153 100644 --- a/tests/org/cacert/gigi/ping/TestSSL.java +++ b/tests/org/cacert/gigi/ping/TestSSL.java @@ -139,7 +139,7 @@ public class TestSSL extends PingTest { private void createCertificate(String test, CertificateProfile profile) throws GeneralSecurityException, IOException, SQLException, InterruptedException, GigiApiException { kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=" + test); - c = new Certificate(User.getById(userid), Certificate.buildDN("CN", test), "sha256", csr, CSRType.CSR, profile); + c = new Certificate(User.getById(id), Certificate.buildDN("CN", test), "sha256", csr, CSRType.CSR, profile); c.issue(null, "2y").waitFor(60000); } diff --git a/tests/org/cacert/gigi/testUtils/ClientTest.java b/tests/org/cacert/gigi/testUtils/ClientTest.java index ab88844f..fc22e6d0 100644 --- a/tests/org/cacert/gigi/testUtils/ClientTest.java +++ b/tests/org/cacert/gigi/testUtils/ClientTest.java @@ -2,15 +2,33 @@ package org.cacert.gigi.testUtils; import java.io.IOException; +import org.cacert.gigi.dbObjects.User; + +/** + * Superclass for testsuites in a scenario where there is an registered member, + * who is already logged on. + */ public abstract class ClientTest extends ManagedTest { + /** + * Email of the member. + */ protected String email = createUniqueName() + "@example.org"; - protected int userid = createVerifiedUser("a", "b", email, TEST_PASSWORD); + /** + * Id of the member + */ + protected int id = createVerifiedUser("a", "b", email, TEST_PASSWORD); - protected String cookie; + /** + * {@link User} object of the member + */ + protected User u = User.getById(id); - protected String csrf; + /** + * Session cookie of the member. + */ + protected String cookie; public ClientTest() { try { diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java index a6bbed85..97b8823b 100644 --- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java +++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java @@ -20,7 +20,11 @@ import sun.security.pkcs10.PKCS10; import sun.security.pkcs10.PKCS10Attributes; import sun.security.x509.X500Name; -public class ConfiguredTest { +/** + * Base class for a Testsuite that makes use of the config variables that define + * the environment. + */ +public abstract class ConfiguredTest { static Properties testProps = new Properties(); diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index c0c8ad49..ce96cf28 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -55,6 +55,10 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; +/** + * Base class for test suites who require a launched Gigi instance. The instance + * is cleared once per test suite. + */ public class ManagedTest extends ConfiguredTest { static { @@ -62,7 +66,7 @@ public class ManagedTest extends ConfiguredTest { } /** - * Some password that fullfills the password criteria. + * Some password that fulfills the password criteria. */ protected static final String TEST_PASSWORD = "xvXV12°§"; diff --git a/tests/org/cacert/gigi/testUtils/PingTest.java b/tests/org/cacert/gigi/testUtils/PingTest.java index 50d5d7fc..4fb49595 100644 --- a/tests/org/cacert/gigi/testUtils/PingTest.java +++ b/tests/org/cacert/gigi/testUtils/PingTest.java @@ -18,8 +18,14 @@ import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.pages.account.domain.DomainOverview; import org.junit.After; +/** + * Base class for test suites that check extensively if the domain-ping + * functionality wroks as expected. + */ public abstract class PingTest extends ClientTest { + protected String csrf; + protected static void updateService(String token, String value, String action) throws IOException, MalformedURLException { String manage = getTestProps().getProperty("domain.manage"); assumeNotNull(manage);