From 64ce7957251a5de6fa57204e41e2699939adae47 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 27 May 2021 09:12:05 +0100 Subject: Remove policies field from PdpUpdate message Issue-ID: POLICY-3323 Change-Id: I14dafe4a20f95e2ebe4279e5b6ae141e2ee4fc48 Signed-off-by: waynedunican Signed-off-by: WayneDunican --- .../onap/policy/models/pdp/concepts/PdpUpdateTest.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'models-pdp/src/test/java') diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpUpdateTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpUpdateTest.java index c37979f81..a24b410ae 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpUpdateTest.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpUpdateTest.java @@ -3,7 +3,7 @@ * ONAP Policy Models * ================================================================================ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import static org.onap.policy.models.pdp.concepts.PdpMessageUtils.removeVariable import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @@ -41,7 +42,8 @@ public class PdpUpdateTest { assertThatThrownBy(() -> new PdpUpdate(null)).isInstanceOf(NullPointerException.class); PdpUpdate orig = new PdpUpdate(); - orig.setPolicies(null); + orig.setPoliciesToBeDeployed(null); + orig.setPoliciesToBeUndeployed(null); // verify with null values assertEquals(removeVariableFields(orig.toString()), removeVariableFields(new PdpUpdate(orig).toString())); @@ -62,14 +64,17 @@ public class PdpUpdateTest { policy2.setVersion("4.5.6"); List policies = Arrays.asList(policy1, policy2); - orig.setPolicies(policies); + orig.setPoliciesToBeDeployed(policies); + orig.setPoliciesToBeUndeployed(policies.stream().map(ToscaPolicy::getIdentifier).collect(Collectors.toList())); PdpUpdate other = new PdpUpdate(orig); assertEquals(removeVariableFields(orig.toString()), removeVariableFields(other.toString())); // ensure list and items are not the same object - assertNotSame(other.getPolicies(), policies); - assertNotSame(other.getPolicies().get(0), policies.get(0)); + assertNotSame(other.getPoliciesToBeDeployed(), policies); + assertNotSame(other.getPoliciesToBeDeployed().get(0), policies.get(0)); + assertNotSame(other.getPoliciesToBeUndeployed(), policies); + assertNotSame(other.getPoliciesToBeUndeployed().get(0), policies.get(0)); } } -- cgit 1.2.3-korg