Code Review
/
aai
/
gizmo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow ingestion of edge schema at deploy time
[aai/gizmo.git]
/
src
/
test
/
java
/
org
/
onap
/
schema
/
RelationshipSchemaTest.java
diff --git
a/src/test/java/org/onap/schema/RelationshipSchemaTest.java
b/src/test/java/org/onap/schema/RelationshipSchemaTest.java
index
7d54a30
..
ce8559a
100644
(file)
--- a/
src/test/java/org/onap/schema/RelationshipSchemaTest.java
+++ b/
src/test/java/org/onap/schema/RelationshipSchemaTest.java
@@
-24,6
+24,8
@@
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.onap.crud.exception.CrudException;
import org.junit.Test;
import org.onap.crud.exception.CrudException;
+import com.att.aft.dme2.internal.apache.commons.lang.ArrayUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@
-60,17
+62,17
@@
public class RelationshipSchemaTest {
public void shouldContainValidTypes() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
public void shouldContainValidTypes() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
- assertTrue(versionContextMap.get("v1
1
").isValidType("groupsResourcesIn"));
- assertTrue(versionContextMap.get("v1
1
").isValidType("uses"));
- assertFalse(versionContextMap.get("v1
1
").isValidType("notValidType"));
+ assertTrue(versionContextMap.get("v1
0
").isValidType("groupsResourcesIn"));
+ assertTrue(versionContextMap.get("v1
0
").isValidType("uses"));
+ assertFalse(versionContextMap.get("v1
0
").isValidType("notValidType"));
}
@Test
public void shouldLookUpByRelation() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
}
@Test
public void shouldLookUpByRelation() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
- assertNotNull(versionContextMap.get("v1
1
").lookupRelation("availability-zone:complex:groupsResourcesIn"));
- assertTrue(versionContextMap.get("v1
1
")
+ assertNotNull(versionContextMap.get("v1
0
").lookupRelation("availability-zone:complex:groupsResourcesIn"));
+ assertTrue(versionContextMap.get("v1
0
")
.lookupRelation("availability-zone:complex:groupsResourcesIn").containsKey("prevent-delete"));
}
.lookupRelation("availability-zone:complex:groupsResourcesIn").containsKey("prevent-delete"));
}
@@
-78,8
+80,8
@@
public class RelationshipSchemaTest {
public void shouldLookUpByRelationType() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
public void shouldLookUpByRelationType() throws Exception {
Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
loadRelations(versionContextMap);
- assertNotNull(versionContextMap.get("v1
1
").lookupRelationType("groupsResourcesIn"));
- assertTrue(versionContextMap.get("v1
1
")
+ assertNotNull(versionContextMap.get("v1
0
").lookupRelationType("groupsResourcesIn"));
+ assertTrue(versionContextMap.get("v1
0
")
.lookupRelation("availability-zone:complex:groupsResourcesIn").containsKey("prevent-delete"));
}
.lookupRelation("availability-zone:complex:groupsResourcesIn").containsKey("prevent-delete"));
}
@@
-88,7
+90,14
@@
public class RelationshipSchemaTest {
File dir = new File(classLoader.getResource("model").getFile());
File[] allFiles = dir.listFiles((d, name) ->
(propsFilePattern.matcher(name).matches() || rulesFilePattern.matcher(name).matches()));
File dir = new File(classLoader.getResource("model").getFile());
File[] allFiles = dir.listFiles((d, name) ->
(propsFilePattern.matcher(name).matches() || rulesFilePattern.matcher(name).matches()));
-
+
+ // Special handling for the v12 file, as it is used for a special test
+ for (File f : allFiles) {
+ if (f.getName().equals("edge_properties_v11.json")) {
+ allFiles = (File[]) ArrayUtils.removeElement(allFiles, f);
+ }
+ }
+
Arrays.stream(allFiles).sorted(Comparator.comparing(File::getName))
.collect(Collectors.groupingBy(f -> myMatcher(versionPattern, f.getName())))
.forEach((e, f) -> map.put(e, jsonFilesLoader(f)));
Arrays.stream(allFiles).sorted(Comparator.comparing(File::getName))
.collect(Collectors.groupingBy(f -> myMatcher(versionPattern, f.getName())))
.forEach((e, f) -> map.put(e, jsonFilesLoader(f)));
@@
-104,7
+113,9
@@
public class RelationshipSchemaTest {
}
try {
}
try {
- rsSchema = new RelationshipSchema(fileContents);
+ if (fileContents.size() == 2) {
+ rsSchema = new RelationshipSchema(fileContents);
+ }
} catch (CrudException e) {
e.printStackTrace();
} catch (IOException e) {
} catch (CrudException e) {
e.printStackTrace();
} catch (IOException e) {