Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-schema-ingest / src / test / java / org / onap / aai / testutils / TestUtilConfigTranslator.java

diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
index 785b740..b4756d6 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-18 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,29 +16,23 @@
  * 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.testutils;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-import org.onap.aai.setup.ConfigTranslator;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.Version;
+import org.onap.aai.setup.*;
 
 public class TestUtilConfigTranslator extends ConfigTranslator {
-       
-       public TestUtilConfigTranslator(SchemaLocationsBean bean) {
-               super(bean);
+
+       public static final SchemaVersion LATEST = new SchemaVersion("v14");
+       public TestUtilConfigTranslator(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
+               super(bean, schemaVersions);
        }
 
        @Override
-       public Map<Version, List<String>> getNodeFiles() {
+       public Map<SchemaVersion, List<String>> getNodeFiles() {
                List<String> files10 = new ArrayList<>();
                files10.add("src/test/resources/oxm/test_network_v10.xml");
                files10.add("src/test/resources/oxm/test_business_v10.xml");
@@ -47,30 +41,42 @@ public class TestUtilConfigTranslator extends ConfigTranslator {
                files11.add("src/test/resources/oxm/test_network_v11.xml");
                files11.add("src/test/resources/oxm/test_business_v11.xml");
                
-               Map<Version, List<String>> input = new EnumMap<>(Version.class);
-               input.put(Version.V10, files10);
-               input.put(Version.V11, files11);
+               Map<SchemaVersion, List<String>> input = new TreeMap<>();
+               input.put(new SchemaVersion("v10"), files10);
+               input.put(new SchemaVersion("v11"), files11);
+
+               List<String> files13 = new ArrayList<>();
+               files13.add("src/test/resources/oxm/business_oxm_v13.xml");
+               files13.add("src/test/resources/oxm/common_oxm_v13.xml");
+               files13.add("src/test/resources/oxm/serviceDesign_oxm_v13.xml");
+               files13.add("src/test/resources/oxm/network_oxm_v13.xml");
+       
+       input.put(new SchemaVersion("v10"), files10);
+               input.put(new SchemaVersion("v11"), files11);
+               input.put(new SchemaVersion("v13"), files13);
                return input;
        }
 
        @Override
-       public Map<Version, List<String>> getEdgeFiles() {
+       public Map<SchemaVersion, List<String>> getEdgeFiles() {
                List<String> files = new ArrayList<>();
                files.add("src/test/resources/edgeRules/test.json");
                files.add("src/test/resources/edgeRules/test2.json");
                files.add("src/test/resources/edgeRules/otherTestRules.json");
-               Map<Version, List<String>> input = new EnumMap<>(Version.class);
-               input.put(Version.getLatest(), files);
+               Map<SchemaVersion, List<String>> input = new TreeMap<>();
+               input.put(LATEST, files);
                
                List<String> files2 = new ArrayList<>();
                files2.add("src/test/resources/edgeRules/test.json");
-               input.put(Version.V10, files2);
+               input.put(new SchemaVersion("v10"), files2);
                
                List<String> files3 = new ArrayList<>();
                files3.add("src/test/resources/edgeRules/test3.json");
                files3.add("src/test/resources/edgeRules/defaultEdgesTest.json");
-               input.put(Version.V11, files3);
+               input.put(new SchemaVersion("v11"), files3);
                
                return input;
        }
 }
+
+