diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2b3a8b0c6..785d8bfef 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,19 +1,21 @@ -- e8379cc9 (HEAD -> main) Merge branch 'main' of https://github.com/nosqlbench/nosqlbench into main -- e0838ff3 (origin/main) Merge pull request #322 from szimmer1/cockroachdb-driver-postgres-workload -- 2c5624d2 add premade bindings example -- 2cba9709 additional premade binding functions -- 78b23f0e add free and attributed zipcode data -- 0cd100d4 simplify CSV sampling usage -- 4f2482ec localize flexmark to API module -- 2bcf47ca remove summary output until it is fixed -- 0a3fc4fa remove non-release repo from pom -- 581fbf74 fix broken version link -- d2fc94b8 avoid NPE in ElemProbD -- e4cf4c49 Adds postgres-basic workload and scenarios as the cockroachdb driver is compatible with postgres -- ba5d6025 Merge branch 'main' of https://github.com/nosqlbench/nosqlbench into main -- 5497e20f Merge pull request #321 from dougwettlaufer/update-gql-schema-first -- eaddc4f0 Update schema-first workloads to reflect latest api -- 3607b804 Merge branch 'main' of https://github.com/nosqlbench/nosqlbench into main -- afdfc715 Merge pull request #320 from EricBorczuk/add-jsonapi-workload -- 91578c52 Add JSON API keyvalue workload -- 2efc5469 Merge branch 'main' of https://github.com/nosqlbench/nosqlbench into main +- 663e3010 (HEAD -> main) correct test for current functional APIs +- e981f808 (origin/main) General improvements and bug-fixes. Thanks to @XN137 +- 5b4a695f update ANTLR to 4.2.9 in all places +- 3b74ae20 General improvements and bug-fixes. Thanks to @XN137 +- 7c7ea039 post-merge fixups +- 9403f51f improve ToDate semantics and docs +- 0edbfb1f fix test for TagFilter +- 365ad619 remove extraneous var in ActivityExecutor +- 34855a39 Merge pull request #336 from XN137/fix-errorprone-errors +- 60ff1d9c Merge pull request #335 from XN137/avoid-threadsafety-warnings +- c5caf51a Merge pull request #334 from XN137/remove-junit4-dependency +- a02df22d Merge pull request #333 from XN137/jdk-string-join +- 950b31fb fix errors found by errorprone +- b98451ab upgrade antlr4-maven-plugin to v4.9.2 avoid threadsafety warnings +- 5e8e6bf1 use assertj v3.19.0 +- 8dcac028 use junit5 v5.7.2 with proper scoping +- 2cd393ae use junit5 apis to remove junit4 dependency +- 0e68abf1 prefer jdk over lib internals for String join +- dc1c6c5e Merge pull request #332 from XN137/fix-virtdata-api-test-folder +- 6232edff move virtdata-api tests to correct folder +- re-run of github actions due to storage error diff --git a/docsys/pom.xml b/docsys/pom.xml index 491a1212b..84632e559 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-servlets - 11.0.1 + 11.0.3 org.eclipse.jetty @@ -114,7 +114,7 @@ io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java index 724e24822..29e3153a9 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java @@ -180,12 +180,6 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { } private void enable(Set enabled) { - - Set toEnable = new HashSet<>(); - if (this.enables !=null) { - toEnable.addAll(this.enables); - } - for (DocsNameSpace nsinfo : docsinfo) { // add namespaces which are neither enabled nor disabled to the default group if (nsinfo.isEnabledByDefault()) { @@ -204,6 +198,4 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { this.enabled = disabled.remove(enabled); } } - - } 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/pom.xml b/driver-cockroachdb/pom.xml index b1029ac79..13e88f4cb 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT org.postgresql 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/pom.xml b/driver-cql-shaded/pom.xml index 9b49e213e..9fff9a44a 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -70,7 +70,7 @@ org.antlr antlr4-runtime - 4.8 + 4.9.2 @@ -142,7 +142,6 @@ org.antlr antlr4-maven-plugin - 4.8 src/main/grammars/cql3 diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java index b538d845f..8dc99798c 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java @@ -75,13 +75,12 @@ public class DateRangeFunc implements LongFunction { this.upper = upper; } - @Override public DateRange apply(long value) { Date lowerDate = new Date(lower.applyAsLong(value)); DateRange.DateRangeBound lower = DateRange.DateRangeBound.lowerBound(lowerDate,precision); Date upperDate = new Date(upper.applyAsLong(value)); - DateRange.DateRangeBound upper = DateRange.DateRangeBound.upperBound(lowerDate,precision); + DateRange.DateRangeBound upper = DateRange.DateRangeBound.upperBound(upperDate,precision); DateRange dateRange = new DateRange(lower, upper); return dateRange; } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java index cb1b0b801..f95dde80d 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java @@ -30,8 +30,6 @@ public class AvailableCQLStatements { } public List getMatching(String tagSpec) { - - List defs = new ArrayList<>(); TagFilter ts = new TagFilter(tagSpec); List CQLStatementDefParsers = availableDefs.stream() diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java index f46bede03..04cd2bf07 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java @@ -21,17 +21,24 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.net.ssl.SSLContext; +import java.io.BufferedInputStream; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOError; import java.io.IOException; import java.net.Inet6Address; import java.net.InetAddress; import java.net.InetSocketAddress; +import java.net.MalformedURLException; +import java.net.URL; import java.net.UnknownHostException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; +import org.apache.commons.codec.digest.DigestUtils; + public class CQLSessionCache implements Shutdownable { private final static Logger logger = LogManager.getLogger(CQLSessionCache.class); @@ -79,8 +86,8 @@ public class CQLSessionCache implements Shutdownable { Optional scb = activityDef.getParams() .getOptionalString("secureconnectbundle"); - scb.map(File::new) - .ifPresent(builder::withCloudSecureConnectBundle); + + scb.map(this::maybeConvertUrlToFile).ifPresent(builder::withCloudSecureConnectBundle); activityDef.getParams() .getOptionalString("insights").map(Boolean::parseBoolean) @@ -313,7 +320,7 @@ public class CQLSessionCache implements Shutdownable { Cluster cl = builder.build(); // Apply default idempotence, if set - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cl.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); @@ -340,4 +347,35 @@ public class CQLSessionCache implements Shutdownable { cluster.close(); } } + + File maybeConvertUrlToFile(String b) { + try { + URL url = new URL(b); + if (url.getProtocol().startsWith("http")) { + File tmp = Paths.get(System.getProperty("java.io.tmpdir"), "scb-" + DigestUtils.sha1Hex(b) + ".zip").toFile(); + if (tmp.exists()) + return tmp; + + try (BufferedInputStream inputStream = new BufferedInputStream(url.openStream()); + FileOutputStream fileOS = new FileOutputStream(tmp)) { + byte[] data = new byte[1024]; + int byteContent; + while ((byteContent = inputStream.read(data, 0, 1024)) != -1) { + fileOS.write(data, 0, byteContent); + } + } + catch (IOException ex) { + tmp.delete(); + throw new IOError(ex); + } + logger.info("Downloaded {} to {}", b, tmp.getAbsoluteFile()); + return tmp; + } + } + catch (MalformedURLException e) { + //Not a url + } + + return new File(b); + } } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java index 7e4ddc076..71deab86f 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java @@ -12,30 +12,18 @@ public class CQLStatementDefParser { private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class); // private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>"); private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}"); - private final static String UNSET_VALUE = "UNSET-VALUE"; private final String stmt; private final String name; - private CQLStatementDef deprecatedDef; // deprecated, to be removed - public void setBindings(Map bindings) { this.bindings = bindings; } private Map bindings; - public CQLStatementDef getDeprecatedDef() { - return deprecatedDef; - } - - public void setDeprecatedDef(CQLStatementDef deprecatedDef) { - this.deprecatedDef = deprecatedDef; - } - public CQLStatementDefParser(String name, String stmt) { this.stmt = stmt; this.name = name; - this.bindings = bindings; } public Map getBindings() { @@ -64,7 +52,7 @@ public class CQLStatementDefParser { public String getParsedStatementOrError(Set namedBindings) { ParseResult result = getParseResult(namedBindings); if (result.hasError()) { - throw new RuntimeException("Statement template has errors:\n" + result.toString()); + throw new RuntimeException("Statement template has errors:\n" + result); } return result.getStatement(); } @@ -115,13 +103,14 @@ public class CQLStatementDefParser { private final Set missingGenerators; private final Set missingAnchors; private final String statement; - private Map bindings; + private final Map bindings; private final String name; public ParseResult(String stmt, String name, Map bindings, Set missingGenerators, Set missingAnchors) { this.missingGenerators = missingGenerators; this.missingAnchors = missingAnchors; this.statement = stmt; + this.bindings = bindings; this.name = name; } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java index 385d692dc..6d570a14d 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java @@ -23,7 +23,7 @@ public enum DiffType { /// the actual data. all(0x1|0x1<<1|0x1<<2); - public int bitmask; + public final int bitmask; DiffType(int bit) { this.bitmask = bit; 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..b7227f03b 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; @@ -9,6 +9,7 @@ import java.nio.file.*; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.stream.Stream; public class ParserForCqlTest { @@ -37,15 +38,14 @@ public class ParserForCqlTest { URL url = resources.nextElement(); System.out.println("url=" + url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - } diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 917ff3284..c2479b45b 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -66,7 +66,7 @@ org.antlr antlr4-runtime - 4.8 + 4.9.2 @@ -138,7 +138,6 @@ org.antlr antlr4-maven-plugin - 4.8 src/main/grammars/cql3 diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java index cb1b0b801..f95dde80d 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java @@ -30,8 +30,6 @@ public class AvailableCQLStatements { } public List getMatching(String tagSpec) { - - List defs = new ArrayList<>(); TagFilter ts = new TagFilter(tagSpec); List CQLStatementDefParsers = availableDefs.stream() diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java index adbbc8a83..c4a79f2f0 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java @@ -304,7 +304,7 @@ public class CQLSessionCache implements Shutdownable { Cluster cl = builder.build(); // Apply default idempotence, if set - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cl.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java index 7e4ddc076..3cdda585b 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java @@ -12,30 +12,18 @@ public class CQLStatementDefParser { private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class); // private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>"); private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}"); - private final static String UNSET_VALUE = "UNSET-VALUE"; private final String stmt; private final String name; - private CQLStatementDef deprecatedDef; // deprecated, to be removed - public void setBindings(Map bindings) { this.bindings = bindings; } private Map bindings; - public CQLStatementDef getDeprecatedDef() { - return deprecatedDef; - } - - public void setDeprecatedDef(CQLStatementDef deprecatedDef) { - this.deprecatedDef = deprecatedDef; - } - public CQLStatementDefParser(String name, String stmt) { this.stmt = stmt; this.name = name; - this.bindings = bindings; } public Map getBindings() { @@ -64,7 +52,7 @@ public class CQLStatementDefParser { public String getParsedStatementOrError(Set namedBindings) { ParseResult result = getParseResult(namedBindings); if (result.hasError()) { - throw new RuntimeException("Statement template has errors:\n" + result.toString()); + throw new RuntimeException("Statement template has errors:\n" + result); } return result.getStatement(); } diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java index 385d692dc..6d570a14d 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java @@ -23,7 +23,7 @@ public enum DiffType { /// the actual data. all(0x1|0x1<<1|0x1<<2); - public int bitmask; + public final int bitmask; DiffType(int bit) { this.bitmask = bit; 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..b7227f03b 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; @@ -9,6 +9,7 @@ import java.nio.file.*; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.stream.Stream; public class ParserForCqlTest { @@ -37,15 +38,14 @@ public class ParserForCqlTest { URL url = resources.nextElement(); System.out.println("url=" + url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - } diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml index ba5779b23..ee945c52f 100644 --- a/driver-cqld4/pom.xml +++ b/driver-cqld4/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,19 +23,19 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT compile diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 55ef8148e..73fe3f55f 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java index 706b3bb9e..355b63e94 100644 --- a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java +++ b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java @@ -3,6 +3,7 @@ package io.nosqlbench.activitytype.cqlverify; import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.activitytype.cql.statements.rsoperators.AssertSingleRowResultSet; import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.engine.api.activityimpl.ParameterMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,27 +23,26 @@ public class CqlVerifyActivity extends CqlActivity { @Override public synchronized void initActivity() { - if (!super.getActivityDef().getParams().contains("verify") && - !super.getActivityDef().getParams().contains("verify-fields")) { + ParameterMap activityParams = super.getActivityDef().getParams(); + if (!activityParams.containsKey("verify") && + !activityParams.containsKey("verify-fields")) { logger.info("Pre-configuring activity param 'verify=*' since none was provided."); logger.info("To control this on a per-statement basis, use the verify param."); - super.getActivityDef().getParams().put("verify", "*"); + activityParams.put("verify", "*"); } - if (!super.getActivityDef().getParams().contains("compare")) { - super.getActivityDef().getParams().put("compare", "all"); + if (!activityParams.containsKey("compare")) { + activityParams.put("compare", "all"); logger.info("Pre-configuring activity param 'compare=all' since none was provided."); logger.info("To control this on a per-statement basis, use the compare param."); } super.initActivity(); - } @Override public void onActivityDefUpdate(ActivityDef activityDef) { super.onActivityDefUpdate(activityDef); addResultSetCycleOperator(new AssertSingleRowResultSet()); - } } diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 0ffd6f823..fbfde2929 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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..6d336307c 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; @@ -39,7 +39,7 @@ public class SequenceBlockerTest { private final static class Printer implements Runnable { - private PrintStream printStream; + private final PrintStream printStream; private final String out; public Printer(PrintStream printStream, String out) { @@ -54,4 +54,4 @@ public class SequenceBlockerTest { } -} \ No newline at end of file +} diff --git a/driver-direct/pom.xml b/driver-direct/pom.xml index 825b1c520..040db3042 100644 --- a/driver-direct/pom.xml +++ b/driver-direct/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -21,12 +21,12 @@ io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT compile diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 14c04f3c3..7fc1942ed 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -70,7 +70,7 @@ org.antlr antlr4-runtime - 4.8 + 4.9.2 @@ -174,7 +174,6 @@ org.antlr antlr4-maven-plugin - 4.8 src/main/grammars/cql3 diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java index 2107bddf0..70afbb2ef 100644 --- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java +++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java @@ -212,7 +212,7 @@ public class GraphActivity extends SimpleActivity implements ActivityDefObserver logger.error("Error while instantiating cluster from builder: " + e, e); throw e; } - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cluster.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); diff --git a/driver-grpc/pom.xml b/driver-grpc/pom.xml index 5abe19c47..f9c269e15 100644 --- a/driver-grpc/pom.xml +++ b/driver-grpc/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults/pom.xml @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 5c8b2fac1..c58d7e731 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/cmds/HttpFormatParser.java b/driver-http/src/main/java/io/nosqlbench/activitytype/cmds/HttpFormatParser.java index 5531443cd..c37808cde 100644 --- a/driver-http/src/main/java/io/nosqlbench/activitytype/cmds/HttpFormatParser.java +++ b/driver-http/src/main/java/io/nosqlbench/activitytype/cmds/HttpFormatParser.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cmds; import io.nosqlbench.nb.api.errors.BasicError; -import io.nosqlbench.virtdata.core.templates.ParsedTemplate; +import io.nosqlbench.virtdata.core.templates.BindPointParser; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -90,7 +90,7 @@ public class HttpFormatParser { StringBuilder sb = new StringBuilder(); String input = template; - Matcher matcher = ParsedTemplate.STANDARD_ANCHOR.matcher(input); + Matcher matcher = BindPointParser.BINDPOINT_ANCHOR.matcher(input); int idx = 0; while (matcher.find()) { String pre = input.substring(idx, matcher.start()); diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java index 2b30e8fe2..2df81b005 100644 --- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java +++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java @@ -108,7 +108,6 @@ public class HttpConsoleFormats { } long mod = 1L; - Set incl = new HashSet<>(); long mask = 0L; for (String include : filterSet) { 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-jdbc/pom.xml b/driver-jdbc/pom.xml index 6c0688c38..a38464126 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT compile diff --git a/driver-jdbc/src/main/java/io/nosqlbench/activitytype/jdbc/impl/ReadyJDBCOp.java b/driver-jdbc/src/main/java/io/nosqlbench/activitytype/jdbc/impl/ReadyJDBCOp.java index e11a71289..74258d559 100644 --- a/driver-jdbc/src/main/java/io/nosqlbench/activitytype/jdbc/impl/ReadyJDBCOp.java +++ b/driver-jdbc/src/main/java/io/nosqlbench/activitytype/jdbc/impl/ReadyJDBCOp.java @@ -12,7 +12,7 @@ public class ReadyJDBCOp implements OpDispenser { public ReadyJDBCOp(OpTemplate stmtDef) { ParsedTemplate paramTemplate = new ParsedTemplate(stmtDef.getStmt(), stmtDef.getBindings()); - BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getCheckedBindPoints()); + BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints()); StringBindingsTemplate template = new StringBindingsTemplate(stmtDef.getStmt(), paramBindings); bindings = template.resolve(); diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index cd4db8090..9fbf055ec 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-stdout - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-jms/src/main/java/io/nosqlbench/driver/jms/JmsActivity.java b/driver-jms/src/main/java/io/nosqlbench/driver/jms/JmsActivity.java index 396982bbf..39ac5b42d 100644 --- a/driver-jms/src/main/java/io/nosqlbench/driver/jms/JmsActivity.java +++ b/driver-jms/src/main/java/io/nosqlbench/driver/jms/JmsActivity.java @@ -116,13 +116,16 @@ public class JmsActivity extends SimpleActivity { ); } + private static String buildCacheKey(String... keyParts) { + return String.join("::", keyParts); + } + /** * If the JMS destination that corresponds to a topic exists, reuse it; Otherwise, create it */ public Destination getOrCreateJmsDestination(String jmsDestinationType, String destName) { - String encodedTopicStr = - JmsUtil.encode(jmsDestinationType, destName); - Destination destination = jmsDestinations.get(encodedTopicStr); + String destinationCacheKey = buildCacheKey(jmsDestinationType, destName); + Destination destination = jmsDestinations.get(destinationCacheKey); if ( destination == null ) { // TODO: should we match Persistent/Non-peristent JMS Delivery mode with @@ -133,7 +136,7 @@ public class JmsActivity extends SimpleActivity { destination = jmsContext.createTopic(destName); } - jmsDestinations.put(encodedTopicStr, destination); + jmsDestinations.put(destinationCacheKey, destination); } return destination; diff --git a/driver-jms/src/main/java/io/nosqlbench/driver/jms/ops/JmsMsgSendOp.java b/driver-jms/src/main/java/io/nosqlbench/driver/jms/ops/JmsMsgSendOp.java index f23ac403e..0219124c6 100644 --- a/driver-jms/src/main/java/io/nosqlbench/driver/jms/ops/JmsMsgSendOp.java +++ b/driver-jms/src/main/java/io/nosqlbench/driver/jms/ops/JmsMsgSendOp.java @@ -108,11 +108,10 @@ public class JmsMsgSendOp extends JmsTimeTrackOp { @Override public void run() { - int messageSize; try { byte[] msgBytes = msgBody.getBytes(StandardCharsets.UTF_8); - messageSize = msgBytes.length; - jmsProducer.send(jmsDestination, msgBody.getBytes(StandardCharsets.UTF_8)); + int messageSize = msgBytes.length; + jmsProducer.send(jmsDestination, msgBytes); messagesizeHistogram.update(messageSize); bytesCounter.inc(messageSize); diff --git a/driver-jms/src/main/java/io/nosqlbench/driver/jms/util/JmsUtil.java b/driver-jms/src/main/java/io/nosqlbench/driver/jms/util/JmsUtil.java index 456939417..2b5e0ba14 100644 --- a/driver-jms/src/main/java/io/nosqlbench/driver/jms/util/JmsUtil.java +++ b/driver-jms/src/main/java/io/nosqlbench/driver/jms/util/JmsUtil.java @@ -1,11 +1,9 @@ package io.nosqlbench.driver.jms.util; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Arrays; -import java.util.Base64; public class JmsUtil { @@ -102,18 +100,5 @@ public class JmsUtil { public static boolean isValidJmsDestinationType(String type) { return Arrays.stream(JMS_DESTINATION_TYPES.values()).anyMatch(t -> t.label.equals(type)); } - - public static String encode(String... strings) { - StringBuilder stringBuilder = new StringBuilder(); - for (String str : strings) { - if (!StringUtils.isBlank(str)) - stringBuilder.append(str).append("::"); - } - - String concatenatedStr = - StringUtils.substringBeforeLast(stringBuilder.toString(), "::"); - - return Base64.getEncoder().encodeToString(concatenatedStr.getBytes()); - } } diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index da9685429..872bba7d5 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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-kafka/pom.xml b/driver-kafka/pom.xml index 8566d20bf..24e0427fa 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-stdout - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java index 819a207b1..20796b233 100644 --- a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java +++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java @@ -33,7 +33,7 @@ public class KafkaStatement { public KafkaStatement(OpTemplate stmtDef, String servers, String clientId, String schemaRegistryUrl) { ParsedTemplate paramTemplate = new ParsedTemplate(stmtDef.getStmt(), stmtDef.getBindings()); - BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getCheckedBindPoints()); + BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints()); StringBindingsTemplate template = new StringBindingsTemplate(stmtDef.getStmt(), paramBindings); this.bindings = template.resolve(); diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 7cfafc13a..7d6583a55 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java index 7edf7893c..67728b8da 100644 --- a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java @@ -16,7 +16,7 @@ public class ReadyMongoStatement { public ReadyMongoStatement(OpTemplate stmtDef) { ParsedTemplate paramTemplate = new ParsedTemplate(stmtDef.getStmt(), stmtDef.getBindings()); - BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getCheckedBindPoints()); + BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints()); StringBindingsTemplate template = new StringBindingsTemplate(stmtDef.getStmt(), paramBindings); this.bindings = template.resolve(); 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-pulsar/pom.xml b/driver-pulsar/pom.xml index 7bd94bfd3..41185882a 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-stdout - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index 76ea6a7f5..668eae911 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -197,6 +197,6 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve } public void asyncOperationFailed(Throwable ex) { - this.asyncOperationFailure = asyncOperationFailure; + this.asyncOperationFailure = ex; } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarSpace.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarSpace.java index 8f0bbab09..947734ba1 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarSpace.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarSpace.java @@ -216,7 +216,7 @@ public class PulsarSpace { public Supplier getTransactionSupplier() { PulsarClient pulsarClient = getPulsarClient(); return () -> { - try (Timer.Context time = createTransactionTimer.time(); ){ + try (Timer.Context time = createTransactionTimer.time()){ return pulsarClient .newTransaction() .build() @@ -233,6 +233,9 @@ public class PulsarSpace { }; } + private static String buildCacheKey(String... keyParts) { + return String.join("::", keyParts); + } public Producer getProducer(String cycleTopicName, String cycleProducerName) { String topicName = getEffectiveProducerTopicName(cycleTopicName); @@ -242,8 +245,8 @@ public class PulsarSpace { throw new RuntimeException("Producer:: must specify a topic name either at the global level or the cycle level"); } - String encodedStr = PulsarActivityUtil.encode(producerName, topicName); - Producer producer = producers.get(encodedStr); + String producerCacheKey = buildCacheKey(producerName, topicName); + Producer producer = producers.get(producerCacheKey); if (producer == null) { PulsarClient pulsarClient = getPulsarClient(); @@ -273,7 +276,7 @@ public class PulsarSpace { ProducerBuilder producerBuilder = pulsarClient.newProducer(pulsarSchema); producerBuilder.loadConf(producerConf); producer = producerBuilder.create(); - producers.put(encodedStr, producer); + producers.put(producerCacheKey, producer); ActivityMetrics.gauge(activityDef, producerMetricsPrefix + "totalbytessent", safeExtractMetric(producer, (s -> s.getTotalBytesSent() + s.getNumBytesSent()))); ActivityMetrics.gauge(activityDef, producerMetricsPrefix + "totalmsgssent", safeExtractMetric(producer, (s -> s.getTotalMsgsSent() + s.getNumMsgsSent()))); @@ -449,29 +452,29 @@ public class PulsarSpace { throw new RuntimeException("Consumer:: \"topic_uri\", \"topic_names\" and \"topics_pattern\" parameters can't be all empty/invalid!"); } - String encodedStr; + String consumerCacheKey; // precedence sequence: // topic_names (consumer statement param) > // topics_pattern (consumer statement param) > // topic_uri (document level param) if (!topicNames.isEmpty()) { - encodedStr = PulsarActivityUtil.encode( + consumerCacheKey = buildCacheKey( consumerName, subscriptionName, - StringUtils.join(topicNames, "|")); + String.join("|", topicNames)); } else if (topicsPattern != null) { - encodedStr = PulsarActivityUtil.encode( + consumerCacheKey = buildCacheKey( consumerName, subscriptionName, topicsPatternStr); } else { - encodedStr = PulsarActivityUtil.encode( + consumerCacheKey = buildCacheKey( consumerName, subscriptionName, cycleTopicUri); } - Consumer consumer = consumers.get(encodedStr); + Consumer consumer = consumers.get(consumerCacheKey); if (consumer == null) { PulsarClient pulsarClient = getPulsarClient(); @@ -508,7 +511,7 @@ public class PulsarSpace { throw new RuntimeException("Unable to create a Pulsar consumer!"); } - consumers.put(encodedStr, consumer); + consumers.put(consumerCacheKey, consumer); } return consumer; @@ -576,8 +579,8 @@ public class PulsarSpace { throw new RuntimeException("Reader:: Invalid value for Reader start message position!"); } - String encodedStr = PulsarActivityUtil.encode(topicName, readerName, startMsgPosStr); - Reader reader = readers.get(encodedStr); + String readerCacheKey = buildCacheKey(topicName, readerName, startMsgPosStr); + Reader reader = readers.get(readerCacheKey); if (reader == null) { PulsarClient pulsarClient = getPulsarClient(); @@ -614,7 +617,7 @@ public class PulsarSpace { throw new RuntimeException("Unable to create a Pulsar reader!"); } - readers.put(encodedStr, reader); + readers.put(readerCacheKey, reader); } return reader; diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java index c12fb2ff2..7f7050dec 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java @@ -15,7 +15,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; -import java.util.Base64; import java.util.HashMap; import java.util.stream.Collectors; @@ -364,10 +363,7 @@ public class PulsarActivityUtil { /////// // Complex strut type: Avro or Json public static boolean isAvroSchemaTypeStr(String typeStr) { - boolean isAvroType = false; - if (typeStr.equalsIgnoreCase("AVRO")) { - isAvroType = true; - } + boolean isAvroType = typeStr.equalsIgnoreCase("AVRO"); return isAvroType; } public static Schema getAvroSchema(String typeStr, String definitionStr) { @@ -403,18 +399,5 @@ public class PulsarActivityUtil { return schema; } - - public static String encode(String... strings) { - StringBuilder stringBuilder = new StringBuilder(); - for (String str : strings) { - if (!StringUtils.isBlank(str)) - stringBuilder.append(str).append("::"); - } - - String concatenatedStr = - StringUtils.substringBeforeLast(stringBuilder.toString(), "::"); - - return Base64.getEncoder().encodeToString(concatenatedStr.getBytes()); - } } diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index fa675f38a..f89867ed2 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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-tcp/pom.xml b/driver-tcp/pom.xml index f22be79bd..1b905a823 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-stdout - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index c31ed5aad..42c77b0ed 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -70,7 +70,7 @@ org.apache.httpcomponents httpclient - 4.5.12 + 4.5.13 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..c2cd2fb27 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(); @@ -33,13 +33,13 @@ public class ExampleWebScript { } System.out.println("!"); - System.out.println(perf.toString()); + System.out.println(perf); // driver.get("http://docs.nosqlbench.io/"); driver.close(); } @Test - @Ignore + @Disabled public void getDocSiteWebHtml() { // System.setProperty("webdriver.http.factory", "okhttp"); WebDriver driver = new HtmlUnitDriver(false); @@ -54,7 +54,7 @@ public class ExampleWebScript { } System.out.println("!"); - System.out.println(perf.toString()); + System.out.println(perf); // driver.get("http://docs.nosqlbench.io/"); driver.close(); } diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index afa2b78de..3886609ba 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index c1bce8b2e..ce2ddce09 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench nb-annotations - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java index 5bde23134..fd1c3a68e 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java @@ -33,7 +33,7 @@ public enum RunState { // The thread has stopped. This should only be set by the controlled thread Stopped("_\u23F9"); - private String runcode; + private final String runcode; RunState(String runcode) { this.runcode = runcode; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java index 9e07af7ba..1ad94d934 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java @@ -83,7 +83,7 @@ public class CycleResultsRLEBufferReadable implements CycleResultSegmentsReadabl private class ResultSpanIterator implements Iterator { private final ByteBuffer iterbuf; - private Predicate filter; + private final Predicate filter; private CycleResultsSegment next; public ResultSpanIterator(ByteBuffer buf, Predicate filter) { @@ -104,11 +104,8 @@ public class CycleResultsRLEBufferReadable implements CycleResultSegmentsReadabl @Override public CycleResultsSegment next() { - if (next==null) { - hasNext(); - if (next==null) { - throw new RuntimeException("Possible call to next() without calling hasNext(). There was no remaining unfiltered data."); - } + if (next == null && !hasNext()) { + throw new RuntimeException("Call to next() but there was no remaining unfiltered data."); } CycleResultsSegment wasNext = this.next; next=null; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java index 7cf32dc7c..4a65c5964 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java @@ -67,9 +67,6 @@ import java.util.function.ToLongFunction; */ public class IntervalSequencer implements ElementSequencer { - private List elems; - private ToLongFunction ratioFunc; - @Override public int[] seqIndexByRatioFunc(List elements, ToLongFunction ratioFunc) { @@ -101,9 +98,9 @@ public class IntervalSequencer implements ElementSequencer { private final static class OpSlot { - private T elem; - private double position; - private int rank; + private final T elem; + private final double position; + private final int rank; public OpSlot(T elem, double position, int rank) { this.elem = elem; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java index d94e1faae..87ba45e68 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java @@ -27,7 +27,7 @@ import java.util.function.ToLongFunction; public class SequencePlanner { private final static Logger logger = LogManager.getLogger(SequencePlanner.class); private final SequencerType sequencerType; - private List elements = new ArrayList<>(); + private final List elements = new ArrayList<>(); private final List ratios = new ArrayList<>(); private int[] elementIndex; @@ -59,7 +59,6 @@ public class SequencePlanner { logger.trace("sequencing elements by concatenation"); this.elementIndex = new ConcatSequencer().seqIndexesByRatios(elements, ratios); } - this.elements = elements; return new Sequence<>(sequencerType, elements, elementIndex); } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java index 81018543a..1d6fe72f6 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java @@ -178,8 +178,6 @@ public class RateSpec { } public String toString() { - StringBuilder sb = new StringBuilder(); - double ratePortion = Math.abs(opsPerSec - ((long) opsPerSec)); String ratefmt = (ratePortion > 0.001D) ? String.format("%,.3f", opsPerSec) : String.format("%,d", (long) opsPerSec); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java index 43052c048..450f645b5 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java @@ -131,14 +131,6 @@ public class ParsedStmt { return opDef.getBindings(); } - /** - * @return the params from the enclosed {@link OpDef} - * @deprecated You should use {@link #getParamReader()} instead. - */ - public Map getParams() { - return opDef.getParams(); - } - /** * @return a params reader from the enclosed {@link OpDef} params map */ @@ -147,7 +139,7 @@ public class ParsedStmt { } public List getBindPoints() { - return parsed.getCheckedBindPoints(); + return parsed.getBindPoints(); } } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java index a464d9baa..d07f51942 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java @@ -27,8 +27,6 @@ import java.util.*; public class StmtsBlock implements Tagged, Iterable { - private final static String NameToken = "name"; - private final static String StmtToken = "stmt"; private final RawStmtsBlock rawStmtsBlock; private final StmtsDoc rawStmtsDoc; private final int blockIdx; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java index 0a4a95ab8..7076a89ee 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java @@ -198,7 +198,7 @@ public class ParameterMap extends ConcurrentHashMap implements Bi @Override public void clear() { - logger.debug("parameter map cleared:" + toString()); + logger.debug("parameter map cleared:" + this); super.clear(); markMutation(); @@ -206,7 +206,7 @@ public class ParameterMap extends ConcurrentHashMap implements Bi @Override public Set> entrySet() { - logger.debug("getting entry set for " + toString()); + logger.debug("getting entry set for " + this); return super.entrySet() .stream() .map(e -> new AbstractMap.SimpleEntry(e.getKey(), e.getValue()) {}) @@ -377,7 +377,6 @@ public class ParameterMap extends ConcurrentHashMap implements Bi } public static String toJSON(Map map) { - StringBuilder sb = new StringBuilder(); List l = new ArrayList<>(); map.forEach((k,v) -> l.add("'" + k + "': '" + v + "'")); return "params={"+String.join(",\n ",l)+"};\n"; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index 030f7c6f4..69d95447d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -254,7 +254,7 @@ public class SimpleActivity implements Activity, ProgressCapable { @Override public void setPhaseLimiter(RateLimiter rateLimiter) { - this.phaseLimiter = phaseLimiter; + this.phaseLimiter = rateLimiter; } @Override diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java index 693c1c754..5f3be5ef2 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java @@ -41,7 +41,6 @@ public class HistoStatsCSVWriter { private PrintStream initFile(File logfile) { try { - FileOutputStream fileOutputStream = new FileOutputStream(logfile); PrintStream writer = new PrintStream(logfile); return writer; } catch (IOException e) { @@ -66,7 +65,7 @@ public class HistoStatsCSVWriter { Locale.US, "#[StartTime: %.3f (seconds since epoch), %s]\n", startTime / 1000.0, - new Date(startTime).toString() + new Date(startTime) ); writer.flush(); } @@ -104,7 +103,7 @@ public class HistoStatsCSVWriter { csvLine.append(",").append(h.getValueAtPercentile(0.999D)); csvLine.append(",").append(h.getValueAtPercentile(0.9999D)); csvLine.append(",").append(h.getMaxValue()); - writer.println(csvLine.toString()); + writer.println(csvLine); } } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java index e323b864b..b71eb70f8 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java @@ -84,9 +84,7 @@ public class HistoStatsLogger extends CapabilityHook mirrors; public NicerTimer(String metricName, DeltaHdrHistogramReservoir deltaHdrHistogramReservoir) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java index 8ad33f6c1..e6ffbba36 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java @@ -143,8 +143,8 @@ public class CommandTemplate { cmd.forEach((param, value) -> { ParsedTemplate paramTemplate = new ParsedTemplate(value, bindings); - if (paramTemplate.getCheckedBindPoints().size() > 0) { - BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getCheckedBindPoints()); + if (paramTemplate.getBindPoints().size() > 0) { + BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints()); StringBindings paramStringBindings = new StringBindingsTemplate(value, paramBindings).resolve(); dynamics.put(param, paramStringBindings); } else { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedCommand.java b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedCommand.java index 64b8187d1..55a6e3241 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedCommand.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedCommand.java @@ -89,11 +89,11 @@ public class ParsedCommand { cmd.forEach((k,v) -> { if (v instanceof CharSequence) { ParsedTemplate parsed = new ParsedTemplate(v.toString(), bindings); - switch (parsed.getForm()) { + switch (parsed.getType()) { case literal: break; - case rawbind: - case template: + case bindref: + case concat: this.dynamics.put(k,v.toString()); break; } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java index 9769f08af..83dd1ee98 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java @@ -239,13 +239,13 @@ public class Unit { public static Count valueOfSuffix(String suffix) { for (Count count : Count.values()) { - if (count.toString().toLowerCase().equals(suffix.toLowerCase())) { + if (count.toString().equalsIgnoreCase(suffix)) { return count; } - if (count.label.toLowerCase().equals(suffix.toLowerCase())) { + if (count.label.equalsIgnoreCase(suffix)) { return count; } - if (count.name.toLowerCase().equals(suffix.toLowerCase())) { + if (count.name.equalsIgnoreCase(suffix)) { return count; } } @@ -265,17 +265,13 @@ public class Unit { TB("TB", "terabyte", bytesPerGB * 1000), PB("PB", "petabyte", bytesPerGB * 1000000), EB("EB", "exabyte", bytesPerGB * bytesPerGB), - ZB("ZB", "zettabyte", bytesPerGB * bytesPerGB * 1000), - YB("YB", "yottabyte", bytesPerGB * bytesPerGB * 1000000), KIB("KiB", "kibibyte", 1024), MIB("MiB", "mebibyte", 1024 * 1024), GIB("GiB", "gibibyte", BytesPerGiB), TIB("TiB", "tebibyte", BytesPerGiB * 1024), PIB("PIB", "pebibyte", BytesPerGiB * 1024 * 1024), - EIB("EiB", "exbibyte", BytesPerGiB * BytesPerGiB), - ZIB("ZiB", "zebibyte", BytesPerGiB * BytesPerGiB * 1024), - YIB("YiB", "yobibyte", BytesPerGiB * BytesPerGiB * 1024 * 1024); + EIB("EiB", "exbibyte", BytesPerGiB * BytesPerGiB); private final String name; private final long bytes; @@ -289,16 +285,16 @@ public class Unit { public static Bytes valueOfSuffix(String unitpart) { for (Bytes byteUnit : Bytes.values()) { - if (byteUnit.label.toLowerCase().equals(unitpart.toLowerCase())) { + if (byteUnit.label.equalsIgnoreCase(unitpart)) { return byteUnit; } - if (byteUnit.name.toLowerCase().equals(unitpart.toLowerCase())) { + if (byteUnit.name.equalsIgnoreCase(unitpart)) { return byteUnit; } if ((byteUnit.name.toLowerCase() + "s").equals(unitpart.toLowerCase())) { return byteUnit; } - if (byteUnit.toString().toLowerCase().equals(unitpart.toLowerCase())) { + if (byteUnit.toString().equalsIgnoreCase(unitpart)) { return byteUnit; } } @@ -334,13 +330,13 @@ public class Unit { public static Duration valueOfSuffix(String spec) { for (Duration duration : Duration.values()) { - if (duration.label.toLowerCase().equals(spec.toLowerCase())) { + if (duration.label.equalsIgnoreCase(spec)) { return duration; } - if (duration.toString().toLowerCase().equals(spec.toLowerCase())) { + if (duration.toString().equalsIgnoreCase(spec)) { return duration; } - if (duration.name.toLowerCase().equals(spec.toLowerCase())) { + if (duration.name.equalsIgnoreCase(spec)) { return duration; } } 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..b71b3fa07 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; @@ -48,7 +48,7 @@ public class EnumReadableMappingFilterTest { } } - private static enum TestEnum implements ResultReadable { + private enum TestEnum implements ResultReadable { Alpha(1), Beta(2), 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..4841cc3be 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; @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class IntervalSequencerTest { - private static ElementSequencer seqr = new IntervalSequencer<>(); + private static final ElementSequencer seqr = new IntervalSequencer<>(); @Test @@ -86,7 +86,7 @@ public class IntervalSequencerTest { return events; } - private static ToLongFunction ratioFunc = value -> value.ratio; + private static final ToLongFunction ratioFunc = value -> value.ratio; private static class AnEvent { public final long ratio; 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..466da5a04 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; @@ -44,6 +44,6 @@ public class RateSpecTest { RateSpec d = new RateSpec("12345,1.4,restart"); assertThat(d.verb).isEqualTo(RateSpec.Verb.restart); RateSpec c = new RateSpec("12345,1.1"); - assertThat(c.verb== RateSpec.Verb.start); + assertThat(c.verb).isEqualTo(RateSpec.Verb.start); } } 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..cf928d1a2 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,89 +20,89 @@ 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; public class TestHybridRateLimiterPerf { - private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); - private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); + private final Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); + private final 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..66c52bf61 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; @@ -33,14 +33,14 @@ import java.util.function.Function; */ public class TestRateLimiterPerf1E7 { - private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); - private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); + private final Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); + private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); // 160 threads at 10_000_000 ops/s // 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..8ad8532e4 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; @@ -33,8 +33,8 @@ import java.util.function.Function; */ public class TestRateLimiterPerf1E8 { - private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); - private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); + private final Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); + private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); // 160 threads at 100_000_000 ops/s // 1600000000_ops 149.351811_S 10712960.186_ops_s, 93_ns_op @@ -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..3508865aa 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; @@ -33,81 +33,81 @@ import java.util.function.Function; */ public class TestRateLimiterPerfSingle { - private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); - private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); + private final Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); + private final 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/HeadingScannerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/HeadingScannerTest.java index e400b6b8e..2f07bca0b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/HeadingScannerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/HeadingScannerTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension; import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.util.ast.Node; -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/rawyaml/OpDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/OpDefTest.java index 9448d218b..04a8cc75c 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/rawyaml/UniformWorkloadSpecificationTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/UniformWorkloadSpecificationTest.java index 09de1b950..2a0f0ffa3 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/UniformWorkloadSpecificationTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/UniformWorkloadSpecificationTest.java @@ -33,7 +33,7 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; import io.nosqlbench.nb.api.content.NBIO; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.reflect.Type; 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 2b2b49489..efe114aba 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..ac8565545 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; @@ -47,20 +47,12 @@ public class HistoIntervalLoggerTest { hil.onHistogramAdded("histo1",nicerHistogram); - List moments = new ArrayList<>(100); - moments.add(System.currentTimeMillis()); // 0 nicerHistogram.update(1L); - moments.add(System.currentTimeMillis()); // 1 delay(1001); - moments.add(System.currentTimeMillis()); // 2 nicerHistogram.update(1000000L); - moments.add(System.currentTimeMillis()); // 3 delay(1001); - moments.add(System.currentTimeMillis()); // 4 nicerHistogram.update(1000L); - moments.add(System.currentTimeMillis()); // 5 hil.onHistogramRemoved("histo1"); - moments.add(System.currentTimeMillis()); // 6 hil.closeMetrics(); @@ -73,7 +65,7 @@ public class HistoIntervalLoggerTest { break; } histos.add(histogram); - }; + } assertThat(histos.size()).isEqualTo(2); assertThat(histos.get(0)).isInstanceOf(Histogram.class); @@ -87,7 +79,7 @@ public class HistoIntervalLoggerTest { try { Thread.sleep(target-System.currentTimeMillis()); } catch (InterruptedException ignored) { - } ; + } } System.out.println("delayed " + (System.currentTimeMillis() - now) + " millis"); } 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 e8ad5379b..502daebd7 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 @@ -5,7 +5,7 @@ import com.google.gson.GsonBuilder; 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..96e58e055 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.*; @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class StrInterpolatorTest { - private static List> abcd = new ArrayList>() {{ + private static final List> abcd = new ArrayList>() {{ add( new HashMap() {{ put("akey", "aval1"); @@ -50,7 +50,7 @@ public class StrInterpolatorTest { ); }}; - private static StrInterpolator interp = new StrInterpolator(abcd); + private static final StrInterpolator interp = new StrInterpolator(abcd); @Test public void shouldReturnIdentity() { 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..ed7975fb4 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; @@ -45,11 +45,9 @@ public class TagFilterTest { @Test public void testSomeFilterTagsNoItemTagsDoesNotMatch() { - Map itemtags = new HashMap<>() {{ - }}; + Map itemtags = new HashMap<>(); TagFilter tf = new TagFilter("tag=foo"); assertThat(tf.matches(itemtags).matched()).isFalse(); - } @Test @@ -59,7 +57,6 @@ public class TagFilterTest { }}; TagFilter tf = new TagFilter(""); assertThat(tf.matches(itemtags).matched()).isTrue(); - } @Test @@ -77,7 +74,6 @@ public class TagFilterTest { assertThat(tf.matches(itemtags2).matched()).isTrue(); } - @Test public void testMatchingKeyMismatchingValueDoesNotMatch() { Map itemtags = new HashMap<>() {{ @@ -110,6 +106,7 @@ public class TagFilterTest { assertThat(tfRight.matches(itemtags).matched()).isTrue(); } + @Test public void testMatchingDetails() { Tagged tagged = new Tagged() { @Override @@ -127,10 +124,7 @@ public class TagFilterTest { TagFilter.Result result = tfLeft.matchesTaggedResult(tagged); assertThat(result.matched()).isFalse(); System.out.println(result.getLog()); - assertThat(result.getLog()).contains("filter(one:four-.*) tag(one:four-five-six): matched pattern"); - assertThat(result.getLog()).contains("filter(five) tag(five): matched names"); - assertThat(result.getLog()).contains("filter(seven) tag(): did not match"); - assertThat(result.getLog()).contains("filter(six:again) tag(six): null tag value did not match"); + assertThat(result.getLog()).contains("(☑,☐) filter(one:'four-.*' five two seven six=again) tag(one:four-five-six): did not match '^'four-.*' five two seven six=again$'"); } @@ -171,5 +165,4 @@ public class TagFilterTest { TagFilter tf2 = new TagFilter("any(car:truck,phase:moon)"); assertThat(tf2.matches(itemtags).matched()).isFalse(); } - } 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/pom.xml b/engine-cli/pom.xml index 0122f1136..890ccf6e1 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-docker - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 1e820fd7c..344141eb9 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -30,7 +30,6 @@ import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.nb.api.logging.NBLogLevel; import io.nosqlbench.nb.api.markdown.exporter.MarkdownExporter; import io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp; -import joptsimple.internal.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.ConfigurationFactory; @@ -299,7 +298,7 @@ public class NBCLI { .session(sessionName) .now() .layer(Layer.CLI) - .detail("cli", Strings.join(args, "\n")) + .detail("cli", String.join("\n", args)) .build() ); diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java index 956697eeb..151b49812 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java @@ -2,7 +2,6 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.nb.api.NBEnvironment; import io.nosqlbench.nb.api.errors.BasicError; -import joptsimple.internal.Strings; import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -338,7 +337,7 @@ public class NBCLIArgsFile { } } if (splitword.length() > 0) { - throw new RuntimeException("unqualified line continuation for '" + splitword.toString() + "'"); + throw new RuntimeException("unqualified line continuation for '" + splitword + "'"); } return loaded; @@ -426,13 +425,13 @@ public class NBCLIArgsFile { String word = iter.next(); if (word.startsWith("-")) { if (element.size() > 0) { - lines.add(Strings.join(element, " ")); + lines.add(String.join(" ", element)); element.clear(); } } element.add(word); } - lines.add(Strings.join(element, " ")); + lines.add(String.join(" ", element)); return lines; } 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..b1a2cc0ab 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 @@ -174,27 +177,28 @@ public class TestNBCLIOptions { @Test public void listWorkloads() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-workloads"}); - List cmds = opts.getCommands(); - assertThat(opts.wantsScenariosList()); + assertThat(opts.wantsWorkloadsList()).isTrue(); + } + + @Test + public void listScenarios() { + NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-scenarios"}); + assertThat(opts.wantsScenariosList()).isTrue(); } @Test public void listScripts() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-scripts"}); - List cmds = opts.getCommands(); - assertThat(opts.wantsScriptList()); + assertThat(opts.wantsScriptList()).isTrue(); } - @Test public void clTest() { String dir= "./"; URL resource = getClass().getClassLoader().getResource(dir); - assertThat(resource); + assertThat(resource).isNotNull(); Path basePath = NBIO.getFirstLocalPath(dir); List yamlPathList = PathWalker.findAll(basePath).stream().filter(f -> f.toString().endsWith(".yaml")).collect(Collectors.toList()); - assertThat(yamlPathList); + assertThat(yamlPathList).isNotEmpty(); } - - } diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 075b2b19f..d744e2246 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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/pom.xml b/engine-core/pom.xml index d576e6cbd..34e628027 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench drivers-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT compile diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java index 837db9032..36e4afa18 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java @@ -98,7 +98,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen */ public synchronized void startActivity() { logger.info("starting activity " + activity.getAlias() + " for cycles " + activity.getCycleSummary()); - this.annotatedCommand = annotatedCommand; Annotators.recordAnnotation(Annotation.newBuilder() .session(sessionId) .now() @@ -248,7 +247,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen return wasStopped; } - /** * Listens for changes to parameter maps, maps them to the activity instance, and notifies all eligible listeners of * changes. @@ -256,9 +254,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen @Override public synchronized void handleParameterMapUpdate(ParameterMap parameterMap) { - if (activity instanceof ActivityDefObserver) { - activity.onActivityDefUpdate(activityDef); - } + activity.onActivityDefUpdate(activityDef); // An activity must be initialized before the motors and other components are // considered ready to handle parameter map changes. This is signaled in an activity @@ -423,8 +419,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen * @return true, if the desired SlotState was detected */ private boolean awaitMotorState(Motor m, int waitTime, int pollTime, RunState... desiredRunStates) { - Set desiredStates = new HashSet<>(Arrays.asList(desiredRunStates)); - long startedAt = System.currentTimeMillis(); while (System.currentTimeMillis() < (startedAt + waitTime)) { Map actualStates = new HashMap<>(); @@ -434,11 +428,11 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen for (RunState desiredRunState : desiredRunStates) { actualStates.remove(desiredRunState); } - logger.trace("state of remaining slots:" + actualStates.toString()); + logger.trace("state of remaining slots:" + actualStates); if (actualStates.size() == 0) { return true; } else { - System.out.println("motor states:" + actualStates.toString()); + System.out.println("motor states:" + actualStates); try { Thread.sleep(pollTime); } catch (InterruptedException ignored) { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java index 30a9229ff..ba5b902d7 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java @@ -383,9 +383,8 @@ public class ScenarioController { * @param waitTimeMillis The time to wait, usually set very high * @return true, if all activities completed before the timer expired, false otherwise */ - public boolean awaitCompletion(int waitTimeMillis) { + public boolean awaitCompletion(long waitTimeMillis) { boolean completed = true; - long waitstart = System.currentTimeMillis(); long remaining = waitTimeMillis; List finishers = new ArrayList<>(); @@ -410,7 +409,6 @@ public class ScenarioController { } return completed; - } private ActivityDef aliasToDef(String alias) { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 127cc4581..6b82d7917 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -311,7 +311,7 @@ public class Scenario implements Callable { endedAtMillis = System.currentTimeMillis(); } } - int awaitCompletionTime = 86400 * 365 * 1000; + long awaitCompletionTime = 86400 * 365 * 1000L; logger.debug("Awaiting completion of scenario for " + awaitCompletionTime + " millis."); scenarioController.awaitCompletion(awaitCompletionTime); //TODO: Ensure control flow covers controller shutdown in event of internal error. diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java index 975b01e74..17fa42914 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java @@ -113,7 +113,7 @@ public class ScenariosExecutor { } Map scenarioResultMap = new LinkedHashMap<>(); getAsyncResultStatus() - .entrySet().forEach(es -> scenarioResultMap.put(es.getKey(), es.getValue().orElseGet(null))); + .entrySet().forEach(es -> scenarioResultMap.put(es.getKey(), es.getValue().orElse(null))); return new ScenariosResults(this, scenarioResultMap); } 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..8d9b2ca3a 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; @@ -19,7 +19,7 @@ public class NBMetricsSummaryTest { NBMetricsSummary.summarize(sb, "test", timer); - System.out.println(sb.toString()); + System.out.println(sb); } } 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-docker/pom.xml b/engine-docker/pom.xml index 582b77c18..f02ec1038 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java index 7ad866abf..ad69cee41 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java @@ -85,13 +85,11 @@ public class DockerHelper { portBindings.add(pb); } - List volumeList = new ArrayList<>(); List volumeBindList = new ArrayList<>(); for (String volumeDesc : volumeDescList) { String volFrom = volumeDesc.split(":")[0]; String volTo = volumeDesc.split(":")[1]; Volume vol = new Volume(volTo); - volumeList.add(vol); volumeBindList.add(new Bind(volFrom, vol)); } @@ -121,7 +119,6 @@ public class DockerHelper { } return containerResponse.getId(); - } private boolean startStoppedContainer(String name) { diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index c8210a72c..a28a9694f 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 1a8c74eb5..8b1a4e15e 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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..d0cbf9a81 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; @@ -90,7 +90,7 @@ public class TestOptimoExperiments { private static class SumDeltaNoise implements MultivariateFunction { private int iter; - private Random r = new Random(System.nanoTime()); + private final Random r = new Random(System.nanoTime()); @Override public double value(double[] doubles) { @@ -115,4 +115,4 @@ public class TestOptimoExperiments { // return 5+Math.pow(a,2.0d)+Math.pow(b,2.0d); // }; -} \ No newline at end of file +} diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 1a36b8ea3..7d9b90087 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -47,7 +47,7 @@ io.nosqlbench engine-cli - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java index 8bff3ba74..d08c35928 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java @@ -123,8 +123,7 @@ public class WorkSpace { List items = new ArrayList<>(); - try { - DirectoryStream elementPaths = Files.newDirectoryStream(target); + try (DirectoryStream elementPaths = Files.newDirectoryStream(target)) { for (Path elementPath : elementPaths) { items.add(new WorkspaceItemView(this.workspacePath,elementPath)); } diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java index 4012ee6e7..1374c7e3d 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java @@ -56,16 +56,13 @@ public class WorkspaceFinder { public List getWorkspaceViews() { List views = new ArrayList<>(); - DirectoryStream wsrEntries = null; - try { - wsrEntries = Files.newDirectoryStream(root); + try (DirectoryStream wsrEntries = Files.newDirectoryStream(root)) { + for (Path entry : wsrEntries) { + views.add(new WorkspaceView(entry)); + } } catch (IOException e) { throw new RuntimeException(e); } - - for (Path entry : wsrEntries) { - views.add(new WorkspaceView(entry)); - } return views; } @@ -137,7 +134,7 @@ public class WorkspaceFinder { Path relativize = root.relativize(path); if (relativize.toString().contains("..")) { - throw new RuntimeException("Illegal path to delete: " + path.toString()); + throw new RuntimeException("Illegal path to delete: " + path); } try (Stream walk = Files.walk(path)) { @@ -145,9 +142,9 @@ public class WorkspaceFinder { .map(Path::toFile) // .peek(System.out::println) .forEach(f -> { - logger.debug("deleting '" + f.toString() + "'"); + logger.debug("deleting '" + f + "'"); if (!f.delete()) { - throw new RuntimeException("Unable to delete " + f.toString()); + throw new RuntimeException("Unable to delete " + f); } }); diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java index bbe12389a..5da71921f 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java @@ -16,9 +16,7 @@ public class WorkspacesView { public List getWorkspaces() { List workspaces = new ArrayList<>(); - - try { - DirectoryStream paths = Files.newDirectoryStream(workspacesRoot); + try (DirectoryStream paths = Files.newDirectoryStream(workspacesRoot)) { for (Path path : paths) { workspaces.add(path.toString()); } 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 852aac093..9051ce615 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT pom @@ -27,7 +27,7 @@ 2.4.0-b180830.0438 1.22 2.9.9 - 5.3.2 + 5.7.2 1.4.1 @@ -37,7 +37,7 @@ 1.0.0 - 1.23 + 1.26 1.1.2.6 @@ -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 @@ -271,7 +270,7 @@ org.antlr antlr4-runtime - 4.8 + 4.9.2 @@ -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 @@ -559,7 +547,7 @@ org.antlr antlr4-maven-plugin - 4.8 + 4.9.2 org.codehaus.mojo diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 27e02b155..5ffac7c68 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults diff --git a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java index 757591ab2..e670ba3fb 100644 --- a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java +++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java @@ -32,14 +32,14 @@ public class ServiceProcessor extends AbstractProcessor { return supportedAnnotations; } - private static Pattern packageNamePattern = Pattern.compile("(?.+)?\\.(?.+)"); + private static final Pattern packageNamePattern = Pattern.compile("(?.+)?\\.(?.+)"); private Filer filer; private Map options; private Elements elementUtils; private Messager messenger; private SourceVersion sourceVersion; private Types typeUtils; - private Map writers = new HashMap<>(); + private final Map writers = new HashMap<>(); @Override public synchronized void init(ProcessingEnvironment processingEnv) { @@ -68,8 +68,6 @@ public class ServiceProcessor extends AbstractProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - List ts = new ArrayList<>(); - try { for (String annotationType : this.getSupportedAnnotationTypes()) { Class annotationClass = diff --git a/nb-api/pom.xml b/nb-api/pom.xml index b4ac9bb27..0617fabf3 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java index 71acb2c23..e23dadf06 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java @@ -19,7 +19,6 @@ public class ResolverForURL implements ContentResolver { @Override public List> resolve(URI uri) { - List> contents = new ArrayList<>(); URLContent urlContent = resolveURI(uri); if (urlContent!=null) { return List.of(urlContent); diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java b/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java index 824900e9e..a67b62fa6 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java @@ -27,13 +27,8 @@ public class MarkdownDocs { } public static List find(String name, DocScope... scopes) { - List aggregated = new ArrayList<>(); - List> markdownContent = RawMarkdownSources.getAllMarkdown(); - // Find all topics and aggregators - List aggregators = new ArrayList<>(); - List markdownInfos = markdownContent .stream() .map(ParsedMarkdown::new) @@ -78,7 +73,7 @@ public class MarkdownDocs { return mdgraph.processed(); // // -// +// List aggregated = new ArrayList<>(); // List>> edges = new ArrayList<>(); // List matchedtopics = null; // 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..618c05d46 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,21 +2,21 @@ 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.*; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; -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"); @@ -74,16 +74,14 @@ public class MarkdownDocsTest { URL url = resources.nextElement(); System.out.println("url="+url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - - } 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/pom.xml b/nb/pom.xml index 3b6740413..ca8f4967a 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-cli - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-docs - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-core - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench engine-extensions - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-web - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-kafka - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-stdout - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-diag - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-tcp - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-http - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-jmx - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench driver-jms - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -225,7 +225,7 @@ io.nosqlbench driver-cqld4 - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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/pom.xml b/pom.xml index f708a8336..ab3c4871d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT mvn-defaults diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 757ce24a8..735493090 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java index 7ed3f5c90..0f09d6c41 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java @@ -48,8 +48,6 @@ public class FunctionManifestProcessor extends AbstractProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - List ts = new ArrayList<>(); - try { if (writer==null) { writer = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/functions") diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java index 4557f3895..ac35a7e66 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java @@ -24,10 +24,10 @@ public enum FunctionType { R_T(Function.class, Object.class, Object.class); private final Class functionClass; - private Class inputClass; - private Class returnClass; - private ValueType returnValueType; - private ValueType inputValueType; + private final Class inputClass; + private final Class returnClass; + private final ValueType returnValueType; + private final ValueType inputValueType; FunctionType(Class functionClass, Class inputClass, Class returnClass) { this.functionClass = functionClass; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java index 021c6b6da..d7270701f 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java @@ -29,7 +29,7 @@ public enum ValueType implements Comparator { OBJECT(Object.class, 8); private final Class clazz; - private int precedence; + private final int precedence; ValueType(Class clazz, int precedence) { this.clazz = clazz; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java index 63dde339a..50a81c2e9 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java @@ -3,14 +3,18 @@ package io.nosqlbench.virtdata.core.templates; import java.util.Objects; public class BindPoint { - private String anchor; - private String bindspec; + private final String anchor; + private final String bindspec; public BindPoint(String anchor, String bindspec) { this.anchor = anchor; this.bindspec = bindspec; } + public static BindPoint of(String userid, String bindspec) { + return new BindPoint(userid,bindspec); + } + public String getAnchor() { return anchor; } @@ -30,6 +34,11 @@ public class BindPoint { return Objects.equals(bindspec, bindPoint.bindspec); } + @Override + public int hashCode() { + return Objects.hash(anchor, bindspec); + } + @Override public String toString() { return "BindPoint{" + diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java new file mode 100644 index 000000000..45e4044f4 --- /dev/null +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java @@ -0,0 +1,41 @@ +package io.nosqlbench.virtdata.core.templates; + +import io.nosqlbench.nb.api.errors.BasicError; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class BindPointParser implements Function> { + + public final static Pattern BINDPOINT_ANCHOR = Pattern.compile("(\\{((?\\w+[-_\\d\\w.]*)})|(\\{\\{(?[^}]+)}}))"); + + @Override + public List apply(String template) { + + Matcher m = BINDPOINT_ANCHOR.matcher(template); + int lastMatch = 0; + List spans = new ArrayList<>(); + + while (m.find()) { + String pre = template.substring(lastMatch, m.start()); + lastMatch=m.end(); + spans.add(pre); + + String anchor = m.group("anchor"); + if (anchor == null) { + anchor = m.group("extended"); + if (anchor == null) { + throw new BasicError("Unable to parse: " + template); + } + } + spans.add(anchor); + } + spans.add(lastMatch >= 0 ? template.substring(lastMatch) : template); + + return spans; + } + +} diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java new file mode 100644 index 000000000..e0d920015 --- /dev/null +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java @@ -0,0 +1,94 @@ +package io.nosqlbench.virtdata.core.templates; + +import java.util.Objects; + +/** + * A capture point is a named variable which should be extracted from a payload or result type + * using a native driver API. The result is meant to be provided to the NoSQLBench runtime + * during cycle execution, and stored in a scoped context of variables which can be re-used within + * other operations. + *
+ *

Format

+ * + * 
{@code
+ * select [username as u1] from users where userid={userid};
+ * }
+ * + * In the example above, the span [username as u1] is recognized as a capture point. + * The name of the variable to be captured is username. It is to be captured under + * a different variable name u1. + * + * If the name is the same in both cases, i.e. the variable is named in the result type as it + * should be known after extraction, then you can elide the as u1 clause as in this example: + * + * 
{@code
+ * select [username] from users where userid={userid};
+ * }
+ * + * During op mapping, any capture points are condensed down to the native driver vernacular by + * removing the square brackets from the op template. Thus, the result of parsing the above would + * yield a form compatible with a native driver. For example, converting to prepared statement form + * would yield: + * + * 
{@code
+ * select username from users where userid=:userid
+ * }
+ * + * For details on the {userid} form, see {@link BindPoint} + */ +public class CapturePoint { + + private final String name; + private final String asName; + + public CapturePoint(String name, String asName) { + this.name = name; + this.asName = asName; + } + + public String getName() { + return name; + } + + /** + * Create a CapturePoint with the specified anchorName, and an optional aliasName. + * If aliasName is null, then the anchorName is used as the alias. + * + * @param anchorName The name of the capture variable in the native form + * @param aliasName The name of the captured value as seen by consumers + * @return A new CapturePoint + */ + public static CapturePoint of(String anchorName, String aliasName) { + Objects.requireNonNull(anchorName); + return new CapturePoint(anchorName, aliasName == null ? anchorName : aliasName); + } + + /** + * Create a CapturePoint with the specified anchorName, and the same aliasName. + * + * @param anchorName The name of the capture variable in the native form and as seen by consumers. + * @return A new CapturePoint + */ + public static CapturePoint of(String anchorName) { + Objects.requireNonNull(anchorName); + return new CapturePoint(anchorName, anchorName); + } + + @Override + public String toString() { + return "[" + getName() + (name.equals(asName) ? "" : " as " + asName) + "]"; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + CapturePoint that = (CapturePoint) o; + return Objects.equals(name, that.name) && Objects.equals(asName, that.asName); + } + + @Override + public int hashCode() { + return Objects.hash(name, asName); + } +} diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java new file mode 100644 index 000000000..b5710d209 --- /dev/null +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java @@ -0,0 +1,71 @@ +package io.nosqlbench.virtdata.core.templates; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class CapturePointParser implements Function { + + public final static Pattern CAPTUREPOINT_PATTERN = Pattern.compile( + "(\\[(?\\w+[-_\\d\\w.]*)(\\s+[aA][sS]\\s+(?\\w+[-_\\d\\w.]*))?])" + ); + @Override + public Result apply(String template) { + StringBuilder raw = new StringBuilder(); + Matcher m = CAPTUREPOINT_PATTERN.matcher(template); + List captures = new ArrayList<>(); + + while (m.find()) { + CapturePoint captured = CapturePoint.of(m.group("capture"), m.group("alias")); + captures.add(captured); + m.appendReplacement(raw,captured.getName()); + } + m.appendTail(raw); + + return new Result(raw.toString(),captures); + } + + public final static class Result { + + private final String rawTemplate; + private final List captures; + + public Result(String rawTemplate, List captures) { + + this.rawTemplate = rawTemplate; + this.captures = captures; + } + + public String getRawTemplate() { + return this.rawTemplate; + } + + public List getCaptures() { + return this.captures; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Result result = (Result) o; + return Objects.equals(rawTemplate, result.rawTemplate) && Objects.equals(captures, result.captures); + } + + @Override + public int hashCode() { + return Objects.hash(rawTemplate, captures); + } + + @Override + public String toString() { + return "Result{" + + "rawTemplate='" + rawTemplate + '\'' + + ", captures=" + captures + + '}'; + } + } +} diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java index fd46105cb..f4fdf4d0b 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java @@ -17,20 +17,36 @@ package io.nosqlbench.virtdata.core.templates; -import org.apache.logging.log4j.Logger; + import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.security.InvalidParameterException; import java.util.*; import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +// TODO: Consider using "Driver Adapter" or "Workload Adapter" instead of ActivityType + /** - * A parsed template is a form of a raw template which has been parsed for its - * named anchors and sanity checked against a set of provided bindings. + * A ParsedTemplate represents any string provided by a user which is meant to be + * a prototype for an operation. Grammars used by native drivers can be decorated + * with named injection and extraction points for data, known respectively as + * {@link BindPoint}s and {@link CapturePoint}s. + * + * The syntax used for bind points and capture points is standard across all + * high-level drivers. As such, this class captures the definition of + * decorative syntax and the rules for parsing them out. + * + * The key responsibilities of ParsedTemplate are: + *
    + *
  • recognize bind points within statement templates
    • + *
  • recognize capture points within statement templates
    • + *
  • render statement templates with bind and capture points elided using a native syntax for variables
    • + *
  • provide metadata to drivers about defined bind and capture points
    • + *
  • provide a text template for re-assembly with injected data
    • + *
* * Once the parsed template is constructed, the method {@link ParsedTemplate#orError()} * should always called before it is used. @@ -65,82 +81,74 @@ import java.util.stream.StreamSupport; */ public class ParsedTemplate { - public enum Form { + private final static Logger logger = LogManager.getLogger(ParsedTemplate.class); + private final List captures; + private final String rawtemplate; + + /** + * The type of a parsed template depends on the structure of the bindings provided. + */ + public enum Type { + + /** + * A literal template is one which has no bindings that need to be provided to render a specific statement. + * These templates are basically static statements. + * Example: {@code truncate testks.testtable;} + */ literal, - rawbind, - template, + /** + * A bindref template is one which has only a single bind point and no leading or trailing text. + * It represents a single value which is to be injected, with no clear indication as to whether the + * value should be in string form or not. These are used when referencing objects by bind point name. + * Callers which use rawbind templates where Strings are needed should convert them with {@link Object#toString()}} + * Example: {@code {myvalue}} + */ + bindref, + /** + * A string template is one which is neither a literal template nor a bindref template. This includes + * any template which has any amount of literal text and any template with more than one bind point. + */ + concat } - /** - * The canonical template pattern follows the pattern of an opening curly brace, - * followed by a word character, followed by any contiguous - * combination of dashes, underscores, digits, words, and dots, followed by - * a closing curly brace. - * - *

Examples

- * 
-     * {var1}
-     * {var2.var3__-var5}
-     *
- */ - - - public final static Pattern STANDARD_ANCHOR = Pattern.compile("\\{(?\\w+[-_\\d\\w.]*)}"); - public final static Pattern EXTENDED_ANCHOR = Pattern.compile("\\{\\{(?.*?)}}"); - private final static Logger logger = LogManager.getLogger(ParsedTemplate.class); - -// private final Pattern[] patterns; - /** * Spans is an even-odd form of (literal, variable, ..., ..., literal) - * Thus a 1-length span is a single literal + * Thus a 1-length span is a single literal, and a 3 length span has a single bind point **/ private final String[] spans; -// private final String rawtemplate; /** * A map of binding names and recipes (or null) */ private final Map bindings = new LinkedHashMap<>(); - /** - * Construct a new ParsedTemplate from the provided statement template. - * - * @param rawtemplate The string that contains literal sections and anchor sections interspersed - * @param providedBindings The bindings that are provided for the template to be parsed - */ - public ParsedTemplate(String rawtemplate, Map providedBindings) { - this(rawtemplate, providedBindings, STANDARD_ANCHOR, EXTENDED_ANCHOR); - } + private final BindPointParser bindPointParser = new BindPointParser(); + private final CapturePointParser capturePointParser = new CapturePointParser(); /** * Parse the given raw template, check the bind points against the provide bindings, and * provide detailed template checks for validity. * - *

Overriding Patterns

- *

- * If patterns are not provided then {@link ParsedTemplate#STANDARD_ANCHOR} are used, which includes - * the ability to match {var1} and ?var1 style anchors. If patterns are - * provided, then they must be compatible with the {@link Matcher#find()} method, and must also - * have a named group with the name 'anchor', as in (?<anchor>...) - *

- * * @param rawtemplate A string template which contains optionally embedded named anchors * @param availableBindings The bindings which are provided by the user to fulfill the named anchors in this raw template - * @param parserPatterns The patterns which match the named anchor format and extract anchor names from the raw template */ - public ParsedTemplate(String rawtemplate, Map availableBindings, Pattern... parserPatterns) { + public ParsedTemplate(String rawtemplate, Map availableBindings) { this.bindings.putAll(availableBindings); - this.spans = parse(rawtemplate, availableBindings, parserPatterns); + this.rawtemplate = rawtemplate; + + CapturePointParser.Result captureData = capturePointParser.apply(rawtemplate); + this.captures = captureData.getCaptures(); + List spanData = bindPointParser.apply(captureData.getRawTemplate()); + this.spans = spanData.toArray(new String[0]); } - public Form getForm() { + public Type getType() { if (this.spans.length == 1) { - return Form.literal; + return Type.literal; } else if (this.spans[0].isEmpty() && this.spans[2].isEmpty()) { - return Form.rawbind; + return Type.bindref; } else { - return Form.template; + return Type.concat; } } @@ -151,59 +159,6 @@ public class ParsedTemplate { return this; } - /** - * After this method runs, the following conditions should apply: - *
    - *
  • spans will contain all the literal and variable sections in order, starting a literal, even if it is empty
    • - *
  • spans will be an odd number in length, meaning that the last section will also be a literal, even if it is empty
    • - *
  • specificBindings will contain an ordered map of the binding definitions
    • - *
- */ - private String[] parse(String rawtemplate, Map providedBindings, Pattern[] patterns) { - List spans = new ArrayList<>(); - - String statement = rawtemplate; - int patternsMatched = 0; - - int lastMatch = 0; - - for (Pattern pattern : patterns) { - if (!pattern.toString().contains("?")) { - throw new InvalidParameterException("The provided pattern '" + pattern + "' must contain a named group called anchor," + - "as in '(?...)'"); - } - - Matcher m = pattern.matcher(rawtemplate); - - if (!m.find()) { // sanity check that this matcher works at all or go to the next pattern - continue; - } - - while (m.find(lastMatch)) { - String pre = statement.substring(lastMatch, m.start()); - spans.add(pre); - - String tokenName = m.group("anchor"); - lastMatch = m.end(); - - spans.add(tokenName); - - } - - break; // If the last matcher worked at all, only do one cycle - } - - if (lastMatch >= 0) { - spans.add(statement.substring(lastMatch)); - } else { - spans.add(statement); - } - - - return spans.toArray(new String[0]); - - } - public String toString() { String sb = "\n parsed: " + StreamSupport.stream(Arrays.spliterator(spans), false) @@ -245,7 +200,7 @@ public class ParsedTemplate { } /** - * @return a list of anchors as fou nd in the raw template. + * @return a list of anchors as found in the raw template. */ public List getAnchors() { List anchors = new ArrayList<>(); @@ -265,7 +220,7 @@ public class ParsedTemplate { * @throws InvalidParameterException if the template has an error, * such as an anchor which has no provided binding. */ - public List getCheckedBindPoints() { + public List getBindPoints() { List bindpoints = new ArrayList<>(); for (int i = 1; i < spans.length; i += 2) { if (!bindings.containsKey(spans[i])) { @@ -277,7 +232,7 @@ public class ParsedTemplate { return bindpoints; } - public List getUncheckedBindPoints() { + private List getUncheckedBindPoints() { List bindpoints = new ArrayList<>(); for (int i = 1; i < spans.length; i += 2) { bindpoints.add(new BindPoint(spans[i], bindings.getOrDefault(spans[i], null))); @@ -329,4 +284,8 @@ public class ParsedTemplate { } } + public List getCaptures() { + return this.captures; + } + } diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java b/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java deleted file mode 100644 index dd5e37864..000000000 --- a/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package io.nosqlbench.virtdata.core.templates; - -import io.nosqlbench.virtdata.core.templates.BindPoint; -import io.nosqlbench.virtdata.core.templates.ParsedTemplate; -import org.junit.Test; - -import java.security.InvalidParameterException; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ParsedTemplateTest { - - private final Map bindings = new HashMap<>() {{ - put("bindname1", "bindspec1"); - put("bindname2", "bindspec2"); - }}; - private final String rawNothing = "This has no anchors"; - private final String oneCurly = "A {curly} brace."; - private final String oneQuestion = " A ?question anchor."; - private final String oneExtraneous = "An {this is an extraneous form} invalid anchor."; - - @Test - public void testShouldMatchRawLiteral() { - ParsedTemplate pt = new ParsedTemplate(rawNothing, bindings); - assertThat(pt.getSpans()).containsExactly("This has no anchors"); - assertThat(pt.getSpecificBindings()).isEmpty(); - assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); - assertThat(pt.getMissingBindings()).isEmpty(); - } - - @Test - public void testShoudlMatchCurlyBraces() { - ParsedTemplate pt = new ParsedTemplate(oneCurly, bindings); - assertThat(pt.getSpans()).containsExactly("A ", "curly", " brace."); - assertThat(pt.getSpecificBindings().isEmpty()); - assertThat(pt.getMissingBindings()).contains("curly"); - assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); - } - - @Test - public void testShouldMatchQuestionMark() { - ParsedTemplate pt = new ParsedTemplate(oneQuestion, bindings); - assertThat(pt.getSpans()).containsExactly(" A ", "question", " anchor."); - assertThat(pt.getSpecificBindings()).isEmpty(); - assertThat(pt.getMissingBindings()).containsExactly("question"); - assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); - } - - @Test - public void testShouldIgnoreExtraneousAnchors() { - ParsedTemplate pt = new ParsedTemplate(oneExtraneous, bindings); - assertThat(pt.getSpans()).containsExactly("An {this is an extraneous form} invalid anchor."); - assertThat(pt.getSpecificBindings()).isEmpty(); - assertThat(pt.getMissingBindings()).isEmpty(); - assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); - } - - @Test - public void testShouldMatchLiteralVariableOnly() { - String literalVariableOnly = "literal {bindname1}"; - ParsedTemplate pt = new ParsedTemplate(literalVariableOnly, bindings); - assertThat(pt.getSpans()).containsExactly("literal ", "bindname1", ""); - assertThat(pt.getSpecificBindings()).containsOnlyKeys("bindname1"); - assertThat(pt.getMissingBindings()).isEmpty(); - assertThat(pt.getExtraBindings()).containsExactly("bindname2"); - - } - - @Test - public void testShouldMatchVariableLiteralOnly() { - String variableLiteralOnly = "{bindname2} literal"; - ParsedTemplate pt = new ParsedTemplate(variableLiteralOnly, bindings); - assertThat(pt.getSpans()).containsExactly("", "bindname2", " literal"); - assertThat(pt.getSpecificBindings()).containsOnlyKeys("bindname2"); - assertThat(pt.getMissingBindings()).isEmpty(); - assertThat(pt.getExtraBindings()).containsExactly("bindname1"); - } - - @Test - public void testShouldMatchProvidedValidPattern() { - String basic = "A [provided] pattern."; - Pattern p = Pattern.compile("\\[(?\\w[_a-zA-Z]+)]"); - ParsedTemplate pt = new ParsedTemplate(basic, bindings, p); - assertThat(pt.getSpans()).containsExactly("A ", "provided", " pattern."); - assertThat(pt.getSpecificBindings()).isEmpty(); - assertThat(pt.getMissingBindings()).containsExactly("provided"); - assertThat(pt.getExtraBindings()).containsAll(bindings.keySet()); - } - - //, expectedExceptionsMessageRegExp = ".*must contain a named group called anchor.*" - @Test(expected= InvalidParameterException.class) - 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); - } - - @Test - public void testPositionalExpansionShouldBeValid() { - String multi = "A {bindname1} of {bindname2} sort."; - ParsedTemplate pt = new ParsedTemplate(multi, bindings); - assertThat(pt.getSpans()).containsExactly("A ", "bindname1", " of ", "bindname2", " sort."); - assertThat(pt.getSpecificBindings()).containsOnlyKeys("bindname1", "bindname2"); - assertThat(pt.getMissingBindings()).isEmpty(); - assertThat(pt.getExtraBindings()).isEmpty(); - assertThat(pt.getPositionalStatement(s -> "##")).isEqualTo("A ## of ## sort."); - assertThat(pt.getPositionalStatement(s -> "[[" + s + "]]")).isEqualTo("A [[bindname1]] of [[bindname2]] sort."); - - assertThat(pt.getBindPoints()).containsExactly( - new BindPoint("bindname1", "bindspec1"), - new BindPoint("bindname2", "bindspec2") - ); - } - - -} diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java similarity index 96% rename from virtdata-api/src/test/io/nosqlbench/virtdata/annotations/ExampleDataTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java index 0f254e459..abbc849e6 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java similarity index 97% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java index 45fd14d57..051e29f36 100644 --- a/virtdata-api/src/test/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java @@ -1,9 +1,10 @@ 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; + public class CompatibilityFixupsTest { @Test @@ -30,7 +31,5 @@ public class CompatibilityFixupsTest { @Test public void testParsingSanity() { assertThat(CompatibilityFixups.fixup("long -> Add(5) -> long")).isEqualTo("long -> Add(5) -> long"); - } - } diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java similarity index 98% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java index 36ae7b867..584e107c9 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java similarity index 94% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/VirtDataComposerTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java index 6992bcf88..2a39156b7 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/VirtDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java similarity index 91% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/VirtDataTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java index 713f564c3..35fa66a29 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java similarity index 99% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java index ae32cffab..4815c10de 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java similarity index 90% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java index a65f3afa8..97ce18b48 100644 --- a/virtdata-api/src/test/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/BindPointParserTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java new file mode 100644 index 000000000..22ef6989e --- /dev/null +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java @@ -0,0 +1,22 @@ +package io.nosqlbench.virtdata.core.templates; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class BindPointParserTest { + + @Test + public void testBindPointParser() { + BindPointParser bpp = new BindPointParser(); + assertThat(bpp.apply("test {one}")).containsExactly("test ","one",""); + assertThat(bpp.apply("test {one} {{two three}}")).containsExactly("test ","one"," ","two three",""); + } + + @Test + public void testBindPointParserBypass() { + BindPointParser bpp = new BindPointParser(); + assertThat(bpp.apply("")).containsExactly(""); + } + +} diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java new file mode 100644 index 000000000..247120eb3 --- /dev/null +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java @@ -0,0 +1,31 @@ +package io.nosqlbench.virtdata.core.templates; + +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class CapturePointTest { + + @Test + public void testBasicCaptures() { + CapturePointParser cpp = new CapturePointParser(); + assertThat(cpp.apply("test [point1] [point2 as alias3]")).isEqualTo( + new CapturePointParser.Result("test point1 point2", + List.of( + CapturePoint.of("point1"), + CapturePoint.of("point2","alias3") + )) + ); + } + + @Test + public void testBypass() { + CapturePointParser cpp = new CapturePointParser(); + assertThat(cpp.apply("")).isEqualTo( + new CapturePointParser.Result("", List.of()) + ); + } + +} 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 61c5e7690..789df5534 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,8 +1,9 @@ package io.nosqlbench.virtdata.core.templates; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.junit.Test; import java.util.Map; import java.util.Optional; @@ -11,40 +12,79 @@ import static org.assertj.core.api.Assertions.assertThat; public class ParsedTemplateTest { + private final Map bindings = Map.of( + "bindname1", "bindspec1", + "bindname2", "bindspec2"); + @Test - public void testParsedTemplate() { - ParsedTemplate pt = new ParsedTemplate("test template", Map.of()); - assertThat(pt.getAnchors()).isEmpty(); - assertThat(pt.getCheckedBindPoints()).isEmpty(); - assertThat(pt.getSpans()).contains("test template"); + public void testShouldMatchRawLiteral() { + String rawNothing = "This has no anchors"; + ParsedTemplate pt = new ParsedTemplate(rawNothing, bindings); + assertThat(pt.getSpans()).containsExactly("This has no anchors"); + assertThat(pt.getBindPoints()).isEmpty(); assertThat(pt.getMissing()).isEmpty(); } @Test - public void testBindPoints() { - ParsedTemplate pt = new ParsedTemplate("test template {missing1}", Map.of("b1","v1")); - assertThat(pt.getSpans()).contains("test template "); - assertThat(pt.getAnchors()).containsExactly("missing1"); - assertThat(pt.getUncheckedBindPoints()).containsExactly(new BindPoint("missing1",null)); + public void testShouldIgnoreExtraneousAnchors() { + String oneExtraneous = "An {this is an extraneous form} invalid anchor."; + ParsedTemplate pt = new ParsedTemplate(oneExtraneous, bindings); + assertThat(pt.getSpans()).containsExactly("An {this is an extraneous form} invalid anchor."); + assertThat(pt.getBindPoints()).isEmpty(); + assertThat(pt.getMissing()).isEmpty(); } @Test - public void testSingleBinding() { - ParsedTemplate pt = new ParsedTemplate("{single}", Map.of()); - Optional sb = pt.asBinding(); - assertThat(sb).isPresent(); - assertThat(sb).contains(new BindPoint("single",null)); + public void testShouldAllowArbitraryNonGreedyInExtendedBindPoint() { + String oneExtendedBindPoint = "An {{this is an extended form}} {{and another}} invalid anchor."; + ParsedTemplate pt = new ParsedTemplate(oneExtendedBindPoint, bindings); + assertThat(pt.getSpans()).containsExactly("An ","this is an extended form"," ","and another"," invalid anchor."); + assertThat(pt.getAnchors()).containsExactly("this is an extended form","and another"); } @Test - public void testJsonFormat() { - ParsedTemplate pt = new ParsedTemplate("test template {missing1}", Map.of("b1","v1")); - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - String format = gson.toJson(pt); - System.out.println(format); - - + public void testShouldMatchLiteralVariableOnly() { + String literalVariableOnly = "literal {bindname1}"; + ParsedTemplate pt = new ParsedTemplate(literalVariableOnly, bindings); + assertThat(pt.getSpans()).containsExactly("literal ", "bindname1", ""); + assertThat(pt.getAnchors()).containsOnly("bindname1"); + assertThat(pt.getMissing()).isEmpty(); } + @Test + public void testShouldMatchVariableLiteralOnly() { + String variableLiteralOnly = "{bindname2} literal"; + ParsedTemplate pt = new ParsedTemplate(variableLiteralOnly, bindings); + assertThat(pt.getSpans()).containsExactly("", "bindname2", " literal"); + assertThat(pt.getAnchors()).containsOnly("bindname2"); + assertThat(pt.getMissing()).isEmpty(); + } + + @Test + public void testPositionalExpansionShouldBeValid() { + String multi = "A {bindname1} of {bindname2} sort."; + ParsedTemplate pt = new ParsedTemplate(multi, bindings); + assertThat(pt.getSpans()).containsExactly("A ", "bindname1", " of ", "bindname2", " sort."); + assertThat(pt.getAnchors()).containsOnly("bindname1", "bindname2"); + assertThat(pt.getMissing()).isEmpty(); + assertThat(pt.getPositionalStatement(s -> "##")).isEqualTo("A ## of ## sort."); + assertThat(pt.getPositionalStatement(s -> "[[" + s + "]]")).isEqualTo("A [[bindname1]] of [[bindname2]] sort."); + + assertThat(pt.getBindPoints()).containsExactly( + new BindPoint("bindname1", "bindspec1"), + new BindPoint("bindname2", "bindspec2") + ); + } + + @Test + public void shouldMatchBasicCapturePoint() { + ParsedTemplate pt = new ParsedTemplate( + "select [u],[v as v1] from users where userid={userid}", Map.of("userid", "NumberNameToString()") + ); + assertThat(pt.getAnchors()).containsExactly("userid"); + assertThat(pt.getType()).isEqualTo(ParsedTemplate.Type.concat); + assertThat(pt.getCaptures()).containsExactly(CapturePoint.of("u"),CapturePoint.of("v","v1")); + + } } diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java similarity index 70% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java index baa945496..65014407d 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java similarity index 90% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java index 1b025bc3d..c0a177d38 100644 --- a/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java @@ -1,7 +1,6 @@ package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.core.templates.StringCompositor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -12,7 +11,6 @@ public class StringCompositorTest { StringCompositor c = new StringCompositor("A"); String[] spans = c.parseTemplate("A\\{ {one}two"); assertThat(spans).containsExactly("A\\{ ", "one", "two"); - } @Test @@ -28,5 +26,4 @@ public class StringCompositorTest { // String[] spans = c.parseTemplate("A\\{B}C"); // assertThat(spans).containsExactly("A\\{B}C"); // } - } diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java similarity index 91% rename from virtdata-api/src/test/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java index 0b66a4876..e1bd9952b 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/testmappers/TestableTemplate.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java similarity index 90% rename from virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestableTemplate.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java index ab2a757ee..24dfdeb64 100644 --- a/virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestableTemplate.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java @@ -7,8 +7,8 @@ import java.util.function.LongFunction; @ThreadSafeMapper public class TestableTemplate implements LongFunction { - private LongFunction[] funcs; - private String separator; + private final LongFunction[] funcs; + private final String separator; public TestableTemplate(String separator, LongFunction... funcs) { this.funcs = funcs; diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java similarity index 91% rename from virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java index 438f6eedb..bc63317a6 100644 --- a/virtdata-api/src/test/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/io/nosqlbench/virtdata/testmappers/TestingRepeater.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java similarity index 93% rename from virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestingRepeater.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java index 4ffede008..45e4cbcde 100644 --- a/virtdata-api/src/test/io/nosqlbench/virtdata/testmappers/TestingRepeater.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java @@ -6,7 +6,7 @@ import java.util.function.LongUnaryOperator; @ThreadSafeMapper public class TestingRepeater implements LongUnaryOperator { - private int repeat; + private final int repeat; public TestingRepeater(int repeat) { this.repeat = repeat; diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java similarity index 92% rename from virtdata-api/src/test/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java index 4feae2e4a..3f86a20b4 100644 --- a/virtdata-api/src/test/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; @@ -47,9 +47,9 @@ public class StringObjectPromoterTest { @Test public void testBigDecimalFallback() { - Object o = StringObjectPromoter.promote("1"+String.valueOf(Double.MAX_VALUE)); + Object o = StringObjectPromoter.promote("1"+ Double.MAX_VALUE); assertThat(o).isInstanceOf(BigDecimal.class); - assertThat(o).isEqualTo(new BigDecimal("1"+String.valueOf(Double.MAX_VALUE))); + assertThat(o).isEqualTo(new BigDecimal("1"+ Double.MAX_VALUE)); } @Test diff --git a/virtdata-api/src/test/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java similarity index 68% rename from virtdata-api/src/test/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java rename to virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java index 29cc60908..8603a3067 100644 --- a/virtdata-api/src/test/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/pom.xml b/virtdata-lang/pom.xml index 3140ac65a..5fed69593 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults 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/pom.xml b/virtdata-lib-basics/pom.xml index 5f4a999fe..bca63d305 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java index 15e4a059a..fefb01f45 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java @@ -8,7 +8,6 @@ import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasElementSampler; import io.nosqlbench.virtdata.library.basics.core.stathelpers.ElemProbD; -import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @@ -68,8 +67,6 @@ public class CSVSampler implements LongFunction { */ @Example({"CSVSampler('USPS','n/a','name','census_state_abbrev')",""}) public CSVSampler(String labelColumn, String weightColumn, String... data) { - List events = new ArrayList<>(); - List values = new ArrayList<>(); Function weightFunc = LabeledStatistic::sum; LongUnaryOperator prefunc = new Hash(); diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java index 0267043e9..5e33c2401 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java @@ -20,8 +20,8 @@ import java.util.function.LongUnaryOperator; */ public class HostHash implements LongUnaryOperator { - private static long hostHash = computeHostHash(); - private ByteBuffer bb = ByteBuffer.allocate(Long.BYTES); + private static final long hostHash = computeHostHash(); + private final ByteBuffer bb = ByteBuffer.allocate(Long.BYTES); private Murmur3F murmur3F; @Example({"HostHash()","a simple per-host hash function"}) @@ -60,10 +60,10 @@ public class HostHash implements LongUnaryOperator { distinctNames.add(iface.getHostName()); }); List nameList = new ArrayList<>(distinctNames); - nameList.sort(String::compareTo); + Collections.sort(nameList); Murmur3F m3f = new Murmur3F(0); m3f.reset(); - distinctNames.forEach( + nameList.forEach( s -> m3f.update(s.getBytes(StandardCharsets.UTF_8)) ); return m3f.getValue(); diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java index 12b729c11..9390761ee 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java @@ -23,13 +23,11 @@ public class WeightedFuncs implements LongFunction { private final LongFunction[] funcs; private final AliasSamplerDoubleInt functionSampler; - private HashedDoubleRange unitSampler = new HashedDoubleRange(0.0d, 1.0d); + private final HashedDoubleRange unitSampler = new HashedDoubleRange(0.0d, 1.0d); public WeightedFuncs(Object... weightsAndFuncs) { - List probabilites = new ArrayList<>(); - List> functions = new ArrayList<>(); - List probabilities = new ArrayList<>(); + List> functions = new ArrayList<>(); if ((weightsAndFuncs.length % 2) != 0) { throw new RuntimeException("You must have weights and functions, pairwise." + @@ -45,7 +43,7 @@ public class WeightedFuncs implements LongFunction { } catch (NumberFormatException nfe) { throw new RuntimeException("the 0th and ever even value must be a floating point weight."); } - probabilites.add(new EvProbD(i >> 1, weight)); + probabilities.add(new EvProbD(i >> 1, weight)); Object f = weightsAndFuncs[i + 1]; try { @@ -58,7 +56,7 @@ public class WeightedFuncs implements LongFunction { } } this.funcs = functions.toArray(new LongFunction[0]); - this.functionSampler = new AliasSamplerDoubleInt(probabilites); + this.functionSampler = new AliasSamplerDoubleInt(probabilities); } @Override diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java index 93ed0b6a2..c57f6adee 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java @@ -38,25 +38,30 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; import io.nosqlbench.virtdata.api.annotations.Categories; import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.LongFunction; /** - * Convert the input value to a {@code Date} + * Convert the input value to a {@code Date}, by multiplying and then dividing + * the input by the provided parameters. */ @ThreadSafeMapper @Categories({Category.datetime}) public class ToDate implements LongFunction { - private long spacing; - private long repeat_count; + private final long spacing; + private final long repeat_count; - public ToDate(int spacing, int repeat_count){ - this.spacing = spacing; - this.repeat_count = repeat_count; + @Example({"ToDate(86400000,2)","produce two Date values per day"}) + public ToDate(int millis_multiplier, int millis_divisor){ + this.spacing = millis_multiplier; + this.repeat_count = millis_divisor; } + + @Example({"ToDate(86400000)","produce a single Date() per day"}) public ToDate(int spacing){ this(spacing, 1); } 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..b149b141e 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; @@ -143,9 +143,9 @@ public class ShuffleTest { } // return shuffle.stats; return new int[0]; - } + @Test public void test16() { int max=16; Shuffle shuffle = new Shuffle(0,max); @@ -161,11 +161,10 @@ public class ShuffleTest { assertThat(r[i]).isEqualTo(i+1); } // System.out.println("resampling stats for " + max + " values: " + Arrays.toString(shuffle.stats)); - } @Test - @Ignore + @Disabled public void test97() { int max=97; Shuffle shuffle = new Shuffle(0,max); @@ -184,7 +183,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/ToDateTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java new file mode 100644 index 000000000..dc537006b --- /dev/null +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java @@ -0,0 +1,28 @@ +package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; + +import org.junit.jupiter.api.Test; + +import java.util.Date; + +import static org.assertj.core.api.Assertions.assertThat; + +class ToDateTest { + + @Test + public void testToDateSimple() { + ToDate f = new ToDate(5); + assertThat(f.apply(0)).isEqualTo(new Date(0)); + assertThat(f.apply(1)).isEqualTo(new Date(5)); + assertThat(f.apply(100)).isEqualTo(new Date(500)); + } + + @Test + public void testToDateWithRepeats() { + ToDate f = new ToDate(86400000,2); + assertThat(f.apply(0)).isEqualTo(new Date(0)); + assertThat(f.apply(1)).isEqualTo(new Date((86400000/2))); + assertThat(f.apply(2)).isEqualTo(new Date((2*86400000)/2)); + assertThat(f.apply(3)).isEqualTo(new Date((3*86400000)/2)); + } + +} 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..80e64c2a1 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; @@ -23,8 +23,6 @@ public class ShowTest { assertThat(showFoo.apply(2342343L)).isEqualTo("{foo=23}"); assertThat(showBar.apply(23423L)).isEqualTo("{bar=Bar}"); new Clear().apply(234); - assertThat(showAll.apply("234").isEmpty()); + assertThat(showAll.apply("234")).isEqualTo("{}"); } - - } \ No newline at end of file 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..98968e4a5 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; @@ -11,7 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat; public class BasicDataMappersTest { - @Test public void testGetDataMapper() throws Exception { Optional> dataMapper = VirtData.getOptionalMapper("StaticStringMapper('foo')"); @@ -52,6 +51,7 @@ public class BasicDataMappersTest { assertThat(dataMapper.get()).isNotNull(); Date d1 = dataMapper.get().get(1); Date d2 = dataMapper.get().get(2); + assertThat(d2).isAfter(d1); } @Test @@ -59,7 +59,9 @@ public class BasicDataMappersTest { Optional> dataMapper = VirtData.getOptionalMapper("ToDate(1000,10000)"); assertThat(dataMapper).isNotNull(); assertThat(dataMapper.get()).isNotNull(); - assertThat(dataMapper.get().get(1).after(new Date(1))); + assertThat(dataMapper.get().get(0)).isEqualTo(new Date(0)); + assertThat(dataMapper.get().get(10)).isEqualTo(new Date(1)); + assertThat(dataMapper.get().get(20)).isEqualTo(new Date(2)); } @Test @@ -69,5 +71,4 @@ public class BasicDataMappersTest { assertThat(dataMapper.get()).isNotNull(); assertThat(dataMapper.get().get(1)).isNotNull(); } - } 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..b48e7e1a4 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; @@ -22,7 +22,7 @@ public class HashedFileExtractToStringTest { assertThat(apply.length()).isLessThanOrEqualTo(3000); } - System.out.println("Loaded examples from data/lorem_ipsum_full.txt:" + iss.toString()); + System.out.println("Loaded examples from data/lorem_ipsum_full.txt:" + iss); } @Test @@ -36,6 +36,6 @@ public class HashedFileExtractToStringTest { iss.accept(apply.length()); } - System.out.println("Loaded examples from data/lorem_ipsum_full.txt:" + iss.toString()); + System.out.println("Loaded examples from data/lorem_ipsum_full.txt:" + iss); } } 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..3e7118995 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; @@ -22,7 +22,10 @@ public class ToEpochTimeUUIDTest { formats.add(formatted); e = new ToEpochTimeUUID(formatted); + } + for (String formatted : formats) { + System.out.println(formatted); } /** diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index ff121b369..95f3ebf07 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java b/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java index 33c0c8ebf..8008d884a 100644 --- a/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java +++ b/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java @@ -340,7 +340,7 @@ public class SemiVariance extends AbstractUnivariateStatistic implements Seriali /** * boolean value UPSIDE <-> true */ - private boolean direction; + private final boolean direction; /** * Create a Direction with the given value. 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..889c11e33 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; @@ -78,7 +78,7 @@ public class RealDistributionsConcurrencyTests { private final Object signal; private final int slot; private final String mapperSpec; - private int size; + private final int size; public RealDistributionCallable(int slot, int size, String mapperSpec, Object signal) { this.slot = slot; 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..114551d40 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; @@ -18,7 +18,7 @@ public class RealDistributionsValuesTest { @Test public void testComputedNormal() { RunData runData = iterateMapperDouble(new Normal(10.0,2.0,"compute"), 1000000); - System.out.println(runData.toString()); + System.out.println(runData); assertThat(runData.getFractionalPercentile(0.5D)) .isCloseTo(10.0D, Offset.offset(0.01D)); assertThat(runData.getFractionalPercentile(0.4D)) @@ -30,7 +30,7 @@ public class RealDistributionsValuesTest { @Test public void testInterpolatedNormal() { RunData runData = iterateMapperDouble(new Normal(10.0,2.0,"interpolate"), 1000000); - System.out.println(runData.toString()); + System.out.println(runData); assertThat(runData.getFractionalPercentile(0.5D)) .isCloseTo(10.0D, Offset.offset(0.01D)); assertThat(runData.getFractionalPercentile(0.4D)) @@ -48,7 +48,7 @@ public class RealDistributionsValuesTest { .isCloseTo(50.0D, Offset.offset(1.0D)); assertThat(runData.getFractionalPercentile(0.78D)) .isCloseTo(78.0D, Offset.offset(1.0D)); - System.out.println(runData.toString()); + System.out.println(runData); } @Test @@ -60,7 +60,7 @@ public class RealDistributionsValuesTest { .isCloseTo(50.0D, Offset.offset(1.0D)); assertThat(runData.getFractionalPercentile(0.78D)) .isCloseTo(78.0D, Offset.offset(1.0D)); - System.out.println(runData.toString()); + System.out.println(runData); } @Test @@ -77,7 +77,7 @@ public class RealDistributionsValuesTest { private RunData iterateMapperDouble(LongToDoubleFunction mapper, int iterations) { assertThat(mapper).isNotNull(); - double samples[] = new double[iterations]; + double[] samples = new double[iterations]; long time_generating = System.nanoTime(); for (int i = 0; i < iterations; i++) { @@ -120,7 +120,7 @@ public class RealDistributionsValuesTest { f.format("iterations: %d\n", iterations); f.format("iterations/ms: %5f\n", (iterations/ms)); for (int i = 10; i < 100; i += 10) { - double pctile = (double) i; + double pctile = i; f.format("pctile %4d %4f\n", i, s1.getPercentile(pctile)); } return sb.toString(); 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..b6280dd55 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; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class IntegerDistributionsBinomialSanity { - private static double[] binomial85steps = new double[]{ + private static final double[] binomial85steps = new double[]{ 0.00390d, 0.03125d, 0.10937d, 0.21875d, 0.27343d, 0.21875d, 0.10937d, 0.03125d, 0.00390d, }; @@ -23,7 +23,7 @@ public class IntegerDistributionsBinomialSanity { ),false); assertThat(b85.applyAsLong(0L)).isEqualTo(0); assertThat(b85.applyAsLong(Long.MAX_VALUE)).isEqualTo(8); - double c[] = new double[binomial85steps.length]; + double[] c = new double[binomial85steps.length]; c[0]=binomial85steps[0]; for (int i = 1; i < c.length; i++) { c[i] = c[i-1]+binomial85steps[i]; @@ -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..7aaef004f 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; @@ -128,7 +128,7 @@ public class IntegerDistributionsConcurrencyTest { private final Object signal; private final int slot; private final String mapperSpec; - private int size; + private final int size; public IntegerDistributionCallable(int slot, int size, String mapperSpec, Object signal) { this.slot = slot; 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..5fdac781e 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,11 +16,11 @@ 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); - System.out.println(runData.toString()); + System.out.println(runData); assertThat(runData.getFractionalPercentile(0.6D)) .isCloseTo(1.0D, Offset.offset(0.0001D)); assertThat(runData.getFractionalPercentile(0.7D)) @@ -34,7 +34,7 @@ public class IntegerDistributionsValuesTest { @Test public void testInterpolatedZipf() { RunData runData = iterateMapperLong(new Zipf(10000,2.0), 10000); - System.out.println(runData.toString()); + System.out.println(runData); assertThat(runData.getFractionalPercentile(0.6D)) .isCloseTo(1.0D, Offset.offset(0.0001D)); assertThat(runData.getFractionalPercentile(0.7D)) @@ -55,7 +55,7 @@ public class IntegerDistributionsValuesTest { .isCloseTo(50.0D, Offset.offset(1.0D)); assertThat(runData.getFractionalPercentile(0.78D)) .isCloseTo(78.0D, Offset.offset(1.0D)); - System.out.println(runData.toString()); + System.out.println(runData); } @Test @@ -67,7 +67,7 @@ public class IntegerDistributionsValuesTest { .isCloseTo(50.0D, Offset.offset(1.0D)); assertThat(runData.getFractionalPercentile(0.78D)) .isCloseTo(78.0D, Offset.offset(1.0D)); - System.out.println(runData.toString()); + System.out.println(runData); } @Test @@ -83,11 +83,11 @@ public class IntegerDistributionsValuesTest { private RunData iterateMapperLong(LongUnaryOperator mapper, int iterations) { assertThat(mapper).isNotNull(); - double samples[] = new double[iterations]; + double[] samples = new double[iterations]; long time_generating = System.nanoTime(); for (int i = 0; i < iterations; i++) { - samples[i] = mapper.applyAsLong((long)i); + samples[i] = mapper.applyAsLong(i); } long time_generated = System.nanoTime(); @@ -98,11 +98,11 @@ public class IntegerDistributionsValuesTest { private RunData iterateMapperDouble(LongToDoubleFunction mapper, int iterations) { assertThat(mapper).isNotNull(); - double samples[] = new double[iterations]; + double[] samples = new double[iterations]; long time_generating = System.nanoTime(); for (int i = 0; i < iterations; i++) { - samples[i] = mapper.applyAsDouble((long)i); + samples[i] = mapper.applyAsDouble(i); } long time_generated = System.nanoTime(); @@ -141,7 +141,7 @@ public class IntegerDistributionsValuesTest { f.format("iterations: %d\n", iterations); f.format("iterations/ms: %5f\n", (iterations/ms)); for (int i = 10; i < 100; i += 10) { - double pctile = (double) i; + double pctile = i; f.format("pctile %4d %4f\n", i, s1.getPercentile(pctile)); } return sb.toString(); 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-lib-random/pom.xml b/virtdata-lib-random/pom.xml index acb689d0c..bc1e06fb0 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 5f1097c7a..b84dc9933 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 5ad766fd9..4f5c31aed 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 17538ab48..e4f8f019f 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-api - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.48-SNAPSHOT + 4.15.51-SNAPSHOT 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..15090876d 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; @@ -216,7 +216,7 @@ public class IntegratedBindingsTest { public void testDirectFunctionalInterfaceLongUnary() { LongUnaryOperator f = VirtData.getFunction("Add(5L)", LongUnaryOperator.class); assertThat(f).isNotNull(); - assertThat(f.getClass()==LongUnaryOperator.class); + assertThat(f.getClass()).isEqualTo(io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Add.class); } @Test 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..b973420c7 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 { @@ -132,19 +133,19 @@ public class IntegratedComposerLogicTest { public void sanityCheckFunctionCasting() { Class c1 = NumberNameToString.class; Class c2 = LongFunction.class; - assertThat(ClassUtils.isAssignable(c1,c2)); + assertThat(ClassUtils.isAssignable(c1, c2)).isTrue(); Class c3 = Identity.class; Class c4 = LongFunction.class; - assertThat(ClassUtils.isAssignable(c3,c4)); + assertThat(ClassUtils.isAssignable(c3, c4)).isFalse(); LongUnaryOperator f; f = new Identity(); - } - @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..db6d3af9a 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; @@ -33,7 +33,7 @@ public class IntegratedCurvesTest { private RunData iterateMapperLong(DataMapper mapper, int iterations) { assertThat(mapper).isNotNull(); - double samples[] = new double[iterations]; + double[] samples = new double[iterations]; long time_generating = System.nanoTime(); for (int i = 0; i < iterations; i++) { @@ -48,7 +48,7 @@ public class IntegratedCurvesTest { private RunData iterateMapperDouble(DataMapper mapper, int iterations) { assertThat(mapper).isNotNull(); - double samples[] = new double[iterations]; + double[] samples = new double[iterations]; long time_generating = System.nanoTime(); for (int i = 0; i < iterations; i++) { @@ -93,7 +93,7 @@ public class IntegratedCurvesTest { f.format("iterations: %d\n", iterations); f.format("iterations/ms: %5f\n", (iterations / ms)); for (int i = 10; i < 100; i += 10) { - double pctile = (double) i; + double pctile = i; f.format("pctile %4d %4f\n", i, s1.getPercentile(pctile)); } return sb.toString(); 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;