diff options
author | Liam Fallon <liam.fallon@ericsson.com> | 2018-09-19 13:37:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-19 13:37:25 +0000 |
commit | b15571184fabee50986f38f40577b87281e8765c (patch) | |
tree | 8f227cd0b3c8d623d61c59f62fefab8e2c7a9dc3 /model | |
parent | b9eca38d1983a5fb3b6a528438947d8102b4797a (diff) | |
parent | 899d7fc8108e249a1de815024b98055adaf65bfe (diff) |
Merge "Fix sonar & add test cases for models"
Diffstat (limited to 'model')
-rw-r--r-- | model/pom.xml | 5 | ||||
-rw-r--r-- | model/src/main/java/org/onap/policy/distribution/model/OptimizationPolicy.java | 2 | ||||
-rw-r--r-- | model/src/test/java/org/onap/policy/distribution/model/TestModels.java | 43 |
3 files changed, 49 insertions, 1 deletions
diff --git a/model/pom.xml b/model/pom.xml index f3e26234..6ccfa6b2 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -31,5 +31,10 @@ <description>[${project.parent.artifactId}] module provides the model for policy distribution</description> <dependencies> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils</artifactId> + <version>${policy.common.version}</version> + </dependency> </dependencies> </project> diff --git a/model/src/main/java/org/onap/policy/distribution/model/OptimizationPolicy.java b/model/src/main/java/org/onap/policy/distribution/model/OptimizationPolicy.java index 71b7cef7..2ca3c945 100644 --- a/model/src/main/java/org/onap/policy/distribution/model/OptimizationPolicy.java +++ b/model/src/main/java/org/onap/policy/distribution/model/OptimizationPolicy.java @@ -61,7 +61,7 @@ public class OptimizationPolicy implements Policy { } public String getPolicyConfigType() { - return OPTIMIZATION; + return getPolicyType(); } public String getOnapName() { diff --git a/model/src/test/java/org/onap/policy/distribution/model/TestModels.java b/model/src/test/java/org/onap/policy/distribution/model/TestModels.java new file mode 100644 index 00000000..060ab36f --- /dev/null +++ b/model/src/test/java/org/onap/policy/distribution/model/TestModels.java @@ -0,0 +1,43 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2018 Ericsson. 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.distribution.model; + +import com.openpojo.reflection.filters.FilterPackageInfo; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SetterTester; + +import org.junit.Test; + +/** + * Class to perform unit testing of all policy models. + * + * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com) + */ +public class TestModels { + + @Test + public void testAllModels() { + final Validator validator = ValidatorBuilder.create().with(new SetterTester()).with(new GetterTester()).build(); + validator.validate(Policy.class.getPackage().getName(), new FilterPackageInfo()); + } +} |