Update the license for 2017-2018 license

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / parsers / relationship / RelationshipToURITest.java

diff --git a/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java b/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java
index 0472706..1d4aba5 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 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.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.parsers.relationship;
 
@@ -54,7 +52,7 @@ public class RelationshipToURITest extends AAISetup {
        public void onlyLink() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("only-related-link.json"));
-               URI expected = new URI("/aai/v10/network/test-objects/test-object/key1");
+               URI expected = new URI("/aai/v10/network/generic-vnfs/generic-vnf/key1");
                
                RelationshipToURI parse = new RelationshipToURI(loader, obj);
                
@@ -67,7 +65,7 @@ public class RelationshipToURITest extends AAISetup {
        public void onlyData() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("only-relationship-data.json"));
-               URI expected = new URI("/network/test-objects/test-object/key1");
+               URI expected = new URI("/network/generic-vnfs/generic-vnf/key1");
 
                RelationshipToURI parse = new RelationshipToURI(loader, obj);
                
@@ -80,7 +78,7 @@ public class RelationshipToURITest extends AAISetup {
        public void failV10() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("both-failv10-successv9.json"));
-               URI expected = new URI("/aai/v10/network/test-objects/test-object/key1");
+               URI expected = new URI("/aai/v10/network/generic-vnfs/generic-vnf/key1");
                
                thrown.expect(AAIIdentityMapParseException.class);
                thrown.expect(hasProperty("code", is("AAI_3000")));
@@ -93,7 +91,7 @@ public class RelationshipToURITest extends AAISetup {
        public void successV9() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version9);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("both-failv10-successv9.json"));
-               URI expected = new URI("/network/test-objects/test-object/key2");
+               URI expected = new URI("/network/generic-vnfs/generic-vnf/key2");
                
                RelationshipToURI parse = new RelationshipToURI(loader, obj);
                URI uri = parse.getUri();
@@ -107,7 +105,7 @@ public class RelationshipToURITest extends AAISetup {
        public void failV9() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version9);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("both-successv10-failv9.json"));
-               URI expected = new URI("/network/test-objects/test-object/key1");
+               URI expected = new URI("/network/generic-vnfs/generic-vnf/key1");
                
                thrown.expect(AAIIdentityMapParseException.class);
                thrown.expect(hasProperty("code", is("AAI_3000")));
@@ -122,7 +120,7 @@ public class RelationshipToURITest extends AAISetup {
        public void failNothingToParse() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("nothing-to-parse.json"));
-               URI expected = new URI("/aai/v10/network/test-objects/test-object/key1");
+               URI expected = new URI("/aai/v10/network/generic-vnfs/generic-vnf/key1");
                
                thrown.expect(AAIIdentityMapParseException.class);
                thrown.expect(hasProperty("code", is("AAI_3000")));
@@ -136,7 +134,7 @@ public class RelationshipToURITest extends AAISetup {
        public void successV10() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("both-successv10-failv9.json"));
-               URI expected = new URI("/aai/v10/network/test-objects/test-object/key1");
+               URI expected = new URI("/aai/v10/network/generic-vnfs/generic-vnf/key1");
                
                RelationshipToURI parse = new RelationshipToURI(loader, obj);
                
@@ -152,7 +150,7 @@ public class RelationshipToURITest extends AAISetup {
        public void ambiguousRelationship() throws AAIException, URISyntaxException, IOException {
                Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10);
                Introspector obj = loader.unmarshal("relationship", this.getJsonString("ambiguous-relationship.json"));
-               URI expected = new URI("/aai/v10/network/test-objects/test-object/key1");
+               URI expected = new URI("/aai/v10/network/generic-vnfs/generic-vnf/key1");
                
                thrown.expect(AmbiguousMapAAIException.class);
                thrown.expect(hasProperty("code", is("AAI_6146")));