diff options
author | Michael Mokry <michael.mokry@att.com> | 2019-02-20 10:13:53 -0600 |
---|---|---|
committer | Michael Mokry <michael.mokry@att.com> | 2019-02-26 14:55:57 -0600 |
commit | 64ee4aa0f333947317bcb97a96e08e7bdc60f162 (patch) | |
tree | ef07d799d088002967cf283bcc1415c24eba59ac /main/src/test/java/org | |
parent | ab1824d122b50d29e000bb58521d8dace9cba2b6 (diff) |
Stubbed endpoints for Decision API and swagger
Includes:
1) Decision API endpoint with Swagger annotations
2) Provider class for Decision added to new provider package
3) Moved other provider classes to provider package
4) Decision model class added to new model package
Note: This is just a draft and still needs a lot of work, please do not
merge. Thanks in advance for the review comments.
Issue-ID: POLICY-1516
Change-Id: Id7414b6cb3eee1b877a0c11521babbef4938a68f
Signed-off-by: Michael Mokry <michael.mokry@att.com>
Diffstat (limited to 'main/src/test/java/org')
3 files changed, 6 insertions, 3 deletions
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java index a116a154..eca28d0b 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java @@ -23,12 +23,14 @@ package org.onap.policy.pdpx.main.rest; import com.openpojo.reflection.filters.FilterClassName; import com.openpojo.validation.Validator; import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.rule.impl.GetterMustExistRule; import com.openpojo.validation.rule.impl.SetterMustExistRule; import com.openpojo.validation.test.impl.GetterTester; import com.openpojo.validation.test.impl.SetterTester; import org.junit.Test; import org.onap.policy.common.utils.validation.ToStringTester; +import org.onap.policy.pdpx.main.rest.model.StatisticsReport; /** * Class to perform unit testing of {@link StatisticsReport}. @@ -39,7 +41,7 @@ public class TestStatisticsReport { @Test public void testStatisticsReport() { final Validator validator = ValidatorBuilder.create().with(new ToStringTester()).with(new SetterMustExistRule()) - .with(new SetterTester()).with(new GetterTester()).build(); + .with(new GetterMustExistRule()).with(new SetterTester()).with(new GetterTester()).build(); validator.validate(StatisticsReport.class.getPackage().getName(), new FilterClassName(StatisticsReport.class.getName())); } diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpRestServer.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpRestServer.java index d9a0e9b0..2170c8a3 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpRestServer.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpRestServer.java @@ -109,7 +109,7 @@ public class TestXacmlPdpRestServer { clientConfig.register(feature); final Client client = ClientBuilder.newClient(clientConfig); - final WebTarget webTarget = client.target("http://localhost:6969/healthcheck"); + final WebTarget webTarget = client.target("http://localhost:6969/policy/pdpx/v1/healthcheck"); final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON); diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpStatistics.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpStatistics.java index b38e92d2..ee05ff06 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpStatistics.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestXacmlPdpStatistics.java @@ -38,6 +38,7 @@ import org.onap.policy.pdpx.main.PolicyXacmlPdpException; import org.onap.policy.pdpx.main.parameters.CommonTestData; import org.onap.policy.pdpx.main.parameters.RestServerParameters; import org.onap.policy.pdpx.main.rest.XacmlPdpStatisticsManager; +import org.onap.policy.pdpx.main.rest.model.StatisticsReport; import org.onap.policy.pdpx.main.startstop.Main; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +104,7 @@ public class TestXacmlPdpStatistics { clientConfig.register(feature); final Client client = ClientBuilder.newClient(clientConfig); - final WebTarget webTarget = client.target("http://localhost:6969/statistics"); + final WebTarget webTarget = client.target("http://localhost:6969/policy/pdpx/v1/statistics"); final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON); |