X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fschema%2FRelationshipSchemaLoaderTest.java;h=22fead017e9e7fd6f0f783e88df170e1ca770107;hb=b713fc2e83452517654c9e37c6380cb68bfbafe7;hp=4dc25d8d2351628bcc81461b0356bbadc629f899;hpb=91ca7d73d42445945a0078f93635fd2fb6c10503;p=aai%2Fgizmo.git

diff --git a/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
index 4dc25d8..22fead0 100644
--- a/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
+++ b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
@@ -1,3 +1,23 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.schema;
 
 import static org.junit.Assert.*;
@@ -25,12 +45,14 @@ public class RelationshipSchemaLoaderTest {
 
     @Test
     public void loadModels() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         RelationshipSchemaLoader.loadModels();
         assertFalse( RelationshipSchemaLoader.getVersionContextMap().keySet().isEmpty());
     }
 
     @Test
     public void loadModelsWithAVersion() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         RelationshipSchemaLoader.loadModels("v11");
         assertEquals(1, RelationshipSchemaLoader.getVersionContextMap().keySet().size());
         assertEquals("v11",  RelationshipSchemaLoader.getLatestSchemaVersion());
@@ -38,14 +60,25 @@ public class RelationshipSchemaLoaderTest {
 
     @Test
     public void getSchemaForVersion() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         RelationshipSchemaLoader.loadModels("v11");
         String version = RelationshipSchemaLoader.getLatestSchemaVersion();
         RelationshipSchema g = RelationshipSchemaLoader.getSchemaForVersion(version);
         assertNotNull(g.lookupRelationType("org.onap.relationships.inventory.BelongsTo"));
     }
 
+    public void getSchemaForVersionManualFile() throws Exception {
+      RelationshipSchemaLoader.resetVersionContextMap();
+      RelationshipSchemaLoader.loadModels("v10");
+      String version = RelationshipSchemaLoader.getLatestSchemaVersion();
+      RelationshipSchema g = RelationshipSchemaLoader.getSchemaForVersion(version);
+      assertNotNull(g.lookupRelationType("locatedIn"));
+    }
+
+
     @Test
     public void getSchemaForVersionFail() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         RelationshipSchemaLoader.loadModels();
         try {
             RelationshipSchemaLoader.getSchemaForVersion("v1");
@@ -56,6 +89,7 @@ public class RelationshipSchemaLoaderTest {
 
     @Test
     public void setVersionContextMap() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         ArrayList<String> jsonString = new ArrayList<String>();
         String rules = "{" +
                 "\"rules\": [" +