Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-schema-ingest / src / test / java / org / onap / aai / validation / edges / SingleContainmentValidationModuleTest.java

diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/SingleContainmentValidationModuleTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/SingleContainmentValidationModuleTest.java
index caf73cb..ae7c23d 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/SingleContainmentValidationModuleTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/SingleContainmentValidationModuleTest.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,40 +16,35 @@
  * 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.validation.edges;
 
 import static org.junit.Assert.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.aai.edges.JsonIngestor;
-import org.onap.aai.setup.Version;
-import org.onap.aai.validation.edges.SingleContainmentValidationModule;
+import org.onap.aai.setup.SchemaVersion;
 
 import com.jayway.jsonpath.DocumentContext;
 
 public class SingleContainmentValidationModuleTest {
        private static List<DocumentContext> ctxs;
        private static SingleContainmentValidationModule validator;
+       public static final SchemaVersion LATEST = new SchemaVersion("v14");
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               Map<Version, List<String>> testRules = new HashMap<>();
+               Map<SchemaVersion, List<String>> testRules = new TreeMap<>();
                List<String> testFiles = new ArrayList<>();
                testFiles.add("src/test/resources/edgeRules/containsValidationTest.json");
-               testRules.put(Version.getLatest(), testFiles);
+               testRules.put(LATEST, testFiles);
                
                JsonIngestor ji = new JsonIngestor();
-               ctxs = ji.ingest(testRules).get(Version.getLatest());
+               ctxs = ji.ingest(testRules).get(LATEST);
                validator = new SingleContainmentValidationModule();
        }