From 84b25b7ab2019a558fad92e21c4cc44c242e4461 Mon Sep 17 00:00:00 2001 From: Vijay VK Date: Mon, 10 Sep 2018 19:04:05 +0100 Subject: Fix build warnings & CLM scan issue Change-Id: I43629917f2d7bafb15258bdbba1cd45478595edb Signed-off-by: VENKATESH KUMAR Issue-ID: DCAEGEN2-603, DCAEGEN2-767 Signed-off-by: VENKATESH KUMAR --- .../onap/dcae/commonFunction/ApiExceptionTest.java | 1 + .../commonFunction/ConfigProcessorAdapterTest.java | 10 +++++----- .../onap/dcae/commonFunction/EventProcessorTest.java | 19 +++++++++++-------- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'src/test/java/org/onap/dcae/commonFunction') diff --git a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java b/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java index ef5b477c..a63e97f1 100644 --- a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java +++ b/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.dcae.commonFunction; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java b/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java index 180dfcf1..1ad55897 100644 --- a/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java +++ b/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java @@ -19,6 +19,11 @@ // package org.onap.dcae.commonFunction; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import org.json.JSONObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,11 +31,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class ConfigProcessorAdapterTest { diff --git a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java index 3e358466..697510c4 100644 --- a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java +++ b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java @@ -18,10 +18,20 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.dcae.commonFunction; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.onap.dcae.commonFunction.EventProcessor.EVENT_LIST_TYPE; + import com.google.gson.Gson; -import io.vavr.collection.Map; +import java.util.List; import org.json.JSONObject; import org.junit.Before; import org.junit.Test; @@ -30,13 +40,6 @@ import org.onap.dcae.ApplicationSettings; import org.onap.dcae.CLIUtils; import org.onap.dcae.commonFunction.event.publishing.EventPublisher; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; -import static org.onap.dcae.commonFunction.EventProcessor.EVENT_LIST_TYPE; public class EventProcessorTest { -- cgit 1.2.3-korg