From c31302e4d08beeb99191e533f0752d53499f694c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 24 Jun 2021 11:18:39 -0500
Subject: [PATCH] fix testing for optional op data

---
 .../io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java    | 5 ++---
 .../engine/api/activityconfig/rawyaml/OpDefTest.java        | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java
index 8a77bfdd0..15ef26c75 100644
--- a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java
+++ b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java
@@ -5,7 +5,6 @@ import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import org.junit.jupiter.api.Test;
 
-import java.net.http.HttpRequest;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -97,7 +96,7 @@ public class ReadyHttpOpTest {
                 " body: StaticString('test')\n");
         OpTemplate stmtDef = docs.getStmts().get(0);
 
-        Map<String, String> parse = HttpFormatParser.parseInline(stmtDef.getStmt());
+        Map<String, String> parse = HttpFormatParser.parseInline(stmtDef.getStmt().orElseThrow());
         assertThat(parse).containsAllEntriesOf(
                 Map.of(
                         "method", "{method}",
@@ -110,4 +109,4 @@ public class ReadyHttpOpTest {
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java
index b80995603..8f64ca349 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java
@@ -75,7 +75,7 @@ public class OpDefTest {
         assertThat(ops).hasSize(2);
         OpTemplate sdef1 = ops.get(0);
         assertThat(sdef1.getName()).isEqualTo("doc1--block0--stmt1");
-        assertThat(ops.get(0).getOp()).isEqualTo(Map.of("stmt","s1"));
+        assertThat(ops.get(0).getOp()).contains(Map.of("stmt","s1"));
     }
 
     @Test
@@ -110,7 +110,7 @@ public class OpDefTest {
         OpTemplate op1 = block1.getOps().get(1);
         assertThat(op1.getParams()).containsAllEntriesOf(Map.of());
         assertThat(op1.getName()).isEqualTo("map-of-maps--block0--s2");
-        assertThat(op1.getOp()).isEqualTo(Map.of("stmt","statement2"));
+        assertThat(op1.getOp()).contains(Map.of("stmt","statement2"));
     }
 
     @Test
@@ -125,7 +125,7 @@ public class OpDefTest {
         assertThat(block1.getOps()).hasSize(1);
         OpTemplate op0 = block1.getOps().get(0);
         assertThat(op0.getName()).isEqualTo("string-statement--block0--stmt1");
-        assertThat(op0.getOp()).isEqualTo(Map.of("stmt","test statement"));
+        assertThat(op0.getOp()).contains(Map.of("stmt","test statement"));
     }
 
     @Test