From 6915f57d07f466a6dd54be693b2af2cec9b8e0c1 Mon Sep 17 00:00:00 2001 From: David Brilla Date: Tue, 24 Mar 2020 13:08:36 +0100 Subject: AAI-common sonar fixes Issue-ID: AAI-2786 Change-Id: Ia37e660886fce56c8ab5c53888fcbf265692a359 Signed-off-by: David Brilla --- .../java/org/onap/aai/audit/ListEndpointsTest.java | 36 ++++------------------ 1 file changed, 6 insertions(+), 30 deletions(-) (limited to 'aai-core/src/test/java') diff --git a/aai-core/src/test/java/org/onap/aai/audit/ListEndpointsTest.java b/aai-core/src/test/java/org/onap/aai/audit/ListEndpointsTest.java index eafffe63..5c825242 100644 --- a/aai-core/src/test/java/org/onap/aai/audit/ListEndpointsTest.java +++ b/aai-core/src/test/java/org/onap/aai/audit/ListEndpointsTest.java @@ -22,32 +22,14 @@ package org.onap.aai.audit; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.onap.aai.AAISetup; -import org.onap.aai.concurrent.AaiCallable; -import org.onap.aai.setup.SchemaServiceVersions; import org.onap.aai.setup.SchemaVersion; -import org.onap.aai.setup.SchemaVersions; -import org.onap.aai.setup.SchemaVersionsBean; -import org.slf4j.MDC; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; -import org.springframework.test.context.TestPropertySource; -import javax.validation.constraints.AssertTrue; -import java.io.File; -import java.io.FileReader; import java.util.List; import java.util.Map; import java.util.Properties; -import static org.junit.Assert.assertTrue; - public class ListEndpointsTest extends AAISetup { private Properties properties; @@ -55,7 +37,7 @@ public class ListEndpointsTest extends AAISetup { private ListEndpoints listEndpoints; @Before - public void setUp() throws Exception { + public void setUp() { properties = new Properties(); version = schemaVersions.getDefaultVersion(); listEndpoints = new ListEndpoints(basePath, schemaVersions.getDefaultVersion()); @@ -63,7 +45,7 @@ public class ListEndpointsTest extends AAISetup { @Test public void testGetEndpoints() { - Assert.assertTrue(listEndpoints != null); + Assert.assertNotNull(listEndpoints); List list = listEndpoints.getEndpoints(); Assert.assertTrue(list != null && !list.isEmpty()); @@ -74,32 +56,26 @@ public class ListEndpointsTest extends AAISetup { @Test public void testGetEndpointsWithParam() { - Assert.assertTrue(listEndpoints != null); + Assert.assertNotNull(listEndpoints); List list = listEndpoints.getEndpoints(); Assert.assertTrue(list != null && !list.isEmpty()); } @Test(expected = RuntimeException.class) public void testGetEndpoints_throwException() { - ListEndpoints listEndpointsFail = new ListEndpoints(basePath, null); + new ListEndpoints(basePath, null); } @Test public void testGetLogicalNames() { - Assert.assertTrue(listEndpoints != null); + Assert.assertNotNull(listEndpoints); Map map = listEndpoints.getLogicalNames(); Assert.assertTrue(map != null && !map.isEmpty()); } - @Test - public void testToString() { - Assert.assertTrue(listEndpoints != null); - String endpoints = listEndpoints.toString(); - } - @Test public void testToStrinWithParam() { - Assert.assertTrue(listEndpoints != null); + Assert.assertNotNull(listEndpoints); String endpoints = listEndpoints.toString("complex"); Assert.assertTrue(!endpoints.contains("complex")); } -- cgit 1.2.3-korg