Fix: some nullpointer references (coverity).

diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java
index 4c24701a03d92f21fea3217fe34fee26d3245558..898e68ef460d3077e8179150e9eab1052f609472 100644 (file)
--- a/tests/org/cacert/gigi/email/TestSendmail.java
+++ b/tests/org/cacert/gigi/email/TestSendmail.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
 import static org.junit.Assume.*;
 
 import java.io.BufferedReader;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -94,6 +95,9 @@ public class TestSendmail extends ConfiguredTest {
         String line = "";
         while ( !line.startsWith(target)) {
             line = br.readLine();
+            if (line == null) {
+                throw new EOFException();
+            }
             response.append(line);
         }
         return response.toString();

diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
index aa118973862eb2a2c0821fa83e7deaa52ce09713..e29dcacdee6f8a9e91de2d72b90e652aa3078795 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
+++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
@@ -175,6 +175,7 @@ public class TestCertificateAdd extends ClientTest {
         Date start = new Date(now);
         Date end = new Date(now + MS_PER_DAY * 10);
         X509Certificate res = createCertWithValidity("&validFrom=" + sdf.format(start) + "&validity=" + sdf.format(end));
+        assertNotNull(res);
         assertEquals(start, res.getNotBefore());
         assertEquals(end, res.getNotAfter());
     }

diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index 28ced07cde2c9532bee32a2f0e85eedfdc158646..c6b2a67b4520c66da6c81ab1c99ee4c38fc42427 100644 (file)
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -11,6 +11,7 @@ import java.util.regex.Pattern;
 import org.cacert.gigi.testUtils.InitTruststore;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -49,6 +50,7 @@ public class RegisterPageTest extends ManagedTest {
 
     private void assertSuccessfullRegMail() {
         TestMail tm = waitForMail();
+        Assert.assertNotNull(tm);
         String link = tm.extractLink();
         assertTrue(link, link.startsWith("https://"));
     }

diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/org/cacert/gigi/ping/TestDNS.java
index 4f2404e92f9bd32b3c9d33635e8e2d9931f5a8c0..021012a196f25432106bbc34c663ba64760db8ee 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestDNS.java
+++ b/tests/org/cacert/gigi/ping/TestDNS.java
@@ -18,6 +18,7 @@ import org.cacert.gigi.testUtils.PingTest;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DNSUtil;
 import org.cacert.gigi.util.RandomToken;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestDNS extends PingTest {
@@ -78,6 +79,7 @@ public class TestDNS extends PingTest {
 
         TestMail mail = getMailReciever().recieve();
         if (emailVariant == 0) {
+            Assert.assertNotNull(mail);
             mail.verify();
         }
 

diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java
index 6ee6f6e821cecc958eb2a338ea9503fd3437dd25..4daa0d7e9421e5a4b672c0b966e1a1fb534d0601 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestHTTP.java
+++ b/tests/org/cacert/gigi/ping/TestHTTP.java
@@ -23,6 +23,7 @@ import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.PingTest;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.RandomToken;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestHTTP extends PingTest {
@@ -73,6 +74,7 @@ public class TestHTTP extends PingTest {
 
         TestMail mail = getMailReciever().recieve();
         if (emailVariant == 0) {
+            Assert.assertNotNull(mail);
             mail.verify();
         }
         waitForPings(2);

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index e877fa6f208cd321c13d787d0c6295d1eba26ff9..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);

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 5c58e23429e02e22ac29f161e0e57fae4c7570c5..8f6e6c5d44f360301e6efd0f5e323583bcc4081f 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -53,6 +53,7 @@ import org.cacert.gigi.util.ServerConstants;
 import org.cacert.gigi.util.SimpleSigner;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -278,6 +279,7 @@ public class ManagedTest extends ConfiguredTest {
         registerUser(firstName, lastName, email, password);
         try {
             TestMail tm = ter.recieve();
+            Assert.assertNotNull(tm);
             tm.verify();
             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
             ps.setString(1, email);
@@ -469,6 +471,7 @@ public class ManagedTest extends ConfiguredTest {
         EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
         adrr.insert(Language.getInstance(Locale.ENGLISH));
         TestMail testMail = getMailReciever().recieve();
+        Assert.assertNotNull(testMail);
         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index 126edc79b22531e88c3b03bc616763daece2d87f..7cb410d8e2ee15424f6aeba4ca5d289efe93764d 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -104,7 +104,8 @@ public class TestEmailReciever extends EmailProvider implements Runnable {
     LinkedBlockingQueue<TestMail> mails = new LinkedBlockingQueue<TestEmailReciever.TestMail>();
 
     public TestMail recieve() throws InterruptedException {
-        return mails.poll(5, TimeUnit.SECONDS);
+        TestMail poll = mails.poll(5, TimeUnit.SECONDS);
+        return poll;
     }
 
     @Override