summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorZlatko Murgoski <zlatko.murgoski@nokia.com>2018-12-31 11:55:42 +0100
committerZlatko Murgoski <zlatko.murgoski@nokia.com>2018-12-31 11:55:42 +0100
commit7ab93201e557976ed8b383cb5652fa129d7b36f7 (patch)
tree74506f4a079e1f59698eff12a03aa37e9fc9710b /src/test
parentaf23ebbe4e86e75cdb44cb6014132b0eb6d515c5 (diff)
Fix sonar violation
Fix sonar violation' Change-Id: Ia5718d2bcbf9f5efea40d8250b7ad57f6d2eb2f3 Issue-ID: DCAEGEN2-1016 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/dcae/common/ApiExceptionTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java)2
-rw-r--r--src/test/java/org/onap/dcae/common/ConfigProcessorAdapterTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java)2
-rw-r--r--src/test/java/org/onap/dcae/common/EventSenderTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java)4
-rw-r--r--src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java)4
-rw-r--r--src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java)2
-rw-r--r--src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java (renamed from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java)6
-rw-r--r--src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java7
-rw-r--r--src/test/java/org/onap/dcae/vestest/AnyNodeTest.java2
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java2
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestVESLogger.java4
10 files changed, 17 insertions, 18 deletions
diff --git a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java b/src/test/java/org/onap/dcae/common/ApiExceptionTest.java
index a63e97f1..2436694c 100644
--- a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java
+++ b/src/test/java/org/onap/dcae/common/ApiExceptionTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
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/common/ConfigProcessorAdapterTest.java
index f2cb3646..214badaf 100644
--- a/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java
+++ b/src/test/java/org/onap/dcae/common/ConfigProcessorAdapterTest.java
@@ -17,7 +17,7 @@
// ============LICENSE_END=========================================================
//
//
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.times;
diff --git a/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java b/src/test/java/org/onap/dcae/common/EventSenderTest.java
index f3cebdb2..aba3c2a9 100644
--- a/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java
+++ b/src/test/java/org/onap/dcae/common/EventSenderTest.java
@@ -18,7 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.EventPublisher;
@RunWith(MockitoJUnitRunner.Silent.class)
public class EventSenderTest {
diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java
index 5a94c662..923aae02 100644
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java
@@ -18,11 +18,11 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
import static io.vavr.API.List;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser.parseToDomainMapping;
+import static org.onap.dcae.common.publishing.DMaaPConfigurationParser.parseToDomainMapping;
import io.vavr.collection.Map;
import io.vavr.control.Try;
diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
index bbe5079e..809ac99c 100644
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
@@ -17,7 +17,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
import static io.vavr.API.Option;
import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java
index 8dc69f62..f4dbe190 100644
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java
@@ -17,7 +17,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
import static io.vavr.API.List;
import static io.vavr.API.Map;
@@ -35,8 +35,8 @@ import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPPublishersCache.CambriaPublishersCacheLoader;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPPublishersCache.OnPublisherRemovalListener;
+import org.onap.dcae.common.publishing.DMaaPPublishersCache.CambriaPublishersCacheLoader;
+import org.onap.dcae.common.publishing.DMaaPPublishersCache.OnPublisherRemovalListener;
public class DMaaPPublishersCacheTest {
diff --git a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
index 09dca676..b0a984a0 100644
--- a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
@@ -27,19 +27,18 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
import static org.onap.dcae.TestingUtilities.createTemporaryFile;
import static org.onap.dcae.TestingUtilities.readFile;
import static org.onap.dcae.TestingUtilities.readJSONFromFile;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.json.JSONObject;
import org.junit.Test;
import org.onap.dcae.WiremockBasedTest;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.DMaaPConfigurationParser;
+import org.onap.dcae.common.publishing.EventPublisher;
public class ConfigLoaderIntegrationE2ETest extends WiremockBasedTest {
diff --git a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
index 52f81271..24577c0f 100644
--- a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
+++ b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
@@ -26,7 +26,7 @@ import com.google.common.collect.Sets;
import java.util.Set;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.dcae.commonFunction.AnyNode;
+import org.onap.dcae.common.AnyNode;
/**
* Created by koblosz on 07.06.18.
diff --git a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 79ae9efb..a350ef86 100644
--- a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
+++ b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
@@ -28,7 +28,7 @@ import java.io.FileReader;
import java.io.IOException;
import org.json.JSONObject;
import org.junit.Test;
-import org.onap.dcae.commonFunction.ConfigProcessors;
+import org.onap.dcae.common.ConfigProcessors;
public class TestConfigProcessor {
diff --git a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
index a1b3e7df..1689263e 100644
--- a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
+++ b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
@@ -23,13 +23,13 @@ package org.onap.dcae.vestest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
-import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
+import static org.onap.dcae.common.VESLogger.REQUEST_ID;
import com.att.nsa.logging.LoggingContext;
import com.att.nsa.logging.log4j.EcompFields;
import java.util.UUID;
import org.junit.Test;
-import org.onap.dcae.commonFunction.VESLogger;
+import org.onap.dcae.common.VESLogger;
public class TestVESLogger {