diff options
| author |   dg5762 <dg5762@att.com> | 2019-10-08 16:04:55 -0500 |
|---|---|---|
| committer | dg5762 <dg5762@att.com> | 2019-10-15 10:56:22 -0500 |
| commit | bd1e928680cbd46365d7a863c85f5274882a2a51 (patch) | |
| tree | d2b6960b03544172de8437e6a98061291381dfe9 /models-interactions/model-yaml/src/test | |
| parent | 0ee2ca49f61f75179f3118cbadd2406f7c72cfb3 (diff) | |
Remove actor and recipe checks from ControlLoopCompiler.java
Remove actor and recipe checks from ControlLoopCompiler.java
and adjusted associated JUNIT tests for the changes that were
implented. Removed some redundant variables, replaced null check
in actor/recipe with blank string, which checks for null as
well as empty/blank strings. drools-applications still builds
correctly.
Issue-ID: POLICY-2128
Change-Id: I83d9e3b1152d87c9c8d2c90586300aebdd53b8e2
Signed-off-by: dg5762 <dg5762@att.com>
Diffstat (limited to 'models-interactions/model-yaml/src/test')
2 files changed, 2 insertions, 6 deletions
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 6603dcb82..f68b9d39e 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 @@ -51,11 +51,7 @@ public class ControlLoopCompilerTest { expectedOnErrorMessages.add("Policy id is set to a PolicyResult SUCCESS"); expectedOnErrorMessages.add("Policy id is set to a FinalResult FINAL_SUCCESS"); expectedOnErrorMessages.add("Policy actor is null"); - expectedOnErrorMessages.add("Policy actor is invalid"); expectedOnErrorMessages.add("Policy recipe is null"); - expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID); - expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID); - expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID); expectedOnErrorMessages.add("Policy target is null"); expectedOnErrorMessages.add("Policy target is invalid"); expectedOnErrorMessages.add("Policy success is neither another policy nor FINAL_SUCCESS"); 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 602e12d6e..5182da560 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 @@ -697,7 +697,7 @@ public class ControlLoopPolicyBuilderTest { .description(TRIGGER_RESTART) .actor(null) .target(null) - .recipe("Instantiate") + .recipe(null) .payload(null) .retries(2) .timeout(300).build()); @@ -712,7 +712,7 @@ public class ControlLoopPolicyBuilderTest { if ("Policy actor is null".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) { invalidActor = true; } - if ("Policy recipe is invalid".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) { + if ("Policy recipe is null".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) { invalidRecipe = true; } if ("Policy target is null".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) { |