From 7b5fd6ca1ca335369aeed22ad29f691a16c333e9 Mon Sep 17 00:00:00 2001 From: ramverma Date: Wed, 20 Mar 2019 15:05:45 +0000 Subject: Adding query & state change PAP REST API's Change-Id: I861ace4811032314c3ce2c3f227f17354e127e5e Issue-ID: POLICY-1541 Signed-off-by: ramverma --- .../main/rest/TestPdpGroupDeployControllerV1.java | 24 ++++---- .../main/rest/TestPdpGroupQueryControllerV1.java | 64 +++++++++++++++++++++ .../rest/TestPdpGroupStateChangeControllerV1.java | 65 ++++++++++++++++++++++ 3 files changed, 142 insertions(+), 11 deletions(-) create mode 100644 main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupQueryControllerV1.java create mode 100644 main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupStateChangeControllerV1.java (limited to 'main/src/test') diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployControllerV1.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployControllerV1.java index 0fc3577e..b6d0f1d7 100644 --- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployControllerV1.java +++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployControllerV1.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. * Modifications Copyright (C) 2019 AT&T Intellectual Property. @@ -25,16 +25,18 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import java.util.Arrays; + import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.junit.Test; import org.onap.policy.models.pap.concepts.PdpGroup; import org.onap.policy.models.pap.concepts.PdpGroupDeployResponse; import org.onap.policy.models.pap.concepts.PdpPolicies; import org.onap.policy.models.pap.concepts.PdpSubGroup; -import org.onap.policy.pdp.common.models.Policy; +import org.onap.policy.models.pap.concepts.Policy; public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer { @@ -49,9 +51,9 @@ public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer { @Test public void testDeployGroup() throws Exception { - Entity entgrp = makePdpGroupEntity(); + final Entity entgrp = makePdpGroupEntity(); - Invocation.Builder invocationBuilder = sendRequest(DEPLOY_GROUP_ENDPOINT); + final Invocation.Builder invocationBuilder = sendRequest(DEPLOY_GROUP_ENDPOINT); Response rawresp = invocationBuilder.post(entgrp); PdpGroupDeployResponse resp = rawresp.readEntity(PdpGroupDeployResponse.class); assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); @@ -68,9 +70,9 @@ public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer { @Test public void testDeployPolicies() throws Exception { - Entity entgrp = makePdpPoliciesEntity(); + final Entity entgrp = makePdpPoliciesEntity(); - Invocation.Builder invocationBuilder = sendRequest(DEPLOY_POLICIES_ENDPOINT); + final Invocation.Builder invocationBuilder = sendRequest(DEPLOY_POLICIES_ENDPOINT); Response rawresp = invocationBuilder.post(entgrp); PdpGroupDeployResponse resp = rawresp.readEntity(PdpGroupDeployResponse.class); assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); @@ -86,10 +88,10 @@ public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer { } private Entity makePdpGroupEntity() { - PdpSubGroup subgrp = new PdpSubGroup(); + final PdpSubGroup subgrp = new PdpSubGroup(); subgrp.setPdpType("drools"); - PdpGroup group = new PdpGroup(); + final PdpGroup group = new PdpGroup(); group.setName("drools-group"); group.setDescription("my description"); group.setVersion("my-version"); @@ -99,14 +101,14 @@ public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer { } private Entity makePdpPoliciesEntity() { - Policy pol1 = new Policy(); + final Policy pol1 = new Policy(); pol1.setName("policy-a"); pol1.setPolicyVersion("1"); - Policy pol2 = new Policy(); + final Policy pol2 = new Policy(); pol2.setName("policy-b"); - PdpPolicies policies = new PdpPolicies(); + final PdpPolicies policies = new PdpPolicies(); policies.setPolicies(Arrays.asList(pol1, pol2)); return Entity.entity(policies, MediaType.APPLICATION_JSON); diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupQueryControllerV1.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupQueryControllerV1.java new file mode 100644 index 00000000..f0bc12bd --- /dev/null +++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupQueryControllerV1.java @@ -0,0 +1,64 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.pap.main.rest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.Response; + +import org.junit.Test; +import org.onap.policy.models.pap.concepts.PdpGroups; + +/** + * Class to perform unit test of {@link PdpGroupQueryControllerV1}. + * + * @author Ram Krishna Verma (ram.krishna.verma@est.tech) + */ +public class TestPdpGroupQueryControllerV1 extends CommonPapRestServer { + + private static final String GROUP_ENDPOINT = "pdps"; + + @Test + public void testSwagger() throws Exception { + super.testSwagger(GROUP_ENDPOINT); + } + + @Test + public void testchangeGroupState() throws Exception { + final String uri = GROUP_ENDPOINT; + + final Invocation.Builder invocationBuilder = sendRequest(uri); + Response rawresp = invocationBuilder.get(); + PdpGroups resp = rawresp.readEntity(PdpGroups.class); + assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); + assertNotNull(resp); + + rawresp = invocationBuilder.get(); + resp = rawresp.readEntity(PdpGroups.class); + assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); + assertNotNull(resp); + + // verify it fails when no authorization info is included + checkUnauthRequest(uri, req -> req.get()); + } +} diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupStateChangeControllerV1.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupStateChangeControllerV1.java new file mode 100644 index 00000000..d824b8b9 --- /dev/null +++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupStateChangeControllerV1.java @@ -0,0 +1,65 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.pap.main.rest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.Response; + +import org.junit.Test; +import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse; + +/** + * Class to perform unit test of {@link PdpGroupStateChangeControllerV1}. + * + * @author Ram Krishna Verma (ram.krishna.verma@est.tech) + */ +public class TestPdpGroupStateChangeControllerV1 extends CommonPapRestServer { + + private static final String GROUP_ENDPOINT = "pdps/groups"; + + @Test + public void testSwagger() throws Exception { + super.testSwagger(GROUP_ENDPOINT + "/{name}/versions/{version}"); + } + + @Test + public void testchangeGroupState() throws Exception { + final String uri = GROUP_ENDPOINT + "/my-name/versions/1.2.3?state=ACTIVE"; + + final Invocation.Builder invocationBuilder = sendRequest(uri); + Response rawresp = invocationBuilder.put(Entity.json("")); + PdpGroupStateChangeResponse resp = rawresp.readEntity(PdpGroupStateChangeResponse.class); + assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); + assertNull(resp.getErrorDetails()); + + rawresp = invocationBuilder.put(Entity.json("")); + resp = rawresp.readEntity(PdpGroupStateChangeResponse.class); + assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus()); + assertNull(resp.getErrorDetails()); + + // verify it fails when no authorization info is included + checkUnauthRequest(uri, req -> req.put(Entity.json(""))); + } +} -- cgit 1.2.3-korg