From: Jim Hahn <jrh3@att.com>
Date: Wed, 31 Jul 2019 22:18:08 +0000 (-0400)
Subject: Fix junit broken by new addTopic(List) method
X-Git-Tag: 1.5.1~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=27280e6dc65a65959dae03545d0eb4f9426390ad;p=policy%2Fdrools-pdp.git

Fix junit broken by new addTopic(List) method

Addition of new TopicEndpoint.addTopic() method resulted in errors
like the following in drools-pdp:
  [ERROR] ... reference to addTopicSources is ambiguous
  both method addTopicSources(Properties)
  and method addTopicSources(List<TopicParameters>)
  match
Fixed the junits to disambiguate the method invocation.

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

diff --git a/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineManagerTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineManagerTest.java
index 287f82f5..c5fa3980 100644
--- a/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineManagerTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineManagerTest.java
@@ -238,8 +238,8 @@ public class PolicyEngineManagerTest {
         when(controller4.lock()).thenReturn(true);
         when(controller4.unlock()).thenReturn(true);
 
-        when(endpoint.addTopicSources(any())).thenReturn(sources);
-        when(endpoint.addTopicSinks(any())).thenReturn(sinks);
+        when(endpoint.addTopicSources(any(Properties.class))).thenReturn(sources);
+        when(endpoint.addTopicSinks(any(Properties.class))).thenReturn(sinks);
         when(endpoint.start()).thenReturn(true);
         when(endpoint.stop()).thenReturn(true);
         when(endpoint.lock()).thenReturn(true);
@@ -452,7 +452,7 @@ public class PolicyEngineManagerTest {
 
         // source list of size 1
         setUp();
-        when(endpoint.addTopicSources(any())).thenReturn(Arrays.asList(source1));
+        when(endpoint.addTopicSources(any(Properties.class))).thenReturn(Arrays.asList(source1));
         mgr.configure(properties);
         assertTrue(mgr.configure(pdpConfig));
 
diff --git a/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java
index 67fdfe65..6f09ab9b 100644
--- a/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java
@@ -109,8 +109,8 @@ public class AggregatedPolicyControllerTest {
         sinks = Arrays.asList(sink1, sink2);
 
         endpointMgr = mock(TopicEndpoint.class);
-        when(endpointMgr.addTopicSources(any())).thenReturn(sources);
-        when(endpointMgr.addTopicSinks(any())).thenReturn(sinks);
+        when(endpointMgr.addTopicSources(any(Properties.class))).thenReturn(sources);
+        when(endpointMgr.addTopicSinks(any(Properties.class))).thenReturn(sinks);
 
         persist = mock(SystemPersistence.class);