From 422c3bcb6d0a35ae11dd673e136dbf1b3962066e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 4 Nov 2021 10:54:49 -0500
Subject: [PATCH] post-merge fixups part 2

---
 .../io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java     | 4 ++--
 .../src/test/resources/scripts/async/extension_csvoutput.js   | 0
 .../src/test/resources/scripts/async/extension_files.js       | 0
 .../src/test/resources/scripts/async/extension_globalstate.js | 0
 .../src/test/resources/scripts/async/extension_http.js        | 0
 {nb => nbr}/src/test/resources/scripts/async/extension_s3.js  | 0
 .../test/resources/scripts/async/extension_shutdown_hook.js   | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_csvoutput.js (100%)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_files.js (100%)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_globalstate.js (100%)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_http.js (100%)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_s3.js (100%)
 rename {nb => nbr}/src/test/resources/scripts/async/extension_shutdown_hook.js (100%)

diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
index 8a0527bfd..b9f6d4ce0 100644
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
@@ -82,13 +82,13 @@ public class NBCLIScenarioParserTest {
     }
 
     @Test
-    public void testThatTemplatesAreExpandedOverride() {
+    public void testThatTemplateParamsAreExpandedAndRemovedOverride() {
         NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "template-test", "cycles-test=20"});
         List<Cmd> cmds = opts.getCommands();
         assertThat(cmds.size()).isEqualTo(1);
         assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout");
         assertThat(cmds.get(0).getArg("cycles")).isEqualTo("20");
-        assertThat(cmds.get(0).getArg("cycles-test")).isEqualTo("20");
+        assertThat(cmds.get(0).getArg("cycles-test")).isNull();
         assertThat(cmds.get(0).getArg("workload")).isEqualTo("scenario-test");
     }
 
diff --git a/nb/src/test/resources/scripts/async/extension_csvoutput.js b/nbr/src/test/resources/scripts/async/extension_csvoutput.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_csvoutput.js
rename to nbr/src/test/resources/scripts/async/extension_csvoutput.js
diff --git a/nb/src/test/resources/scripts/async/extension_files.js b/nbr/src/test/resources/scripts/async/extension_files.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_files.js
rename to nbr/src/test/resources/scripts/async/extension_files.js
diff --git a/nb/src/test/resources/scripts/async/extension_globalstate.js b/nbr/src/test/resources/scripts/async/extension_globalstate.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_globalstate.js
rename to nbr/src/test/resources/scripts/async/extension_globalstate.js
diff --git a/nb/src/test/resources/scripts/async/extension_http.js b/nbr/src/test/resources/scripts/async/extension_http.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_http.js
rename to nbr/src/test/resources/scripts/async/extension_http.js
diff --git a/nb/src/test/resources/scripts/async/extension_s3.js b/nbr/src/test/resources/scripts/async/extension_s3.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_s3.js
rename to nbr/src/test/resources/scripts/async/extension_s3.js
diff --git a/nb/src/test/resources/scripts/async/extension_shutdown_hook.js b/nbr/src/test/resources/scripts/async/extension_shutdown_hook.js
similarity index 100%
rename from nb/src/test/resources/scripts/async/extension_shutdown_hook.js
rename to nbr/src/test/resources/scripts/async/extension_shutdown_hook.js