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

modify historic format testing to accomodate design change

Browse Source
This commit is contained in:
Jonathan Shook 2023-10-05 20:38:15 -05:00
parent 36a233eaa1
commit 71b39fa95a
4 changed files with 16 additions and 5 deletions
adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig
rawyaml
OpDefTest.java
yaml
OpsDocListTest.java
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario
ScenarioController.java
mvn-defaults
pom.xml

8
adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpDefTest.java
View File

@ -23,6 +23,7 @@ import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDoc;
import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@ -34,6 +35,8 @@ public class OpDefTest {
private final static Logger logger = LogManager.getLogger(OpDefTest.class); private final static Logger logger = LogManager.getLogger(OpDefTest.class);
// TODO: cover fully qualified element naming in UniformWorkloadSpecification
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testLayering() { public void testLayering() {
@ -62,6 +65,7 @@ public class OpDefTest {
assertThat(block22.getTags().get("root1")).isEqualTo("value23"); assertThat(block22.getTags().get("root1")).isEqualTo("value23");
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testStatementRendering() { public void testStatementRendering() {
OpsDocList all = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of()); OpsDocList all = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of());
@ -77,6 +81,7 @@ public class OpDefTest {
assertThat(ops.get(0).getOp()).contains(Map.of("stmt","s1")); assertThat(ops.get(0).getOp()).contains(Map.of("stmt","s1"));
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testConsumableMapState() { public void testConsumableMapState() {
OpsDocList all = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of()); OpsDocList all = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of());
@ -92,6 +97,7 @@ public class OpDefTest {
assertThat(stmt1.getParams()).containsAllEntriesOf(Map.of("timeout", 23423, "foobar", "baz")); assertThat(stmt1.getParams()).containsAllEntriesOf(Map.of("timeout", 23423, "foobar", "baz"));
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testMapOfMaps() { public void testMapOfMaps() {
OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of()); OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of());
@ -113,6 +119,7 @@ public class OpDefTest {
assertThat(op1.getOp()).contains(Map.of("stmt","statement2")); assertThat(op1.getOp()).contains(Map.of("stmt","statement2"));
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testBasicStringStmt() { public void testBasicStringStmt() {
OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of()); OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of());
@ -128,6 +135,7 @@ public class OpDefTest {
assertThat(op0.getOp()).contains(Map.of("stmt","test statement")); assertThat(op0.getOp()).contains(Map.of("stmt","test statement"));
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testListOfNamedMap() { public void testListOfNamedMap() {
OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of()); OpsDocList all = OpsLoader.loadPath("testdocs/op_variants.yaml", Map.of());

3
adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocListTest.java
View File

@ -22,6 +22,7 @@ import org.assertj.core.data.MapEntry;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -54,6 +55,7 @@ public class OpsDocListTest {
doclist = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of()); doclist = OpsLoader.loadPath("testdocs/docs_blocks_ops.yaml", Map.of());
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testBlocksInheritDocData() { public void testBlocksInheritDocData() {
assertThat(doclist).isNotNull(); assertThat(doclist).isNotNull();
@ -74,6 +76,7 @@ public class OpsDocListTest {
} }
@Disabled("superseded by UniformWorkloadSpecification")
@Test @Test
public void testStmtInheritsBlockData() { public void testStmtInheritsBlockData() {
OpsDoc doc0 = doclist.getStmtDocs().get(0); OpsDoc doc0 = doclist.getStmtDocs().get(0);

2
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java
View File

@ -58,7 +58,7 @@ public class ScenarioController implements NBLabeledElement {
ActivitiesExceptionHandler exceptionHandler = new ActivitiesExceptionHandler(this); ActivitiesExceptionHandler exceptionHandler = new ActivitiesExceptionHandler(this);
IndexedThreadFactory indexedThreadFactory = new IndexedThreadFactory("ACTIVITY", exceptionHandler); IndexedThreadFactory indexedThreadFactory = new IndexedThreadFactory("ACTIVITY", exceptionHandler);
this.activitiesExecutor = Executors.newVirtualThreadPerTaskExecutor(); this.activitiesExecutor = Executors.newCachedThreadPool(indexedThreadFactory);
} }
/** /**

8
mvn-defaults/pom.xml
View File

@ -523,9 +523,9 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<debug>true</debug> <debug>true</debug>
<target>21</target> <target>17</target>
<source>21</source> <source>17</source>
<release>21</release> <release>17</release>
<compilerArgs> <compilerArgs>
<!-- <compilerArg>-Xdoclint:all</compilerArg>--> <!-- <compilerArg>-Xdoclint:all</compilerArg>-->
<!-- <compilerArg>-Xlint:all</compilerArg>--> <!-- <compilerArg>-Xlint:all</compilerArg>-->
@ -638,7 +638,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<release>21</release> <release>17</release>
<doctitle>${javadoc.name}</doctitle> <doctitle>${javadoc.name}</doctitle>
<windowtitle>${javadoc.name}</windowtitle> <windowtitle>${javadoc.name}</windowtitle>
<isOffline>false</isOffline> <isOffline>false</isOffline>