diff options
| author |   Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-04-02 22:38:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-02 22:38:05 +0000 |
| commit | 338796c4d56d2e95aa2903d80589b3b35b5a3dd2 (patch) | |
| tree | 6a71f698101d9c67e4ae5fa4dda45d4473981b81 /ONAP-PAP-REST/src/test | |
| parent | 55d7f3d9d076a858bce8aad24b69c80438831040 (diff) | |
| parent | c72526cde70d6b2899d9e4bbc40e096e0ecf1b7d (diff) | |
Merge "Push and unpush to support multiple policies"
Diffstat (limited to 'ONAP-PAP-REST/src/test')
2 files changed, 8 insertions, 8 deletions
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java index e7ab36e7a..73540033f 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java @@ -96,7 +96,7 @@ public class DeleteHandlerTest { // Test deletion from PAP MockHttpServletResponse response = new MockHttpServletResponse(); try { - handler.doAPIDeleteFromPAP(request, response); + handler.doApiDeleteFromPap(request, response); } catch (Exception ex) { fail("Not expecting an exception: " + ex); } @@ -104,7 +104,7 @@ public class DeleteHandlerTest { // Test deletion from PDP ONAPLoggingContext loggingContext = Mockito.mock(ONAPLoggingContext.class); try { - handler.doAPIDeleteFromPDP(request, response, loggingContext); + handler.doApiDeleteFromPdp(request, response, loggingContext); } catch (Exception ex) { fail("Not expecting an exception: " + ex); diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicyTest.java index 162f4a928..cd6bf021d 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicyTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicyTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP-PDP-REST * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,10 +21,10 @@ package org.onap.policy.pap.xacml.rest.model; import static org.junit.Assert.assertEquals; +import com.att.research.xacml.api.pap.PDPPolicy; import org.junit.Test; import org.onap.policy.xacml.std.pap.StdPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPPolicy; -import com.att.research.xacml.api.pap.PDPPolicy; public class RemoveGroupPolicyTest { @Test @@ -37,8 +37,8 @@ public class RemoveGroupPolicyTest { // Test remove PDPPolicy policy = new StdPDPPolicy(); - remove.prepareToRemove(policy); - remove.doSave(); + remove.prepareToRemove(); + remove.removePolicy(policy); assertEquals(remove.isRemoved(), true); } } |