Code Review
/
aai
/
aai-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Integrate aai-schema-ingest library into aai-core
[aai/aai-common.git]
/
aai-schema-ingest
/
src
/
test
/
java
/
org
/
onap
/
aai
/
testutils
/
BadEdgeConfigForValidationTest.java
diff --git
a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
index
d6aee9a
..
b2400aa
100644
(file)
--- a/
aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
+++ b/
aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
@@
-2,7
+2,7
@@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* ============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.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,45
+16,40
@@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
* 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;
*/
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.*;
/**
* Good oxm, bad edge rules for rainy day edge rule validation testing
*/
public class BadEdgeConfigForValidationTest extends ConfigTranslator {
/**
* Good oxm, bad edge rules for rainy day edge rule validation testing
*/
public class BadEdgeConfigForValidationTest extends ConfigTranslator {
- public BadEdgeConfigForValidationTest(SchemaLocationsBean bean) {
- super(bean);
+ public static final SchemaVersion LATEST = new SchemaVersion("v14");
+
+ public BadEdgeConfigForValidationTest(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
+ super(bean, schemaVersions);
}
@Override
}
@Override
- public Map<Version, List<String>> getNodeFiles() {
+ public Map<
Schema
Version, List<String>> getNodeFiles() {
List<String> files = new ArrayList<>();
files.add("src/test/resources/oxm/goodConfigForValidationTest_oxm.xml");
List<String> files = new ArrayList<>();
files.add("src/test/resources/oxm/goodConfigForValidationTest_oxm.xml");
- Map<
Version, List<String>> input = new EnumMap<>(Version.class
);
- input.put(
Version.getLatest()
, files);
+ Map<
SchemaVersion, List<String>> input = new HashMap<>(
);
+ input.put(
LATEST
, files);
return input;
}
@Override
return input;
}
@Override
- public Map<Version, List<String>> getEdgeFiles() {
- Map<
Version, List<String>> input = new EnumMap<>(Version.class
);
+ public Map<
Schema
Version, List<String>> getEdgeFiles() {
+ Map<
SchemaVersion, List<String>> input = new TreeMap<>(
);
List<String> files = new ArrayList<>();
files.add("src/test/resources/edgeRules/test3-butbad.json");
List<String> files = new ArrayList<>();
files.add("src/test/resources/edgeRules/test3-butbad.json");
- input.put(
Version.getLatest()
, files);
+ input.put(
LATEST
, files);
return input;
}
return input;
}