From 0d4259eba2c747b2657ea9755f0f39827c8cb437 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 1 Nov 2019 06:55:23 +0000 Subject: Fix Checkstyle issues in policy-models Some minor checkstyle issues were introduced into policy-models by recent reviews. Issue-ID: POLICY-2088 Change-Id: I84af19926432081d72e2054af788cdc35850a99c Signed-off-by: liamfallon --- .../policy/controlloop/compiler/ControlLoopCompilerTest.java | 2 -- .../controlloop/policy/ControlLoopPolicyBuilderTest.java | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'models-interactions/model-yaml/src/test/java/org/onap') diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java index f68b9d39e..6fc3e1acb 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java @@ -37,8 +37,6 @@ import org.onap.policy.controlloop.policy.ControlLoopPolicy; import org.onap.policy.controlloop.policy.FinalResult; public class ControlLoopCompilerTest { - - private static final String POLICY_RECIPE_IS_INVALID = "Policy recipe is invalid"; private static final String RESTART_UNKNOWN_POLICY = "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy"; @Rule diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java index 5182da560..3236bca3f 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java @@ -244,7 +244,7 @@ public class ControlLoopPolicyBuilderTest { ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400, pnf); assertEquals(pnf, builder.getControlLoop().getPnf()); - builder.removePNF(); + builder.removePnf(); assertNull(builder.getControlLoop().getPnf()); } @@ -258,10 +258,10 @@ public class ControlLoopPolicyBuilderTest { Pnf pnf = new Pnf(); pnf.setPnfType(PnfType.ENODEB); - builder.setPNF(pnf); + builder.setPnf(pnf); assertEquals(pnf, builder.getControlLoop().getPnf()); - builder.removePNF(); + builder.removePnf(); assertNull(builder.getControlLoop().getPnf()); } @@ -271,7 +271,7 @@ public class ControlLoopPolicyBuilderTest { ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400); expectedException.expect(BuilderException.class); expectedException.expectMessage("PNF must not be null"); - builder.setPNF(null); + builder.setPnf(null); } @Test @@ -280,7 +280,7 @@ public class ControlLoopPolicyBuilderTest { ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400); expectedException.expect(BuilderException.class); expectedException.expectMessage("Invalid PNF - need either pnfName or pnfType"); - builder.setPNF(new Pnf()); + builder.setPnf(new Pnf()); } @Test @@ -862,7 +862,7 @@ public class ControlLoopPolicyBuilderTest { // Set pnf // if (policyTobuild.getControlLoop().getPnf() != null) { - builder = builder.setPNF(policyTobuild.getControlLoop().getPnf()); + builder = builder.setPnf(policyTobuild.getControlLoop().getPnf()); } // // Add the policies and be sure to set the trigger policy -- cgit 1.2.3-korg