From b06911b11d1d5c352f2c2cf2204efe5acc482146 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 12 Apr 2024 16:38:32 -0400 Subject: [PATCH] Fix even more failing unit tests --- ...LIScenarioPreprocessorTemplateVarTest.java | 20 +++++++++---------- .../cli/NBCLIScenarioPreprocessorTest.java | 2 +- .../example_scenarios_templatevars.yaml | 10 ++++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 nb-engine/nb-engine-cli/src/test/resources/activities/example_scenarios_templatevars.yaml diff --git a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java index 95ac268210..946cacc161 100644 --- a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java +++ b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 nosqlbench + * Copyright (c) 2022-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,36 +30,36 @@ public class NBCLIScenarioPreprocessorTemplateVarTest { @Test public void testMultipleOccurencesOfSameTemplateVar() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "local/example_scenarios_templatevars" }, NBCLIOptions.Mode.ParseAllOptions); + NBCLIOptions opts = new NBCLIOptions(new String[]{"example_scenarios_templatevars"}, NBCLIOptions.Mode.ParseAllOptions); List cmds = opts.getCommands(); cmds.forEach(System.out::println); - OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"),cmds.get(0).getArgMap()); + OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"), cmds.get(0).getArgMap()); OpTemplate optpl1 = workload1.getOps(true).get(0); - System.out.println("op from cmd1:"+optpl1); + System.out.println("op from cmd1:" + optpl1); assertThat(optpl1.getStmt()).contains("cycle {cycle} replaced replaced\n"); - OpsDocList workload2 = OpsLoader.loadPath(cmds.get(1).getArgValue("workload"),cmds.get(1).getArgMap()); + OpsDocList workload2 = OpsLoader.loadPath(cmds.get(1).getArgValue("workload"), cmds.get(1).getArgMap()); OpTemplate optpl2 = workload2.getOps(true).get(0); - System.out.println("op from cmd2:"+optpl2); + System.out.println("op from cmd2:" + optpl2); assertThat(optpl2.getStmt()).contains("cycle {cycle} def1 def1\n"); } @Test public void testThatCLIOverridesWorkForTemplateVars() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "local/example_scenarios_templatevars", "tvar1=overridden" }, NBCLIOptions.Mode.ParseAllOptions); + NBCLIOptions opts = new NBCLIOptions(new String[]{"example_scenarios_templatevars", "tvar1=overridden"}, NBCLIOptions.Mode.ParseAllOptions); List cmds = opts.getCommands(); cmds.forEach(System.out::println); - OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"),cmds.get(0).getArgMap()); + OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"), cmds.get(0).getArgMap()); OpTemplate optpl1 = workload1.getOps(true).get(0); - System.out.println("op from cmd1:"+optpl1); + System.out.println("op from cmd1:" + optpl1); assertThat(optpl1.getStmt()).contains("cycle {cycle} overridden overridden\n"); } @Test public void testThatAdditionalCLIParamIsAdded() { - NBCLIOptions opts = new NBCLIOptions(new String[]{"local/example_scenarios_templatevars", "tvar3=tval3"}, NBCLIOptions.Mode.ParseAllOptions); + NBCLIOptions opts = new NBCLIOptions(new String[]{"example_scenarios_templatevars", "tvar3=tval3"}, NBCLIOptions.Mode.ParseAllOptions); List cmds = opts.getCommands(); cmds.forEach(System.out::println); assertThat(cmds).hasSize(2); diff --git a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java index bcddbcc6d1..bb9b02156d 100644 --- a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java +++ b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java @@ -33,7 +33,7 @@ public class NBCLIScenarioPreprocessorTest { @Test public void providePathForScenario() { - NBCLIOptions opts = new NBCLIOptions(new String[]{"local/example_scenarios"}, NBCLIOptions.Mode.ParseAllOptions); + NBCLIOptions opts = new NBCLIOptions(new String[]{"example_scenarios"}, NBCLIOptions.Mode.ParseAllOptions); List cmds = opts.getCommands(); } diff --git a/nb-engine/nb-engine-cli/src/test/resources/activities/example_scenarios_templatevars.yaml b/nb-engine/nb-engine-cli/src/test/resources/activities/example_scenarios_templatevars.yaml new file mode 100644 index 0000000000..026304bbf9 --- /dev/null +++ b/nb-engine/nb-engine-cli/src/test/resources/activities/example_scenarios_templatevars.yaml @@ -0,0 +1,10 @@ +# example_scenarios_templatevars.yaml +scenarios: + default: + first: run cycles=3 alias=A driver=stdout tvar1=replaced + second: run cycles=5 alias=B driver=stdout +bindings: + cycle: Identity() + name: NumberNameToCycle() +ops: + cycle: "cycle {cycle} TEMPLATE(tvar1,def1) TEMPLATE(tvar1)\n"