summaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-executor-test/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-02-17 15:23:38 -0500
committerJim Hahn <jrh3@att.com>2021-02-18 17:47:55 +0000
commitb6977d2f7ce64ece732ac1a1a0525dac972d7ccf (patch)
tree4966f5aa4737b0fef8241989eb216cce7fbe9294 /testsuites/integration/integration-executor-test/src/test
parent4e05982e36aa66b83fa0ee44b9631412442c3969 (diff)
Fix sonars in apex-pdp
Addressed the following issues: - initialize mocks before use - use parameterized queries - Random() is not secure - provide parameterized type for generics - unused imports - constructor visibility - use compute() instead of containsKey()/put() - make final fields static - rename constants to all upper case - no assert() in Thread.run() methods - nested try - nested if/else - too many break/continue - use try-with-resources - repeatable annotations - overlapping characters in reg ex - hashcode is not sufficient in compareTo() - need equals() with compareTo() - make class an interface - use parameterized test - multiple calls in assert() - log or re-throw - use different type of lambda - use parameterized logging - use StringBuilder instead of concatenation - use StandardCharsets.UTF_8 Issue-ID: POLICY-2906 Change-Id: I2cf8c885e3e22c2c6cbe6403a34906928afad022 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'testsuites/integration/integration-executor-test/src/test')
-rw-r--r--testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java61
1 files changed, 15 insertions, 46 deletions
diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java
index a00729268..956691797 100644
--- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java
+++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java
@@ -1,73 +1,42 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 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.
* 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.apex.testsuites.integration.executor.handling;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
public class TestApexSamplePolicyCreateModelFiles {
@Test
- public void testModelWriteReadJava() throws Exception {
- final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JAVA");
- final TestApexModel<AxPolicyModel> testApexPolicyModel =
- new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
- testApexPolicyModel.testApexModelWriteReadXml();
- testApexPolicyModel.testApexModelWriteReadJson();
- }
-
- @Test
- public void testModelWriteReadJavascript() throws Exception {
- final TestApexSamplePolicyModelCreator apexPolicyModelCreator =
- new TestApexSamplePolicyModelCreator("JAVASCRIPT");
- final TestApexModel<AxPolicyModel> testApexPolicyModel =
- new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
- testApexPolicyModel.testApexModelWriteReadXml();
- testApexPolicyModel.testApexModelWriteReadJson();
- }
-
- @Test
- public void testModelWriteReadJRuby() throws Exception {
- final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JRUBY");
- final TestApexModel<AxPolicyModel> testApexPolicyModel =
- new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
- testApexPolicyModel.testApexModelWriteReadXml();
- testApexPolicyModel.testApexModelWriteReadJson();
- }
-
- @Test
- public void testModelWriteReadJython() throws Exception {
- final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JYTHON");
- final TestApexModel<AxPolicyModel> testApexPolicyModel =
- new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
- testApexPolicyModel.testApexModelWriteReadXml();
- testApexPolicyModel.testApexModelWriteReadJson();
- }
-
- @Test
- public void testModelWriteReadMvel() throws Exception {
- final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("MVEL");
- final TestApexModel<AxPolicyModel> testApexPolicyModel =
- new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
- testApexPolicyModel.testApexModelWriteReadXml();
- testApexPolicyModel.testApexModelWriteReadJson();
+ public void testModelWriteRead() throws Exception {
+ String[] types = {"JAVA", "JAVASCRIPT", "JRUBY", "JYTHON", "MVEL"};
+ for (String type: types) {
+ final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator(type);
+ final TestApexModel<AxPolicyModel> testApexPolicyModel =
+ new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
+ assertThatCode(() -> testApexPolicyModel.testApexModelWriteReadXml()).doesNotThrowAnyException();
+ assertThatCode(() -> testApexPolicyModel.testApexModelWriteReadJson()).doesNotThrowAnyException();
+ }
}
}