aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorArul.Nambi <arul.nambi@amdocs.com>2017-09-13 15:13:29 -0400
committerArul.Nambi <arul.nambi@amdocs.com>2017-09-13 15:13:37 -0400
commit059f42e1a2289ecb2cb5835b8b14a0d098c9e1d3 (patch)
treeeb9218adc67f1183b9d371a4ca10fc31ece3b23c /src/test/java
parent7813ad1766bb168f92ce6c0c10a6926a2f00b519 (diff)
Renaming openecomp to onap
Issue-ID: AAI-208 Change-Id: I559ba27fba96364c506730e8cbac05a9e6591694 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java (renamed from src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java)6
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java)12
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java)6
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java)7
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java)8
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java)6
-rw-r--r--src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java (renamed from src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java)6
-rw-r--r--src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java (renamed from src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java)8
-rw-r--r--src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java (renamed from src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java)3
9 files changed, 40 insertions, 22 deletions
diff --git a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java b/src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java
index 54ce0d5..b30b00d 100644
--- a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java
+++ b/src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.config;
+package org.onap.aai.modelloader.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -33,8 +33,8 @@ import java.util.Properties;
import org.eclipse.jetty.util.security.Password;
import org.junit.Test;
-import org.openecomp.modelloader.restclient.AaiRestClient;
-
+import org.onap.aai.modelloader.config.ModelLoaderConfig;
+import org.onap.aai.modelloader.restclient.AaiRestClient;
import org.openecomp.sdc.utils.ArtifactTypeEnum;
public class ModelLoaderConfigTest {
diff --git a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java b/src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
index a6e1b96..22137f5 100644
--- a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.catalog;
+package org.onap.aai.modelloader.entity.catalog;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -37,10 +37,12 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import org.openecomp.modelloader.config.ModelLoaderConfig;
-import org.openecomp.modelloader.entity.Artifact;
-import org.openecomp.modelloader.restclient.AaiRestClient;
-import org.openecomp.modelloader.restclient.AaiRestClient.MimeType;
+import org.onap.aai.modelloader.config.ModelLoaderConfig;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifact;
+import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifactHandler;
+import org.onap.aai.modelloader.restclient.AaiRestClient;
+import org.onap.aai.modelloader.restclient.AaiRestClient.MimeType;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java
index 040d5a0..95b1748 100644
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.model;
+package org.onap.aai.modelloader.entity.model;
import static org.junit.Assert.assertTrue;
@@ -30,7 +30,9 @@ import java.nio.file.Paths;
import java.util.List;
import org.junit.Test;
-import org.openecomp.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.model.ModelArtifact;
+import org.onap.aai.modelloader.entity.model.ModelArtifactParser;
public class ModelArtifactParserTest {
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java
index 2b4faff..9deaf52 100644
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.model;
+package org.onap.aai.modelloader.entity.model;
import static org.junit.Assert.assertTrue;
@@ -29,6 +29,11 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import org.junit.Test;
+import org.onap.aai.modelloader.entity.model.IModelParser;
+import org.onap.aai.modelloader.entity.model.ModelArtifactParser;
+import org.onap.aai.modelloader.entity.model.ModelParserFactory;
+import org.onap.aai.modelloader.entity.model.ModelV8ArtifactParser;
+import org.onap.aai.modelloader.entity.model.NamedQueryArtifactParser;
public class ModelParserFactoryTest {
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java
index 27cdfc9..c787e06 100644
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.model;
+package org.onap.aai.modelloader.entity.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -31,7 +31,11 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
-import org.openecomp.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.model.ModelArtifact;
+import org.onap.aai.modelloader.entity.model.ModelSorter;
+import org.onap.aai.modelloader.entity.model.ModelV8Artifact;
+import org.onap.aai.modelloader.entity.model.NamedQueryArtifact;
public class ModelSorterTest {
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java
index 17772a7..6a9bd61 100644
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.model;
+package org.onap.aai.modelloader.entity.model;
import static org.junit.Assert.assertTrue;
@@ -30,7 +30,9 @@ import java.nio.file.Paths;
import java.util.List;
import org.junit.Test;
-import org.openecomp.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.model.ModelV8Artifact;
+import org.onap.aai.modelloader.entity.model.ModelV8ArtifactParser;
public class ModelV8ArtifactParserTest {
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java
index 69ac855..75065a3 100644
--- a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.entity.model;
+package org.onap.aai.modelloader.entity.model;
import static org.junit.Assert.assertTrue;
@@ -30,7 +30,9 @@ import java.nio.file.Paths;
import java.util.List;
import org.junit.Test;
-import org.openecomp.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.model.NamedQueryArtifact;
+import org.onap.aai.modelloader.entity.model.NamedQueryArtifactParser;
public class NamedQueryArtifactParserTest {
diff --git a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java b/src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java
index 8f9931c..07541b2 100644
--- a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java
+++ b/src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java
@@ -21,15 +21,15 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.restclient;
+package org.onap.aai.modelloader.restclient;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import org.openecomp.modelloader.config.ModelLoaderConfig;
-import org.openecomp.modelloader.entity.ArtifactType;
-import org.openecomp.modelloader.entity.model.ModelArtifact;
+import org.onap.aai.modelloader.config.ModelLoaderConfig;
+import org.onap.aai.modelloader.entity.ArtifactType;
+import org.onap.aai.modelloader.entity.model.ModelArtifact;
public class AaiRestClientTest {
diff --git a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
index fc8a80a..816f004 100644
--- a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
@@ -21,7 +21,7 @@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.openecomp.modelloader.util;
+package org.onap.aai.modelloader.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -34,6 +34,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.junit.Test;
+import org.onap.aai.modelloader.util.JsonXmlConverter;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;