From 28675b61ff01735e091fb37fd0d150574f2f61b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 22 Feb 2015 02:00:44 +0100 Subject: [PATCH] Fix: some nullpointer references (coverity). --- tests/org/cacert/gigi/email/TestSendmail.java | 4 ++++ tests/org/cacert/gigi/pages/account/TestCertificateAdd.java | 1 + tests/org/cacert/gigi/pages/main/RegisterPageTest.java | 2 ++ tests/org/cacert/gigi/ping/TestDNS.java | 2 ++ tests/org/cacert/gigi/ping/TestHTTP.java | 2 ++ tests/org/cacert/gigi/ping/TestSSL.java | 2 ++ tests/org/cacert/gigi/testUtils/ManagedTest.java | 3 +++ tests/org/cacert/gigi/testUtils/TestEmailReciever.java | 3 ++- 8 files changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java index 4c24701a..898e68ef 100644 --- 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 aa118973..e29dcacd 100644 --- 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 28ced07c..c6b2a67b 100644 --- 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 4f2404e9..021012a1 100644 --- 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 6ee6f6e8..4daa0d7e 100644 --- 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 e877fa6f..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,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 5c58e234..8f6e6c5d 100644 --- 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 126edc79..7cb410d8 100644 --- 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 mails = new LinkedBlockingQueue(); public TestMail recieve() throws InterruptedException { - return mails.poll(5, TimeUnit.SECONDS); + TestMail poll = mails.poll(5, TimeUnit.SECONDS); + return poll; } @Override -- 2.39.2