Merge remote-tracking branch 'origin/libs/scrypt/local'

[gigi.git] / tests / org / cacert / gigi / ping / TestSSL.java

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index fccd97ebab28031bcd1d6d58da56cce40c8c0fba..a9aa73b1bb61e7fea945b94c579cc7fe90f5935b 100644 (file)
--- 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,6 +122,7 @@ public class TestSSL extends PingTest {
 
         TestMail mail = getMailReciever().recieve();
         if (emailVariant == 0) {
+            Assert.assertNotNull(mail);
             mail.verify();
         }
         waitForPings(3);
@@ -143,8 +145,7 @@ public class TestSSL extends PingTest {
     }
 
     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;