From: Jim Hahn <jrh3@att.com>
Date: Sat, 29 Sep 2018 14:06:26 +0000 (-0400)
Subject: Fix RestManager test issue
X-Git-Tag: 1.3.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=01badaecbe2fbbfd0494e15b9684cc3236dee8f9;p=policy%2Fcommon.git

Fix RestManager test issue

Apparently drools-pdp code depends on Dmaap topic factories throwing
IllegalArgumentException instead of IllegalStateException (which is what
the other topic factories throw) when an unknown topic name is requested.
Therefore, the change to make them consistent has been backed out.

Change-Id: Ia3d7e26a61027977eb626c9ddad6369982eae002
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java
index dc207a84..09078720 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java
@@ -395,7 +395,7 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
             if (dmaapTopicWriters.containsKey(topic)) {
                 return dmaapTopicWriters.get(topic);
             } else {
-                throw new IllegalStateException("DmaapTopicSink for " + topic + " not found");
+                throw new IllegalArgumentException("DmaapTopicSink for " + topic + " not found");
             }
         }
     }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
index ae6c6c3b..f45164f8 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
@@ -448,7 +448,7 @@ class IndexedDmaapTopicSourceFactory implements DmaapTopicSourceFactory {
             if (dmaapTopicSources.containsKey(topic)) {
                 return dmaapTopicSources.get(topic);
             } else {
-                throw new IllegalStateException("DmaapTopiceSource for " + topic + " not found");
+                throw new IllegalArgumentException("DmaapTopiceSource for " + topic + " not found");
             }
         }
     }
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
index c008a3bf..440120e6 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
@@ -106,4 +106,28 @@ public abstract class DmaapTopicFactoryTestBase<T extends Topic> extends BusTopi
         BusTopicParams params = getLastParams();
         assertEquals(false, params.isAllowSelfSignedCerts());
     }
+
+    /**
+     * Tests exception cases with get(topic).  DMaaP topics are special in that they
+     * throw IllegalArgumentException, even for an unknown topic name; all of the
+     * other Topic Factory classes throw IllegalStateException, thus we override
+     * the default test method.
+     */
+    @Override
+    public void testGet_Ex() {
+        // null topic
+        RuntimeException actual = expectException(() -> getTopic(null));
+        assertEquals("null topic", IllegalArgumentException.class, actual.getClass());
+
+        // empty topic
+        actual = expectException(() -> getTopic(""));
+        assertEquals("empty topic", IllegalArgumentException.class, actual.getClass());
+
+        // unknown topic
+        initFactory();
+        buildTopics(makePropBuilder().makeTopic(MY_TOPIC).build());
+
+        actual = expectException(() -> getTopic(TOPIC2));
+        assertEquals("unknown topic", IllegalArgumentException.class, actual.getClass());
+    }
 }