X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fschema%2FRelationshipSchemaLoaderTest.java;h=feeb1c4529e1acc311a6a20df70502d00fc03e3b;hb=28f9fa1399f5e513a3d5860c52cd51b615bc0a2c;hp=a2b99566f836b2147fa1eaecfd49718b88e7a67e;hpb=4201bd18a0f676121f066670f82be124f9508657;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 a2b9956..feeb1c4 100644
--- a/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
+++ b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
@@ -1,36 +1,57 @@
+/**
+ * ============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.*;
-import edu.emory.mathcs.backport.java.util.Arrays;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.crud.exception.CrudException;
-
-import java.io.File;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-
-import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.crud.exception.CrudException;
 
 public class RelationshipSchemaLoaderTest {
 
     @Before
-    public void init() {
-        ClassLoader classLoader = getClass().getClassLoader();
-        File dir = new File(classLoader.getResource( "model").getFile());
-        System.setProperty("CONFIG_HOME", dir.getParent());
+    public void init() throws Exception {
+        Path resourcePath = Paths.get(ClassLoader.getSystemResource("model").toURI());
+        Path parentPath = resourcePath.getParent();
+        System.setProperty("CONFIG_HOME", parentPath.toString());
         RelationshipSchemaLoader.resetVersionContextMap();
     }
 
     @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 +59,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("isMemberOf"));
+        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 +88,7 @@ public class RelationshipSchemaLoaderTest {
 
     @Test
     public void setVersionContextMap() throws Exception {
+        RelationshipSchemaLoader.resetVersionContextMap();
         ArrayList<String> jsonString = new ArrayList<String>();
         String rules = "{" +
                 "\"rules\": [" +
@@ -88,4 +121,4 @@ public class RelationshipSchemaLoaderTest {
         RelationshipSchemaLoader.setVersionContextMap(versionMap);
         assertNotNull(RelationshipSchemaLoader.getSchemaForVersion("v1").lookupRelationType("groupsResourcesIn"));
     }
-}
\ No newline at end of file
+}