X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fping%2FTestSSL.java;h=fe2db568fe09b6f4b97bd2684e225516d3600134;hp=71ee55ebd64659757f53be836f8cbbfe32a0c611;hb=e9bc2a58c7f2cefa106c3570bc8f4824c75b4679;hpb=90771b77a6e7cd00bce47feeb35786f0371b89bd

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index 71ee55eb..fe2db568 100644
--- a/tests/org/cacert/gigi/ping/TestSSL.java
+++ b/tests/org/cacert/gigi/ping/TestSSL.java
@@ -36,7 +36,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.account.domain.DomainOverview;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.PingTest;
-import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
+import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
 import org.junit.Test;
 
 public class TestSSL extends PingTest {
@@ -106,7 +106,7 @@ public class TestSSL extends PingTest {
                 sss.close();
             }
         }
-        String content = "newdomain=" + URLEncoder.encode(test, "UTF-8") + //
+        String content = "adddomain&newdomain=" + URLEncoder.encode(test, "UTF-8") + //
                 "&emailType=y&email=2&SSLType=y" + //
                 "&ssl-type-0=direct&ssl-port-0=" + port + //
                 "&ssl-type-1=direct&ssl-port-1=" + port2 + //
@@ -119,10 +119,9 @@ public class TestSSL extends PingTest {
         boolean secondsSucceeds = sslVariant != 0;
         assertTrue(secondsSucceeds ^ acceptSSLServer(sss2));
 
-        TestMail mail = getMailReciever().recieve();
+        TestMail mail = getMailReciever().receive();
         if (emailVariant == 0) {
-            String link = mail.extractLink();
-            new URL(link).openConnection().getHeaderField("");
+            mail.verify();
         }
         waitForPings(3);
 
@@ -139,13 +138,12 @@ 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), "/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);
     }
 
     private boolean acceptSSLServer(SSLServerSocket sss) throws IOException {
-        try {
-            Socket s = sss.accept();
+        try (Socket s = sss.accept()) {
             s.getOutputStream().write('b');
             s.getOutputStream().close();
             return true;