From e940ccf7d38373c145b5d5f4a95603edaa089796 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 14 Oct 2019 14:25:58 +0100 Subject: Clean up minor things in policy-models Cleam up of some minor eclipse, checkstyle, and Sonar issues in policy-models Issue-ID: POLICY-2165 Change-Id: Id5682fd60e1a6cebbf716d9c258453aa53ca2482 Signed-off-by: liamfallon --- .../actor/cds/CdsActorServiceProviderTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'models-interactions/model-actors/actor.cds/src') diff --git a/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProviderTest.java b/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProviderTest.java index 28a1676ed..eb82ae231 100644 --- a/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProviderTest.java +++ b/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProviderTest.java @@ -87,6 +87,8 @@ public class CdsActorServiceProviderTest { // Setup policy policy = new Policy(); Map payloadMap = new HashMap() { + private static final long serialVersionUID = 1L; + { put(CdsActorConstants.KEY_CBA_NAME, CDS_BLUEPRINT_NAME); put(CdsActorConstants.KEY_CBA_VERSION, CDS_BLUEPRINT_VERSION); @@ -124,7 +126,7 @@ public class CdsActorServiceProviderTest { @Test public void testActor() { - assertEquals(cdsActor.actor(), CdsActorConstants.CDS_ACTOR); + assertEquals(CdsActorConstants.CDS_ACTOR, cdsActor.actor()); } @Test @@ -147,7 +149,7 @@ public class CdsActorServiceProviderTest { assertTrue(cdsRequest.hasCommonHeader()); CommonHeader commonHeader = cdsRequest.getCommonHeader(); assertEquals(commonHeader.getRequestId(), REQUEST_ID.toString()); - assertEquals(commonHeader.getSubRequestId(), SUBREQUEST_ID); + assertEquals(SUBREQUEST_ID, commonHeader.getSubRequestId()); assertTrue(cdsRequest.hasPayload()); Struct cdsPayload = cdsRequest.getPayload(); @@ -155,24 +157,24 @@ public class CdsActorServiceProviderTest { assertTrue(cdsRequest.hasActionIdentifiers()); ActionIdentifiers actionIdentifiers = cdsRequest.getActionIdentifiers(); - assertEquals(actionIdentifiers.getActionName(), CDS_RECIPE); - assertEquals(actionIdentifiers.getBlueprintName(), CDS_BLUEPRINT_NAME); - assertEquals(actionIdentifiers.getBlueprintVersion(), CDS_BLUEPRINT_VERSION); + assertEquals(CDS_RECIPE, actionIdentifiers.getActionName()); + assertEquals(CDS_BLUEPRINT_NAME, actionIdentifiers.getBlueprintName()); + assertEquals(CDS_BLUEPRINT_VERSION, actionIdentifiers.getBlueprintVersion()); } @Test public void testRecipePayloads() { - assertEquals(cdsActor.recipePayloads("").size(), 0); + assertEquals(0, cdsActor.recipePayloads("").size()); } @Test public void testRecipes() { - assertEquals(cdsActor.recipes().size(), 0); + assertEquals(0, cdsActor.recipes().size()); } @Test public void testRecipeTargets() { - assertEquals(cdsActor.recipeTargets("").size(), 0); + assertEquals(0, cdsActor.recipeTargets("").size()); } @Test -- cgit 1.2.3-korg