From b2c0a4930f4714e2d0f13f86b7303422bed314f5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 19 Jan 2022 14:50:12 -0600 Subject: [PATCH] allow template params to remain in expanded command --- .../engine/cli/NBCLIScenarioParserTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 bcf83890b..a2e93b960 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,14 +82,17 @@ public class NBCLIScenarioParserTest { } @Test - public void testThatTemplateParamsAreExpandedAndRemovedOverride() { + public void testThatTemplateParamsAreExpandedAndNotRemovedOverride() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "template-test", "cycles-test=20"}); List 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")).isNull(); - assertThat(cmds.get(0).getArg("workload")).isEqualTo("scenario-test"); + assertThat(cmds.get(0).getParams()).isEqualTo(Map.of( + "alias","scenariotest_templatetest_withtemplate", + "cycles","20", + "cycles-test","20", + "driver","stdout", + "workload","scenario-test" + )); } @Test @@ -99,6 +102,7 @@ public class NBCLIScenarioParserTest { assertThat(cmds.size()).isEqualTo(1); assertThat(cmds.get(0).getParams()).isEqualTo(Map.of( "alias","scenariotest_schemaonly_000", + "cycles-test","20", "driver","stdout", "tags","phase:schema", "workload","scenario-test"