aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/org/onap/policy/api/main/parameters/ApiParameterGroup.java1
-rw-r--r--main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java4
-rw-r--r--main/src/test/java/org/onap/policy/api/main/startstop/TestMain.java3
-rw-r--r--main/src/test/resources/parameters/ApiConfigParameters.json5
-rw-r--r--main/src/test/resources/parameters/ApiConfigParameters_Https.json5
5 files changed, 12 insertions, 6 deletions
diff --git a/main/src/main/java/org/onap/policy/api/main/parameters/ApiParameterGroup.java b/main/src/main/java/org/onap/policy/api/main/parameters/ApiParameterGroup.java
index 17f3f1ab..aa8ad973 100644
--- a/main/src/main/java/org/onap/policy/api/main/parameters/ApiParameterGroup.java
+++ b/main/src/main/java/org/onap/policy/api/main/parameters/ApiParameterGroup.java
@@ -20,7 +20,6 @@
package org.onap.policy.api.main.parameters;
-import java.util.ArrayList;
import java.util.List;
import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.parameters.GroupValidationResult;
diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 4dd88c07..434185a6 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -704,7 +704,7 @@ public class TestApiRestServer {
Response rawResponse = readResource(POLICYTYPES, true, APP_JSON);
assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
- assertEquals(21, response.getPolicyTypes().size());
+ assertEquals(25, response.getPolicyTypes().size());
}
@Test
@@ -714,7 +714,7 @@ public class TestApiRestServer {
Response rawResponse = readResource(POLICYTYPES, true, APP_YAML);
assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
- assertEquals(21, response.getPolicyTypes().size());
+ assertEquals(25, response.getPolicyTypes().size());
}
@Test
diff --git a/main/src/test/java/org/onap/policy/api/main/startstop/TestMain.java b/main/src/test/java/org/onap/policy/api/main/startstop/TestMain.java
index d770b56c..b97b0ccc 100644
--- a/main/src/test/java/org/onap/policy/api/main/startstop/TestMain.java
+++ b/main/src/test/java/org/onap/policy/api/main/startstop/TestMain.java
@@ -21,6 +21,7 @@
package org.onap.policy.api.main.startstop;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -63,7 +64,7 @@ public class TestMain {
@Test
public void testMain_Help() {
final String[] apiConfigParameters = { "-h" };
- Main.main(apiConfigParameters);
+ assertThatCode(() -> Main.main(apiConfigParameters)).doesNotThrowAnyException();
}
@Test
diff --git a/main/src/test/resources/parameters/ApiConfigParameters.json b/main/src/test/resources/parameters/ApiConfigParameters.json
index 91e304fe..bfb02f1e 100644
--- a/main/src/test/resources/parameters/ApiConfigParameters.json
+++ b/main/src/test/resources/parameters/ApiConfigParameters.json
@@ -33,6 +33,9 @@
"policytypes/onap.policies.controlloop.guard.MinMax.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.controlloop.Operational.yaml",
- "policytypes/onap.policies.Naming.yaml"
+ "policytypes/onap.policies.Naming.yaml",
+ "policytypes/onap.policies.drools.Controller.yaml",
+ "policytypes/onap.policies.native.Drools.yaml",
+ "policytypes/onap.policies.native.Xacml.yaml"
]
}
diff --git a/main/src/test/resources/parameters/ApiConfigParameters_Https.json b/main/src/test/resources/parameters/ApiConfigParameters_Https.json
index e4b2b6d6..d395e1fb 100644
--- a/main/src/test/resources/parameters/ApiConfigParameters_Https.json
+++ b/main/src/test/resources/parameters/ApiConfigParameters_Https.json
@@ -34,6 +34,9 @@
"policytypes/onap.policies.controlloop.guard.MinMax.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.controlloop.Operational.yaml",
- "policytypes/onap.policies.Naming.yaml"
+ "policytypes/onap.policies.Naming.yaml",
+ "policytypes/onap.policies.drools.Controller.yaml",
+ "policytypes/onap.policies.native.Drools.yaml",
+ "policytypes/onap.policies.native.Xacml.yaml"
]
}