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

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index 71ee55eb..a9aa73b1 100644
--- a/tests/org/cacert/gigi/ping/TestSSL.java
+++ b/tests/org/cacert/gigi/ping/TestSSL.java
@@ -37,6 +37,7 @@ 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.junit.Assert;
 import org.junit.Test;
 
 public class TestSSL extends PingTest {
@@ -121,8 +122,8 @@ public class TestSSL extends PingTest {
 
         TestMail mail = getMailReciever().recieve();
         if (emailVariant == 0) {
-            String link = mail.extractLink();
-            new URL(link).openConnection().getHeaderField("");
+            Assert.assertNotNull(mail);
+            mail.verify();
         }
         waitForPings(3);
 
@@ -139,13 +140,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;