From a56d3929f2387252525577fb36f9e03933064b8f Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 3 Apr 2020 09:44:26 -0400 Subject: Address sonar issues in common Addressed the following sonar issues: - missing assertion in junit test case - disable sonars about setAccessible() as it's required for jackson emulation - sleep in junit - don't use wild-cards (e.g., "*") with java.util Pattern - use re2j instead of java.util Pattern - use String methods (e.g., startsWith()) - duplicate method bodies - duplicate code in Coder classes - string concatenation in logger calls - UTF-8 encoding - return primitive instead of boxed primitive - add assertion to tests - renamed support methods from doTestXxx to verifyXxx - cognitive complexity - use AtomicRef instead of volatile - use specific Functionals (e.g., IntConsumer) - function always returns the same value - serializable vs transient Issue-ID: POLICY-2305 Change-Id: I08eb7aa495a80bdc1d26827ba17a7946c83b9828 Signed-off-by: Jim Hahn --- .../exception/PropertyAccessExceptionTest.java | 28 +++++++++++----------- .../exception/PropertyAnnotationExceptionTest.java | 20 ++++++++-------- .../exception/PropertyExceptionTest.java | 20 ++++++++-------- .../exception/PropertyInvalidExceptionTest.java | 20 ++++++++-------- .../exception/PropertyMissingExceptionTest.java | 14 +++++------ .../SupportBasicPropertyExceptionTester.java | 16 ++++++------- 6 files changed, 59 insertions(+), 59 deletions(-) (limited to 'utils/src/test/java') diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java index 190fddd5..27b0e850 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -28,46 +28,46 @@ import org.junit.Test; public class PropertyAccessExceptionTest extends SupportBasicPropertyExceptionTester { /** - * Test method for + * Test method for * {@link org.onap.policy.common.utils.properties.exception.PropertyAccessException#PropertyAccessException * (java.lang.String, java.lang.String)}. */ @Test public void testPropertyAccessExceptionStringField() { - doTestPropertyExceptionStringField_AllPopulated( new PropertyAccessException(PROPERTY, FIELD)); - doTestPropertyExceptionStringField_NullProperty( new PropertyAccessException(null, FIELD)); - doTestPropertyExceptionStringField_NullField( new PropertyAccessException(PROPERTY, null)); - doTestPropertyExceptionStringField_BothNull( new PropertyAccessException(null, null)); + verifyPropertyExceptionStringField_AllPopulated( new PropertyAccessException(PROPERTY, FIELD)); + verifyPropertyExceptionStringField_NullProperty( new PropertyAccessException(null, FIELD)); + verifyPropertyExceptionStringField_NullField( new PropertyAccessException(PROPERTY, null)); + verifyPropertyExceptionStringField_BothNull( new PropertyAccessException(null, null)); } /** - * Test method for + * Test method for * {@link org.onap.policy.common.utils.properties.exception.PropertyAccessException#PropertyAccessException * (java.lang.String, java.lang.String, java.lang.String)}. */ @Test public void testPropertyAccessExceptionStringFieldString() { - doTestPropertyExceptionStringFieldString(new PropertyAccessException(PROPERTY, FIELD, MESSAGE)); + verifyPropertyExceptionStringFieldString(new PropertyAccessException(PROPERTY, FIELD, MESSAGE)); } /** - * Test method for + * Test method for * {@link org.onap.policy.common.utils.properties.exception.PropertyAccessException#PropertyAccessException * (java.lang.String, java.lang.String, java.lang.Throwable)}. */ @Test public void testPropertyAccessExceptionStringFieldThrowable() { - doTestPropertyExceptionStringFieldThrowable(new PropertyAccessException(PROPERTY, FIELD, THROWABLE)); + verifyPropertyExceptionStringFieldThrowable(new PropertyAccessException(PROPERTY, FIELD, THROWABLE)); } /** - * Test method for + * Test method for * {@link org.onap.policy.common.utils.properties.exception.PropertyAccessException#PropertyAccessException * (java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)}. */ @Test public void testPropertyAccessExceptionStringFieldStringThrowable() { - doTestPropertyExceptionStringFieldStringThrowable( + verifyPropertyExceptionStringFieldStringThrowable( new PropertyAccessException(PROPERTY, FIELD, MESSAGE, THROWABLE)); } diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java index c4803912..91879763 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -34,10 +34,10 @@ public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExcepti */ @Test public void testPropertyExceptionStringField() { - doTestPropertyExceptionStringField_AllPopulated(new PropertyAnnotationException(PROPERTY, FIELD)); - doTestPropertyExceptionStringField_NullProperty(new PropertyAnnotationException(null, FIELD)); - doTestPropertyExceptionStringField_NullField(new PropertyAnnotationException(PROPERTY, null)); - doTestPropertyExceptionStringField_BothNull(new PropertyAnnotationException(null, null)); + verifyPropertyExceptionStringField_AllPopulated(new PropertyAnnotationException(PROPERTY, FIELD)); + verifyPropertyExceptionStringField_NullProperty(new PropertyAnnotationException(null, FIELD)); + verifyPropertyExceptionStringField_NullField(new PropertyAnnotationException(PROPERTY, null)); + verifyPropertyExceptionStringField_BothNull(new PropertyAnnotationException(null, null)); } /** @@ -47,7 +47,7 @@ public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExcepti */ @Test public void testPropertyExceptionStringFieldString() { - doTestPropertyExceptionStringFieldString(new PropertyAnnotationException(PROPERTY, FIELD, MESSAGE)); + verifyPropertyExceptionStringFieldString(new PropertyAnnotationException(PROPERTY, FIELD, MESSAGE)); } /** @@ -57,7 +57,7 @@ public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExcepti */ @Test public void testPropertyExceptionStringFieldThrowable() { - doTestPropertyExceptionStringFieldThrowable(new PropertyAnnotationException(PROPERTY, FIELD, THROWABLE)); + verifyPropertyExceptionStringFieldThrowable(new PropertyAnnotationException(PROPERTY, FIELD, THROWABLE)); } /** @@ -67,7 +67,7 @@ public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExcepti */ @Test public void testPropertyExceptionStringFieldStringThrowable() { - doTestPropertyExceptionStringFieldStringThrowable( + verifyPropertyExceptionStringFieldStringThrowable( new PropertyAnnotationException(PROPERTY, FIELD, MESSAGE, THROWABLE)); } diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java index 9055aeb7..9166749b 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -34,10 +34,10 @@ public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester { */ @Test public void testPropertyExceptionStringField() { - doTestPropertyExceptionStringField_AllPopulated(new PropertyException(PROPERTY, FIELD)); - doTestPropertyExceptionStringField_NullProperty(new PropertyException(null, FIELD)); - doTestPropertyExceptionStringField_NullField(new PropertyException(PROPERTY, null)); - doTestPropertyExceptionStringField_BothNull(new PropertyException(null, null)); + verifyPropertyExceptionStringField_AllPopulated(new PropertyException(PROPERTY, FIELD)); + verifyPropertyExceptionStringField_NullProperty(new PropertyException(null, FIELD)); + verifyPropertyExceptionStringField_NullField(new PropertyException(PROPERTY, null)); + verifyPropertyExceptionStringField_BothNull(new PropertyException(null, null)); } /** @@ -47,7 +47,7 @@ public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester { */ @Test public void testPropertyExceptionStringFieldString() { - doTestPropertyExceptionStringFieldString(new PropertyException(PROPERTY, FIELD, MESSAGE)); + verifyPropertyExceptionStringFieldString(new PropertyException(PROPERTY, FIELD, MESSAGE)); } /** @@ -57,7 +57,7 @@ public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester { */ @Test public void testPropertyExceptionStringFieldThrowable() { - doTestPropertyExceptionStringFieldThrowable(new PropertyException(PROPERTY, FIELD, THROWABLE)); + verifyPropertyExceptionStringFieldThrowable(new PropertyException(PROPERTY, FIELD, THROWABLE)); } /** @@ -67,7 +67,7 @@ public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester { */ @Test public void testPropertyExceptionStringFieldStringThrowable() { - doTestPropertyExceptionStringFieldStringThrowable(new PropertyException(PROPERTY, FIELD, MESSAGE, THROWABLE)); + verifyPropertyExceptionStringFieldStringThrowable(new PropertyException(PROPERTY, FIELD, MESSAGE, THROWABLE)); } } diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java index 69ab1bd3..3edd7ff4 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -34,10 +34,10 @@ public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionT */ @Test public void testPropertyExceptionStringField() { - doTestPropertyExceptionStringField_AllPopulated(new PropertyInvalidException(PROPERTY, FIELD)); - doTestPropertyExceptionStringField_NullProperty(new PropertyInvalidException(null, FIELD)); - doTestPropertyExceptionStringField_NullField(new PropertyInvalidException(PROPERTY, null)); - doTestPropertyExceptionStringField_BothNull(new PropertyInvalidException(null, null)); + verifyPropertyExceptionStringField_AllPopulated(new PropertyInvalidException(PROPERTY, FIELD)); + verifyPropertyExceptionStringField_NullProperty(new PropertyInvalidException(null, FIELD)); + verifyPropertyExceptionStringField_NullField(new PropertyInvalidException(PROPERTY, null)); + verifyPropertyExceptionStringField_BothNull(new PropertyInvalidException(null, null)); } /** @@ -47,7 +47,7 @@ public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionT */ @Test public void testPropertyExceptionStringFieldString() { - doTestPropertyExceptionStringFieldString(new PropertyInvalidException(PROPERTY, FIELD, MESSAGE)); + verifyPropertyExceptionStringFieldString(new PropertyInvalidException(PROPERTY, FIELD, MESSAGE)); } /** @@ -57,7 +57,7 @@ public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionT */ @Test public void testPropertyExceptionStringFieldThrowable() { - doTestPropertyExceptionStringFieldThrowable(new PropertyInvalidException(PROPERTY, FIELD, THROWABLE)); + verifyPropertyExceptionStringFieldThrowable(new PropertyInvalidException(PROPERTY, FIELD, THROWABLE)); } /** @@ -67,7 +67,7 @@ public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionT */ @Test public void testPropertyExceptionStringFieldStringThrowable() { - doTestPropertyExceptionStringFieldStringThrowable( + verifyPropertyExceptionStringFieldStringThrowable( new PropertyInvalidException(PROPERTY, FIELD, MESSAGE, THROWABLE)); } diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java index 81a7c36a..948bc18e 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java @@ -2,14 +2,14 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -34,10 +34,10 @@ public class PropertyMissingExceptionTest extends SupportBasicPropertyExceptionT */ @Test public void testPropertyExceptionStringField() { - doTestPropertyExceptionStringField_AllPopulated(new PropertyMissingException(PROPERTY, FIELD)); - doTestPropertyExceptionStringField_NullProperty(new PropertyMissingException(null, FIELD)); - doTestPropertyExceptionStringField_NullField(new PropertyMissingException(PROPERTY, null)); - doTestPropertyExceptionStringField_BothNull(new PropertyMissingException(null, null)); + verifyPropertyExceptionStringField_AllPopulated(new PropertyMissingException(PROPERTY, FIELD)); + verifyPropertyExceptionStringField_NullProperty(new PropertyMissingException(null, FIELD)); + verifyPropertyExceptionStringField_NullField(new PropertyMissingException(PROPERTY, null)); + verifyPropertyExceptionStringField_BothNull(new PropertyMissingException(null, null)); } } diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java index f5842923..be3f8183 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018, 2020 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. @@ -53,42 +53,42 @@ public class SupportBasicPropertyExceptionTester { * Methods to perform various tests on the except subclass. */ - protected void doTestPropertyExceptionStringField_AllPopulated(PropertyException ex) { + protected void verifyPropertyExceptionStringField_AllPopulated(PropertyException ex) { standardTests(ex); } - protected void doTestPropertyExceptionStringField_NullProperty(PropertyException ex) { + protected void verifyPropertyExceptionStringField_NullProperty(PropertyException ex) { assertEquals(null, ex.getPropertyName()); assertEquals(FIELD, ex.getFieldName()); assertNotNull(ex.getMessage()); assertNotNull(ex.toString()); } - protected void doTestPropertyExceptionStringField_NullField(PropertyException ex) { + protected void verifyPropertyExceptionStringField_NullField(PropertyException ex) { assertEquals(PROPERTY, ex.getPropertyName()); assertEquals(null, ex.getFieldName()); assertNotNull(ex.getMessage()); assertNotNull(ex.toString()); } - protected void doTestPropertyExceptionStringField_BothNull(PropertyException ex) { + protected void verifyPropertyExceptionStringField_BothNull(PropertyException ex) { assertEquals(null, ex.getPropertyName()); assertEquals(null, ex.getFieldName()); assertNotNull(ex.getMessage()); assertNotNull(ex.toString()); } - protected void doTestPropertyExceptionStringFieldString(PropertyException ex) { + protected void verifyPropertyExceptionStringFieldString(PropertyException ex) { standardTests(ex); standardMessageTests(ex); } - protected void doTestPropertyExceptionStringFieldThrowable(PropertyException ex) { + protected void verifyPropertyExceptionStringFieldThrowable(PropertyException ex) { standardTests(ex); standardThrowableTests(ex); } - protected void doTestPropertyExceptionStringFieldStringThrowable(PropertyException ex) { + protected void verifyPropertyExceptionStringFieldStringThrowable(PropertyException ex) { standardTests(ex); standardMessageTests(ex); standardThrowableTests(ex); -- cgit 1.2.3-korg