From 6656a9fc98c178351122fd326940fbb6923d292f Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Fri, 14 Aug 2020 19:29:51 -0400
Subject: Remove legacy operational policy from drools-apps

Issue-ID: POLICY-2766
Change-Id: I1ff7bbc4e301cfe6fa746f38c839acf83f7584b6
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../common/rules/test/BaseTestTest.java            | 36 ++--------------------
 .../common/rules/test/DroolsRuleTestTest.java      |  2 +-
 2 files changed, 4 insertions(+), 34 deletions(-)

(limited to 'controlloop/common/rules-test/src/test')

diff --git a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/BaseTestTest.java b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/BaseTestTest.java
index ecff7e0bb..ea90a6ba6 100644
--- a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/BaseTestTest.java
+++ b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/BaseTestTest.java
@@ -136,8 +136,8 @@ public class BaseTestTest {
                         any(StandardCoder.class))).thenReturn(appcLcmRead);
         when(topics.createListener(eq(BaseTest.APPC_CL_TOPIC), eq(Request.class),
                         any(StandardCoderInstantAsMillis.class))).thenReturn(appcClSink);
-        when(topics.createListener(eq(BaseTest.SDNR_CL_TOPIC), eq(PciMessage.class),
-            any(StandardCoder.class))).thenReturn(sdnrClSink);
+        when(topics.createListener(eq(BaseTest.SDNR_CL_TOPIC), eq(PciMessage.class), any(StandardCoder.class)))
+                        .thenReturn(sdnrClSink);
 
         Supplier<HttpClients> httpClientMaker = this::makeHttpClients;
         Supplier<Simulators> simMaker = this::makeSim;
@@ -204,7 +204,7 @@ public class BaseTestTest {
 
     @Test
     public void testInit() {
-        assertSame(topics, base.getTopics());
+        assertSame(topics, BaseTest.getTopics());
     }
 
     @Test
@@ -264,11 +264,6 @@ public class BaseTestTest {
         verify(topics, times(2)).inject(eq(BaseTest.APPC_LCM_WRITE_TOPIC), any(), any());
     }
 
-    @Test
-    public void testTestVcpeSunnyDayLegacy() {
-        checkAppcLcmPolicy("restart", base::testVcpeSunnyDayLegacy);
-    }
-
     @Test
     public void testTestVcpeSunnyDayCompliant() {
         checkAppcLcmPolicy("restart", base::testVcpeSunnyDayCompliant);
@@ -295,11 +290,6 @@ public class BaseTestTest {
         verify(topics).inject(eq(BaseTest.APPC_LCM_WRITE_TOPIC), any(), any());
     }
 
-    @Test
-    public void testTestVdnsSunnyDayLegacy() {
-        checkHttpPolicy(base::testVdnsSunnyDayLegacy);
-    }
-
     @Test
     public void testTestVdnsSunnyDayCompliant() {
         checkHttpPolicy(base::testVdnsSunnyDayCompliant);
@@ -310,21 +300,11 @@ public class BaseTestTest {
         checkHttpPolicyCompliantFailure(base::testVdnsRainyDayCompliant);
     }
 
-    @Test
-    public void testTestVfwSunnyDayLegacy() {
-        checkAppcLegacyPolicy("ModifyConfig", base::testVfwSunnyDayLegacy);
-    }
-
     @Test
     public void testTestVfwSunnyDayCompliant() {
         checkAppcLegacyPolicy("ModifyConfig", base::testVfwSunnyDayCompliant);
     }
 
-    @Test
-    public void testTestVfwRainyDayLegacyFailure() {
-        checkAppcLegacyPolicyOperationFailure("ModifyConfig", base::testVfwRainyDayLegacyFailure);
-    }
-
     @Test
     public void testTestVfwRainyDayOverallTimeout() {
         checkAppcLegacyPolicyFinalFailure("ModifyConfig", base::testVfwRainyDayOverallTimeout);
@@ -335,21 +315,11 @@ public class BaseTestTest {
         checkAppcLegacyPolicyFinalFailure("ModifyConfig", base::testVfwRainyDayCompliantTimeout);
     }
 
-    @Test
-    public void testTestVpciSunnyDayLegacy() {
-        checkSdnrPolicy("ModifyConfig", base::testVpciSunnyDayLegacy);
-    }
-
     @Test
     public void testTestVpciSunnyDayCompliant() {
         checkSdnrPolicy("ModifyConfig", base::testVpciSunnyDayCompliant);
     }
 
-    @Test
-    public void testTestVsonhSunnyDayLegacy() {
-        checkSdnrPolicy("ModifyConfigANR", base::testVsonhSunnyDayLegacy);
-    }
-
     @Test
     public void testTestVsonhSunnyDayCompliant() {
         checkSdnrPolicy("ModifyConfigANR", base::testVsonhSunnyDayCompliant);
diff --git a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/DroolsRuleTestTest.java b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/DroolsRuleTestTest.java
index a21fa0a93..43392b9bb 100644
--- a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/DroolsRuleTestTest.java
+++ b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/DroolsRuleTestTest.java
@@ -204,7 +204,7 @@ public class DroolsRuleTestTest {
 
     @Test
     public void testInit() {
-        assertSame(topics, base.getTopics());
+        assertSame(topics, BaseTest.getTopics());
         assertSame(controller, base.controller);
     }
 
-- 
cgit