summaryrefslogtreecommitdiffstats
path: root/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-06-12 14:32:25 -0400
committerJim Hahn <jrh3@att.com>2019-06-12 17:36:59 -0400
commitea262e6da52fd4da0733f02998f87aebaf502ddb (patch)
treea7cded567521f0141f31d9f8c185eccdaf2a8979 /common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java
parente671e9fa5d09ec696cb24aeefaf10ddbc7c705d7 (diff)
Apply simple sonar fixes
Note: A number of these were identified, by SonarLint, in the Test classes, which are not typically scanned by Sonar. Removed unnecessary imports. Removed unneeded "throws Xxx". Replaced lambda with method references. Replaced duplicate strings with constants. Replaced try-fail-catch with assert-j methods to eliminate sonar complaints about duplicate failure messages. Added missing @Override annotations. Use map.computeIfAbsent() where appropriate. Also fixed some minor checkstyle issues. Removed unneeded "volatile" declarations. Replaced some if-else constructs with "?:" construct, per sonar. Replaced Object.wait() with CountDownLatch.await(); according to sonar (and javadocs), Object.wait() can return due to "spurious wakeups". Fixed issue whereby CryptoUtilsTest wouldn't run in my Eclipse. Change-Id: Ib6b71ed65662cfd6209400dac57ed69279bf29ec Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java')
-rw-r--r--common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java
index eb673222..9e7121cd 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidation.java
@@ -38,6 +38,8 @@ import org.onap.policy.common.parameters.testclasses.TestParametersL00;
import org.onap.policy.common.parameters.testclasses.TestParametersL10;
public class TestValidation {
+ private static final String L0_PARAMETERS = "l0Parameters";
+
private static final String NOT_BLANK_STRING_MESSAGE =
"field 'notBlankString' type 'java.lang.String' value '' INVALID, must be a non-blank string\n"
.replace('\'', '"');
@@ -73,7 +75,7 @@ public class TestValidation {
@Test
public void testValidationOk() throws IOException {
- TestParametersL00 l0Parameters = new TestParametersL00("l0Parameters");
+ TestParametersL00 l0Parameters = new TestParametersL00(L0_PARAMETERS);
GroupValidationResult validationResult = l0Parameters.validate();
assertTrue(validationResult.isValid());
@@ -90,7 +92,7 @@ public class TestValidation {
@Test
public void testValidationObservation() throws IOException {
- TestParametersL00 l0Parameters = new TestParametersL00("l0Parameters");
+ TestParametersL00 l0Parameters = new TestParametersL00(L0_PARAMETERS);
l0Parameters.triggerValidationStatus(ValidationStatus.OBSERVATION, 3);
@@ -135,7 +137,7 @@ public class TestValidation {
@Test
public void testValidationWarning() throws IOException {
- TestParametersL00 l0Parameters = new TestParametersL00("l0Parameters");
+ TestParametersL00 l0Parameters = new TestParametersL00(L0_PARAMETERS);
l0Parameters.triggerValidationStatus(ValidationStatus.WARNING, 3);
@@ -179,7 +181,7 @@ public class TestValidation {
@Test
public void testValidationInvalid() throws IOException {
- TestParametersL00 l0Parameters = new TestParametersL00("l0Parameters");
+ TestParametersL00 l0Parameters = new TestParametersL00(L0_PARAMETERS);
l0Parameters.triggerValidationStatus(ValidationStatus.INVALID, 3);
@@ -222,7 +224,7 @@ public class TestValidation {
}
@Test
- public void testValidationEmptySubGroup() throws IOException {
+ public void testValidationEmptySubGroup() {
TestParametersL10 l10Parameters = new TestParametersL10("l10Parameters");
l10Parameters.setL10LGenericNested0(null);
@@ -234,7 +236,7 @@ public class TestValidation {
}
@Test
- public void testGetValidationResult() throws Exception {
+ public void testGetValidationResult() {
Contained item = new Contained();
item.setName("item");