fix: display verify information only when verification token is known.

[gigi.git] / tests / org / cacert / gigi / LoginTest.java

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index 86e3d7b7e53314a10e9b51c4513400bc4666a304..ed1c932af6e9c4676e64c74c6c50debe42bacd9e 100644 (file)
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -15,7 +15,6 @@ import java.security.cert.X509Certificate;
 
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.CSRType;
-import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.IOUtils;
@@ -53,7 +52,7 @@ public class LoginTest extends ManagedTest {
         headerField = huc.getHeaderField("Set-Cookie");
         assertNotNull(headerField);
         assertEquals(302, huc.getResponseCode());
-        assertEquals("https://" + getServerName().replaceFirst(":443$", "") + SECURE_REFERENCE, huc.getHeaderField("Location"));
+        assertEquals("https://" + getServerName() + SECURE_REFERENCE, huc.getHeaderField("Location"));
     }
 
     @Test
@@ -94,13 +93,13 @@ public class LoginTest extends ManagedTest {
         KeyPair kp = generateKeypair();
         String csr = generatePEMCSR(kp, "CN=hans");
         User u = User.getById(user);
-        Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1));
+        Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, getClientProfile());
         final PrivateKey pk = kp.getPrivate();
         await(c.issue(null, "2y", u));
         final X509Certificate ce = c.cert();
         c.setLoginEnabled(true);
         String cookie = login(pk, ce);
-        URL u2 = new URL("https://" + getServerName().replaceFirst("^www.", "secure.") + SECURE_REFERENCE);
+        URL u2 = new URL("https://" + getSecureServerName() + SECURE_REFERENCE);
         HttpURLConnection huc = (HttpURLConnection) u2.openConnection();
         huc.addRequestProperty("Cookie", cookie);
         authenticateClientCert(pk, ce, huc);