IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

qualify engine selection

Browse Source
This commit is contained in:
Jonathan Shook
2020-04-27 01:36:06 -05:00
parent ef49cc5320
commit 4362e389ce
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
View File

@@ -14,24 +14,20 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
import io.nosqlbench.engine.api.activityimpl.ActivityDef;
import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
import io.nosqlbench.engine.api.templating.StrInterpolator;
import io.nosqlbench.engine.api.util.Synonyms;
import io.nosqlbench.nb.api.content.NBIO;
import io.nosqlbench.nb.api.errors.BasicError;
import joptsimple.internal.Strings;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.awt.*;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.StreamSupport;
public class WebDriverActivity extends SimpleActivity {

3
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java
View File

@@ -17,8 +17,7 @@
package io.nosqlbench.engine.api.activityimpl.motor;
import io.nosqlbench.engine.api.activityimpl.ParameterMap;
import io.nosqlbench.engine.api.util.Synonyms;
import io.nosqlbench.nb.api.config.Synonyms;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
View File

@@ -244,7 +244,7 @@ public class NBCLI {
ScenariosExecutor executor = new ScenariosExecutor("executor-" + sessionName, 1);
Scenario scenario = new Scenario(sessionName, options.getProgressSpec());
Scenario scenario = new Scenario(sessionName, options.getScriptingEngine(), options.getProgressSpec());
ScriptBuffer buffer = new BasicScriptBuffer(
options.getLogsDirectory()+ FileSystems.getDefault().getSeparator()+ "_scenario."+ scenario.getName() +".js"
).add(options.getCommands().toArray(new Cmd[0]));

7
engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
View File

@@ -64,18 +64,19 @@ public class Scenario implements Callable<ScenarioResult> {
Graalvm
}
public Scenario(String name, String progressInterval) {
public Scenario(String name, Engine engine, String progressInterval) {
this.name = name;
this.engine = engine;
this.progressInterval = progressInterval;
}
public Scenario(String name) {
public Scenario(String name, Engine engine) {
this.name = name;
this.engine = engine;
}
public Scenario addScriptText(String scriptText) {
scripts.add(scriptText);
this.engine = engine;
return this;
}

2
engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java
View File

@@ -25,7 +25,7 @@ public class ScenarioTest {
@Test
public void shouldLoadScriptText() {
ScriptEnvBuffer buffer = new ScriptEnvBuffer();
Scenario env = new Scenario("testing");
Scenario env = new Scenario("testing", Scenario.Engine.Graalvm);
env.addScriptText("print('loaded script environment...');\n");
env.run();
assertThat(env.getIOLog().get().get(0)).contains("loaded script environment...");

2
engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java
View File

@@ -27,7 +27,7 @@ public class ScenariosExecutorTest {
@Ignore
public void testAwaitOnTime() {
ScenariosExecutor e = new ScenariosExecutor(ScenariosExecutorTest.class.getSimpleName(), 1);
Scenario s = new Scenario("testing");
Scenario s = new Scenario("testing", Scenario.Engine.Graalvm);
s.addScriptText("load('classpath:scripts/asyncs.js');\nsetTimeout(\"print('waited')\",5000);\n");
e.execute(s);
ScenariosResults scenariosResults = e.awaitAllResults();

2
nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
View File

@@ -54,7 +54,7 @@ public class AsyncScriptIntegrationTests {
String scenarioName = "scenario " + scriptname;
System.out.println("=".repeat(29) + " Running ASYNC integration test for: " + scenarioName);
ScenariosExecutor e = new ScenariosExecutor(AsyncScriptIntegrationTests.class.getSimpleName() + ":" + scriptname, 1);
Scenario s = new Scenario(scenarioName);
Scenario s = new Scenario(scenarioName, Scenario.Engine.Graalvm);
s.addScenarioScriptParams(paramsMap);
ClassLoader cl = AsyncScriptIntegrationTests.class.getClassLoader();

2
nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
View File

@@ -49,7 +49,7 @@ public class ScriptIntegrationTests {
String scenarioName = "scenario " + scriptname;
System.out.println("=".repeat(29) + " Running SYNC integration test for: " + scenarioName);
ScenariosExecutor e = new ScenariosExecutor(ScriptIntegrationTests.class.getSimpleName() + ":" + scriptname, 1);
Scenario s = new Scenario(scenarioName);
Scenario s = new Scenario(scenarioName, Scenario.Engine.Graalvm);
s.addScenarioScriptParams(paramsMap);
ClassLoader cl = AsyncScriptIntegrationTests.class.getClassLoader();
String script;