From fdd5783d8e339ec14076f3e52b1139a62afa763c Mon Sep 17 00:00:00 2001
From: Patrick Gotthard <patrick@patrick-gotthard.de>
Date: Mon, 14 Apr 2014 20:14:31 +0200
Subject: [PATCH] Added FIXME comments to wrong used assert statements

---
 src/main/java/org/rometools/certiorem/hub/Hub.java   |  2 ++
 .../org/rometools/certiorem/hub/data/jpa/JPADAO.java |  1 +
 .../certiorem/hub/data/ram/InMemoryHubDAO.java       |  1 +
 .../certiorem/hub/data/AbstractDAOTest.java          | 12 +++++++-----
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/rometools/certiorem/hub/Hub.java b/src/main/java/org/rometools/certiorem/hub/Hub.java
index dbe6397..c6996b5 100644
--- a/src/main/java/org/rometools/certiorem/hub/Hub.java
+++ b/src/main/java/org/rometools/certiorem/hub/Hub.java
@@ -123,6 +123,7 @@ public class Hub {
      *             request.
      */
     public void sendNotification(final String requestHost, final String topic) {
+        // FIXME assert should not be used for validation because it can be disabled
         assert validTopics.isEmpty() || validTopics.contains(topic) : "That topic is not supported by this hub. " + topic;
         LOG.debug("Sending notification for {}", topic);
         try {
@@ -179,6 +180,7 @@ public class Hub {
         LOG.debug("{} wants to subscribe to {}", callback, topic);
         try {
             try {
+                // FIXME assert should not be used for validation because it can be disabled
                 assert callback != null : "Callback URL is required.";
                 assert topic != null : "Topic URL is required.";
 
diff --git a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java b/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java
index 01d1f4b..ceb2f67 100644
--- a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java
+++ b/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java
@@ -95,6 +95,7 @@ public class JPADAO implements HubDAO {
 
     @Override
     public Subscriber addSubscriber(final Subscriber subscriber) {
+        // FIXME assert should not be used for validation because it can be disabled
         assert subscriber != null : "Attempt to store a null subscriber";
         final EntityManager em = factory.createEntityManager();
         final EntityTransaction tx = em.getTransaction();
diff --git a/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java b/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java
index 72a8075..cdcce85 100644
--- a/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java
+++ b/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java
@@ -39,6 +39,7 @@ public class InMemoryHubDAO implements HubDAO {
 
     @Override
     public Subscriber addSubscriber(final Subscriber subscriber) {
+        // FIXME assert should not be used for validation because it can be disabled
         assert subscriber != null : "Attempt to store a null subscriber";
 
         List<Subscriber> subList = subscribers.get(subscriber.getTopic());
diff --git a/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java b/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java
index 4867195..191f5cb 100644
--- a/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java
+++ b/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java
@@ -20,6 +20,7 @@ package org.rometools.certiorem.hub.data;
 
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,11 +47,12 @@ public abstract class AbstractDAOTest {
 
         final Subscriber result = instance.addSubscriber(subscriber);
 
-        assert result.equals(subscriber) : "Subscriber not equal.";
+        Assert.assertTrue("Subscriber not equal", result.equals(subscriber));
 
         final List<? extends Subscriber> subscribers = instance.subscribersForTopic(subscriber.getTopic());
 
-        assert subscribers.contains(result) : "Subscriber not in result.";
+        Assert.assertTrue("Subscriber not in result", subscribers.contains(result));
+
     }
 
     @Test
@@ -65,14 +67,14 @@ public abstract class AbstractDAOTest {
 
         final Subscriber result = instance.addSubscriber(subscriber);
 
-        assert subscriber.equals(result) : "Subscriber not equal.";
+        Assert.assertEquals("Subscriber not equal", subscriber, result);
         // quick test for store.
         List<? extends Subscriber> subscribers = instance.subscribersForTopic(subscriber.getTopic());
-        assert subscribers.contains(result) : "Subscriber not in result.";
+        Assert.assertTrue("Subscriber not in result", subscribers.contains(result));
         // sleep past expiration
         Thread.sleep(1100);
         subscribers = instance.subscribersForTopic(subscriber.getTopic());
-        assert !subscribers.contains(result) : "Subscriber should have expired";
+        Assert.assertFalse("Subscriber should have expired", subscribers.contains(result));
     }
 
     @Test