diff options
Diffstat (limited to 'controlloop/common/policy-yaml/src/test/java')
2 files changed, 16 insertions, 45 deletions
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java index f8ad499f0..90d498a8d 100644 --- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java +++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java @@ -61,30 +61,30 @@ public class ControlLoopPolicyBuilderTest { // // Test add services // - Service vSCP = new Service("vSCP"); - Service vUSP = new Service("vUSP"); - Service vTrinity = new Service("Trinity"); - builder = builder.addService(vSCP, vUSP, vTrinity); + Service Ser1 = new Service("Ser1"); + Service Ser2 = new Service("Ser2"); + Service Ser3 = new Service("Ser3"); + builder = builder.addService(Ser1, Ser2, Ser3); assertTrue(builder.getControlLoop().services.size() == 3); // // Test remove services // - builder = builder.removeService(vSCP); + builder = builder.removeService(Ser1); assertTrue(builder.getControlLoop().services.size() == 2); builder = builder.removeAllServices(); assertTrue(builder.getControlLoop().services.size() == 0); // // Test add resources // - Resource vCTS = new Resource("vCTS", ResourceType.VF); - Resource vCOM = new Resource("vCTS", ResourceType.VF); - Resource vRAR = new Resource("vCTS", ResourceType.VF); - builder = builder.addResource(vCTS, vCOM, vRAR); + Resource Resrc1 = new Resource("Resrc1", ResourceType.VF); + Resource Resrc2 = new Resource("Resrc1", ResourceType.VF); + Resource Resrc3 = new Resource("Resrc1", ResourceType.VF); + builder = builder.addResource(Resrc1, Resrc2, Resrc3); assertTrue(builder.getControlLoop().resources.size() == 3); // // Test remove resources // - builder = builder.removeResource(vCTS); + builder = builder.removeResource(Resrc1); assertTrue(builder.getControlLoop().resources.size() == 2); builder = builder.removeAllResources(); assertTrue(builder.getControlLoop().resources.size() == 0); @@ -308,7 +308,7 @@ public class ControlLoopPolicyBuilderTest { Policy triggerPolicy = builder.setTriggerPolicy( "Restart the eNodeB", "Upon getting the trigger event, restart the eNodeB", - "SDNR", + "RANController", new Target(TargetType.PNF), "Restart", null, diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java index 9e91dc4d3..555b69282 100644 --- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java +++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java @@ -36,54 +36,25 @@ import org.yaml.snakeyaml.constructor.Constructor; public class ControlLoopPolicyTest { - @Test - public void testSDNO() { - this.test("src/test/resources/v1.0.0/policy_SDNO_1702.yaml"); - } @Test public void test() { this.test("src/test/resources/v1.0.0/policy_Test.yaml"); } - - @Test - public void testMultipleService() { - this.test("src/test/resources/v1.0.0/policy_Test_MultipleService.yaml"); - } - - @Test - public void testF5() { - this.test("src/test/resources/v1.0.0/policy_vSCP_F5_1610.yaml"); - } @Test - public void testUSP() { - this.test("src/test/resources/v1.0.0/policy_vUSP_1610.yaml"); + public void testvService1() { + this.test("src/test/resources/v1.0.0/policy_vService.yaml"); } @Test public void testOpenLoop() { - this.test("src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml"); - } - - @Test - public void testvProbes() { - this.test("src/test/resources/v1.0.0/policy_vProbes_1610.yaml"); - } - - @Test - public void test1707() { - this.test("src/test/resources/v2.0.0/policy_vUSP_1707.yaml"); - } - - @Test - public void testeNodeBALU() { - this.test("src/test/resources/v2.0.0/policy_eNodeB_ALU_1707.yaml"); + this.test("src/test/resources/v1.0.0/policy_OpenLoop.yaml"); } @Test - public void testeNodeBEricsson() { - this.test("src/test/resources/v2.0.0/policy_eNodeB_Ericsson_1707.yaml"); + public void testvService2() { + this.test("src/test/resources/v2.0.0/policy_vService.yaml"); } public void test(String testFile) { |