update opdef tests to honor snake case requirement

This commit is contained in:
Jonathan Shook
2023-09-09 00:30:18 -05:00
parent c55213da7c
commit 91a402dc2f
3 changed files with 16 additions and 16 deletions

View File

@@ -73,7 +73,7 @@ public class OpDefTest {
List<OpTemplate> ops = block1.getOps();
assertThat(ops).hasSize(2);
OpTemplate sdef1 = ops.get(0);
assertThat(sdef1.getName()).isEqualTo("doc1--block0--stmt1");
assertThat(sdef1.getName()).isEqualTo("doc1--block0__stmt1");
assertThat(ops.get(0).getOp()).contains(Map.of("stmt","s1"));
}
@@ -103,13 +103,13 @@ public class OpDefTest {
assertThat(block1.getName()).isEqualTo("map-of-maps--block0");
assertThat(block1.getOps()).hasSize(2);
OpTemplate op0 = block1.getOps().get(0);
assertThat(op0.getName()).isEqualTo("map-of-maps--block0--s3");
assertThat(op0.getName()).isEqualTo("map-of-maps--block0__s3");
assertThat(op0.getOp()).contains(Map.of("p1","v7","p2","v8"));
assertThat(op0.getParams()).hasSize(0);
assertThat(op0.getParams()).hasSize(0);
OpTemplate op1 = block1.getOps().get(1);
assertThat(op1.getParams()).containsAllEntriesOf(Map.of());
assertThat(op1.getName()).isEqualTo("map-of-maps--block0--s2");
assertThat(op1.getName()).isEqualTo("map-of-maps--block0__s2");
assertThat(op1.getOp()).contains(Map.of("stmt","statement2"));
}
@@ -124,7 +124,7 @@ public class OpDefTest {
assertThat(block1.getName()).isEqualTo("string-statement--block0");
assertThat(block1.getOps()).hasSize(1);
OpTemplate op0 = block1.getOps().get(0);
assertThat(op0.getName()).isEqualTo("string-statement--block0--stmt1");
assertThat(op0.getName()).isEqualTo("string-statement--block0__stmt1");
assertThat(op0.getOp()).contains(Map.of("stmt","test statement"));
}
@@ -140,7 +140,7 @@ public class OpDefTest {
OpTemplate op0 = block1.getOps().get(0);
System.out.println(op0.getParams());
assertThat(op0.getName()).isEqualTo("list-of-named-map--block1--s1");
assertThat(op0.getName()).isEqualTo("list-of-named-map--block1__s1");
assertThat(op0.getOp()).contains(Map.of("p1","v1","p2","v2"));
// System.out.println("here");
// TODO: This needs to be clarified and the logic made less ambiguous

View File

@@ -43,32 +43,32 @@ public class OpDetailOverrideTest {
OpsBlock doc1block0 = doc1.getBlocks().get(0);
assertThat(doc1block0.getOps().size()).isEqualTo(1);
OpTemplate s = doc1block0.getOps().get(0);
assertThat(s.getName()).isEqualTo("block0--stmt1");
assertThat(s.getName()).isEqualTo("block0__stmt1");
assertThat(s.getStmt()).contains("globalstatement1");
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
assertThat(s.getTags()).isEqualTo(Map.of("block","block0","global_tag1","tag value","name","block0--stmt1"));
assertThat(s.getTags()).isEqualTo(Map.of("block","block0","global_tag1","tag value","name","block0__stmt1"));
OpsBlock doc1block1 = doc1.getBlocks().get(1);
List<OpTemplate> ops = doc1block1.getOps();
assertThat(ops).hasSize(4);
s = ops.get(0);
assertThat(s.getName()).isEqualTo("testblock1--stmt1");
assertThat(s.getName()).isEqualTo("testblock1__stmt1");
assertThat(s.getStmt()).contains("astatement1");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1--stmt1"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__stmt1"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
s = ops.get(1);
assertThat(s.getName()).isEqualTo("testblock1--s2name");
assertThat(s.getName()).isEqualTo("testblock1__s2name");
assertThat(s.getStmt()).contains("s2statement data");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1--s2name"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__s2name"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
s = ops.get(2);
assertThat(s.getName()).isEqualTo("testblock1--s3");
assertThat(s.getName()).isEqualTo("testblock1__s3");
assertThat(s.getStmt()).contains("statement three");
assertThat(s.getTags()).containsEntry("tname1", "tval1");
assertThat(s.getTags()).containsEntry("global_tag1", "tag value");
@@ -76,9 +76,9 @@ public class OpDetailOverrideTest {
assertThat(s.getParams()).hasSize(2);
s = ops.get(3);
assertThat(s.getName()).isEqualTo("testblock1--s4");
assertThat(s.getName()).isEqualTo("testblock1__s4");
assertThat(s.getStmt()).contains("statement 4");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1--s4"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__s4"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);

View File

@@ -87,11 +87,11 @@ public class OpsDocListTest {
assertThat(ops1.get(0).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
assertThat(ops1.get(0).getParams()).containsExactly(MapEntry.entry("param1","value1"));
assertThat(ops1.get(0).getTags()).isEqualTo(Map.of("atagname","atagvalue","name","doc1--block0--stmt1","block","doc1--block0"));
assertThat(ops1.get(0).getTags()).isEqualTo(Map.of("atagname","atagvalue","name","doc1--block0__stmt1","block","doc1--block0"));
assertThat(ops1.get(1).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
assertThat(ops1.get(1).getParams()).containsExactly(MapEntry.entry("param1","value1"));
assertThat(ops1.get(1).getTags()).isEqualTo(Map.of("atagname","atagvalue","name","doc1--block0--stmt2","block","doc1--block0"));
assertThat(ops1.get(1).getTags()).isEqualTo(Map.of("atagname","atagvalue","name","doc1--block0__stmt2","block","doc1--block0"));
}