diff --git a/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownLoaderEndpointTest.java b/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownLoaderEndpointTest.java index 29788ab4b..89b9258c2 100644 --- a/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownLoaderEndpointTest.java +++ b/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownLoaderEndpointTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.docsys.core; import io.nosqlbench.docsys.endpoints.DocsysMarkdownEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DocsysMarkdownLoaderEndpointTest { diff --git a/driver-cockroachdb/src/test/java/io/nosqlbench/activitytype/cockroachdb/CockroachActivityTest.java b/driver-cockroachdb/src/test/java/io/nosqlbench/activitytype/cockroachdb/CockroachActivityTest.java index cefe4a6dc..7232dd205 100644 --- a/driver-cockroachdb/src/test/java/io/nosqlbench/activitytype/cockroachdb/CockroachActivityTest.java +++ b/driver-cockroachdb/src/test/java/io/nosqlbench/activitytype/cockroachdb/CockroachActivityTest.java @@ -2,14 +2,14 @@ package io.nosqlbench.activitytype.cockroachdb; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.ParameterMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.postgresql.util.PSQLException; import org.postgresql.util.PSQLState; import java.net.SocketTimeoutException; import java.sql.SQLException; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CockroachActivityTest { @Test diff --git a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java index 8faba74f3..d42866b06 100644 --- a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java +++ b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java @@ -3,13 +3,13 @@ package com.datastax.ebdrivers.cql; import io.nosqlbench.activitytype.cql.core.CqlAction; import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class CqlActionTest { @Test - @Ignore + @Disabled public void testCqlAction() { ActivityDef ad = ActivityDef.parseActivityDef("driver=ebdrivers;alias=foo;yaml=write-telemetry.yaml;"); CqlActivity cac = new CqlActivity(ad); diff --git a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java index af06c0675..2e90ae941 100644 --- a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java +++ b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java @@ -1,7 +1,7 @@ package com.datastax.ebdrivers.cql.statements; import io.nosqlbench.activitytype.cql.statements.core.CQLStatementDefParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java index 132e2a082..cb47d5504 100644 --- a/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java +++ b/driver-cql-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java @@ -8,7 +8,7 @@ import com.datastax.driver.core.policies.ReconnectionPolicy; import com.datastax.driver.core.policies.RetryPolicy; import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; import io.nosqlbench.activitytype.cql.core.CQLOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java index 829a11473..a5071d56d 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/double_to_cqlduration/CqlDurationTests.java b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/double_to_cqlduration/CqlDurationTests.java index d5c00f942..a60f64ee2 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/double_to_cqlduration/CqlDurationTests.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/double_to_cqlduration/CqlDurationTests.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.double_to_cqldurati import com.datastax.driver.core.Duration; import io.nosqlbench.activitytype.cql.datamappers.functions.long_to_cqlduration.CqlDurationFunctions; import io.nosqlbench.activitytype.cql.datamappers.functions.long_to_cqlduration.ToCqlDurationNanos; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.LongToIntFunction; import java.util.function.LongUnaryOperator; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java index a2966b9cf..c791e7a27 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Instant; import java.time.LocalDate; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java index 640f89a8e..bf6e89735 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Function; import java.util.function.LongFunction; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java b/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java index 445322126..515548a15 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.generators.cql.lang; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; diff --git a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java index 8faba74f3..d42866b06 100644 --- a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java +++ b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java @@ -3,13 +3,13 @@ package com.datastax.ebdrivers.cql; import io.nosqlbench.activitytype.cql.core.CqlAction; import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class CqlActionTest { @Test - @Ignore + @Disabled public void testCqlAction() { ActivityDef ad = ActivityDef.parseActivityDef("driver=ebdrivers;alias=foo;yaml=write-telemetry.yaml;"); CqlActivity cac = new CqlActivity(ad); diff --git a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java index af06c0675..2e90ae941 100644 --- a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java +++ b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java @@ -1,7 +1,7 @@ package com.datastax.ebdrivers.cql.statements; import io.nosqlbench.activitytype.cql.statements.core.CQLStatementDefParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java index 132e2a082..cb47d5504 100644 --- a/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java +++ b/driver-cqld3-shaded/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java @@ -8,7 +8,7 @@ import com.datastax.driver.core.policies.ReconnectionPolicy; import com.datastax.driver.core.policies.RetryPolicy; import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; import io.nosqlbench.activitytype.cql.core.CQLOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/driver-cqld3-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java b/driver-cqld3-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java index 829a11473..a5071d56d 100644 --- a/driver-cqld3-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java +++ b/driver-cqld3-shaded/src/test/java/io/nosqlbench/activitytype/cql/core/CqlActivityTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java b/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java index 445322126..515548a15 100644 --- a/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java +++ b/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.generators.cql.lang; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; diff --git a/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java index dc9c20107..ee3ba295a 100644 --- a/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java +++ b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; /* * Copyright 2016 jshook diff --git a/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java index 83dc284e9..8d234f33f 100644 --- a/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java +++ b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.activitytype.diag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.PrintStream; diff --git a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java index 49b2489af..929387f0f 100644 --- a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java +++ b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cmds; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java index 1c85feb1c..8a77bfdd0 100644 --- a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java +++ b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/ReadyHttpOpTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cmds; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.http.HttpRequest; import java.util.Map; diff --git a/driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java index c4bb3b167..ab68cc228 100644 --- a/driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java +++ b/driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.http; import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HttpActivityTypeTest { @Test diff --git a/driver-jmx/src/test/java/io/nosqlbench/driver/jmx/ValueConverterTest.java b/driver-jmx/src/test/java/io/nosqlbench/driver/jmx/ValueConverterTest.java index ac47b205e..afc66d941 100644 --- a/driver-jmx/src/test/java/io/nosqlbench/driver/jmx/ValueConverterTest.java +++ b/driver-jmx/src/test/java/io/nosqlbench/driver/jmx/ValueConverterTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.driver.jmx; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java index 47a15adfd..da9b7cd56 100644 --- a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java +++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.driver.mongodb; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; import io.nosqlbench.engine.api.activityimpl.ActivityDef; @@ -12,7 +12,7 @@ public class MongoActivityTest { private ActivityDef activityDef; - @Before + @BeforeEach public void setup() { String[] params = { "yaml=activities/mongodb-basic.yaml", diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java index 99d462045..221d9d74d 100644 --- a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java +++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java @@ -10,8 +10,8 @@ import io.nosqlbench.virtdata.core.templates.BindPoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bson.conversions.Bson; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Objects; @@ -25,7 +25,7 @@ public class ReadyMongoStatementTest { private ActivityDef activityDef; private StmtsDocList stmtsDocList; - @Before + @BeforeEach public void setup() { String[] params = { "yaml=activities/mongodb-basic.yaml", diff --git a/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java index 0d21ff10d..4d65f6486 100644 --- a/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java +++ b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.activitytype.stdout; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java index 99ad701e2..5661e48cb 100644 --- a/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java +++ b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.activitytype.stdout; import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Created by sebastianestevez on 5/5/17. diff --git a/driver-web/src/test/java/io/nosqlbench/driver/webdriver/ExampleWebScript.java b/driver-web/src/test/java/io/nosqlbench/driver/webdriver/ExampleWebScript.java index a2a535682..f7b9ee981 100644 --- a/driver-web/src/test/java/io/nosqlbench/driver/webdriver/ExampleWebScript.java +++ b/driver-web/src/test/java/io/nosqlbench/driver/webdriver/ExampleWebScript.java @@ -1,8 +1,8 @@ package io.nosqlbench.driver.webdriver; import io.nosqlbench.nb.api.testutils.Perf; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; @@ -18,7 +18,7 @@ import org.openqa.selenium.htmlunit.HtmlUnitDriver; public class ExampleWebScript { @Test - @Ignore + @Disabled public void getDocsSiteChromeDriver() { System.setProperty("webdriver.http.factory", "okhttp"); WebDriver driver = new ChromeDriver(); @@ -39,7 +39,7 @@ public class ExampleWebScript { } @Test - @Ignore + @Disabled public void getDocSiteWebHtml() { // System.setProperty("webdriver.http.factory", "okhttp"); WebDriver driver = new HtmlUnitDriver(false); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java index fb938b8e2..ab1835312 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java @@ -19,11 +19,12 @@ package io.nosqlbench.engine.api.activityapi; import io.nosqlbench.engine.api.activityimpl.ParameterMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class ParameterMapTest { @@ -85,11 +86,12 @@ public class ParameterMapTest { assertThat(multiNames.get().getOptionalString("delta","gamma").orElse("missing")).isEqualTo("blue"); } - @Test(expected = RuntimeException.class) + @Test public void testAmbiguousMultiValueThrowsException() { Optional multiNames = ParameterMap.parseParams("alpha=blue;beta=red;delta=blue"); assertThat(multiNames).isPresent(); - assertThat(multiNames.get().getOptionalString("alpha","delta").orElse("missing")).isEqualTo("blue"); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> multiNames.get().getOptionalString("alpha","delta")); } @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java index 862382ab5..22ff62e50 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.SucceededOp import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.EventedOpImpl; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OpTrackerImplTest { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java index 30bf42f86..3d7ab42f2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.stream.StreamSupport; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java index 79ee0b95c..435a24f1e 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java index f6bed755f..c63074016 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Iterator; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java index 3403c930a..0bed4ed29 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.stream.StreamSupport; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java index 9ce44c9cd..d60e60a02 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java index 37e9c40f3..269af6066 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java @@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogOutput; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.File; @@ -31,7 +31,7 @@ public class CycleLogInputTest { private final static String filepath="cycle-log-reader-test"; private static File cyclefile; - @BeforeClass + @BeforeAll public static void createTempFile() { try { cyclefile = File.createTempFile(filepath, "cyclelog"); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java index afd4a597a..2e96118b5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java @@ -22,7 +22,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.filters.CoreResultValueFilt import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java index 5c2ea0294..3ec13a454 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java @@ -22,7 +22,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReada import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java index a840f1d68..1eec14fd9 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java @@ -17,8 +17,8 @@ package io.nosqlbench.engine.api.activityapi.errorhandling; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.security.InvalidParameterException; import java.util.ArrayList; @@ -26,19 +26,22 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class HashedErrorHandlerTest { HashedErrorHandler handler; - @Before + @BeforeEach public void beforeTest() { handler = new HashedErrorHandler(); } - @Test(expected= RuntimeException.class) + @Test public void testDefaultHandlerThrowsException() { - handler.handleError(1L, new InvalidParameterException("this is an invalid exception, actually")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> { + handler.handleError(1L, new InvalidParameterException("this is an invalid exception, actually")); + }); } @Test @@ -91,7 +94,7 @@ public class HashedErrorHandlerTest { assertThat(result).isFalse(); } - @Test(expected = RuntimeException.class) + @Test public void testNamedGroup() { handler.setGroup("test1",IndexOutOfBoundsException.class,ArrayIndexOutOfBoundsException.class); handler.setGroup("types",InvalidParameterException.class); @@ -99,36 +102,41 @@ public class HashedErrorHandlerTest { assertThat(handler.getGroupNames()).hasSize(2); assertThat(handler.getGroupNames()).contains("test1"); assertThat(handler.getGroupNames()).contains("types"); - handler.handleError(5L,new InvalidParameterException("this is an error")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> + handler.handleError(5L,new InvalidParameterException("this is an error"))); } - @Test(expected = RuntimeException.class) + @Test public void testFindVagueSingleSubmatchException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); - handler.setHandlerForPattern("Index", CycleErrorHandlers.rethrow("12345 678910 11 12")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> + handler.setHandlerForPattern("Index", CycleErrorHandlers.rethrow("12345 678910 11 12"))); } - @Test(expected = RuntimeException.class) + @Test public void testFindMultipleRegex() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); handler.setHandlerForPattern(".*Index.*", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); - Boolean result = handler.handleError(9L, new IndexOutOfBoundsException("9L was out of bounds")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> + handler.handleError(9L, new IndexOutOfBoundsException("9L was out of bounds"))); } - @Test(expected = RuntimeException.class) + @Test public void testNonMatchingSubstringException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); Set> groups = handler.getGroup("index"); assertThat(groups).isNotNull(); assertThat(groups).hasSize(2); assertThat(groups.contains(IndexOutOfBoundsException.class)).isTrue(); - handler.setHandlerForPattern("Dyahwemo", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> + handler.setHandlerForPattern("Dyahwemo", CycleErrorHandlers.rethrow("Journey through the klein bottle."))); } - @Test(expected=RuntimeException.class) + @Test public void testSetHandlerForMissingGroupException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); - handler.setHandlerForGroup("outdex", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); + assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> + handler.setHandlerForGroup("outdex", CycleErrorHandlers.rethrow("Journey through the klein bottle."))); } @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java index eeb95664a..16aaad386 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java @@ -6,22 +6,23 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class NBErrorHandlerTest { private final RuntimeException runtimeException = new RuntimeException("test exception"); - - @Test(expected = RuntimeException.class) + @Test public void testNullConfig() { ErrorMetrics errorMetrics = new ErrorMetrics(ActivityDef.parseActivityDef("alias=testalias_stop")); NBErrorHandler errhandler = new NBErrorHandler(() -> "stop", () -> errorMetrics); - ErrorDetail detail = errhandler.handleError(runtimeException, 1, 2); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> errhandler.handleError(runtimeException, 1, 2)); } @Test @@ -90,6 +91,4 @@ public class NBErrorHandlerTest { assertThat(detail.isRetryable()).isFalse(); assertThat(detail.resultCode).isEqualTo(42); } - - } diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java index 802f4ab46..ea78598c8 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.api.activityapi.planning; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java index 12dd8a0a0..581281a28 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.planning; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java index 42b20a677..a2a51a2ef 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.planning; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java index 6c3910072..e72e961f2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java index 9783cce65..60ab9b88b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java @@ -20,8 +20,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.nb.api.testutils.Perf; import io.nosqlbench.nb.api.testutils.Result; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.function.Function; @@ -32,77 +32,77 @@ public class TestHybridRateLimiterPerf { private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); @Test - @Ignore + @Disabled public void testPerf1e9() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E9, 1.1),10_000_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e8() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E8, 1.1),50_000_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e7() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E7, 1.1),5_000_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e6() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E6, 1.1),500_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e5() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E5, 1.1),50_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e4() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E4, 1.1),5_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e3() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E3, 1.1),500,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e2() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E2, 1.1),50,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E1, 1.1),5,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e0() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E0, 1.1),2,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testePerf1eN1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E-1, 1.1),1,0.005d); System.out.println(result); @@ -110,14 +110,14 @@ public class TestHybridRateLimiterPerf { } @Test - @Ignore + @Disabled public void test100Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,160); System.out.println(perf.getLastResult()); } @Test - @Ignore + @Disabled public void test100Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,80); System.out.println(perf.getLastResult()); @@ -130,7 +130,7 @@ public class TestHybridRateLimiterPerf { // JVM 11.0.1 // 400000000_ops 33.622751_S 11896706.363_ops_s, 84_ns_op @Test - @Ignore + @Disabled public void test100Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,40); System.out.println(perf.getLastResult()); @@ -150,7 +150,7 @@ public class TestHybridRateLimiterPerf { // 200000000_ops 17.691698_S 11304737.461_ops_s, 88_ns_op @Test - @Ignore + @Disabled public void test100Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,20); System.out.println(perf.getLastResult()); @@ -163,7 +163,7 @@ public class TestHybridRateLimiterPerf { // 200000000_ops 17.474475_S 11445264.894_ops_s, 87_ns_op // 200000000_ops 14.089247_S 14195222.897_ops_s, 70_ns_op @Test - @Ignore + @Disabled public void test100Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,10); System.out.println(perf.getLastResult()); @@ -177,7 +177,7 @@ public class TestHybridRateLimiterPerf { // JVM 11.0.1 // 200000000_ops 11.839666_S 16892368.438_ops_s, 59_ns_op @Test - @Ignore + @Disabled public void test100Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 40_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java index df895e87c..900e24248 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java @@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.nb.api.testutils.Perf; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.function.Function; @@ -40,7 +40,7 @@ public class TestRateLimiterPerf1E7 { // JVM 11.0.1 // 160000000_ops 18.122886_S 8828615.971_ops_s, 113_ns_op @Test - @Ignore + @Disabled public void test10Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,160); System.out.println(perf.getLastResult()); @@ -50,7 +50,7 @@ public class TestRateLimiterPerf1E7 { // JVM 11.0.1 // 80000000_ops 8.354648_S 9575507.945_ops_s, 104_ns_op @Test - @Ignore + @Disabled public void test10Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,80); System.out.println(perf.getLastResult()); @@ -60,7 +60,7 @@ public class TestRateLimiterPerf1E7 { // JVM 11.0.1 // 40000000_ops 4.001661_S 9995849.116_ops_s, 100_ns_op @Test - @Ignore + @Disabled public void test10Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,40); System.out.println(perf.getLastResult()); @@ -70,7 +70,7 @@ public class TestRateLimiterPerf1E7 { // JVM 11.0.1 // 20000000_ops 1.914366_S 10447323.063_ops_s, 96_ns_op @Test - @Ignore + @Disabled public void test10Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 10), 20_000_000,20); System.out.println(perf.getLastResult()); @@ -84,7 +84,7 @@ public class TestRateLimiterPerf1E7 { // 100000000_ops 10.123873_S 9877642.338_ops_s, 101_ns_op // 100000000_ops 10.078673_S 9921941.517_ops_s, 101_ns_op @Test - @Ignore + @Disabled public void test10Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,10); System.out.println(perf.getLastResult()); @@ -99,7 +99,7 @@ public class TestRateLimiterPerf1E7 { // 200000000_ops 19.761154_S 10120866.172_ops_s, 99_ns_op // 200000000_ops 19.928625_S 10035815.505_ops_s, 100_ns_op @Test - @Ignore + @Disabled public void test10Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java index 6edd0fe09..6c7e13e4f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java @@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.nb.api.testutils.Perf; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.function.Function; @@ -44,7 +44,7 @@ public class TestRateLimiterPerf1E8 { // 1600000000_ops 158.224286_S 10_112_227.620_ops_s, 99_ns_op // @Test - @Ignore + @Disabled public void test100Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,160); System.out.println(perf.getLastResult()); @@ -55,7 +55,7 @@ public class TestRateLimiterPerf1E8 { // 800000000_ops 74.104295_S 10795595.534_ops_s, 93_ns_op // 800000000_ops 74.155495_S 10788141.933_ops_s, 93_ns_op @Test - @Ignore + @Disabled public void test100Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,80); System.out.println(perf.getLastResult()); @@ -68,7 +68,7 @@ public class TestRateLimiterPerf1E8 { // JVM 11.0.1, Intel(R) Core(TM) i7-4790 CPU @ 3.60GHz // 400000000_ops 33.622751_S 11896706.363_ops_s, 84_ns_op @Test - @Ignore + @Disabled public void test100Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,40); System.out.println(perf.getLastResult()); @@ -88,7 +88,7 @@ public class TestRateLimiterPerf1E8 { // 200000000_ops 17.691698_S 11304737.461_ops_s, 88_ns_op @Test - @Ignore + @Disabled public void test100Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,20); System.out.println(perf.getLastResult()); @@ -104,7 +104,7 @@ public class TestRateLimiterPerf1E8 { // 100000000_ops 7.751758_S 12900299.587_ops_s, 78_ns_op // 100000000_ops 7.864851_S 12714799.657_ops_s, 79_ns_op @Test - @Ignore + @Disabled public void test100Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,10); System.out.println(perf.getLastResult()); @@ -121,7 +121,7 @@ public class TestRateLimiterPerf1E8 { // 100000000_ops 6.317008_S 15830279.182_ops_s, 63_ns_op // 200000000_ops 13.551712_S 14758282.931_ops_s, 68_ns_op @Test - @Ignore + @Disabled public void test100Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java index dae803a2b..812c117a5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java @@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.nb.api.testutils.Result; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.function.Function; @@ -37,77 +37,77 @@ public class TestRateLimiterPerfSingle { private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); @Test - @Ignore + @Disabled public void testPerf1e9() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E9, 1.1),10_000_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e8() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E8, 1.1),50_000_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e7() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E7, 1.1),5_000_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e6() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E6, 1.1),500_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e5() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E5, 1.1),50_000,0.01d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e4() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E4, 1.1),5_000,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e3() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E3, 1.1),500,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e2() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E2, 1.1),50,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E1, 1.1),5,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testPerf1e0() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E0, 1.1),2,0.005d); System.out.println(result); } @Test - @Ignore + @Disabled public void testePerf1eN1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E-1, 1.1),1,0.005d); System.out.println(result); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java index 86dc50afc..76dea68ad 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.ParameterMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java index 43e04fd30..15f94cd1d 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java @@ -17,13 +17,13 @@ package io.nosqlbench.engine.api.activityapi.sysperf; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class SysPerfBaselinerTest { @Test - @Ignore + @Disabled public void testSysOpsNanoTime() { SysPerfBaseliner sbo = new SysPerfBaseliner(); SysPerfData perfdata = sbo.getSysPerfData(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java index 55f11bd28..f4d322ae2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java @@ -17,8 +17,8 @@ package io.nosqlbench.engine.api.activityapi.sysperf; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.nio.file.attribute.FileTime; import java.util.Optional; @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class SysPerfTest { @Test - @Ignore + @Disabled public void testForcedBench() { // SysPerf.get().reset(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java index 6a44f9d82..d460c12f4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityconfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java index 10413036c..f19168368 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java @@ -21,7 +21,7 @@ import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java index 1ab1d07fa..274034a72 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java @@ -22,7 +22,7 @@ import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsBlock; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDoc; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java index 2772c1b77..2e79a56f0 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java index 48d22eb2a..381f00400 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java @@ -19,10 +19,10 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.*; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; @@ -33,7 +33,7 @@ public class StmtEscapingTest { private final static Logger logger = LogManager.getLogger(StmtEscapingTest.class); private static List defs; - @BeforeClass + @BeforeAll public static void testLayering() { StmtsDocList all = StatementsLoader.loadPath(logger, "testdocs/escaped_stmts.yaml"); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java index 3b510b09a..1039e3ab5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java index 1a294115f..6c8a2e04a 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java @@ -19,10 +19,10 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.ParsedStmt; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -30,7 +30,7 @@ public class ParsedStmtTest { private static final Logger logger = LogManager.getLogger(ParsedStmtTest.class); private static StmtsDocList doclist; - @BeforeClass + @BeforeAll public static void testLoadYaml() { doclist = StatementsLoader.loadPath(logger, "testdocs/bindings.yaml"); } diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java index 2f7f061e2..a93858cc5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java index 55972d2c7..ee4b8d366 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java @@ -19,10 +19,10 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import org.assertj.core.data.MapEntry; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; @@ -49,7 +49,7 @@ public class StmtsDocListTest { }}; - @BeforeClass + @BeforeAll public static void testLoadYaml() { doclist = StatementsLoader.loadPath(logger, "testdocs/docs_blocks_stmts.yaml"); } diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java index f2de0eb77..4c32e2d6d 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java index 11f12a568..030ab5311 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java index ae66c22c6..cc8de9607 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java index 3e9379889..9d9d53a9b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleArray; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java index c5764cda0..02db2786f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleArray; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java index e5f6a5cb0..8eff84a09 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java index 68a339faa..6274a99f4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.marker; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java index 346523e9d..ca53e60b2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl.marker; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CoreOutputAtticTest { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java index bbe16bee9..829145377 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.output.Output; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java index 11494c0ab..d7648e16b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java @@ -2,8 +2,8 @@ package io.nosqlbench.engine.api.activityimpl.tracking; import io.nosqlbench.engine.api.activityimpl.marker.longheap.LongTreeTracker; import io.nosqlbench.engine.api.activityimpl.marker.longheap.LongTreeTrackerAtomic; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -139,7 +139,7 @@ public class LongTreeTrackerTest2 { */ @Test - @Ignore + @Disabled public void speedcheckThreadLocal() { long t1=System.nanoTime(); LongTreeTracker t = new LongTreeTracker(); @@ -159,7 +159,7 @@ public class LongTreeTrackerTest2 { } @Test - @Ignore + @Disabled public void speedcheckConcurrentLocal() { long t1=System.nanoTime(); LongTreeTracker t = new LongTreeTrackerAtomic(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java index f847fe232..fe6353638 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.api.activityimpl.tracking; import io.nosqlbench.engine.api.activityimpl.marker.longheap.TreeTracker1024; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java index 155adadb0..8ed23b34c 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.api.clireader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java index 74eca0c9c..326bbce91 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java index 03cb09eb8..4972e4944 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Snapshot; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DeltaHdrHistogramReservoirTest { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java index 4006cce39..c9bb298ef 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.metrics; import org.HdrHistogram.EncodableHistogram; import org.HdrHistogram.Histogram; import org.HdrHistogram.HistogramLogReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java index 2f269b53f..fbee78446 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java index 88e1315a6..866724f38 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java @@ -2,13 +2,13 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.ExponentiallyDecayingReservoir; import com.codahale.metrics.Snapshot; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class TestHistoTypes { @Test - @Ignore + @Disabled public void compareHistos() { Clock c = new Clock(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java index d8b5de7c6..636dd3fe4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.scripting; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java index f6a1d430b..a5a505ecd 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.engine.api.templating; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/StrInterpolatorTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/StrInterpolatorTest.java index cf5ba4efa..e0e2b2102 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/StrInterpolatorTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/StrInterpolatorTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.templating; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.*; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java index 894e4b6a0..3ffd0579e 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.util; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.FileNotFoundException; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java index 0b94ea0c4..91a752711 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java index 3234db195..56cb7ff64 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java index 747de0dc2..927a9ce15 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.util; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java index cca5bfab0..3463a6d62 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java @@ -1,10 +1,11 @@ package io.nosqlbench.engine.cli; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class BasicScriptBufferTest { @@ -62,14 +63,9 @@ public class BasicScriptBufferTest { assertThat(script).matches("(?s).*a single line.*"); } - @Test(expected = NumberFormatException.class) + @Test public void shouldThrowErrorForInvalidWaitMillisOperand() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "waitmillis", "noway" }); - BasicScriptBuffer b = new BasicScriptBuffer(); - b.add(opts.getCommands().toArray(new Cmd[0])); - String s = b.getParsedScript(); + assertThatExceptionOfType(NumberFormatException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{ "waitmillis", "noway" })); } - - - } diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java index 0ce03decc..c9e24cd45 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.cli; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java index 9b2b8f55b..788af9214 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.cli; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Files; @@ -10,6 +10,7 @@ import java.util.LinkedList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class NBCLIArgsFileTest { @@ -30,11 +31,11 @@ public class NBCLIArgsFileTest { System.out.println(result); } - @Test(expected = RuntimeException.class) + @Test public void testLoadingMissingRequiredFails() { - LinkedList result; NBCLIArgsFile argsFile = new NBCLIArgsFile(); - result = argsFile.process("--argsfile-required", "src/test/resources/argsfiles/nonextant.cli"); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> argsFile.process("--argsfile-required", "src/test/resources/argsfiles/nonextant.cli")); } @Test 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 a98f9b510..1c265f92a 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 @@ -2,11 +2,12 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.api.scenarios.NBCLIScenarioParser; import io.nosqlbench.nb.api.errors.BasicError; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class NBCLIScenarioParserTest { @@ -49,15 +50,16 @@ public class NBCLIScenarioParserTest { assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout"); } - @Test(expected = BasicError.class) + @Test public void testThatVerboseFinalParameterThrowsError() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "yaml=canttouchthis"}); - List cmds = opts.getCommands(); + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{ "scenario-test", "yaml=canttouchthis"})); } - @Test(expected = BasicError.class) + @Test public void testThatMissingScenarioNameThrowsError() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "missing-scenario"}); + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{ "scenario-test", "missing-scenario"})); } @Test diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java index d49925345..326822339 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.cli; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java index 0f4ef55d1..484af1e46 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.docsys.core.PathWalker; import io.nosqlbench.nb.api.content.NBIO; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URL; import java.nio.file.Path; @@ -11,6 +11,7 @@ import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class TestNBCLIOptions { @@ -87,9 +88,10 @@ public class TestNBCLIOptions { assertThat(opts.wantsTopicalHelp()).isFalse(); } - @Test(expected = IllegalArgumentException.class) + @Test public void shouldErrorSanelyWhenNoMatch() { - NBCLIOptions opts = new NBCLIOptions(new String[]{"unrecognizable command"}); + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{"unrecognizable command"})); } @Test @@ -102,14 +104,16 @@ public class TestNBCLIOptions { assertThat(cmd.getParams().get("param1")).isEqualTo("value1"); } - @Test(expected = InvalidParameterException.class) + @Test public void testShouldErrorSanelyWhenScriptNameSkipped() { - NBCLIOptions opts = new NBCLIOptions(new String[]{"script", "param1=value1"}); + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{"script", "param1=value1"})); } - @Test(expected = InvalidParameterException.class) + @Test public void testShouldErrorForMissingScriptName() { - NBCLIOptions opts = new NBCLIOptions(new String[]{"script"}); + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{"script"})); } @Test @@ -140,10 +144,10 @@ public class TestNBCLIOptions { } - @Test(expected = InvalidParameterException.class) + @Test public void shouldThrowErrorForInvalidStopActivity() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "stop", "woah=woah" }); - List cmds = opts.getCommands(); + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{ "stop", "woah=woah" })); } @Test @@ -155,11 +159,10 @@ public class TestNBCLIOptions { } - @Test(expected = InvalidParameterException.class) + @Test public void shouldThrowErrorForInvalidAwaitActivity() { - NBCLIOptions opts = new NBCLIOptions(new String[]{ "await", "awaitme=notvalid" }); - List cmds = opts.getCommands(); - + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(() -> new NBCLIOptions(new String[]{ "await", "awaitme=notvalid" })); } @Test diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java index c025f9455..09ffd2170 100644 --- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java +++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.clients.grafana; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java index 100417b13..35f1bc1cf 100644 --- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java +++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java @@ -1,8 +1,8 @@ package io.nosqlbench.engine.clients.grafana; import io.nosqlbench.engine.clients.grafana.transfer.GAnnotation; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -10,7 +10,7 @@ public class GrafanaClientTest { private static final String testurl = "http://localhost:3000/"; @Test - @Ignore + @Disabled public void testCreateAnnotation() { GrafanaClient client = new GrafanaClient(testurl); client.getConfig().basicAuth("admin", "admin"); @@ -22,7 +22,7 @@ public class GrafanaClientTest { } @Test - @Ignore + @Disabled public void testFindAnnotations() { GrafanaClient client = new GrafanaClient(testurl); client.getConfig().basicAuth("admin", "admin"); @@ -31,7 +31,7 @@ public class GrafanaClientTest { } @Test - @Ignore + @Disabled public void testGetApiToken() { GrafanaClient client = new GrafanaClient(testurl); client.getConfig().basicAuth("admin", "admin"); diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java index 709f8f497..b6ef94319 100644 --- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java +++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java @@ -1,13 +1,13 @@ package io.nosqlbench.engine.clients.grafana.analyzer; import io.nosqlbench.engine.clients.grafana.transfer.GDashboard; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class GrafanaRegionAnalyzerTest { @Test - @Ignore + @Disabled public void testGetQueries() { GrafanaRegionAnalyzer gra = new GrafanaRegionAnalyzer(); gra.setBaseUrl("http://44.242.139.57:3000/"); diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java index a5b85aad5..10d15f4c2 100644 --- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java +++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java @@ -4,8 +4,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import io.nosqlbench.nb.api.content.NBIO; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.lang.reflect.Type; @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class PMatrixElemTest { @Test - @Ignore + @Disabled public void testMatrixElem() { Gson gson = new GsonBuilder().create(); String json = NBIO.classpath().name("test.json").one().asString(); diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java index 8098fa3a6..f15ab5a33 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java @@ -15,7 +15,7 @@ import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser; import io.nosqlbench.engine.core.lifecycle.ActivityExecutor; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java index c2b73156a..50757c472 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java @@ -5,7 +5,7 @@ import io.nosqlbench.engine.core.fortesting.BlockingSegmentInput; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java index f03e323c6..cda510c0e 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.core; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; import io.nosqlbench.engine.core.script.Scenario; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java b/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java index b187d63ff..7c0c3f18a 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.core.experimental; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java index 8ad34d8dc..57606ad1c 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.core.metrics; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.metrics.DeltaHdrHistogramReservoir; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java index 290d811df..0949f53b5 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java index e09516f34..beb6b38f3 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java @@ -18,13 +18,13 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.core.lifecycle.ScenariosResults; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ScenariosExecutorTest { @Test - @Ignore + @Disabled public void testAwaitOnTime() { ScenariosExecutor e = new ScenariosExecutor(ScenariosExecutorTest.class.getSimpleName(), 1); Scenario s = new Scenario("testing", Scenario.Engine.Graalvm,"stdout:3000"); diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScriptParamsTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScriptParamsTest.java index 64a43b3f6..28f4ccce5 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScriptParamsTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScriptParamsTest.java @@ -1,23 +1,25 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.nb.api.errors.BasicError; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class ScriptParamsTest { - @Test(expected = BasicError.class) + @Test public void testThatNullOverridesKeyThrowsBasicError() { ScriptParams p = new ScriptParams(); p.putAll(Map.of("a","b")); p.withDefaults(Map.of("c","d")); HashMap overrides = new HashMap<>(); overrides.put(null,"test"); - p.withOverrides(overrides); + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> p.withOverrides(overrides)); } } diff --git a/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java b/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java index 0794e136a..97efeff2d 100644 --- a/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java +++ b/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java @@ -21,7 +21,7 @@ import org.apache.commons.math3.optim.*; import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction; import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/engine-rest/src/test/java/io/nosqlbench/engine/rest/services/openapi/OpenApiLoaderTest.java b/engine-rest/src/test/java/io/nosqlbench/engine/rest/services/openapi/OpenApiLoaderTest.java index 38ba88044..234733022 100644 --- a/engine-rest/src/test/java/io/nosqlbench/engine/rest/services/openapi/OpenApiLoaderTest.java +++ b/engine-rest/src/test/java/io/nosqlbench/engine/rest/services/openapi/OpenApiLoaderTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.rest.services.openapi; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OpenApiLoaderTest { diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 84f77d9a8..bd96b4f07 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -27,7 +27,7 @@ 2.4.0-b180830.0438 1.22 2.9.9 - 5.3.2 + 5.7.2 1.4.1 @@ -88,7 +88,7 @@ org.junit.jupiter - 5.6.2 + ${junit.jupiter.version} junit-jupiter test @@ -209,7 +209,6 @@ 5.2.2 - com.google.code.gson gson @@ -354,31 +353,20 @@ org.assertj assertj-core - 3.15.0 + 3.19.0 test org.junit.platform junit-platform-launcher - 1.6.2 + 1.7.2 test org.junit.jupiter junit-jupiter - 5.6.2 - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - test - - - org.junit.vintage - junit-vintage-engine - 5.6.2 + ${junit.jupiter.version} test diff --git a/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java b/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java index 45a4ab40a..72a50a1f7 100644 --- a/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java +++ b/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java @@ -18,11 +18,12 @@ package io.nosqlbench.engine.api.activityimpl.motor; import io.nosqlbench.nb.api.config.ParamsParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class ParamsParserTest { @@ -60,7 +61,6 @@ public class ParamsParserTest { assertThat(p).hasSize(2); assertThat(p).containsKey("b"); assertThat(p.get("b")).isEqualTo("fo'urfive"); - } @Test @@ -127,7 +127,6 @@ public class ParamsParserTest { assertThat(p).containsKey("b"); assertThat(p.get("a")).isEqualTo("1"); assertThat(p.get("b")).isEqualTo("2"); - } @Test @@ -138,7 +137,6 @@ public class ParamsParserTest { assertThat(p).containsKey("b"); assertThat(p.get("a")).isEqualTo("1 2 3"); assertThat(p.get("b")).isEqualTo("2"); - } @Test @@ -149,17 +147,12 @@ public class ParamsParserTest { assertThat(p).containsKey("b"); assertThat(p.get("a")).isEqualTo("1"); assertThat(p.get("b")).isEqualTo("2 3 4"); - } - @Test(expected = RuntimeException.class) - public void testValidNameException() { - Map p = ParamsParser.parse("a=1\\\\;'\";b=2 3 4",true); - assertThat(p).hasSize(2); - assertThat(p).containsKey("a"); - assertThat(p).containsKey("b"); - assertThat(p.get("a")).isEqualTo("1\\;'\""); - assertThat(p.get("b")).isEqualTo("2 3 4"); + @Test + public void testInvalidNameException() { + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> ParamsParser.parse("a=1\\\\;'\";b=2 3 4",true)); } @Test @@ -170,8 +163,6 @@ public class ParamsParserTest { assertThat(p).containsKey("b"); assertThat(p.get("a")).isEqualTo("fiver"); assertThat(p.get("b")).isEqualTo(" sixer"); - } - } diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java index 7a20a4cad..9693e4d04 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java index 2f62bddb0..62508270f 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SystemIdTest { diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java index c676a7a5f..19b6f09ea 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api.annotations; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java index 9ad30c9d2..84ae2cd94 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java index c3e922b0a..a952aec2d 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java index 9efd2c923..5aadf28f2 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java @@ -1,8 +1,8 @@ package io.nosqlbench.nb.api.config.params; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.List; @@ -36,7 +36,7 @@ public class NBParamsTest { } @Test - @Ignore("This case is unwieldy and generally not useful") + @Disabled("This case is unwieldy and generally not useful") public void testNestedMixedJsonParamsMap() { Element one = NBParams.one("{\"key1\":\"key2={\"key3\":\"value3\",\"key4\":\"value4\"}\"}"); assertThat(one.get("key1.key2.key3", String.class)).isPresent(); diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java index 97eba30a9..6193e192d 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.nb.api.content; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java index 9fc06d633..715b65459 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java @@ -2,8 +2,8 @@ package io.nosqlbench.nb.api.markdown.aggregator; import io.nosqlbench.nb.api.content.PathContent; import io.nosqlbench.nb.api.markdown.types.MarkdownInfo; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.net.URL; import java.nio.file.*; @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.from; public class MarkdownDocsTest { @Test - @Ignore + @Disabled public void testLoadMarkdown() { List processed = MarkdownDocs.findAll(); List expected = fromRaw("docs-for-testing-logical"); diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java index 24d30c282..edad4801d 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.nb.api.content.Content; import io.nosqlbench.nb.api.content.ResolverForClasspath; import io.nosqlbench.nb.api.content.ResolverForFilesystem; import io.nosqlbench.nb.api.content.ResolverForURL; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URL; import java.nio.file.Path; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java index 8ab8aa96f..7bffb7f91 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.nb.api.testutils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java index 8a7db1dd1..7c50e91d0 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.nb.api.testutils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java b/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java index 319494b9f..0066ce1aa 100644 --- a/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java @@ -17,7 +17,7 @@ package io.nosqlbench.cli.testing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; import java.util.stream.Collectors; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java index dfbcfc933..cbfde08a4 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java @@ -21,8 +21,8 @@ import io.nosqlbench.engine.core.lifecycle.ScenarioResult; import io.nosqlbench.engine.core.lifecycle.ScenariosResults; import org.apache.commons.compress.utils.IOUtils; import org.assertj.core.data.Offset; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -73,7 +73,7 @@ public class AsyncScriptIntegrationTests { return scenarioResult; } - @BeforeClass + @BeforeAll public static void logit() { System.out.println("Running ASYNC version of Script Integration Tests."); } @@ -265,7 +265,7 @@ public class AsyncScriptIntegrationTests { // @Test -// @Ignore +// @Disabled // public void testCycleRateChangeOldMetrics() { // ScenarioResult scenarioResult = runScenario("cycle_rate_change_deprecated"); // String ioLog = scenarioResult.getIOLog(); diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java index 43695f462..a3b10337e 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.core.script; import com.codahale.metrics.Histogram; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java index bfe88d93c..c2bfb120a 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java @@ -15,7 +15,7 @@ package io.nosqlbench.engine.core.script; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java index 1f57813a0..9a8f431d4 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.cli.testing.ProcessInvoker; import io.nosqlbench.cli.testing.ProcessResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java index 85099dfdd..f0a75e356 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java @@ -21,8 +21,8 @@ import io.nosqlbench.engine.core.lifecycle.ScenarioResult; import io.nosqlbench.engine.core.lifecycle.ScenariosResults; import org.apache.commons.compress.utils.IOUtils; import org.assertj.core.data.Offset; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -68,7 +68,7 @@ public class ScriptIntegrationTests { } - @BeforeClass + @BeforeAll public static void logit() { System.out.println("Running SYNC version of Script Integration Tests."); } diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java index f244523c3..7c23c8815 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java @@ -15,8 +15,8 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.core.lifecycle.ScenarioResult; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** @@ -26,13 +26,13 @@ import org.junit.Test; public class SpeedCheckIntegrationTests { @Test - @Ignore + @Disabled public void testSpeedSanity() { ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("speedcheck"); } @Test - @Ignore + @Disabled public void testThreadSpeeds() { ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("threadspeeds"); } diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java index 0f254e459..abbc849e6 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.annotations; import io.nosqlbench.virtdata.api.annotations.ExampleData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java index 1726c2b23..fa1701170 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.api.bindings; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.*; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java index 7af1971b0..051e29f36 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.core.bindings.CompatibilityFixups; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java index 36ae7b867..584e107c9 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.core.bindings.ResolvedFunction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.LongUnaryOperator; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java index 6992bcf88..2a39156b7 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; import io.nosqlbench.virtdata.core.bindings.VirtDataComposer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VirtDataComposerTest { diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java index 713f564c3..35fa66a29 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java index ae32cffab..4815c10de 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.virtdata.core.composers; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.FunctionType; import io.nosqlbench.virtdata.core.bindings.DataMapperFunctionMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java index a65f3afa8..97ce18b48 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java @@ -1,13 +1,14 @@ package io.nosqlbench.virtdata.core.composers; import io.nosqlbench.virtdata.core.bindings.DataMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.LongUnaryOperator; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class FunctionAssemblerTest { @@ -51,13 +52,14 @@ public class FunctionAssemblerTest { assertThat(aLong).isEqualTo(15); } - @Test(expected = ClassCastException.class) - public void testLongFunctionLongFunctionMistyped() throws Exception { + @Test + public void testLongFunctionLongFunctionMistyped() { FunctionComposer fass = new FunctionAssembly(); fass.andThen(new LongAddFiveFunction()); fass.andThen(new GenericStringCat()); DataMapper dataMapper = fass.getDataMapper(); - dataMapper.get(5); + assertThatExceptionOfType(ClassCastException.class) + .isThrownBy(() -> dataMapper.get(5)); } @Test @@ -79,12 +81,13 @@ public class FunctionAssemblerTest { // assertThat(s).isEqualTo("Cat5"); // } - @Test(expected= ClassCastException.class) + @Test public void testFunctionFunctionMistyped() { FunctionComposer fass = new FunctionAssembly(); fass.andThen(new GenericStringCat()); DataMapper dataMapper = fass.getDataMapper(); - String s = dataMapper.get(5); + assertThatExceptionOfType(ClassCastException.class) + .isThrownBy(() -> dataMapper.get(5)); } @Test diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java index a6bd8c30a..74f647780 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core.config; import io.nosqlbench.nb.api.config.ConfigData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java index 6a9671c22..2e4faf37f 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core.templates; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.security.InvalidParameterException; import java.util.HashMap; @@ -9,6 +9,7 @@ import java.util.Map; import java.util.regex.Pattern; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class ParsedTemplateTest { @@ -39,7 +40,7 @@ public class ParsedTemplateTest { assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); } - @Ignore("currently not working correctly") + @Disabled("currently not working correctly") @Test public void testShouldMatchQuestionMark() { ParsedTemplate pt = new ParsedTemplate(oneQuestion, bindings); @@ -90,11 +91,12 @@ public class ParsedTemplateTest { } //, expectedExceptionsMessageRegExp = ".*must contain a named group called anchor.*" - @Test(expected= InvalidParameterException.class) + @Test public void testShouldErrorOnInvalidPattern() { String wontuse = "This won't get used."; Pattern p = Pattern.compile("\\[(\\w[_a-zA-Z]+)]"); - ParsedTemplate pt = new ParsedTemplate(wontuse, bindings, p); + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(()-> new ParsedTemplate(wontuse, bindings, p)); } @Test diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java index baa945496..65014407d 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java @@ -1,18 +1,20 @@ package io.nosqlbench.virtdata.core.templates; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class StringBindingsTemplateTest { // , expectedExceptionsMessageRegExp = ".*not provided in the bindings: \\[two, three\\]") - @Test(expected = RuntimeException.class) + @Test public void testUnqualifiedBindings() { BindingsTemplate bt1 = new BindingsTemplate(); bt1.addFieldBinding("one", "Identity()"); String template="{one} {two} {three}\n"; StringBindingsTemplate sbt = new StringBindingsTemplate(template,bt1); - StringBindings resolved = sbt.resolve(); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(sbt::resolve); } - } diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java index 91b4baf73..c0a177d38 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.core.templates; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java index 0b66a4876..e1bd9952b 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core.templates; import io.nosqlbench.virtdata.core.bindings.ValueType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java index 438f6eedb..bc63317a6 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.testmappers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java index 4feae2e4a..6271b68f9 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.util; import io.nosqlbench.virtdata.core.bindings.StringObjectPromoter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java index 29cc60908..8603a3067 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java @@ -1,12 +1,14 @@ package io.nosqlbench.virtdata.util; import io.nosqlbench.virtdata.api.bindings.VirtDataFunctions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.security.InvalidParameterException; import java.util.function.Function; import java.util.function.LongFunction; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + public class VirtDataFunctionsTest { @Test @@ -16,11 +18,10 @@ public class VirtDataFunctionsTest { long f2 = adapted.apply(42L); } - @Test(expected = InvalidParameterException.class) + @Test public void testWrongLongUnaryConversion() { - Function fl = (Long l) -> Math.max(l.intValue(),43); - LongFunction adapted = VirtDataFunctions.adapt(fl, LongFunction.class, Long.class, true); - long f2 = adapted.apply(42L); + Function fl = (Long l) -> Math.max(l.intValue(), 43); + assertThatExceptionOfType(InvalidParameterException.class) + .isThrownBy(() -> VirtDataFunctions.adapt(fl, LongFunction.class, Long.class, true)); } - } diff --git a/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java b/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java index 8f1ac7f1b..0b4ac5e56 100644 --- a/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java +++ b/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java @@ -6,7 +6,7 @@ import io.nosqlbench.virtdata.lang.generated.VirtDataParser; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.CommonTokenStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.IOException; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java index 2d3cd07cf..8e021566b 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java @@ -1,8 +1,9 @@ package io.nosqlbench.virtdata.library.basics.core.lfsrs; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class MetaShiftTest { @@ -14,9 +15,10 @@ public class MetaShiftTest { assertThat(MetaShift.getMsbPosition(Long.MAX_VALUE)).isEqualTo(63); } - @Test(expected = RuntimeException.class) + @Test public void testNegativeException() { - assertThat(MetaShift.getMsbPosition(-34)).isEqualTo(64); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> MetaShift.getMsbPosition(-34)); } @Test @@ -25,9 +27,10 @@ public class MetaShiftTest { assertThat(f.config.feedback).isEqualTo(9L); } - @Test(expected = RuntimeException.class) + @Test public void testBankSelectorOverrun() { - MetaShift.Func f = MetaShift.forSizeAndBank(4, 123); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> MetaShift.forSizeAndBank(4, 123)); } // @Test diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java index eb3d25cb4..42ad4b56b 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.core.stathelpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DiscreteProbabilityBufferTest { diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java index 10707b73e..912d9dae1 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.core.stathelpers.aliasmethod; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasElementSampler; import io.nosqlbench.virtdata.library.basics.core.stathelpers.ElemProbD; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java index a4a2a7e6e..b7bff3e16 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java @@ -2,8 +2,8 @@ package io.nosqlbench.virtdata.library.basics.core.stathelpers.aliasmethod; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasSamplerDoubleInt; import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -60,7 +60,7 @@ public class AliasSamplerDoubleIntTest { // Single threaded performance: 100000000 ops in 1366334133 nanos for 73188539.746449 ops/s // yes, that is >70M discrete probability samples per second, but hey, it's only 3 discrete probabilities in this test @Test - @Ignore + @Disabled public void testAliasMicroBenchSmallMany() { List events = new ArrayList<>(); events.add(new EvProbD(1,1D)); diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java index 443391d02..8c9cce2ca 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java @@ -13,7 +13,7 @@ import io.nosqlbench.virtdata.library.basics.shared.unary_string.Prefix; import io.nosqlbench.virtdata.library.basics.shared.unary_string.StringFlow; import io.nosqlbench.virtdata.library.basics.shared.unary_string.Suffix; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.IntUnaryOperator; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java index b2a8258a5..964743643 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.basicsmappers; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java index e6ed687be..845231a5d 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.DoubleFunction; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java index 3f7ac17b1..756f6a52f 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java index 065aa38eb..433acfafe 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Function; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java index 028533e90..7829cfeaa 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.diagnostics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java index 0e369f258..124cfc4cd 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.distributions; import org.assertj.core.data.Percentage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java index 5eebba872..1c526c06e 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_bigdecimal; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.MathContext; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java index c3a817736..83cced303 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double.to_do import io.nosqlbench.virtdata.library.basics.shared.from_double.to_double.Clamp; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java index 35bd95865..56201ab5c 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bigdecimal; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.MathContext; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java index 7a2cdaab6..221d25e07 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java index 11f5ca316..5c610690d 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java @@ -3,11 +3,12 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.MessageDigestAlgorithms; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class DigestToByteBufferTest { @@ -39,11 +40,11 @@ public class DigestToByteBufferTest { System.out.println(Hex.encodeHexString(digest)); } - @Test(expected = RuntimeException.class) + @Test public void testInvalidName() { DigestToByteBuffer d1 = new DigestToByteBuffer("Whoops"); - ByteBuffer digest = d1.apply(233423L); - assertThat(digest).isEqualTo(ByteBuffer.wrap(new byte[] {0x32})); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> d1.apply(233423L)); } } diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java index 2ff66cad6..0f7010197 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_charbuffer.CharBufferExtract; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.HashedLoremExtractToString; import org.apache.commons.codec.binary.Hex; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java index e632dc96c..6f67b3209 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java index 7cb372c54..b7944c9ed 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java index 7d1042948..5d9238766 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java index 0d7c86c7d..fb49ed8ee 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java index 4de915e2e..b22a17eff 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java index cfbca1cb7..53fb49682 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; import java.util.function.*; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java index 1e10ef099..943ada63a 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.LongFunction; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java index 07be70e5d..56c2c0567 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java @@ -1,9 +1,10 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.nb.api.errors.BasicError; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class HashIntervalTest { @@ -15,8 +16,9 @@ public class HashIntervalTest { } - @Test(expected = BasicError.class) + @Test public void testRangeError() { - HashInterval hi = new HashInterval(3L, 3L); + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> new HashInterval(3L, 3L)); } } \ No newline at end of file diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java index e9386860a..ad28c1911 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import org.assertj.core.data.Percentage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LongSummaryStatistics; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java index 605e98275..bc76114a3 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java index e0bdae1af..440acdfb0 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; import io.nosqlbench.virtdata.library.basics.shared.stateful.Clear; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java index 55533b561..891f585bb 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -59,7 +59,7 @@ public class ShuffleTest { * */ @Test - @Ignore + @Disabled public void testWorstCaseThrough28Bits() { int min=1; int max=28; @@ -115,7 +115,7 @@ public class ShuffleTest { * */ @Test - @Ignore + @Disabled public void testBestCaseThrough31Bits() { int min=1; int max=31; @@ -165,7 +165,7 @@ public class ShuffleTest { } @Test - @Ignore + @Disabled public void test97() { int max=97; Shuffle shuffle = new Shuffle(0,max); @@ -184,7 +184,7 @@ public class ShuffleTest { } @Test - @Ignore + @Disabled public void test1000000() { int max=1000000; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java index 9e896b28e..61bea9aa1 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.library.basics.shared.stateful.Clear; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java index 0ccf088ed..735c6c96b 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java @@ -4,8 +4,8 @@ import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Combinations; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; import io.nosqlbench.virtdata.library.basics.shared.functionadapters.ToLongFunction; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.stream.Collectors; @@ -27,7 +27,7 @@ public class CoinFuncTest { } // Uncomment this if you want to see the qualitative check - @Ignore + @Disabled @Test public void testResults() { CoinFunc f = new CoinFunc(0.1, diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java index c8f136788..967ee9169 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_object; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.FixedValues; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java index 974c99e87..9fa1b9a8d 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import io.nosqlbench.virtdata.library.basics.shared.stateful.NullOrPass; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java index 723ba29ab..2ceb7d725 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java index aa5525981..382812d39 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Mod; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java index 2d975ad51..382dc40db 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java index 30035f88e..c32515a20 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TextImageExtractTest { diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java index 67bf0bb7c..bba60b8af 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToMD5ByteBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToMD5ByteBufferTest.java index c1ee64c28..1cb894466 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToMD5ByteBufferTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToMD5ByteBufferTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java index 8a8ad58a4..c0c656b4e 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java @@ -1,12 +1,14 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import org.joda.time.DateTimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class TimezonesTest { - @Test(expected= RuntimeException.class) + @Test public void testInvalidId() { - DateTimeZone sdf = Timezones.forId("not gonna find it"); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> Timezones.forId("not gonna find it")); } } \ No newline at end of file diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java index cd62088bf..0d15ad775 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.jod import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java index 623035204..578a072be 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java index 4c1a0caf5..02f2a51a0 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java index 98598b024..d56c48ec9 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java index 6ba7d9938..d2684a430 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java index 52fa1e737..b0f2a6970 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java index 97c53dced..a610609c6 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java @@ -1,9 +1,10 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class NullOrPassTest { @@ -22,14 +23,16 @@ public class NullOrPassTest { NullOrPass g = new NullOrPass(0.0,"value"); } - @Test(expected = RuntimeException.class) + @Test public void testLowRatio() { - NullOrPass f = new NullOrPass(-0.00001d,"value"); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> new NullOrPass(-0.00001d,"value")); } - @Test(expected = RuntimeException.class) + @Test public void testHighRatio() { - NullOrPass g = new NullOrPass(1.000001d,"value"); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> new NullOrPass(1.000001d,"value")); } } \ No newline at end of file diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java index 9b2a06492..cee47274f 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Save; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java index 05f184f7c..8a7b0778d 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java index f221f3d8f..f7b79edf4 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java index a7b022367..f6c54019f 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java index e4020fc7b..940222e19 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.*; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java index 2fb96a6d4..22a9bb0aa 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.basics.tests.libraryimpl; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.Optional; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java index 0bae4b120..bce88e16d 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_collections; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection.HashedRangeToLongList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java index eae4caa7f..f0c73cac2 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_double; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java index 2c684f013..12299499f 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_long; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java index 0ed7b80e7..a7415ccc9 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.tests.long_long; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java index e41e0a538..7edb3a395 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.AddCycleRa import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.AddHashRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.CycleRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java index d5c32e509..0326ba000 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_long; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.SignedHash; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java index 029c6b356..8eaad9481 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.AlphaNumericString; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java index a4bd03201..b7acc4553 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java @@ -1,9 +1,10 @@ package io.nosqlbench.virtdata.library.basics.tests.long_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Combinations; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class CombinationsTest { @@ -69,11 +70,12 @@ public class CombinationsTest { assertThat(combinations.apply(31)).isEqualTo("D1"); } - @Test(expected = ArithmeticException.class) + @Test public void testOverflow() { // (104^9 / 2^63) < 1.0 // (104^10 / 2^63) > 1.0 - Combinations combinations = new Combinations( + assertThatExceptionOfType(ArithmeticException.class) + .isThrownBy(() -> new Combinations( "A-ZA-ZA-ZA-Z;" + "A-ZA-ZA-ZA-Z;" + "A-ZA-ZA-ZA-Z;" @@ -84,9 +86,7 @@ public class CombinationsTest { + "A-ZA-ZA-ZA-Z;" + "A-ZA-ZA-ZA-Z;" + "A-ZA-ZA-ZA-Z;" - ); - - combinations.apply(Long.MAX_VALUE); + )); } diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java index c949faaad..bda5005ef 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.HashedFileExtractToString; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.IntSummaryStatistics; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java index 1dd5d4a08..1f81fdfc8 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.long_string; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.WeightedStrings; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java index 509e146c0..d0e4b9d42 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java @@ -6,7 +6,7 @@ import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Duration; import org.joda.time.Interval; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java index bb84295f2..6677a74bc 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.library.basics.core.DateTimeFormats; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.ToEpochTimeUUID; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java index 2fabebbd4..82e6b36c4 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Enumerated; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.stream.LongStream; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java index b0aa6d0ed..326872551 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Levy; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java index c68871126..befe0bbf2 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java index 1bb9908ae..6ab46e626 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Normal; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform; import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Formatter; import java.util.Locale; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java index 65dfdaac9..de9549039 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java @@ -3,8 +3,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete; import io.nosqlbench.virtdata.library.curves4.discrete.common.DiscreteLongLongSampler; import io.nosqlbench.virtdata.library.curves4.discrete.common.IntegerDistributionICDSource; import org.apache.commons.statistics.distribution.BinomialDistribution; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -56,7 +56,7 @@ public class IntegerDistributionsBinomialSanity { } - @Ignore + @Disabled @Test public void showBinomialICDF() { DiscreteLongLongSampler b85 = new DiscreteLongLongSampler(new IntegerDistributionICDSource( diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java index 79bfcc0c9..9227e4a60 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.commons.statistics.distribution.BinomialDistribution; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java index 486f8caa4..e0dffd206 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java @@ -4,8 +4,8 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform; import io.nosqlbench.virtdata.library.curves4.discrete.long_long.Zipf; import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Formatter; import java.util.Locale; @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class IntegerDistributionsValuesTest { - @Ignore + @Disabled @Test public void testComputedZipf() { RunData runData = iterateMapperLong(new Zipf(10000,2.0), 10000); diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java index 8a2238730..077d9c740 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.common; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java index 520d13e73..9cc3745b2 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java @@ -1,12 +1,12 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ZipfTest { @Test - @Ignore + @Disabled public void testZipfMatrix() { for (int i = 0; i < 20; i++) { diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java index 97e150c8a..4c6c2707f 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; import io.nosqlbench.virtdata.api.processors.DocFuncData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java index a609b3b82..a05797263 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc1; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc2; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFunc; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFuncs; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FDocFuncsTest { diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java index fe74877bf..4917fedcd 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.userlibs.streams.fillers; import io.nosqlbench.virtdata.userlibs.streams.ByteBufferStreams; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java index 2982f3982..bc747d9d3 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.userlibs.streams.pojos; import io.nosqlbench.virtdata.userlibs.streams.fillers.ByteBufferSource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java index b785af536..51ea10bee 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java @@ -3,7 +3,7 @@ package io.virtdata; import io.nosqlbench.virtdata.library.basics.shared.distributions.DelimFrequencySampler; import io.nosqlbench.virtdata.library.basics.shared.distributions.WeightedStringsFromCSV; import io.nosqlbench.virtdata.library.basics.shared.distributions.CSVFrequencySampler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java index f62e33b91..90d4590a0 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java @@ -18,7 +18,7 @@ package io.virtdata; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.Bindings; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java index b87bcdf7e..49815cd89 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java @@ -20,28 +20,25 @@ import io.nosqlbench.virtdata.core.bindings.Bindings; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Optional; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class IntegratedComposerLibraryTest { // The deprecated functions are not being included in the next release, so this test's purpose has been // reversed. - @Test(expected=RuntimeException.class) + @Test public void testArgumentMatchingViaMainLib() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("param","RandomLineToString('data/variable_words.txt')"); - Bindings bindings = bt.resolveBindings(); - Object[] all = bindings.getAll(5); - assertThat(all).isNotNull(); - assertThat(all.length).isEqualTo(1); - Object o = all[0]; - assertThat(o.getClass()).isEqualTo(String.class); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> bt.resolveBindings()); } @Test @@ -83,7 +80,7 @@ public class IntegratedComposerLibraryTest { // TODO: Fix this test @Test - @Ignore + @Disabled public void testTypeCoercionWhenNeeded() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("mod_to_string", "compose Mod(3) ; Suffix('0000000000') -> String"); @@ -98,7 +95,7 @@ public class IntegratedComposerLibraryTest { // TODO: Fix this test @Test - @Ignore + @Disabled public void testBasicRange() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("phone","HashRange(1000000000, 9999999999)"); diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java index 82810595d..0f1b0cb19 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java @@ -6,7 +6,7 @@ import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Identity; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template; import org.apache.commons.lang3.ClassUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; import java.util.function.Function; @@ -14,6 +14,7 @@ import java.util.function.LongFunction; import java.util.function.LongUnaryOperator; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class IntegratedComposerLogicTest { @@ -142,9 +143,10 @@ public class IntegratedComposerLogicTest { } - @Test(expected = RuntimeException.class) + @Test public void testVirtDataTypeVarianceError() { - DataMapper mapper = VirtData.getMapper("Uniform(0.0D,1.0D) -> java.lang.String", long.class); + assertThatExceptionOfType(RuntimeException.class) + .isThrownBy(() -> VirtData.getMapper("Uniform(0.0D,1.0D) -> java.lang.String", long.class)); } @Test diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java index d66a94a8f..826b01890 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Formatter; import java.util.Locale; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java index 72e30384b..ce8aaacd4 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java @@ -2,7 +2,7 @@ package io.virtdata; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java index 849bc4df9..f89d3805d 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java @@ -3,8 +3,8 @@ package io.virtdata; import io.nosqlbench.virtdata.core.bindings.Bindings; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import io.nosqlbench.virtdata.core.templates.StringCompositor; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.function.Function; @@ -15,7 +15,7 @@ public class IntegratedStringCompositorTest { private static BindingsTemplate template; private static Bindings bindings; - @BeforeClass + @BeforeAll public static void setupTemplate() { BindingsTemplate bindingsTemplate = new BindingsTemplate(); bindingsTemplate.addFieldBinding("ident","Identity()"); diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java index 21cfdccda..6d5ac61bd 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.VirtData; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.UUID;