X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fclub%2Fwpia%2Fgigi%2FTestSeparateSessionScope.java;h=02635bef3d9a8ec890806ce9e62bd574ec06c869;hb=770aa3cabf55da5c3e955764dc6ea7159130821d;hp=c5bb9dceabd40fd8aaa590f42829e44ad30be9cc;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git diff --git a/tests/club/wpia/gigi/TestSeparateSessionScope.java b/tests/club/wpia/gigi/TestSeparateSessionScope.java index c5bb9dce..02635bef 100644 --- a/tests/club/wpia/gigi/TestSeparateSessionScope.java +++ b/tests/club/wpia/gigi/TestSeparateSessionScope.java @@ -6,9 +6,7 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.security.GeneralSecurityException; -import java.security.KeyManagementException; import java.security.KeyPair; -import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.sql.SQLException; @@ -27,7 +25,7 @@ public class TestSeparateSessionScope extends ManagedTest { @Test public void testSeparateScope() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { String mail = "thisgo" + createUniqueName() + "@example.com"; - int user = createAssuranceUser("test", "tugo", mail, TEST_PASSWORD); + int user = createVerificationUser("test", "tugo", mail, TEST_PASSWORD); String cookie = login(mail, TEST_PASSWORD); KeyPair kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=hans"); @@ -49,7 +47,7 @@ public class TestSeparateSessionScope extends ManagedTest { @Test public void testSerialSteal() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { String mail = "thisgo" + createUniqueName() + "@example.com"; - int user = createAssuranceUser("test", "tugo", mail, TEST_PASSWORD); + int user = createVerificationUser("test", "tugo", mail, TEST_PASSWORD); KeyPair kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=hans"); User u = User.getById(user); @@ -69,7 +67,7 @@ public class TestSeparateSessionScope extends ManagedTest { } - private void checkCertLogin(Certificate c2, final PrivateKey pk, String scookie, int expected) throws IOException, NoSuchAlgorithmException, KeyManagementException, GeneralSecurityException { + private void checkCertLogin(Certificate c2, final PrivateKey pk, String scookie, int expected) throws IOException, GeneralSecurityException, GigiApiException { URL u = new URL("https://" + getSecureServerName() + SECURE_REFERENCE); HttpURLConnection huc = (HttpURLConnection) u.openConnection(); authenticateClientCert(pk, c2.cert(), huc);