From fbe03881aba8946e8c253b8bded74afd88254f81 Mon Sep 17 00:00:00 2001 From: scottf Date: Tue, 4 Nov 2025 07:23:48 -0500 Subject: [PATCH 01/51] Moving to build with Java 21 Updating Gradle to 8.14 Cleaning up actions --- .github/workflows/branch-snapshot.yml | 2 +- .github/workflows/build-main.yml | 2 +- .github/workflows/build-pr.yml | 4 +- .github/workflows/build-release.yml | 4 +- build.gradle | 66 ++++++++++++--------------- settings.gradle | 9 +++- 6 files changed, 41 insertions(+), 46 deletions(-) diff --git a/.github/workflows/branch-snapshot.yml b/.github/workflows/branch-snapshot.yml index 90e24b384..e45b383b6 100644 --- a/.github/workflows/branch-snapshot.yml +++ b/.github/workflows/branch-snapshot.yml @@ -19,7 +19,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index ff88fba3a..e13a556f0 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -20,7 +20,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 359ffca6d..c1ec61f11 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,9 +16,9 @@ jobs: SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} steps: - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index d47cc9cdb..6f25ef039 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -20,7 +20,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -44,7 +44,7 @@ jobs: - name: Build and Test run: chmod +x gradlew && ./gradlew clean test - name: Verify, Sign and Publish Release - run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository + run: ./gradlew -i publishToSonatype closeAndReleaseSonatypeStagingRepository - name: Clean up if: always() run: pkill -9 nats-server 2>/dev/null || true diff --git a/build.gradle b/build.gradle index 682b5c5fb..5a42cd56a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,29 +2,24 @@ import aQute.bnd.gradle.Bundle import org.gradle.internal.os.OperatingSystem plugins { - id 'java' - id 'java-library' - id 'maven-publish' - id 'jacoco' -// id 'com.github.kt3k.coveralls' version '2.12.2' - id 'biz.aQute.bnd.builder' version '5.1.2' - id "org.gradle.test-retry" version "1.6.2" - id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' - id 'signing' + id("java") + id("java-library") + id("maven-publish") + id("jacoco") + id("biz.aQute.bnd.builder") version "7.1.0" + id("org.gradle.test-retry") version "1.6.4" + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" + id("signing") } def jarVersion = "2.23.1" -def buildEvent = System.getenv("BUILD_EVENT") -def isRelease = buildEvent == "release" +def isRelease = System.getenv("BUILD_EVENT") == "release" def brn = System.getenv("BRANCH_REF_NAME") def snap = brn == null || brn.equals("") ? "-SNAPSHOT" : "." + brn + "-SNAPSHOT" -// version is the variable the build actually uses. -version = isRelease ? jarVersion : jarVersion + snap - -archivesBaseName = 'jnats' group = 'io.nats' +version = isRelease ? jarVersion : jarVersion + snap // version is the variable the build actually uses. java { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -32,11 +27,9 @@ java { } repositories { - gradlePluginPortal() mavenCentral() - maven { url "https://repo1.maven.org/maven2/" } - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } - maven { url "https://oss.sonatype.org/content/repositories/releases/" } + maven { url="https://repo1.maven.org/maven2/" } + maven { url="https://central.sonatype.com/repository/maven-snapshots/" } } dependencies { @@ -67,15 +60,13 @@ tasks.register('bundle', Bundle) { } jar { - manifest { - attributes('Automatic-Module-Name': 'io.nats.jnats') + bundle { + bnd("Bundle-Name": "io.nats.jnats", + "Bundle-Vendor": "nats.io", + "Bundle-Description": "Java Nats", + "Bundle-DocURL": "https://github.com/nats-io/nats.java" + ) } - bnd (['Implementation-Title': 'Java Nats', - 'Implementation-Version': jarVersion, - 'Implementation-Vendor': 'nats.io', - "Import-Package": "!org.bouncycastle:bcprov-lts8on"] - ) - exclude("io/nats/examples/**") } test { @@ -161,8 +152,12 @@ tasks.register('fatJar', Jar) { with jar } +artifacts { + archives javadocJar, sourcesJar, examplesJar, testsJar +} + jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.12" } jacocoTestReport { @@ -172,17 +167,12 @@ jacocoTestReport { } afterEvaluate { // only report on main library not examples classDirectories.setFrom(files(classDirectories.files.collect { - fileTree(dir: it, exclude: [ - '**/examples/**', 'io/nats/client/tests/**', 'io/nats/client/support/Debug*' - ]) + fileTree(dir: it, + exclude: ['**/examples/**', '**/Debug**']) })) } } -artifacts { - archives javadocJar, sourcesJar, examplesJar, testsJar -} - nexusPublishing { repositories { sonatype { @@ -203,10 +193,10 @@ publishing { artifact javadocJar artifact testsJar pom { - name = 'jnats' - packaging = 'jar' + name = "jnats" + packaging = "jar" groupId = group - artifactId = archivesBaseName + artifactId = "jnats" description = 'Client library for working with the NATS messaging system.' url = 'https://github.com/nats-io/nats.java' licenses { diff --git a/settings.gradle b/settings.gradle index ea03d6ce4..0eaa8335e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,13 @@ pluginManagement { repositories { + gradlePluginPortal() mavenCentral() - maven { url "https://oss.sonatype.org/content/repositories/releases/" } - maven { url "https://plugins.gradle.org/m2/" } + maven { url="https://repo1.maven.org/maven2/" } + maven { url="https://central.sonatype.com/repository/maven-snapshots/" } + maven { url="https://plugins.gradle.org/m2/" } + } + plugins { + id("biz.aQute.bnd.builder") version "7.1.0" } } rootProject.name = 'java-nats' From e704148a6cb3903d0ae0ee64ea0ff4a49ed779ba Mon Sep 17 00:00:00 2001 From: scottf Date: Sat, 8 Nov 2025 06:11:35 -0500 Subject: [PATCH 02/51] tuning test execution --- build.gradle | 39 +++++++------------ .../io/nats/client/api/PurgeResponse.java | 2 +- src/test/java/io/nats/client/AuthTests.java | 3 ++ .../nats/client/support/JsonUtilsTests.java | 16 ++++---- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 07b1337fe..959b04505 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ import aQute.bnd.gradle.Bundle -import org.gradle.internal.os.OperatingSystem plugins { id("java") @@ -27,18 +26,21 @@ java { } repositories { + mavenLocal() mavenCentral() maven { url="https://repo1.maven.org/maven2/" } maven { url="https://central.sonatype.com/repository/maven-snapshots/" } } dependencies { - implementation 'org.bouncycastle:bcprov-lts8on:2.73.8' + implementation 'org.bouncycastle:bcprov-lts8on:2.73.9' implementation 'org.jspecify:jspecify:1.0.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' testImplementation 'io.nats:jnats-server-runner:3.0.1' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.2.1' + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } sourceSets { @@ -82,35 +84,24 @@ test { maxFailures = 4 maxRetries = 4 } - maxParallelForks = Runtime.runtime.availableProcessors() +// maxParallelForks = Runtime.runtime.availableProcessors() + maxParallelForks = 2 systemProperty 'junit.jupiter.execution.timeout.default', '3m' } javadoc { options.overview = 'src/main/javadoc/overview.html' // relative to source root + options.memberLevel = JavadocMemberLevel.PUBLIC source = sourceSets.main.allJava title = "NATS.IO Java API" - excludes = ['io/nats/client/impl', - 'io/nats/examples', - "io/nats/client/api/ConsumerCreateRequest.java", - "io/nats/client/api/MessageGetRequest.java" + excludes = [ + "io/nats/client/impl", + "io/nats/examples", + "io/nats/client/api/ConsumerCreateRequest.java", + "io/nats/client/api/MessageGetRequest.java", + "**/Debug**" ] classpath = sourceSets.main.runtimeClasspath - doLast { - if (!OperatingSystem.current().isWindows()) { - exec { - println "Updating favicon on all html files" - workingDir 'build/docs/javadoc' - // Only on linux, mac at this point - commandLine 'find', '.', '-name', '*.html', '-exec', 'sed', '-i', '-e', 's###', '{}', ';' - } - copy { - println "Copying images to javadoc folder" - from 'src/main/javadoc/images' - into 'build/docs/javadoc' - } - } - } } tasks.register('examplesJar', Jar) { diff --git a/src/main/java/io/nats/client/api/PurgeResponse.java b/src/main/java/io/nats/client/api/PurgeResponse.java index 78fa15923..05c8fe8aa 100644 --- a/src/main/java/io/nats/client/api/PurgeResponse.java +++ b/src/main/java/io/nats/client/api/PurgeResponse.java @@ -49,7 +49,7 @@ public boolean isSuccess() { */ @Deprecated public int getPurgedCount() { - return new Long(purged).intValue(); + return Long.valueOf(purged).intValue(); } /** diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 8ef43046d..d880dae6e 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -22,6 +22,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; import javax.net.ssl.SSLContext; import java.io.BufferedWriter; @@ -37,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; +@Execution(ExecutionMode.SAME_THREAD) public class AuthTests extends TestBase { @Test diff --git a/src/test/java/io/nats/client/support/JsonUtilsTests.java b/src/test/java/io/nats/client/support/JsonUtilsTests.java index ccc8ad5b7..fde80f9f1 100644 --- a/src/test/java/io/nats/client/support/JsonUtilsTests.java +++ b/src/test/java/io/nats/client/support/JsonUtilsTests.java @@ -186,11 +186,13 @@ public void testAddFields() { addRawJson(sb, "n/a", ""); assertEquals(0, sb.length()); - //noinspection UnnecessaryBoxing - addField(sb, "iminusone", new Integer(-1)); + //noinspection WrapperTypeMayBePrimitive + Integer i = -1; + addField(sb, "iminusone", i); assertEquals(0, sb.length()); - addField(sb, "lminusone", new Long(-1)); + Long l = -1L; + addField(sb, "lminusone", l); assertEquals(0, sb.length()); addFieldWhenGteMinusOne(sb, "lnull", null); @@ -235,15 +237,15 @@ public void testAddFields() { addFieldWhenGtZero(sb, "longnull", (Long) null); assertEquals(87, sb.length()); - //noinspection UnnecessaryBoxing - addFieldWhenGtZero(sb, "intnotgt0", new Integer(0)); + i = 0; + addFieldWhenGtZero(sb, "intnotgt0", i); assertEquals(87, sb.length()); addFieldWhenGtZero(sb, "longnotgt0", 0L); assertEquals(87, sb.length()); - //noinspection UnnecessaryBoxing - addFieldWhenGtZero(sb, "intgt0", new Integer(1)); + i = 1; + addFieldWhenGtZero(sb, "intgt0", i); assertEquals(98, sb.length()); addFieldWhenGtZero(sb, "longgt0", 1L); From 9c1b1989f8b43ab72eb74a2ae25665030c75aa74 Mon Sep 17 00:00:00 2001 From: scottf Date: Wed, 19 Nov 2025 11:01:14 -0500 Subject: [PATCH 03/51] Work in progress --- build.gradle | 30 +- gradle/libs.versions.toml | 12 + src/test/java/io/nats/client/AuthTests.java | 69 +- .../java/io/nats/client/ConnectTests.java | 1351 ++++++++--------- src/test/java/io/nats/client/EchoTests.java | 111 +- .../nats/client/NatsServerProtocolMock.java | 538 +++---- .../java/io/nats/client/NatsTestServer.java | 70 +- .../io/nats/client/PublishOptionsTests.java | 315 ++-- .../java/io/nats/client/PublishTests.java | 662 ++++---- .../java/io/nats/client/RequestTests.java | 61 - .../io/nats/client/SubscribeOptionsTests.java | 183 ++- .../java/io/nats/client/SubscriberTests.java | 419 ++--- .../client/api/AccountStatisticsTests.java | 6 + .../api/ConsumerConfigurationTests.java | 19 +- .../nats/client/api/ObjectStoreApiTests.java | 19 +- .../client/api/StreamConfigurationTests.java | 71 +- .../nats/client/impl/AuthAndConnectTests.java | 17 +- .../client/impl/ConnectionListenerTests.java | 14 +- .../io/nats/client/impl/DispatcherTests.java | 1261 +++++++-------- .../java/io/nats/client/impl/DrainTests.java | 3 +- .../nats/client/impl/ErrorListenerTests.java | 8 +- .../client/impl/JetStreamConsumerTests.java | 162 +- .../client/impl/JetStreamGeneralTests.java | 762 +++++----- .../client/impl/JetStreamManagementTests.java | 946 +++++------- .../JetStreamManagementWithConfTests.java | 147 ++ .../impl/JetStreamMirrorAndSourcesTests.java | 145 +- .../nats/client/impl/JetStreamPubTests.java | 297 ++-- .../nats/client/impl/JetStreamPullTests.java | 514 +++---- .../client/impl/JetStreamPushAsyncTests.java | 116 +- .../client/impl/JetStreamPushQueueTests.java | 17 +- .../nats/client/impl/JetStreamPushTests.java | 198 +-- .../nats/client/impl/JetStreamTestBase.java | 132 +- .../client/impl/JetStreamTestingContext.java | 81 + .../io/nats/client/impl/KeyValueTests.java | 317 ++-- .../nats/client/impl/MessageManagerTests.java | 34 +- .../client/impl/NatsConnectionImplTests.java | 14 +- .../io/nats/client/impl/NatsMessageTests.java | 782 +++++----- .../nats/client/impl/NatsStatisticsTests.java | 26 +- .../io/nats/client/impl/ObjectStoreTests.java | 90 +- .../java/io/nats/client/impl/PingTests.java | 550 +++---- .../io/nats/client/impl/ReconnectTests.java | 277 ++-- .../io/nats/client/impl/RequestTests.java | 126 +- .../nats/client/impl/SimplificationTests.java | 584 ++++--- .../io/nats/client/impl/TLSConnectTests.java | 10 +- .../client/impl/WebsocketConnectTests.java | 4 +- .../nats/client/support/JsonParsingTests.java | 55 +- .../client/support/ScheduledTaskTests.java | 4 +- .../nats/client/utils/LongRunningServer.java | 123 ++ .../java/io/nats/client/utils/TestBase.java | 553 ++++--- .../java/io/nats/service/ServiceTests.java | 176 +-- 50 files changed, 6073 insertions(+), 6408 deletions(-) create mode 100644 gradle/libs.versions.toml delete mode 100644 src/test/java/io/nats/client/RequestTests.java create mode 100644 src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java create mode 100644 src/test/java/io/nats/client/impl/JetStreamTestingContext.java create mode 100644 src/test/java/io/nats/client/utils/LongRunningServer.java diff --git a/build.gradle b/build.gradle index 5b6b4747b..5974bef76 100644 --- a/build.gradle +++ b/build.gradle @@ -5,24 +5,35 @@ plugins { id("java-library") id("maven-publish") id("jacoco") - id("biz.aQute.bnd.builder") version "7.1.0" + id("biz.aQute.bnd.builder") version "5.1.2" +// id("biz.aQute.bnd.builder") version "7.1.0" id("org.gradle.test-retry") version "1.6.4" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("signing") } def jarVersion = "2.24.1" +group = 'io.nats' def isRelease = System.getenv("BUILD_EVENT") == "release" def brn = System.getenv("BRANCH_REF_NAME") def snap = brn == null || brn.equals("") ? "-SNAPSHOT" : "." + brn + "-SNAPSHOT" -group = 'io.nats' +def tc = System.getenv("TARGET_COMPATIBILITY"); +def targetCompat = tc == "21" ? JavaVersion.VERSION_21 : (tc == "17" ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8) +def jarEnd = tc == "21" ? "-jdk21" : (tc == "17" ? "-jdk17" : "") +def jarAndArtifactName = "jnats" + jarEnd + version = isRelease ? jarVersion : jarVersion + snap // version is the variable the build actually uses. +def javaVersion = System.getProperty("java.version"); +System.out.println("Java: " + javaVersion) +System.out.println("Target Compatibility: " + targetCompat) +System.out.println(group + ":" + jarAndArtifactName + ":" + version) + java { sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = targetCompat } repositories { @@ -37,8 +48,13 @@ dependencies { implementation 'org.jspecify:jspecify:1.0.0' testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' - testImplementation 'io.nats:jnats-server-runner:3.0.1' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3' + testImplementation 'io.nats:jnats-server-runner:3.0.2-SNAPSHOT' + if (javaVersion.startsWith("1.8")) { + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3' + } + else { + testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.2.2' + } testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } @@ -186,10 +202,10 @@ publishing { artifact javadocJar artifact testsJar pom { - name = "jnats" + name = jarAndArtifactName packaging = "jar" groupId = group - artifactId = "jnats" + artifactId = jarAndArtifactName description = 'Client library for working with the NATS messaging system.' url = 'https://github.com/nats-io/nats.java' licenses { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..2cfe86acd --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,12 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +commons-math3 = "3.6.1" +guava = "33.4.5-jre" +junit-jupiter = "5.12.1" + +[libraries] +commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index d880dae6e..98dc7f199 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -13,6 +13,7 @@ package io.nats.client; +import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.ListenerForTesting; @@ -36,6 +37,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import static io.nats.client.NatsTestServer.configuredServer; +import static io.nats.client.NatsTestServer.skipValidateServer; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @@ -110,7 +113,8 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { String user = "u" + test + "u"; String pass = "p" + test + "p"; String[] customArgs = {"--user", "\"" + user + "\"", "--pass", "\"" + pass + "\""}; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + try (NatsTestServer ts = new NatsTestServer( + NatsServerRunner.builder().customArgs(customArgs))) { // See config file for user/pass Options options = new Options.Builder().server("nats://localhost:" + ts.getPort()) .userInfo(user, pass) @@ -132,7 +136,7 @@ public void testUserPassOnReconnect() throws Exception { // See config file for user/pass Options options = new Options.Builder().server(ts.getURI()).maxReconnects(-1) .userInfo("stephen".toCharArray(), "password".toCharArray()).connectionListener(listener).build(); - nc = standardConnection(options); + nc = standardConnectionWait(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -201,7 +205,7 @@ public void testUserPassInURLOnReconnect() throws Exception { // See config file for user/pass Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts.getPort()) .maxReconnects(-1).connectionListener(listener).build(); - nc = standardConnection(options); + nc = standardConnectionWait(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -241,7 +245,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts1.getPort()) .server("nats://alberto:casadecampo@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), "nats://stephen:password@localhost:" + ts1.getPort()); listener.prepForStatusChange(Events.RESUBSCRIBED); @@ -264,7 +268,7 @@ public void testUserPassInURLWithFallback() throws Exception { .server("nats://localhost:" + ts2.getPort()).noRandomize() .userInfo("alberto".toCharArray(), "casadecampo".toCharArray()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), "nats://stephen:password@localhost:" + ts1.getPort()); listener.prepForStatusChange(Events.RESUBSCRIBED); @@ -287,7 +291,7 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { Options options = new Options.Builder().server("nats://token_one@localhost:" + ts1.getPort()) .server("nats://token_two@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), "nats://token_one@localhost:" + ts1.getPort()); listener.prepForStatusChange(Events.RESUBSCRIBED); @@ -312,7 +316,7 @@ public void testTokenInURLWithFallback() throws Exception { Options options = new Options.Builder().server("nats://token_one@localhost:" + ts1.getPort()) .server("nats://localhost:" + ts2.getPort()).token("token_two".toCharArray()).maxReconnects(4) .noRandomize().connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); - nc = standardConnection(options); + nc = standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), "nats://token_one@localhost:" + ts1.getPort()); listener.prepForStatusChange(Events.RESUBSCRIBED); @@ -381,7 +385,7 @@ public void testBadToken() { Options options = new Options.Builder() .server(ts.getURI()) .maxReconnects(0) - .errorListener(new ErrorListener() {}) + .errorListener(NO_OP_EL) .token("notthetoken".toCharArray()) .build(); Nats.connect(options); // expected to fail @@ -462,7 +466,7 @@ public void testStaticNKeyAuth() throws Exception { @Test public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf")) { Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) .build(); @@ -475,14 +479,14 @@ public void testJWTAuthWithCredsFile() throws Exception { } //test Nats.connect method - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf")) { Connection nc = Nats.connect(ts.getURI(), Nats.credentials("src/test/resources/jwt_nkey/user.creds")); standardConnectionWait(nc); standardCloseConnection(nc); } //test Nats.connect method - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operatorJnatsTest.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operatorJnatsTest.conf")) { Connection nc = Nats.connect(ts.getURI(), Nats.credentials("src/test/resources/jwt_nkey/userJnatsTest.creds")); standardConnectionWait(nc); standardCloseConnection(nc); @@ -491,7 +495,7 @@ public void testJWTAuthWithCredsFile() throws Exception { @Test public void testWsJWTAuthWithCredsFile() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws_operator.conf", false)) { + try (NatsTestServer ts = skipValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); Options options = new Options.Builder().server(uri).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); @@ -499,7 +503,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { } //test Nats.connect method - try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws_operator.conf", false)) { + try (NatsTestServer ts = skipValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); Connection nc = Nats.connect(uri, Nats.credentials("src/test/resources/jwt_nkey/user.creds")); standardConnectionWait(nc); @@ -510,7 +514,8 @@ public void testWsJWTAuthWithCredsFile() throws Exception { @Test public void testWssJWTAuthWithCredsFile() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss_operator.conf", false)) { + try (NatsTestServer ts = skipValidateServer("wss_operator.conf")) + { String uri = ts.getLocalhostUri("wss"); Options options = new Options.Builder().server(uri).maxReconnects(0).sslContext(ctx) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); @@ -552,13 +557,11 @@ public void testBadAuthHandler() { @Test public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - // Connect should fail on ts2 - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false); - NatsTestServer ts2 = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { Options options = new Options.Builder().servers(new String[]{ts.getURI(), ts2.getURI()}) .noRandomize().maxReconnects(-1).authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); @@ -578,12 +581,11 @@ public void testCloseOnReconnectWithSameError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts1 - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator_noacct.conf", false); - NatsTestServer ts2 = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { Options options = new Options.Builder().servers(new String[]{ts.getURI(), ts2.getURI()}) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(ts2.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.CLOSED); @@ -599,8 +601,8 @@ public void testCloseOnReconnectWithSameError() throws Exception { @Test public void testThatAuthErrorIsCleared() throws Exception { // Connect should fail on ts1 - try (NatsTestServer ts1 = new NatsTestServer("src/test/resources/operator_noacct.conf", false); - NatsTestServer ts2 = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts1 = NatsTestServer.configuredServer("operator_noacct.conf"); + NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { Options options = new Options.Builder() .servers(new String[]{ts1.getURI(), ts2.getURI()}).noRandomize() @@ -610,7 +612,7 @@ public void testThatAuthErrorIsCleared() throws Exception { .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) .errorListener(new ListenerForTesting()) .build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(ts2.getURI(), nc.getConnectedUrl()); String tsURI = ts1.getURI(); @@ -618,16 +620,15 @@ public void testThatAuthErrorIsCleared() throws Exception { int port2 = ts2.getPort(); ts1.close(); - // ts3 will be at the same port that ts was - try (NatsTestServer ts3 = new NatsTestServer("src/test/resources/operator.conf", port1, false)) { + try (NatsTestServer ts3 = configuredServer("operator.conf", port1)) { ListenerForTesting listener = new ListenerForTesting(); listener.prepForStatusChange(Events.RECONNECTED); ts2.close(); // reconnect should work because we are now running with the good config - listenerConnectionWait(nc, listener, 10000); + listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); assertEquals(ts3.getURI(), nc.getConnectedUrl()); assertEquals(tsURI, ts3.getURI()); @@ -636,9 +637,9 @@ public void testThatAuthErrorIsCleared() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); ts3.close(); - try (NatsTestServer ignored = new NatsTestServer("src/test/resources/operator_noacct.conf", port1, false); - NatsTestServer ts5 = new NatsTestServer("src/test/resources/operator.conf", port2, false)) { - listenerConnectionWait(nc, listener, 10000); + try (NatsTestServer ignored = configuredServer("operator_noacct.conf", port1); + NatsTestServer ts5 = configuredServer("operator.conf", port2)) { + listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); assertEquals(ts5.getURI(), nc.getConnectedUrl()); } } @@ -681,16 +682,16 @@ private static void _testReconnectAfter(String errText) throws Exception { // Connect should fail on ts1 try (NatsServerProtocolMock ts = new NatsServerProtocolMock(timeoutCustomizer, port, true); - NatsTestServer ts2 = new NatsTestServer("src/test/resources/operator.conf", false)) { + NatsTestServer ts2 = skipValidateServer("operator.conf")) { Options options = new Options.Builder() .servers(new String[]{ts.getURI(), ts2.getURI()}) .maxReconnects(-1) .noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) - .errorListener(new ErrorListener() {}) + .errorListener(NO_OP_EL) .build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); @@ -753,7 +754,7 @@ else if (error.equalsIgnoreCase("authorization violation")) { String creds = String.format(JwtUtils.NATS_USER_JWT_FORMAT, jwt, new String(nKeyUser.getSeed())); String credsFile = ResourceUtils.createTempFile("nats_java_test", ".creds", creds.split("\\Q\\n\\E")); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operatorJnatsTest.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredServer("operatorJnatsTest.conf")) { Options options = Options.builder() .server(ts.getURI()) diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 12ba692b9..05b40985f 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -1,678 +1,673 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import io.nats.client.ConnectionListener.Events; -import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.api.ServerInfo; -import io.nats.client.impl.ListenerForTesting; -import io.nats.client.impl.SimulateSocketDataPortException; -import io.nats.client.utils.TestBase; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.net.InetAddress; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -import static io.nats.client.utils.TestBase.*; -import static org.junit.jupiter.api.Assertions.*; - -public class ConnectTests { - @Test - public void testDefaultConnection() throws Exception { - try (NatsTestServer ignored = new NatsTestServer(Options.DEFAULT_PORT, false)) { - Connection nc = standardConnection(); - assertEquals(Options.DEFAULT_PORT, nc.getServerInfo().getPort()); - standardCloseConnection(nc); - } - } - - @Test - public void testConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = standardConnection(ts.getURI()); - assertEquals(ts.getPort(), nc.getServerInfo().getPort()); - // coverage for getClientAddress - InetAddress inetAddress = nc.getClientInetAddress(); - assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) - || inetAddress.equals(InetAddress.getLocalHost())); - standardCloseConnection(nc); - } - } - - @Test - public void testConnectionWithOptions() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).build(); - assertCanConnect(options); - } - } - - @Test - public void testFullFakeConnect() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - assertCanConnect(ts.getURI()); - } - } - - @Test - public void testFullFakeConnectWithTabs() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - ts.useTabs(); - assertCanConnect(ts.getURI()); - } - } - - @Test - public void testConnectExitBeforeInfo() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); - assertCanConnect(options); - } - }); - } - - @Test - public void testConnectExitAfterInfo() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); - assertCanConnect(options); - } - }); - } - - @Test - public void testConnectExitAfterConnect() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); - assertCanConnect(options); - } - }); - } - - @Test - public void testConnectExitAfterPing() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); - assertCanConnect(options); - } - }); - } - - @Test - public void testConnectionFailureWithFallback() throws Exception { - - try (NatsTestServer ts = new NatsTestServer(false)) { - try (NatsServerProtocolMock fake = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = new Options.Builder().connectionTimeout(Duration.ofSeconds(5)).server(fake.getURI()) - .server(ts.getURI()).build(); - assertCanConnect(options); - } - } - } - - @Test - public void testConnectWithConfig() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/simple.conf", false)) { - assertCanConnect(ts.getURI()); - } - } - - @Test - public void testConnectWithCommas() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { - assertCanConnect(ts1.getURI() + "," + ts2.getURI()); - } - } - } - - @Test - public void testConnectRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { - boolean needOne = true; - boolean needTwo = true; - int count = 0; - int maxTries = 100; - while (count++ < maxTries && (needOne || needTwo)) { - Connection nc = standardConnection(ts1.getURI() + "," + ts2.getURI()); - if (nc.getConnectedUrl().equals(ts1.getURI())) { - needOne = false; - } else { - needTwo = false; - } - Collection servers = nc.getServers(); - assertTrue(servers.contains(ts1.getURI())); - assertTrue(servers.contains(ts2.getURI())); - standardCloseConnection(nc); - } - assertFalse(needOne); - assertFalse(needTwo); - } - } - } - - @Test - public void testConnectNoRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { - int one = 0; - int two = 0; - - // should get at least 1 for each - for (int i = 0; i < 10; i++) { - String[] servers = { ts1.getURI(), ts2.getURI() }; - Options options = new Options.Builder().noRandomize().servers(servers).build(); - Connection nc = standardConnection(options); - if (nc.getConnectedUrl().equals(ts1.getURI())) { - one++; - } else { - two++; - } - standardCloseConnection(nc); - } - - assertEquals(one, 10, "always got one"); - assertEquals(two, 0, "never got two"); - } - } - } - - @Test - public void testFailWithMissingLineFeedAfterInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testFailWithStuffAfterInitialInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testFailWrongInitialInfoOP() { - assertThrows(IOException.class, () -> { - String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - ts.useCustomInfoAsFullInfo(); - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testIncompleteInitialInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\"\r\n"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testAsyncConnection() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - Connection nc = null; - - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).connectionListener(listener).build(); - listener.prepForStatusChange(Events.CONNECTED); - - Nats.connectAsynchronously(options, false); - - listener.waitForStatusChange(1, TimeUnit.SECONDS); - - nc = listener.getLastEventConnection(); - assertNotNull(nc); - assertConnected(nc); - standardCloseConnection(nc); - } - } - - @Test - public void testAsyncConnectionWithReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - int port = NatsTestServer.nextPort(); - Options options = new Options.Builder().server("nats://localhost:" + port).maxReconnects(-1) - .reconnectWait(Duration.ofMillis(100)).connectionListener(listener).build(); - - Nats.connectAsynchronously(options, true); - - sleep(5000); // No server at this point, let it fail and try to start over - - Connection nc = listener.getLastEventConnection(); // will be disconnected, but should be there - assertNotNull(nc); - - listener.prepForStatusChange(Events.RECONNECTED); - try (NatsTestServer ignored = new NatsTestServer(port, false)) { - listenerConnectionWait(nc, listener); - standardCloseConnection(nc); - } - } - - @Test - public void testThrowOnAsyncWithoutListener() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).build(); - Nats.connectAsynchronously(options, false); - } - }); - } - - @Test - public void testErrorOnAsync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - Options options = new Options.Builder().server("nats://localhost:" + NatsTestServer.nextPort()) - .connectionListener(listener).errorListener(listener).noReconnect().build(); - listener.prepForStatusChange(Events.CLOSED); - Nats.connectAsynchronously(options, false); - listener.waitForStatusChange(10, TimeUnit.SECONDS); - - assertTrue(listener.getExceptionCount() > 0); - assertTrue(listener.getEventCount(Events.CLOSED) > 0); - } - - @Test - public void testConnectionTimeout() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 - Options options = new Options.Builder().server(ts.getURI()).noReconnect().traceConnection() - .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test - build(); - Connection nc = Nats.connect(options); - assertNotSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - } - }); - } - - @Test - public void testSlowConnectionNoTimeout() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect() - .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep - build(); - assertCanConnect(options); - } - } - - @Test - public void testTimeCheckCoverage() throws Exception { - List traces = new ArrayList<>(); - TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); - - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).traceConnection().build(); - assertCanConnect(options); - - options = new Options.Builder().server(ts.getURI()).timeTraceLogger(l).build(); - assertCanConnect(options); - } - - int i = 0; - assertTrue(traces.get(i++).startsWith("creating connection object")); - assertTrue(traces.get(i++).startsWith("creating NUID")); - assertTrue(traces.get(i++).startsWith("creating executors")); - assertTrue(traces.get(i++).startsWith("creating reader and writer")); - assertTrue(traces.get(i++).startsWith("connection object created")); - assertTrue(traces.get(i++).startsWith("starting connect loop")); - assertTrue(traces.get(i++).startsWith("setting status to connecting")); - assertTrue(traces.get(i++).startsWith("trying to connect")); - assertTrue(traces.get(i++).startsWith("starting connection attempt")); - assertTrue(traces.get(i++).startsWith("waiting for reader")); - assertTrue(traces.get(i++).startsWith("waiting for writer")); - assertTrue(traces.get(i++).startsWith("cleaning pong queue")); - assertTrue(traces.get(i++).startsWith("connecting data port")); - assertTrue(traces.get(i++).startsWith("reading info")); - assertTrue(traces.get(i++).startsWith("starting reader")); - assertTrue(traces.get(i++).startsWith("starting writer")); - assertTrue(traces.get(i++).startsWith("sending connect message")); - assertTrue(traces.get(i++).startsWith("sending initial ping")); - assertTrue(traces.get(i++).startsWith("starting ping and cleanup timers")); - assertTrue(traces.get(i++).startsWith("updating status to connected")); - assertTrue(traces.get(i++).startsWith("status updated")); - assertTrue(traces.get(i).startsWith("connect complete")); - } - - @Test - public void testReconnectLogging() throws Exception { - List traces = new ArrayList<>(); - TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); - - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder() - .server(ts.getURI()) - .traceConnection() - .timeTraceLogger(l) - .reconnectWait(Duration.ofSeconds(1)) - .maxReconnects(1) - .connectionTimeout(Duration.ofSeconds(2)) - .build(); - - try (Connection nc = Nats.connect(options)) { - assertConnected(nc); - ts.close(); - Thread.sleep(3000); - } - } - - boolean foundReconnectLog = traces.stream().anyMatch(s -> s.contains("reconnecting to server")); - assertTrue(foundReconnectLog, "Reconnect log not found"); - } - - @Test - public void testConnectExceptionHasURLS() { - try { - Nats.connect("nats://testserver.notnats:4222, nats://testserver.alsonotnats:4223"); - } catch (Exception e) { - assertTrue(e.getMessage().contains("testserver.notnats:4222")); - assertTrue(e.getMessage().contains("testserver.alsonotnats:4223")); - } - } - - @Test - public void testFlushBuffer() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = standardConnection(ts.getURI()); - - // test connected - nc.flushBuffer(); - - ts.shutdown(); - while (nc.getStatus() == Connection.Status.CONNECTED) { - sleep(10); - } - - // test while reconnecting - assertThrows(IllegalStateException.class, nc::flushBuffer); - standardCloseConnection(nc); - - // test when closed. - assertThrows(IllegalStateException.class, nc::flushBuffer); - } - } - - @Test - public void testFlushBufferThreadSafety() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = standardConnection(ts.getURI()); - - // use two latches to sync the threads as close as - // possible. - CountDownLatch pubLatch = new CountDownLatch(1); - CountDownLatch flushLatch = new CountDownLatch(1); - CountDownLatch completedLatch = new CountDownLatch(1); - - Thread t = new Thread("publisher") { - @SuppressWarnings("ResultOfMethodCallIgnored") - public void run() { - byte[] payload = new byte[5]; - pubLatch.countDown(); - try { - flushLatch.await(2, TimeUnit.SECONDS); - } catch (Exception e) { - // NOOP - } - for (int i = 1; i <= 50000; i++) { - nc.publish("foo", payload); - if (i % 2000 == 0) { - try { - nc.flushBuffer(); - } catch (IOException e) { - break; - } - } - } - completedLatch.countDown(); - } - }; - - t.start(); - - // sync up the current thread and the publish thread - // to get the most out of the test. - try { - pubLatch.await(2, TimeUnit.SECONDS); - } catch (Exception e) { - // NOOP - } - flushLatch.countDown(); - - // flush as fast as we can while the publisher - // is publishing. - - while (t.isAlive()) { - nc.flushBuffer(); - } - - // cleanup and doublecheck the thread is done. - t.join(2000); - - // make sure the publisher actually completed. - assertTrue(completedLatch.await(10, TimeUnit.SECONDS)); - - standardCloseConnection(nc); - } - } - - @SuppressWarnings({"unused", "UnusedAssignment"}) - @Test - public void testSocketLevelException() throws Exception { - int port = NatsTestServer.nextPort(); - - AtomicBoolean simExReceived = new AtomicBoolean(); - ListenerForTesting listener = new ListenerForTesting(); - ErrorListener el = new ErrorListener() { - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - if (exp.getMessage().contains("Simulated Exception")) { - simExReceived.set(true); - } - } - }; - - Options options = new Options.Builder() - .server(NatsTestServer.getNatsLocalhostUri(port)) - .dataPortType("io.nats.client.impl.SimulateSocketDataPortException") - .connectionListener(listener) - .errorListener(el) - .reconnectDelayHandler(l -> Duration.ofSeconds(1)) - .build(); - - Connection connection = null; - - // 1. DO NOT RECONNECT ON CONNECT - try (NatsTestServer ts = new NatsTestServer(port, false)) { - try { - SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); - connection = Nats.connect(options); - fail(); - } - catch (Exception ignore) {} - } - - Thread.sleep(200); // just making sure messages get through - assertNull(connection); - assertTrue(simExReceived.get()); - simExReceived.set(false); - - // 2. RECONNECT ON CONNECT - try (NatsTestServer ts = new NatsTestServer(port, false)) { - try { - SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); - listener.prepForStatusChange(Events.RECONNECTED); - connection = Nats.connectReconnectOnConnect(options); - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); - listener.prepForStatusChange(Events.DISCONNECTED); - } - catch (Exception e) { - fail("should have connected " + e); - } - } - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); - assertTrue(simExReceived.get()); - simExReceived.set(false); - - // 2. NORMAL RECONNECT - listener.prepForStatusChange(Events.RECONNECTED); - try (NatsTestServer ts = new NatsTestServer(port, false)) { - SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); - try { - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); - } - catch (Exception e) { - fail("should have reconnected " + e); - } - } - } - - @Test - public void testRunInJsCluster() throws Exception { - ListenerForTesting[] listeners = new ListenerForTesting[3]; - listeners[0] = new ListenerForTesting(); - listeners[1] = new ListenerForTesting(); - listeners[2] = new ListenerForTesting(); - - ThreeServerTestOptions tstOpts = new ThreeServerTestOptions() { - @Override - public void append(int index, Options.Builder builder) { - builder.connectionListener(listeners[index]).errorListener(listeners[index]); - } - - @Override - public boolean configureAccount() { - return true; - } - - @Override - public boolean includeAllServers() { - return true; - } - }; - - runInJsCluster(ConnectTests::validateRunInJsCluster); - - listeners[0] = new ListenerForTesting(); - listeners[1] = new ListenerForTesting(); - listeners[2] = new ListenerForTesting(); - - runInJsCluster(tstOpts, ConnectTests::validateRunInJsCluster); - } - - private static void validateRunInJsCluster(Connection nc1, Connection nc2, Connection nc3) throws InterruptedException { - Thread.sleep(200); - ServerInfo si1 = nc1.getServerInfo(); - ServerInfo si2 = nc2.getServerInfo(); - ServerInfo si3 = nc3.getServerInfo(); - assertEquals(si1.getCluster(), si2.getCluster()); - assertEquals(si1.getCluster(), si3.getCluster()); - String port1 = "" + si1.getPort(); - String port2 = "" + si2.getPort(); - String port3 = "" + si3.getPort(); - String urls1 = String.join(",", si1.getConnectURLs()); - String urls2 = String.join(",", si2.getConnectURLs()); - String urls3 = String.join(",", si3.getConnectURLs()); - assertTrue(urls1.contains(port1)); - assertTrue(urls1.contains(port2)); - assertTrue(urls1.contains(port3)); - assertTrue(urls2.contains(port1)); - assertTrue(urls2.contains(port2)); - assertTrue(urls2.contains(port3)); - assertTrue(urls3.contains(port1)); - assertTrue(urls3.contains(port2)); - assertTrue(urls3.contains(port3)); - } - - // https://github.com/nats-io/nats.java/issues/1201 - @Test - void testLowConnectionTimeoutResultsInIOException() { - Options options = Options.builder() - .connectionTimeout(Duration.ZERO) - .build(); - - assertThrows(IOException.class, () -> { - Connection nc = Nats.connect(options); - nc.close(); - }); - } - - @Test - void testConnectWithFastFallback() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).enableFastFallback().build(); - Connection nc = standardConnection(options); - standardCloseConnection(nc); - } - } - - @Test - void testConnectPendingCountCoverage() throws Exception { - TestBase.runInJsServer(nc -> { - AtomicLong outgoingPendingMessageCount = new AtomicLong(); - AtomicLong outgoingPendingBytes = new AtomicLong(); - - AtomicBoolean tKeepGoing = new AtomicBoolean(true); - Thread t = new Thread(() -> { - while (tKeepGoing.get()) { - outgoingPendingMessageCount.set(Math.max(outgoingPendingMessageCount.get(), nc.outgoingPendingMessageCount())); - outgoingPendingBytes.set(Math.max(outgoingPendingBytes.get(), nc.outgoingPendingBytes())); - try { - Thread.sleep(10); - } - catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - }); - t.start(); - - String subject = subject(); - byte[] data = new byte[8 * 1024]; - for (int x = 0; x < 5000; x++) { - nc.publish(subject, data); - } - tKeepGoing.set(false); - t.join(); - - assertTrue(outgoingPendingMessageCount.get() > 0); - assertTrue(outgoingPendingBytes.get() > outgoingPendingMessageCount.get() * 1000); - }); - } -} +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client; + +import io.nats.client.ConnectionListener.Events; +import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.api.ServerInfo; +import io.nats.client.impl.ListenerForTesting; +import io.nats.client.impl.SimulateSocketDataPortException; +import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.InetAddress; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; + +import static io.nats.client.utils.TestBase.*; +import static org.junit.jupiter.api.Assertions.*; + +public class ConnectTests { + @Test + public void testDefaultConnection() throws Exception { + try (NatsTestServer ignored = new NatsTestServer(Options.DEFAULT_PORT, false)) { + Connection nc = TestBase.standardConnectionWait(); + assertEquals(Options.DEFAULT_PORT, nc.getServerInfo().getPort()); + standardCloseConnection(nc); + } + } + + @Test + public void testConnection() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Connection nc = TestBase.standardConnectionWait(ts.getURI()); + assertEquals(ts.getPort(), nc.getServerInfo().getPort()); + // coverage for getClientAddress + InetAddress inetAddress = nc.getClientInetAddress(); + assertNotNull(inetAddress); + assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) + || inetAddress.equals(InetAddress.getLocalHost())); + standardCloseConnection(nc); + } + } + + @Test + public void testConnectionWithOptions() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()).build(); + assertCanConnect(options); + } + } + + @Test + public void testFullFakeConnect() throws Exception { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + assertCanConnect(ts.getURI()); + } + } + + @Test + public void testFullFakeConnectWithTabs() throws Exception { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + ts.useTabs(); + assertCanConnect(ts.getURI()); + } + } + + @Test + public void testConnectExitBeforeInfo() { + assertThrows(IOException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { + Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + assertCanConnect(options); + } + }); + } + + @Test + public void testConnectExitAfterInfo() { + assertThrows(IOException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { + Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + assertCanConnect(options); + } + }); + } + + @Test + public void testConnectExitAfterConnect() { + assertThrows(IOException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { + Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + assertCanConnect(options); + } + }); + } + + @Test + public void testConnectExitAfterPing() { + assertThrows(IOException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { + Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + assertCanConnect(options); + } + }); + } + + @Test + public void testConnectionFailureWithFallback() throws Exception { + + try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsServerProtocolMock fake = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { + Options options = new Options.Builder().connectionTimeout(Duration.ofSeconds(5)).server(fake.getURI()) + .server(ts.getURI()).build(); + assertCanConnect(options); + } + } + } + + @Test + public void testConnectWithConfig() throws Exception { + try (NatsTestServer ts = new NatsTestServer("src/test/resources/simple.conf", false)) { + assertCanConnect(ts.getURI()); + } + } + + @Test + public void testConnectWithCommas() throws Exception { + try (NatsTestServer ts1 = new NatsTestServer(false)) { + try (NatsTestServer ts2 = new NatsTestServer(false)) { + assertCanConnect(ts1.getURI() + "," + ts2.getURI()); + } + } + } + + @Test + public void testConnectRandomize() throws Exception { + try (NatsTestServer ts1 = new NatsTestServer(false)) { + try (NatsTestServer ts2 = new NatsTestServer(false)) { + boolean needOne = true; + boolean needTwo = true; + int count = 0; + int maxTries = 100; + while (count++ < maxTries && (needOne || needTwo)) { + Connection nc = TestBase.standardConnectionWait(ts1.getURI() + "," + ts2.getURI()); + if (ts1.getURI().equals(nc.getConnectedUrl())) { + needOne = false; + } else { + needTwo = false; + } + Collection servers = nc.getServers(); + assertTrue(servers.contains(ts1.getURI())); + assertTrue(servers.contains(ts2.getURI())); + standardCloseConnection(nc); + } + assertFalse(needOne); + assertFalse(needTwo); + } + } + } + + @Test + public void testConnectNoRandomize() throws Exception { + try (NatsTestServer ts1 = new NatsTestServer(false)) { + try (NatsTestServer ts2 = new NatsTestServer(false)) { + int one = 0; + int two = 0; + + // should get at least 1 for each + for (int i = 0; i < 10; i++) { + String[] servers = { ts1.getURI(), ts2.getURI() }; + Options options = new Options.Builder().noRandomize().servers(servers).build(); + Connection nc = TestBase.standardConnectionWait(options); + if (ts1.getURI().equals(nc.getConnectedUrl())) { + one++; + } else { + two++; + } + standardCloseConnection(nc); + } + + assertEquals(10, one, "always got one"); + assertEquals(0, two, "never got two"); + } + } + } + + @Test + public void testFailWithMissingLineFeedAfterInfo() { + assertThrows(IOException.class, () -> { + String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { + Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Nats.connect(options); + } + }); + } + + @Test + public void testFailWithStuffAfterInitialInfo() { + assertThrows(IOException.class, () -> { + String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { + Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Nats.connect(options); + } + }); + } + + @Test + public void testFailWrongInitialInfoOP() { + assertThrows(IOException.class, () -> { + String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { + ts.useCustomInfoAsFullInfo(); + Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Nats.connect(options); + } + }); + } + + @Test + public void testIncompleteInitialInfo() { + assertThrows(IOException.class, () -> { + String badInfo = "{\"server_id\"\r\n"; + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { + Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Nats.connect(options); + } + }); + } + + @Test + public void testAsyncConnection() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()).connectionListener(listener).build(); + listener.prepForStatusChange(Events.CONNECTED); + + Nats.connectAsynchronously(options, false); + + listener.waitForStatusChange(1, TimeUnit.SECONDS); + + Connection nc = listener.getLastEventConnection(); + assertNotNull(nc); + assertConnected(nc); + standardCloseConnection(nc); + } + } + + @Test + public void testAsyncConnectionWithReconnect() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + int port = NatsTestServer.nextPort(); + Options options = new Options.Builder().server("nats://localhost:" + port).maxReconnects(-1) + .reconnectWait(Duration.ofMillis(100)).connectionListener(listener).build(); + + Nats.connectAsynchronously(options, true); + + sleep(5000); // No server at this point, let it fail and try to start over + + Connection nc = listener.getLastEventConnection(); // will be disconnected, but should be there + assertNotNull(nc); + + listener.prepForStatusChange(Events.RECONNECTED); + try (NatsTestServer ignored = new NatsTestServer(port, false)) { + TestBase.listenerConnectionWait(nc, listener); + standardCloseConnection(nc); + } + } + + @Test + public void testThrowOnAsyncWithoutListener() { + assertThrows(IllegalArgumentException.class, () -> { + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()).build(); + Nats.connectAsynchronously(options, false); + } + }); + } + + @Test + public void testErrorOnAsync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + Options options = new Options.Builder().server("nats://localhost:" + NatsTestServer.nextPort()) + .connectionListener(listener).errorListener(listener).noReconnect().build(); + listener.prepForStatusChange(Events.CLOSED); + Nats.connectAsynchronously(options, false); + listener.waitForStatusChange(10, TimeUnit.SECONDS); + + assertTrue(listener.getExceptionCount() > 0); + assertTrue(listener.getEventCount(Events.CLOSED) > 0); + } + + @Test + public void testConnectionTimeout() { + assertThrows(IOException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 + Options options = new Options.Builder().server(ts.getURI()).noReconnect().traceConnection() + .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test + build(); + Connection nc = Nats.connect(options); + assertNotSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + } + }); + } + + @Test + public void testSlowConnectionNoTimeout() throws Exception { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { + Options options = new Options.Builder().server(ts.getURI()).noReconnect() + .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep + build(); + assertCanConnect(options); + } + } + + @Test + public void testTimeCheckCoverage() throws Exception { + List traces = new ArrayList<>(); + TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); + + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()).traceConnection().build(); + assertCanConnect(options); + + options = new Options.Builder().server(ts.getURI()).timeTraceLogger(l).build(); + assertCanConnect(options); + } + + int i = 0; + assertTrue(traces.get(i++).startsWith("creating connection object")); + assertTrue(traces.get(i++).startsWith("creating NUID")); + assertTrue(traces.get(i++).startsWith("creating executors")); + assertTrue(traces.get(i++).startsWith("creating reader and writer")); + assertTrue(traces.get(i++).startsWith("connection object created")); + assertTrue(traces.get(i++).startsWith("starting connect loop")); + assertTrue(traces.get(i++).startsWith("setting status to connecting")); + assertTrue(traces.get(i++).startsWith("trying to connect")); + assertTrue(traces.get(i++).startsWith("starting connection attempt")); + assertTrue(traces.get(i++).startsWith("waiting for reader")); + assertTrue(traces.get(i++).startsWith("waiting for writer")); + assertTrue(traces.get(i++).startsWith("cleaning pong queue")); + assertTrue(traces.get(i++).startsWith("connecting data port")); + assertTrue(traces.get(i++).startsWith("reading info")); + assertTrue(traces.get(i++).startsWith("starting reader")); + assertTrue(traces.get(i++).startsWith("starting writer")); + assertTrue(traces.get(i++).startsWith("sending connect message")); + assertTrue(traces.get(i++).startsWith("sending initial ping")); + assertTrue(traces.get(i++).startsWith("starting ping and cleanup timers")); + assertTrue(traces.get(i++).startsWith("updating status to connected")); + assertTrue(traces.get(i++).startsWith("status updated")); + assertTrue(traces.get(i).startsWith("connect complete")); + } + + @Test + public void testReconnectLogging() throws Exception { + List traces = new ArrayList<>(); + TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); + + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder() + .server(ts.getURI()) + .traceConnection() + .timeTraceLogger(l) + .reconnectWait(Duration.ofSeconds(1)) + .maxReconnects(1) + .connectionTimeout(Duration.ofSeconds(2)) + .build(); + + try (Connection nc = Nats.connect(options)) { + assertConnected(nc); + ts.close(); + Thread.sleep(3000); + } + } + + boolean foundReconnectLog = traces.stream().anyMatch(s -> s.contains("reconnecting to server")); + assertTrue(foundReconnectLog, "Reconnect log not found"); + } + + @Test + public void testConnectExceptionHasURLS() { + try { + Nats.connect("nats://testserver.notnats:4222, nats://testserver.alsonotnats:4223"); + } catch (Exception e) { + assertTrue(e.getMessage().contains("testserver.notnats:4222")); + assertTrue(e.getMessage().contains("testserver.alsonotnats:4223")); + } + } + + @Test + public void testFlushBuffer() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Connection nc = TestBase.standardConnectionWait(ts.getURI()); + + // test connected + nc.flushBuffer(); + + ts.shutdown(); + while (nc.getStatus() == Connection.Status.CONNECTED) { + sleep(10); + } + + // test while reconnecting + assertThrows(IllegalStateException.class, nc::flushBuffer); + standardCloseConnection(nc); + + // test when closed. + assertThrows(IllegalStateException.class, nc::flushBuffer); + } + } + + @Test + public void testFlushBufferThreadSafety() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Connection nc = TestBase.standardConnectionWait(ts.getURI()); + + // use two latches to sync the threads as close as + // possible. + CountDownLatch pubLatch = new CountDownLatch(1); + CountDownLatch flushLatch = new CountDownLatch(1); + CountDownLatch completedLatch = new CountDownLatch(1); + + Thread t = new Thread("publisher") { + @SuppressWarnings("ResultOfMethodCallIgnored") + public void run() { + byte[] payload = new byte[5]; + pubLatch.countDown(); + try { + flushLatch.await(2, TimeUnit.SECONDS); + } catch (Exception e) { + // NOOP + } + for (int i = 1; i <= 50000; i++) { + nc.publish("foo", payload); + if (i % 2000 == 0) { + try { + nc.flushBuffer(); + } catch (IOException e) { + break; + } + } + } + completedLatch.countDown(); + } + }; + + t.start(); + + // sync up the current thread and the publish thread + // to get the most out of the test. + try { + //noinspection ResultOfMethodCallIgnored + pubLatch.await(2, TimeUnit.SECONDS); + } catch (Exception e) { + // NOOP + } + flushLatch.countDown(); + + // flush as fast as we can while the publisher + // is publishing. + + while (t.isAlive()) { + nc.flushBuffer(); + } + + // cleanup and doublecheck the thread is done. + t.join(2000); + + // make sure the publisher actually completed. + assertTrue(completedLatch.await(10, TimeUnit.SECONDS)); + + standardCloseConnection(nc); + } + } + + @SuppressWarnings({"unused", "UnusedAssignment"}) + @Test + public void testSocketLevelException() throws Exception { + int port = NatsTestServer.nextPort(); + + AtomicBoolean simExReceived = new AtomicBoolean(); + ListenerForTesting listener = new ListenerForTesting(); + ErrorListener el = new ErrorListener() { + @Override + public void exceptionOccurred(Connection conn, Exception exp) { + if (exp.getMessage().contains("Simulated Exception")) { + simExReceived.set(true); + } + } + }; + + Options options = new Options.Builder() + .server(NatsTestServer.getNatsLocalhostUri(port)) + .dataPortType("io.nats.client.impl.SimulateSocketDataPortException") + .connectionListener(listener) + .errorListener(el) + .reconnectDelayHandler(l -> Duration.ofSeconds(1)) + .build(); + + Connection connection = null; + + // 1. DO NOT RECONNECT ON CONNECT + try (NatsTestServer ts = new NatsTestServer(port, false)) { + try { + SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); + connection = Nats.connect(options); + fail(); + } + catch (Exception ignore) {} + } + + Thread.sleep(200); // just making sure messages get through + assertNull(connection); + assertTrue(simExReceived.get()); + simExReceived.set(false); + + // 2. RECONNECT ON CONNECT + try (NatsTestServer ts = new NatsTestServer(port, false)) { + try { + SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); + listener.prepForStatusChange(Events.RECONNECTED); + connection = Nats.connectReconnectOnConnect(options); + assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); + listener.prepForStatusChange(Events.DISCONNECTED); + } + catch (Exception e) { + fail("should have connected " + e); + } + } + assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); + assertTrue(simExReceived.get()); + simExReceived.set(false); + + // 2. NORMAL RECONNECT + listener.prepForStatusChange(Events.RECONNECTED); + try (NatsTestServer ts = new NatsTestServer(port, false)) { + SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); + try { + assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); + } + catch (Exception e) { + fail("should have reconnected " + e); + } + } + } + + @Test + public void testRunInJsCluster() throws Exception { + ListenerForTesting[] listeners = new ListenerForTesting[3]; + listeners[0] = new ListenerForTesting(); + listeners[1] = new ListenerForTesting(); + listeners[2] = new ListenerForTesting(); + + ThreeServerTestOptions tstOpts = new ThreeServerTestOptions() { + @Override + public void append(int index, Options.Builder builder) { + builder.connectionListener(listeners[index]).errorListener(listeners[index]); + } + + @Override + public boolean configureAccount() { + return true; + } + + @Override + public boolean includeAllServers() { + return true; + } + }; + + runInJsCluster(ConnectTests::validateRunInJsCluster); + + listeners[0] = new ListenerForTesting(); + listeners[1] = new ListenerForTesting(); + listeners[2] = new ListenerForTesting(); + + runInJsCluster(tstOpts, ConnectTests::validateRunInJsCluster); + } + + private static void validateRunInJsCluster(Connection nc1, Connection nc2, Connection nc3) throws InterruptedException { + Thread.sleep(200); + ServerInfo si1 = nc1.getServerInfo(); + ServerInfo si2 = nc2.getServerInfo(); + ServerInfo si3 = nc3.getServerInfo(); + assertEquals(si1.getCluster(), si2.getCluster()); + assertEquals(si1.getCluster(), si3.getCluster()); + String port1 = "" + si1.getPort(); + String port2 = "" + si2.getPort(); + String port3 = "" + si3.getPort(); + String urls1 = String.join(",", si1.getConnectURLs()); + String urls2 = String.join(",", si2.getConnectURLs()); + String urls3 = String.join(",", si3.getConnectURLs()); + assertTrue(urls1.contains(port1)); + assertTrue(urls1.contains(port2)); + assertTrue(urls1.contains(port3)); + assertTrue(urls2.contains(port1)); + assertTrue(urls2.contains(port2)); + assertTrue(urls2.contains(port3)); + assertTrue(urls3.contains(port1)); + assertTrue(urls3.contains(port2)); + assertTrue(urls3.contains(port3)); + } + + // https://github.com/nats-io/nats.java/issues/1201 + @Test + void testLowConnectionTimeoutResultsInIOException() { + Options options = Options.builder() + .connectionTimeout(Duration.ZERO) + .build(); + + assertThrows(IOException.class, () -> { + Connection nc = Nats.connect(options); + nc.close(); + }); + } + + @Test + void testConnectWithFastFallback() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()).enableFastFallback().build(); + Connection nc = TestBase.standardConnectionWait(options); + standardCloseConnection(nc); + } + } + + @Test + void testConnectPendingCountCoverage() throws Exception { + runInServer(nc -> { + AtomicLong outgoingPendingMessageCount = new AtomicLong(); + AtomicLong outgoingPendingBytes = new AtomicLong(); + + AtomicBoolean tKeepGoing = new AtomicBoolean(true); + Thread t = new Thread(() -> { + while (tKeepGoing.get()) { + outgoingPendingMessageCount.set(Math.max(outgoingPendingMessageCount.get(), nc.outgoingPendingMessageCount())); + outgoingPendingBytes.set(Math.max(outgoingPendingBytes.get(), nc.outgoingPendingBytes())); + sleep(10); + } + }); + t.start(); + + String subject = TestBase.random(); + byte[] data = new byte[8 * 1024]; + for (int x = 0; x < 5000; x++) { + nc.publish(subject, data); + } + tKeepGoing.set(false); + t.join(); + + assertTrue(outgoingPendingMessageCount.get() > 0); + assertTrue(outgoingPendingBytes.get() > outgoingPendingMessageCount.get() * 1000); + }); + } +} diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 6429ed843..2a6f849d4 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -13,17 +13,15 @@ package io.nats.client; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.utils.LongRunningServer; +import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; -import org.junit.jupiter.api.Test; - -import io.nats.client.NatsServerProtocolMock.ExitAt; +import static org.junit.jupiter.api.Assertions.*; public class EchoTests { @Test @@ -31,13 +29,14 @@ public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().build(); + Options opt = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().errorListener(TestBase.NO_OP_EL).build(); try { nc = Nats.connect(opt); // Should fail - } finally { + } + finally { if (nc != null) { nc.close(); - assertTrue(Connection.Status.CLOSED == nc.getStatus(), "Closed Status"); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } } @@ -48,13 +47,13 @@ public void testFailWithBadServerProtocol() { public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noReconnect().build(); + Options opt = new Options.Builder().server(ts.getURI()).noReconnect().errorListener(TestBase.NO_OP_EL).build(); try { nc = Nats.connect(opt); } finally { if (nc != null) { nc.close(); - assertTrue(Connection.Status.CLOSED == nc.getStatus(), "Closed Status"); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } } @@ -62,65 +61,47 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); - try (Connection nc1 = Nats.connect(options); - Connection nc2 = Nats.connect(options);) { - - // Echo is on so both sub should get messages from both pub - Subscription sub1 = nc1.subscribe("test"); - nc1.flush(Duration.ofSeconds(1)); - Subscription sub2 = nc2.subscribe("test"); - nc2.flush(Duration.ofSeconds(1)); + // do not open LrConns in try-resources + Connection nc1 = LongRunningServer.getLrConn(); + Connection nc2 = LongRunningServer.getLrConn2(); + // Echo is on so both sub should get messages from both pub + String subject = TestBase.random(); + Subscription sub1 = nc1.subscribe(subject); + nc1.flush(Duration.ofSeconds(1)); + Subscription sub2 = nc2.subscribe(subject); + nc2.flush(Duration.ofSeconds(1)); - // Pub from connect 1 - nc1.publish("test", null); - nc1.flush(Duration.ofSeconds(1)); - Message msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); + // Pub from connect 1 + nc1.publish(subject, null); + nc1.flush(Duration.ofSeconds(1)); + Message msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); - // Pub from connect 2 - nc2.publish("test", null); - nc2.flush(Duration.ofSeconds(1)); - msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - } - } + // Pub from connect 2 + nc2.publish(subject, null); + nc2.flush(Duration.ofSeconds(1)); + msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); } - + @Test public void testWithNoEcho() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().build(); - try (Connection nc1 = Nats.connect(options); - Connection nc2 = Nats.connect(options);) { + Options options = LongRunningServer.optionsBuilder().noEcho().noReconnect().build(); + try (Connection nc1 = Nats.connect(options);) { + String subject = TestBase.random(); + // Echo is off so sub should get messages from pub from other connections + Subscription sub1 = nc1.subscribe(subject); + nc1.flush(Duration.ofSeconds(1)); - // Echo is on so both sub should get messages from both pub - Subscription sub1 = nc1.subscribe("test"); - nc1.flush(Duration.ofSeconds(1)); - Subscription sub2 = nc2.subscribe("test"); - nc2.flush(Duration.ofSeconds(1)); - - // Pub from connect 1 - nc1.publish("test", null); - nc1.flush(Duration.ofSeconds(1)); - Message msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNull(msg); // no message for sub1 from pub 1 - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - - // Pub from connect 2 - nc2.publish("test", null); - nc2.flush(Duration.ofSeconds(1)); - msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNull(msg); // no message for sub2 from pub 2 - } + // Pub from connect 1 + nc1.publish(subject, null); + nc1.flush(Duration.ofSeconds(1)); + Message msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNull(msg); // no message for sub1 from pub 1 } } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/NatsServerProtocolMock.java b/src/test/java/io/nats/client/NatsServerProtocolMock.java index 8051c2696..6b1ce0981 100644 --- a/src/test/java/io/nats/client/NatsServerProtocolMock.java +++ b/src/test/java/io/nats/client/NatsServerProtocolMock.java @@ -1,270 +1,270 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import java.io.*; -import java.net.ServerSocket; -import java.net.Socket; -import java.util.concurrent.CompletableFuture; - -import static io.nats.client.support.Encoding.base64UrlEncodeToString; - -/** - * Handles the begining of the connect sequence, all hard coded, but - * is configurable to fail at specific points to allow client testing. - */ -public class NatsServerProtocolMock implements Closeable{ - - // Default is to exit after pong - public enum ExitAt { - SLEEP_BEFORE_INFO, - EXIT_BEFORE_INFO, - EXIT_AFTER_INFO, - EXIT_AFTER_CONNECT, - EXIT_AFTER_PING, - EXIT_AFTER_CUSTOM, - NO_EXIT - } - - public enum Progress { - NO_CLIENT, - CLIENT_CONNECTED, - SENT_INFO, - GOT_CONNECT, - GOT_PING, - SENT_PONG, - STARTED_CUSTOM_CODE, - COMPLETED_CUSTOM_CODE, - } - - public interface Customizer { - public void customizeTest(NatsServerProtocolMock ts, BufferedReader reader, PrintWriter writer); - } - - private int port; - private ExitAt exitAt; - private Progress progress; - private boolean protocolFailure; - private CompletableFuture waitForIt; - private Customizer customizer; - private String customInfo; - private String separator = " "; - - private boolean customInfoIsFullInfo = false; - - public NatsServerProtocolMock(ExitAt exitAt) throws IOException { - this(NatsTestServer.nextPort(), exitAt); - } - - public NatsServerProtocolMock(int port, ExitAt exitAt) { - this.port = port; - this.exitAt = exitAt; - start(); - } - - public NatsServerProtocolMock(Customizer custom) throws IOException { - this.port = NatsTestServer.nextPort(); - this.exitAt = ExitAt.NO_EXIT; - this.customizer = custom; - start(); - } - - public NatsServerProtocolMock(Customizer custom, int port, boolean exitAfterCustom) { - this.port = port; - - if (exitAfterCustom) { - this.exitAt = ExitAt.EXIT_AFTER_CUSTOM; - } else { - this.exitAt = ExitAt.NO_EXIT; - } - this.customizer = custom; - start(); - } - - // CustomInfo is just the JSON string, not the full protocol string - // or the \r\n. - public NatsServerProtocolMock(Customizer custom, String customInfo) throws IOException { - this.port = NatsTestServer.nextPort(); - this.exitAt = ExitAt.NO_EXIT; - this.customizer = custom; - this.customInfo = customInfo; - start(); - } - - private void start() { - this.progress = Progress.NO_CLIENT; - this.waitForIt = new CompletableFuture<>(); - Thread t = new Thread(() -> {accept();}); - t.start(); - try { - Thread.sleep(100); - } catch (Exception exp) { - //Give the server time to get going - } - } - - public void useTabs() { - this.separator = "\t"; - } - - public void useCustomInfoAsFullInfo() { - customInfoIsFullInfo = true; - } - - public int getPort() { - return port; - } - - public String getURI() { - return "nats://localhost:" + this.getPort(); - } - - public Progress getProgress() { - return this.progress; - } - - // True if the failure was not intentional - public boolean wasProtocolFailure() { - return protocolFailure; - } - - public void close() { - waitForIt.complete(Boolean.TRUE); - } - - public void accept() { - ServerSocket serverSocket = null; - Socket socket = null; - PrintWriter writer = null; - BufferedReader reader = null; - - try { - serverSocket = new ServerSocket(this.port); - serverSocket.setSoTimeout(5000); - - // System.out.println("*** Mock Server @" + this.port + " started..."); - socket = serverSocket.accept(); - - this.progress = Progress.CLIENT_CONNECTED; - // System.out.println("*** Mock Server @" + this.port + " got client..."); - - writer = new PrintWriter(socket.getOutputStream()); - reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); - - if (exitAt == ExitAt.EXIT_BEFORE_INFO) { - throw new Exception("exit"); - } - - if (exitAt == ExitAt.SLEEP_BEFORE_INFO) { - try { - Thread.sleep(3000); - } catch ( InterruptedException e) { - // ignore - } - } - - String encodedNonce = base64UrlEncodeToString("abcdefg".getBytes()); - - if (this.customInfo != null) { - if (customInfoIsFullInfo) { - writer.write(customInfo); - } else { - writer.write("INFO" + this.separator + customInfo + "\r\n"); - } - } else { - writer.write("INFO" + this.separator + "{\"server_id\":\"test\", \"version\":\"9.9.99\", \"nonce\":\""+encodedNonce+"\", \"headers\":true}\r\n"); - } - writer.flush(); - this.progress = Progress.SENT_INFO; - // System.out.println("*** Mock Server @" + this.port + " sent info..."); - - if (exitAt == ExitAt.EXIT_AFTER_INFO) { - throw new Exception("exit"); - } - - String connect = reader.readLine(); - - if (connect != null && connect.startsWith("CONNECT")) { - this.progress = Progress.GOT_CONNECT; - // System.out.println("*** Mock Server @" + this.port + " got connect..."); - } else { - throw new IOException("First message wasn't CONNECT"); - } - - if (exitAt == ExitAt.EXIT_AFTER_CONNECT) { - throw new Exception("exit"); - } - - String ping = reader.readLine(); - - if (ping.startsWith("PING")) { - this.progress = Progress.GOT_PING; - // System.out.println("*** Mock Server @" + this.port + " got ping..."); - } else { - throw new IOException("Second message wasn't PING"); - } - - if (exitAt == ExitAt.EXIT_AFTER_PING) { - throw new Exception("exit"); - } - - writer.write("PONG\r\n"); - writer.flush(); - this.progress = Progress.SENT_PONG; - // System.out.println("*** Mock Server @" + this.port + " sent pong..."); - - if (this.customizer != null) { - this.progress = Progress.STARTED_CUSTOM_CODE; - // System.out.println("*** Mock Server @" + this.port + " starting custom code..."); - this.customizer.customizeTest(this, reader, writer); - this.progress = Progress.COMPLETED_CUSTOM_CODE; - } - - if (exitAt == ExitAt.EXIT_AFTER_CUSTOM) { - throw new Exception("exit"); - } - waitForIt.get(); // Wait for the test to cancel us - - } catch (IOException io) { - protocolFailure = true; - // System.out.println("\n*** Mock Server @" + this.port + " got exception "+io.getMessage()); - io.printStackTrace(); - } catch (Exception ex) { - // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); - - if (!"exit".equals(ex.getMessage())) { - ex.printStackTrace(); - } - } - finally { - if (serverSocket != null) { - try { - serverSocket.close(); - } catch (IOException ex) { - // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); - } - } - if (socket != null) { - try { - writer.close(); - reader.close(); - socket.close(); - } catch (IOException ex) { - // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); - } - } - } - // System.out.println("*** Mock Server @" + this.port + " completed..."); - } +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client; + +import java.io.*; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.concurrent.CompletableFuture; + +import static io.nats.client.support.Encoding.base64UrlEncodeToString; + +/** + * Handles the begining of the connect sequence, all hard coded, but + * is configurable to fail at specific points to allow client testing. + */ +public class NatsServerProtocolMock implements Closeable{ + + // Default is to exit after pong + public enum ExitAt { + SLEEP_BEFORE_INFO, + EXIT_BEFORE_INFO, + EXIT_AFTER_INFO, + EXIT_AFTER_CONNECT, + EXIT_AFTER_PING, + EXIT_AFTER_CUSTOM, + NO_EXIT + } + + public enum Progress { + NO_CLIENT, + CLIENT_CONNECTED, + SENT_INFO, + GOT_CONNECT, + GOT_PING, + SENT_PONG, + STARTED_CUSTOM_CODE, + COMPLETED_CUSTOM_CODE, + } + + public interface Customizer { + public void customizeTest(NatsServerProtocolMock ts, BufferedReader reader, PrintWriter writer); + } + + private int port; + private ExitAt exitAt; + private Progress progress; + private boolean protocolFailure; + private CompletableFuture waitForIt; + private Customizer customizer; + private String customInfo; + private String separator = " "; + + private boolean customInfoIsFullInfo = false; + + public NatsServerProtocolMock(ExitAt exitAt) throws IOException { + this(NatsTestServer.nextPort(), exitAt); + } + + public NatsServerProtocolMock(int port, ExitAt exitAt) { + this.port = port; + this.exitAt = exitAt; + start(); + } + + public NatsServerProtocolMock(Customizer custom) throws IOException { + this.port = NatsTestServer.nextPort(); + this.exitAt = ExitAt.NO_EXIT; + this.customizer = custom; + start(); + } + + public NatsServerProtocolMock(Customizer custom, int port, boolean exitAfterCustom) { + this.port = port; + + if (exitAfterCustom) { + this.exitAt = ExitAt.EXIT_AFTER_CUSTOM; + } else { + this.exitAt = ExitAt.NO_EXIT; + } + this.customizer = custom; + start(); + } + + // CustomInfo is just the JSON string, not the full protocol string + // or the \r\n. + public NatsServerProtocolMock(Customizer custom, String customInfo) throws IOException { + this.port = NatsTestServer.nextPort(); + this.exitAt = ExitAt.NO_EXIT; + this.customizer = custom; + this.customInfo = customInfo; + start(); + } + + private void start() { + this.progress = Progress.NO_CLIENT; + this.waitForIt = new CompletableFuture<>(); + Thread t = new Thread(() -> {accept();}); + t.start(); + try { + Thread.sleep(100); + } catch (Exception exp) { + //Give the server time to get going + } + } + + public void useTabs() { + this.separator = "\t"; + } + + public void useCustomInfoAsFullInfo() { + customInfoIsFullInfo = true; + } + + public int getPort() { + return port; + } + + public String getURI() { + return "nats://0.0.0.0:" + this.getPort(); + } + + public Progress getProgress() { + return this.progress; + } + + // True if the failure was not intentional + public boolean wasProtocolFailure() { + return protocolFailure; + } + + public void close() { + waitForIt.complete(Boolean.TRUE); + } + + public void accept() { + ServerSocket serverSocket = null; + Socket socket = null; + PrintWriter writer = null; + BufferedReader reader = null; + + try { + serverSocket = new ServerSocket(this.port); + serverSocket.setSoTimeout(5000); + + // System.out.println("*** Mock Server @" + this.port + " started..."); + socket = serverSocket.accept(); + + this.progress = Progress.CLIENT_CONNECTED; + // System.out.println("*** Mock Server @" + this.port + " got client..."); + + writer = new PrintWriter(socket.getOutputStream()); + reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); + + if (exitAt == ExitAt.EXIT_BEFORE_INFO) { + throw new Exception("exit"); + } + + if (exitAt == ExitAt.SLEEP_BEFORE_INFO) { + try { + Thread.sleep(3000); + } catch ( InterruptedException e) { + // ignore + } + } + + String encodedNonce = base64UrlEncodeToString("abcdefg".getBytes()); + + if (this.customInfo != null) { + if (customInfoIsFullInfo) { + writer.write(customInfo); + } else { + writer.write("INFO" + this.separator + customInfo + "\r\n"); + } + } else { + writer.write("INFO" + this.separator + "{\"server_id\":\"test\", \"version\":\"9.9.99\", \"nonce\":\""+encodedNonce+"\", \"headers\":true}\r\n"); + } + writer.flush(); + this.progress = Progress.SENT_INFO; + // System.out.println("*** Mock Server @" + this.port + " sent info..."); + + if (exitAt == ExitAt.EXIT_AFTER_INFO) { + throw new Exception("exit"); + } + + String connect = reader.readLine(); + + if (connect != null && connect.startsWith("CONNECT")) { + this.progress = Progress.GOT_CONNECT; + // System.out.println("*** Mock Server @" + this.port + " got connect..."); + } else { + throw new IOException("First message wasn't CONNECT"); + } + + if (exitAt == ExitAt.EXIT_AFTER_CONNECT) { + throw new Exception("exit"); + } + + String ping = reader.readLine(); + + if (ping.startsWith("PING")) { + this.progress = Progress.GOT_PING; + // System.out.println("*** Mock Server @" + this.port + " got ping..."); + } else { + throw new IOException("Second message wasn't PING"); + } + + if (exitAt == ExitAt.EXIT_AFTER_PING) { + throw new Exception("exit"); + } + + writer.write("PONG\r\n"); + writer.flush(); + this.progress = Progress.SENT_PONG; + // System.out.println("*** Mock Server @" + this.port + " sent pong..."); + + if (this.customizer != null) { + this.progress = Progress.STARTED_CUSTOM_CODE; + // System.out.println("*** Mock Server @" + this.port + " starting custom code..."); + this.customizer.customizeTest(this, reader, writer); + this.progress = Progress.COMPLETED_CUSTOM_CODE; + } + + if (exitAt == ExitAt.EXIT_AFTER_CUSTOM) { + throw new Exception("exit"); + } + waitForIt.get(); // Wait for the test to cancel us + + } catch (IOException io) { + protocolFailure = true; + // System.out.println("\n*** Mock Server @" + this.port + " got exception "+io.getMessage()); + // io.printStackTrace(); + } catch (Exception ex) { + // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); + + if (!"exit".equals(ex.getMessage())) { + ex.printStackTrace(); + } + } + finally { + if (serverSocket != null) { + try { + serverSocket.close(); + } catch (IOException ex) { + // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); + } + } + if (socket != null) { + try { + writer.close(); + reader.close(); + socket.close(); + } catch (IOException ex) { + // System.out.println("\n*** Mock Server @" + this.port + " got exception "+ex.getMessage()); + } + } + } + // System.out.println("*** Mock Server @" + this.port + " completed..."); + } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index 0a4ae36ed..bc31c37b8 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -21,68 +21,102 @@ import java.util.logging.Level; public class NatsTestServer extends NatsServerRunner { + + private static final String CONFIG_FILE_BASE = "src/test/resources/"; + static { NatsTestServer.quiet(); - NatsServerRunner.setDefaultOutputSupplier(ConsoleOutput::new); - NatsServerRunner.setDefaultValidateTries(5); - NatsServerRunner.setDefaultInitialValidateDelay(100); - NatsServerRunner.setDefaultSubsequentValidateDelay(50); + NatsRunnerUtils.setDefaultConnectValidateTries(10); + NatsRunnerUtils.setDefaultConnectValidateTimeout(200); + NatsRunnerUtils.setDefaultOutputSupplier(ConsoleOutput::new); + NatsRunnerUtils.setDefaultLocalhostHost(NatsRunnerUtils.LocalHost.ip); } public static void quiet() { - NatsServerRunner.setDefaultOutputLevel(Level.WARNING); + NatsRunnerUtils.setDefaultOutputLevel(Level.WARNING); } public static void verbose() { - NatsServerRunner.setDefaultOutputLevel(Level.ALL); + NatsRunnerUtils.setDefaultOutputLevel(Level.ALL); + } + + public static String configFilePath(String configFilePath) { + return configFilePath.startsWith(CONFIG_FILE_BASE) ? configFilePath : CONFIG_FILE_BASE + configFilePath; + } + + public static NatsTestServer configuredServer(String configFilePath) throws IOException { + return new NatsTestServer( + NatsServerRunner.builder() + .configFilePath(configFilePath(configFilePath))); + } + + public static NatsTestServer configuredJsServer(String configFilePath) throws IOException { + return new NatsTestServer( + NatsServerRunner.builder() + .jetstream(true) + .configFilePath(configFilePath(configFilePath))); + } + + public static NatsTestServer configuredServer(String configFilePath, int port) throws IOException { + return new NatsTestServer( + NatsServerRunner.builder() + .port(port) + .configFilePath(configFilePath(configFilePath))); + } + + public static NatsTestServer skipValidateServer(String configFilePath) throws IOException { + return new NatsTestServer( + NatsServerRunner.builder() + .configFilePath(configFilePath(configFilePath)) + .skipConnectValidate()); } public NatsTestServer() throws IOException { - super(); + this(builder()); } public NatsTestServer(boolean debug) throws IOException { - super(debug); + this(builder().debug(debug)); } public NatsTestServer(boolean debug, boolean jetstream) throws IOException { - super(debug, jetstream); + this(builder().debug(debug).jetstream(jetstream)); } public NatsTestServer(int port, boolean debug) throws IOException { - super(port, debug); + this(builder().port(port).debug(debug)); } public NatsTestServer(int port, boolean debug, boolean jetstream) throws IOException { - super(port, debug, jetstream); + this(builder().port(port).debug(debug).jetstream(jetstream)); } public NatsTestServer(String configFilePath, boolean debug) throws IOException { - super(configFilePath, debug); + this(builder().configFilePath(configFilePath).debug(debug)); } public NatsTestServer(String configFilePath, boolean debug, boolean jetstream) throws IOException { - super(configFilePath, debug, jetstream); + this(builder().configFilePath(configFilePath).debug(debug).jetstream(jetstream)); } public NatsTestServer(String configFilePath, String[] configInserts, int port, boolean debug) throws IOException { - super(configFilePath, configInserts, port, debug); + this(builder().configFilePath(configFilePath).configInserts(configInserts).debug(debug)); } public NatsTestServer(String configFilePath, int port, boolean debug) throws IOException { - super(configFilePath, port, debug); + this(builder().configFilePath(configFilePath).port(port).debug(debug)); } public NatsTestServer(String[] customArgs, boolean debug) throws IOException { - super(customArgs, debug); + this(builder().customArgs(customArgs).debug(debug)); } public NatsTestServer(String[] customArgs, int port, boolean debug) throws IOException { - super(customArgs, port, debug); + this(builder().customArgs(customArgs).port(port).debug(debug)); } public NatsTestServer(int port, boolean debug, boolean jetstream, String configFilePath, String[] configInserts, String[] customArgs) throws IOException { - super(port, debug, jetstream, configFilePath, configInserts, customArgs); + this(builder().port(port).debug(debug).jetstream(jetstream).configFilePath(configFilePath).configInserts(configInserts).customArgs(customArgs)); } public NatsTestServer(Builder b) throws IOException { diff --git a/src/test/java/io/nats/client/PublishOptionsTests.java b/src/test/java/io/nats/client/PublishOptionsTests.java index 3e0a83369..93867a424 100644 --- a/src/test/java/io/nats/client/PublishOptionsTests.java +++ b/src/test/java/io/nats/client/PublishOptionsTests.java @@ -1,157 +1,158 @@ -// Copyright 2020 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import io.nats.client.utils.TestBase; -import org.junit.jupiter.api.Test; - -import java.time.Duration; -import java.util.Properties; - -import static org.junit.jupiter.api.Assertions.*; - -public class PublishOptionsTests extends TestBase { - - @Test - public void testBuilder() { - PublishOptions.Builder builder = PublishOptions.builder(); - PublishOptions po = builder.build(); - //noinspection deprecation - assertNull(po.getStream()); - assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); - assertNull(po.getExpectedStream()); - assertNull(po.getExpectedLastMsgId()); - assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSequence()); - assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSubjectSequence()); - assertNull(po.getExpectedLastSubjectSequenceSubject()); - assertNull(po.getMessageTtl()); - - Duration streamTimeout = Duration.ofSeconds(99); - //noinspection deprecation - builder.stream("pubAckStream"); // DEPRECATED SO JUST COVERAGE - - po = builder - .streamTimeout(streamTimeout) - .expectedStream("expectedStream") - .expectedLastMsgId("1") - .expectedLastSequence(42) - .expectedLastSubjectSequence(43) - .expectedLastSubjectSequenceSubject("sss") - .messageId("msgId") - .messageTtlCustom("custom") - .build(); - - //noinspection deprecation - assertEquals("pubAckStream", po.getStream()); // DEPRECATED / COVERAGE - assertEquals(streamTimeout, po.getStreamTimeout()); - assertEquals("expectedStream", po.getExpectedStream()); - assertEquals("1", po.getExpectedLastMsgId()); - assertEquals(42, po.getExpectedLastSequence()); - assertEquals(43, po.getExpectedLastSubjectSequence()); - assertEquals("sss", po.getExpectedLastSubjectSequenceSubject()); - assertEquals("msgId", po.getMessageId()); - assertEquals("custom", po.getMessageTtl()); - - // test clearExpected - po = builder.clearExpected().build(); - - // these are not cleared - assertEquals("expectedStream", po.getExpectedStream()); - assertEquals(Duration.ofSeconds(99), po.getStreamTimeout()); - assertEquals("custom", po.getMessageTtl()); - - // these are cleared - assertNull(po.getExpectedLastMsgId()); - assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSequence()); - assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSubjectSequence()); - assertNull(po.getExpectedLastSubjectSequenceSubject()); - assertNull(po.getMessageId()); - - //noinspection deprecation - po = builder.stream(null).streamTimeout(null).build(); - //noinspection deprecation - assertNull(po.getStream()); - assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); - - //noinspection deprecation - po = builder.stream("pubAckStream").build(); - //noinspection deprecation - assertEquals("pubAckStream", po.getStream()); - - //noinspection deprecation - po = builder.stream("").build(); - //noinspection deprecation - assertNull(po.getStream()); - } - - @Test - public void testProperties() { - Properties p = new Properties(); - p.setProperty(PublishOptions.PROP_PUBLISH_TIMEOUT, "PT20M"); - p.setProperty(PublishOptions.PROP_STREAM_NAME, STREAM); - PublishOptions po = new PublishOptions.Builder(p).build(); - //noinspection deprecation - assertEquals(STREAM, po.getStream(), "stream foo"); - assertEquals(Duration.ofMinutes(20), po.getStreamTimeout(), "20M timeout"); - - p = new Properties(); - po = new PublishOptions.Builder(p).build(); - //noinspection deprecation - assertNull(po.getStream()); - assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); - } - - @Test - public void testMessageTtl() { - PublishOptions po = PublishOptions.builder().messageTtlSeconds(3).build(); - assertEquals("3s", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlCustom("abcd").build(); - assertEquals("abcd", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlNever().build(); - assertEquals("never", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtl(MessageTtl.seconds(3)).build(); - assertEquals("3s", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtl(MessageTtl.custom("abcd")).build(); - assertEquals("abcd", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtl(MessageTtl.never()).build(); - assertEquals("never", po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlSeconds(0).build(); - assertNull(po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlSeconds(-1).build(); - assertNull(po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlCustom(null).build(); - assertNull(po.getMessageTtl()); - - po = PublishOptions.builder().messageTtlCustom("").build(); - assertNull(po.getMessageTtl()); - - po = PublishOptions.builder().messageTtl(null).build(); - assertNull(po.getMessageTtl()); - - assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(0)); - assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(-1)); - assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom(null)); - assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom("")); - - assertTrue(MessageTtl.seconds(3).toString().contains("3s")); // COVERAGE - } -} +// Copyright 2020 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client; + +import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.Test; + +import java.time.Duration; +import java.util.Properties; + +import static org.junit.jupiter.api.Assertions.*; + +public class PublishOptionsTests extends TestBase { + + @Test + public void testBuilder() { + PublishOptions.Builder builder = PublishOptions.builder(); + PublishOptions po = builder.build(); + //noinspection deprecation + assertNull(po.getStream()); + assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); + assertNull(po.getExpectedStream()); + assertNull(po.getExpectedLastMsgId()); + assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSequence()); + assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSubjectSequence()); + assertNull(po.getExpectedLastSubjectSequenceSubject()); + assertNull(po.getMessageTtl()); + + Duration streamTimeout = Duration.ofSeconds(99); + //noinspection deprecation + builder.stream("pubAckStream"); // DEPRECATED SO JUST COVERAGE + + po = builder + .streamTimeout(streamTimeout) + .expectedStream("expectedStream") + .expectedLastMsgId("1") + .expectedLastSequence(42) + .expectedLastSubjectSequence(43) + .expectedLastSubjectSequenceSubject("sss") + .messageId("msgId") + .messageTtlCustom("custom") + .build(); + + //noinspection deprecation + assertEquals("pubAckStream", po.getStream()); // DEPRECATED / COVERAGE + assertEquals(streamTimeout, po.getStreamTimeout()); + assertEquals("expectedStream", po.getExpectedStream()); + assertEquals("1", po.getExpectedLastMsgId()); + assertEquals(42, po.getExpectedLastSequence()); + assertEquals(43, po.getExpectedLastSubjectSequence()); + assertEquals("sss", po.getExpectedLastSubjectSequenceSubject()); + assertEquals("msgId", po.getMessageId()); + assertEquals("custom", po.getMessageTtl()); + + // test clearExpected + po = builder.clearExpected().build(); + + // these are not cleared + assertEquals("expectedStream", po.getExpectedStream()); + assertEquals(Duration.ofSeconds(99), po.getStreamTimeout()); + assertEquals("custom", po.getMessageTtl()); + + // these are cleared + assertNull(po.getExpectedLastMsgId()); + assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSequence()); + assertEquals(PublishOptions.UNSET_LAST_SEQUENCE, po.getExpectedLastSubjectSequence()); + assertNull(po.getExpectedLastSubjectSequenceSubject()); + assertNull(po.getMessageId()); + + //noinspection deprecation + po = builder.stream(null).streamTimeout(null).build(); + //noinspection deprecation + assertNull(po.getStream()); + assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); + + //noinspection deprecation + po = builder.stream("pubAckStream").build(); + //noinspection deprecation + assertEquals("pubAckStream", po.getStream()); + + //noinspection deprecation + po = builder.stream("").build(); + //noinspection deprecation + assertNull(po.getStream()); + } + + @Test + public void testProperties() { + String stream = random(); + Properties p = new Properties(); + p.setProperty(PublishOptions.PROP_PUBLISH_TIMEOUT, "PT20M"); + p.setProperty(PublishOptions.PROP_STREAM_NAME, stream); + PublishOptions po = new PublishOptions.Builder(p).build(); + //noinspection deprecation + assertEquals(stream, po.getStream(), "stream foo"); + assertEquals(Duration.ofMinutes(20), po.getStreamTimeout(), "20M timeout"); + + p = new Properties(); + po = new PublishOptions.Builder(p).build(); + //noinspection deprecation + assertNull(po.getStream()); + assertEquals(PublishOptions.DEFAULT_TIMEOUT, po.getStreamTimeout()); + } + + @Test + public void testMessageTtl() { + PublishOptions po = PublishOptions.builder().messageTtlSeconds(3).build(); + assertEquals("3s", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlCustom("abcd").build(); + assertEquals("abcd", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlNever().build(); + assertEquals("never", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtl(MessageTtl.seconds(3)).build(); + assertEquals("3s", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtl(MessageTtl.custom("abcd")).build(); + assertEquals("abcd", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtl(MessageTtl.never()).build(); + assertEquals("never", po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlSeconds(0).build(); + assertNull(po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlSeconds(-1).build(); + assertNull(po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlCustom(null).build(); + assertNull(po.getMessageTtl()); + + po = PublishOptions.builder().messageTtlCustom("").build(); + assertNull(po.getMessageTtl()); + + po = PublishOptions.builder().messageTtl(null).build(); + assertNull(po.getMessageTtl()); + + assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(0)); + assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(-1)); + assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom(null)); + assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom("")); + + assertTrue(MessageTtl.seconds(3).toString().contains("3s")); // COVERAGE + } +} diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 271c3bc1c..9e35ff987 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -1,336 +1,326 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import io.nats.client.api.StreamConfiguration; -import io.nats.client.impl.Headers; -import io.nats.client.impl.NatsMessage; -import org.junit.jupiter.api.Test; - -import java.net.SocketException; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -import static io.nats.client.support.NatsConstants.*; -import static io.nats.client.utils.ResourceUtils.dataAsLines; -import static io.nats.client.utils.TestBase.*; -import static org.junit.jupiter.api.Assertions.*; - -public class PublishTests { - @Test - public void throwsIfClosedOnPublish() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.close(); - nc.publish("subject", "replyto", null); - fail(); - } - }); - } - - @Test - public void throwsIfClosedOnFlush() { - assertThrows(TimeoutException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.close(); - nc.flush(null); - fail(); - } - }); - } - - @Test - public void testThrowsWithoutSubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.publish(null, null); - fail(); - } - }); - } - - @Test - public void testThrowsIfTooBig() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/max_payload.conf", false, false)) - { - Connection nc = Nats.connect(ts.getURI()); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - byte[] body = new byte[1001]; - assertThrows(IllegalArgumentException.class, () -> nc.publish("subject", null, null, body)); - nc.close(); - - AtomicBoolean mpv = new AtomicBoolean(false); - AtomicBoolean se = new AtomicBoolean(false); - ErrorListener el = new ErrorListener() { - @Override - public void errorOccurred(Connection conn, String error) { - mpv.set(error.contains("Maximum Payload Violation")); - } - - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - se.set(exp instanceof SocketException); - } - }; - Options options = Options.builder() - .server(ts.getURI()) - .clientSideLimitChecks(false) - .errorListener(el) - .build(); - Connection nc2 = Nats.connect(options); - assertSame(Connection.Status.CONNECTED, nc2.getStatus(), "Connected Status"); - nc2.publish("subject", null, null, body); - - sleep(100); - assertTrue(mpv.get()); - assertTrue(se.get()); - } - } - - @Test - public void testThrowsIfheadersNotSupported() { - assertThrows(IllegalArgumentException.class, () -> { - String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; - - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo); - Connection nc = Nats.connect(ts.getURI())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - nc.publish(NatsMessage.builder() - .subject("testThrowsIfheadersNotSupported") - .headers(new Headers().add("key", "value")) - .build()); - fail(); - } - }); - } - - @Test - public void testEmptyPublish() throws Exception { - runSimplePublishTest("testsubemptybody", null, null, ""); - } - - @Test - public void testEmptyByDefaultPublish() throws Exception { - runSimplePublishTest("testsubemptybody", null, null, null); - } - - @Test - public void testNoReplyPublish() throws Exception { - runSimplePublishTest("testsub", null, null, "This is the message."); - } - - @Test - public void testReplyToInPublish() throws Exception { - runSimplePublishTest("testsubforreply", "replyTo", null, "This is the message to reply to."); - runSimplePublishTest("testsubforreply", "replyTo", new Headers().add("key", "value"), "This is the message to reply to."); - } - - private void runSimplePublishTest(String subject, String replyTo, Headers headers, String bodyString) - throws Exception { - CompletableFuture gotPub = new CompletableFuture<>(); - AtomicReference hdrProto = new AtomicReference<>(""); - AtomicReference body = new AtomicReference<>(""); - AtomicReference protocol = new AtomicReference<>(""); - - boolean hPub = headers != null && !headers.isEmpty(); - String proto = hPub ? OP_HPUB : OP_PUB; - int hdrlen = hPub ? headers.serializedLength() : 0; - - NatsServerProtocolMock.Customizer receiveMessageCustomizer = (ts, r,w) -> { - String pubLine; - StringBuilder headerLine; - String bodyLine; - - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for " + proto + " ..."); - try { - pubLine = r.readLine(); - if (hPub) { - // the version \r\n, each header \r\n, then separator \r\n - headerLine = new StringBuilder(r.readLine()).append("\r\n"); - while (headerLine.length() < hdrlen) { - headerLine.append(r.readLine()).append("\r\n"); - } - } - else { - headerLine = new StringBuilder(); - } - bodyLine = r.readLine(); // Ignores encoding, but ok for test - } catch(Exception e) { - gotPub.cancel(true); - return; - } - - if (pubLine.startsWith(proto)) { - System.out.println("*** Mock Server @" + ts.getPort() + " got " + proto + " ..."); - protocol.set(pubLine); - hdrProto.set(headerLine.toString()); - body.set(bodyLine); - gotPub.complete(Boolean.TRUE); - } - }; - - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnection(ts.getURI())) { - - byte[] bodyBytes; - if (bodyString == null || bodyString.isEmpty()) { - bodyBytes = EMPTY_BODY; - bodyString = ""; - } - else { - bodyBytes = bodyString.getBytes(StandardCharsets.UTF_8); - } - - nc.publish(NatsMessage.builder().subject(subject).replyTo(replyTo).headers(headers).data(bodyBytes).build()); - - assertTrue(gotPub.get(), "Got " + proto + "."); //wait for receipt to close up - standardCloseConnection(nc); - - if (proto.equals(OP_PUB)) { - String expectedProtocol; - if (replyTo == null) { - expectedProtocol = proto + " " + subject + " " + bodyBytes.length; - } else { - expectedProtocol = proto + " " + subject + " " + replyTo + " " + bodyBytes.length; - } - assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); - assertEquals(bodyString, body.get(), "Body matches"); - } - else { - String expectedProtocol; - int hdrLen = headers.serializedLength(); - int totLen = hdrLen + bodyBytes.length; - if (replyTo == null) { - expectedProtocol = proto + " " + subject + " " + hdrLen + " " + totLen; - } else { - expectedProtocol = proto + " " + subject + " " + replyTo + " " + hdrLen + " " + totLen; - } - assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); - assertEquals(bodyString, body.get(), "Body matches"); - assertEquals(new String(headers.getSerialized()), hdrProto.get()); - } - } - } - - @Test - public void testMaxPayload() throws Exception { - runInServer(standardOptionsBuilder().noReconnect(), nc -> { - int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - nc.publish("mptest", new byte[maxPayload-1]); - nc.publish("mptest", new byte[maxPayload]); - }); - - try { - runInServer(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { - int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - for (int x = 1; x < 1000; x++) { - nc.publish("mptest", new byte[maxPayload + x]); - } - }); - fail("Expecting IllegalStateException"); - } - catch (IllegalStateException ignore) {} - - try { - runInServer(standardOptionsBuilder().noReconnect(), nc -> { - int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - for (int x = 1; x < 1000; x++) { - nc.publish("mptest", new byte[maxPayload + x]); - } - }); - fail("Expecting IllegalArgumentException"); - } - catch (IllegalArgumentException ignore) {} - } - - @Test - public void testUtf8Subjects() throws Exception { - String subject = dataAsLines("utf8-test-strings.txt").get(0); - String jsSubject = variant() + "-" + subject; // just to have a different; - - AtomicReference coreReceivedSubjectNotSupported = new AtomicReference<>(); - AtomicReference coreReceivedSubjectWhenSupported = new AtomicReference<>(); - AtomicReference jsReceivedSubjectNotSupported = new AtomicReference<>(); - AtomicReference jsReceivedSubjectWhenSupported = new AtomicReference<>(); - CountDownLatch coreReceivedLatchNotSupported = new CountDownLatch(1); - CountDownLatch coreReceivedLatchWhenSupported = new CountDownLatch(1); - CountDownLatch jsReceivedLatchNotSupported = new CountDownLatch(1); - CountDownLatch jsReceivedLatchWhenSupported = new CountDownLatch(1); - - try (NatsTestServer ts = new NatsTestServer(false, true); - Connection ncNotSupported = standardConnection(standardOptionsBuilder(ts.getURI()).build()); - Connection ncSupported = standardConnection(standardOptionsBuilder(ts.getURI()).supportUTF8Subjects().build())) - { - try { - ncNotSupported.jetStreamManagement().addStream( - StreamConfiguration.builder() - .name(stream()) - .subjects(jsSubject) - .build()); - JetStream jsNotSupported = ncNotSupported.jetStream(); - JetStream jsSupported = ncNotSupported.jetStream(); - - Dispatcher dNotSupported = ncNotSupported.createDispatcher(); - Dispatcher dSupported = ncSupported.createDispatcher(); - - dNotSupported.subscribe(subject, m -> { - coreReceivedSubjectNotSupported.set(m.getSubject()); - coreReceivedLatchNotSupported.countDown(); - }); - - dSupported.subscribe(subject, m -> { - coreReceivedSubjectWhenSupported.set(m.getSubject()); - coreReceivedLatchWhenSupported.countDown(); - }); - - jsNotSupported.subscribe(jsSubject, dNotSupported, m -> { - jsReceivedSubjectNotSupported.set(m.getSubject()); - jsReceivedLatchNotSupported.countDown(); - }, false); - - jsSupported.subscribe(jsSubject, dSupported, m -> { - jsReceivedSubjectWhenSupported.set(m.getSubject()); - jsReceivedLatchWhenSupported.countDown(); - }, false); - - ncNotSupported.publish(subject, null); // demonstrates that publishing always does utf8 - jsSupported.publish(jsSubject, null); - - assertTrue(coreReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); - assertTrue(coreReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); - assertTrue(jsReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); - assertTrue(jsReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); - - assertNotEquals(subject, coreReceivedSubjectNotSupported.get()); - assertEquals(subject, coreReceivedSubjectWhenSupported.get()); - assertNotEquals(jsSubject, jsReceivedSubjectNotSupported.get()); - assertEquals(jsSubject, jsReceivedSubjectWhenSupported.get()); - - } - finally { - cleanupJs(ncSupported); - } - } - } -} +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client; + +import io.nats.client.api.StreamConfiguration; +import io.nats.client.impl.Headers; +import io.nats.client.impl.NatsMessage; +import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.Test; + +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicReference; + +import static io.nats.client.support.NatsConstants.*; +import static io.nats.client.utils.ResourceUtils.dataAsLines; +import static io.nats.client.utils.TestBase.*; +import static org.junit.jupiter.api.Assertions.*; + +public class PublishTests { + @Test + public void throwsIfClosed() throws Exception { + runInLrServerCloseableConnection(nc -> { + nc.close(); + // can't publish after close + assertThrows(IllegalStateException.class, () -> nc.publish("subject", "replyto", null)); + + // flush after close always times out + assertThrows(TimeoutException.class, () -> nc.flush(null)); + }); + } + + @Test + public void testThrowsWithoutSubject() throws Exception { + runInLrServer(nc -> { + //noinspection DataFlowIssue + assertThrows(IllegalArgumentException.class, () -> nc.publish(null, null)); + }); + } + + @Test + public void testThrowsIfTooBig() throws Exception { + try (NatsTestServer ts = NatsTestServer.configuredServer("max_payload.conf")) { + Connection nc = standardConnectionWait(ts.getURI()); + + byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 + assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); + nc.close(); + Thread.sleep(1000); + + CountDownLatch mpvLatch = new CountDownLatch(1); + CountDownLatch seLatch = new CountDownLatch(1); + ErrorListener el = new ErrorListener() { + @Override + public void errorOccurred(Connection conn, String error) { + if (error.contains("Maximum Payload Violation")) { + mpvLatch.countDown(); + } + } + + @Override + public void exceptionOccurred(Connection conn, Exception exp) { + if (exp instanceof SocketException) { + seLatch.countDown(); + } + } + }; + Options options = Options.builder() + .server(ts.getURI()) + .clientSideLimitChecks(false) + .errorListener(el) + .build(); + Connection nc2 = longConnectionWait(options); + nc2.publish(random(), null, null, body); + + if (!mpvLatch.await(1, TimeUnit.SECONDS)) { + fail(); + } + if (!seLatch.await(1, TimeUnit.SECONDS)) { + fail(); + } + } + } + + @Test + public void testThrowsIfheadersNotSupported() { + assertThrows(IllegalArgumentException.class, () -> { + String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; + + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo); + Connection nc = Nats.connect(ts.getURI())) { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + + nc.publish(NatsMessage.builder() + .subject("testThrowsIfheadersNotSupported") + .headers(new Headers().add("key", "value")) + .build()); + fail(); + } + }); + } + + @Test + public void testEmptyPublish() throws Exception { + runSimplePublishTest("testsubemptybody", null, null, ""); + } + + @Test + public void testEmptyByDefaultPublish() throws Exception { + runSimplePublishTest("testsubemptybody", null, null, null); + } + + @Test + public void testNoReplyPublish() throws Exception { + runSimplePublishTest("testsub", null, null, "This is the message."); + } + + @Test + public void testReplyToInPublish() throws Exception { + runSimplePublishTest("testsubforreply", "replyTo", null, "This is the message to reply to."); + runSimplePublishTest("testsubforreply", "replyTo", new Headers().add("key", "value"), "This is the message to reply to."); + } + + private void runSimplePublishTest(String subject, String replyTo, Headers headers, String bodyString) + throws Exception { + CompletableFuture gotPub = new CompletableFuture<>(); + AtomicReference hdrProto = new AtomicReference<>(""); + AtomicReference body = new AtomicReference<>(""); + AtomicReference protocol = new AtomicReference<>(""); + + boolean hPub = headers != null && !headers.isEmpty(); + String proto = hPub ? OP_HPUB : OP_PUB; + int hdrlen = hPub ? headers.serializedLength() : 0; + + NatsServerProtocolMock.Customizer receiveMessageCustomizer = (ts, r,w) -> { + String pubLine; + StringBuilder headerLine; + String bodyLine; + + System.out.println("*** Mock Server @" + ts.getPort() + " waiting for " + proto + " ..."); + try { + pubLine = r.readLine(); + if (hPub) { + // the version \r\n, each header \r\n, then separator \r\n + headerLine = new StringBuilder(r.readLine()).append("\r\n"); + while (headerLine.length() < hdrlen) { + headerLine.append(r.readLine()).append("\r\n"); + } + } + else { + headerLine = new StringBuilder(); + } + bodyLine = r.readLine(); // Ignores encoding, but ok for test + } catch(Exception e) { + gotPub.cancel(true); + return; + } + + if (pubLine.startsWith(proto)) { + System.out.println("*** Mock Server @" + ts.getPort() + " got " + proto + " ..."); + protocol.set(pubLine); + hdrProto.set(headerLine.toString()); + body.set(bodyLine); + gotPub.complete(Boolean.TRUE); + } + }; + + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + + byte[] bodyBytes; + if (bodyString == null || bodyString.isEmpty()) { + bodyBytes = EMPTY_BODY; + bodyString = ""; + } + else { + bodyBytes = bodyString.getBytes(StandardCharsets.UTF_8); + } + + nc.publish(NatsMessage.builder().subject(subject).replyTo(replyTo).headers(headers).data(bodyBytes).build()); + + assertTrue(gotPub.get(), "Got " + proto + "."); //wait for receipt to close up + standardCloseConnection(nc); + + if (proto.equals(OP_PUB)) { + String expectedProtocol; + if (replyTo == null) { + expectedProtocol = proto + " " + subject + " " + bodyBytes.length; + } else { + expectedProtocol = proto + " " + subject + " " + replyTo + " " + bodyBytes.length; + } + assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); + assertEquals(bodyString, body.get(), "Body matches"); + } + else { + String expectedProtocol; + int hdrLen = headers.serializedLength(); + int totLen = hdrLen + bodyBytes.length; + if (replyTo == null) { + expectedProtocol = proto + " " + subject + " " + hdrLen + " " + totLen; + } else { + expectedProtocol = proto + " " + subject + " " + replyTo + " " + hdrLen + " " + totLen; + } + assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); + assertEquals(bodyString, body.get(), "Body matches"); + assertEquals(new String(headers.getSerialized()), hdrProto.get()); + } + } + } + + @Test + public void testMaxPayload() throws Exception { + runInServer(standardOptionsBuilder().noReconnect(), nc -> { + int maxPayload = (int)nc.getServerInfo().getMaxPayload(); + nc.publish("mptest", new byte[maxPayload-1]); + nc.publish("mptest", new byte[maxPayload]); + }); + + try { + runInServer(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { + int maxPayload = (int)nc.getServerInfo().getMaxPayload(); + for (int x = 1; x < 1000; x++) { + nc.publish("mptest", new byte[maxPayload + x]); + } + }); + fail("Expecting IllegalStateException"); + } + catch (IllegalStateException ignore) {} + + try { + runInServer(standardOptionsBuilder().noReconnect(), nc -> { + int maxPayload = (int)nc.getServerInfo().getMaxPayload(); + for (int x = 1; x < 1000; x++) { + nc.publish("mptest", new byte[maxPayload + x]); + } + }); + fail("Expecting IllegalArgumentException"); + } + catch (IllegalArgumentException ignore) {} + } + + @Test + public void testUtf8Subjects() throws Exception { + String subject = dataAsLines("utf8-test-strings.txt").get(0); + String jsSubject = random() + "-" + subject; // just to have a different; + + AtomicReference coreReceivedSubjectNotSupported = new AtomicReference<>(); + AtomicReference coreReceivedSubjectWhenSupported = new AtomicReference<>(); + AtomicReference jsReceivedSubjectNotSupported = new AtomicReference<>(); + AtomicReference jsReceivedSubjectWhenSupported = new AtomicReference<>(); + CountDownLatch coreReceivedLatchNotSupported = new CountDownLatch(1); + CountDownLatch coreReceivedLatchWhenSupported = new CountDownLatch(1); + CountDownLatch jsReceivedLatchNotSupported = new CountDownLatch(1); + CountDownLatch jsReceivedLatchWhenSupported = new CountDownLatch(1); + + try (NatsTestServer ts = new NatsTestServer(false, true); + Connection ncNotSupported = TestBase.standardConnectionWait(standardOptionsBuilder(ts.getURI()).build()); + Connection ncSupported = TestBase.standardConnectionWait(standardOptionsBuilder(ts.getURI()).supportUTF8Subjects().build())) + { + try { + ncNotSupported.jetStreamManagement().addStream( + StreamConfiguration.builder() + .name(TestBase.random()) + .subjects(jsSubject) + .build()); + JetStream jsNotSupported = ncNotSupported.jetStream(); + JetStream jsSupported = ncNotSupported.jetStream(); + + Dispatcher dNotSupported = ncNotSupported.createDispatcher(); + Dispatcher dSupported = ncSupported.createDispatcher(); + + dNotSupported.subscribe(subject, m -> { + coreReceivedSubjectNotSupported.set(m.getSubject()); + coreReceivedLatchNotSupported.countDown(); + }); + + dSupported.subscribe(subject, m -> { + coreReceivedSubjectWhenSupported.set(m.getSubject()); + coreReceivedLatchWhenSupported.countDown(); + }); + + jsNotSupported.subscribe(jsSubject, dNotSupported, m -> { + jsReceivedSubjectNotSupported.set(m.getSubject()); + jsReceivedLatchNotSupported.countDown(); + }, false); + + jsSupported.subscribe(jsSubject, dSupported, m -> { + jsReceivedSubjectWhenSupported.set(m.getSubject()); + jsReceivedLatchWhenSupported.countDown(); + }, false); + + ncNotSupported.publish(subject, null); // demonstrates that publishing always does utf8 + jsSupported.publish(jsSubject, null); + + assertTrue(coreReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); + assertTrue(coreReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); + assertTrue(jsReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); + assertTrue(jsReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); + + assertNotEquals(subject, coreReceivedSubjectNotSupported.get()); + assertEquals(subject, coreReceivedSubjectWhenSupported.get()); + assertNotEquals(jsSubject, jsReceivedSubjectNotSupported.get()); + assertEquals(jsSubject, jsReceivedSubjectWhenSupported.get()); + + } + finally { + cleanupJs(ncSupported); + } + } + } +} diff --git a/src/test/java/io/nats/client/RequestTests.java b/src/test/java/io/nats/client/RequestTests.java deleted file mode 100644 index 639e0b2a3..000000000 --- a/src/test/java/io/nats/client/RequestTests.java +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2020 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import io.nats.client.api.StorageType; -import io.nats.client.api.StreamConfiguration; -import io.nats.client.impl.ListenerForTesting; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; - -import static io.nats.client.utils.TestBase.standardConnection; -import static io.nats.client.utils.TestBase.subject; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class RequestTests { - - @Test - public void testRequestNoResponder() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false, true)) { - Options optCancel = Options.builder().server(ts.getURI()).errorListener(new ListenerForTesting()).build(); - Options optReport = Options.builder().server(ts.getURI()).reportNoResponders().errorListener(new ListenerForTesting()).build(); - try (Connection ncCancel = standardConnection(optCancel); - Connection ncReport = standardConnection(optReport); - ) - { - assertThrows(CancellationException.class, () -> ncCancel.request(subject(999), null).get()); - ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(subject(999), null).get()); - assertTrue(ee.getCause() instanceof JetStreamStatusException); - assertTrue(ee.getMessage().contains("503 No Responders Available For Request")); - - ncCancel.jetStreamManagement().addStream( - StreamConfiguration.builder() - .name("testRequestNoResponder").subjects("trnrExists").storageType(StorageType.Memory) - .build()); - - JetStream jsCancel = ncCancel.jetStream(); - JetStream jsReport = ncReport.jetStream(); - - IOException ioe = assertThrows(IOException.class, () -> jsCancel.publish("not-exist", null)); - assertTrue(ioe.getMessage().contains("503")); - ioe = assertThrows(IOException.class, () -> jsReport.publish("trnrNotExist", null)); - assertTrue(ioe.getMessage().contains("503")); - } - } - } -} \ No newline at end of file diff --git a/src/test/java/io/nats/client/SubscribeOptionsTests.java b/src/test/java/io/nats/client/SubscribeOptionsTests.java index 3ca4b61a8..eb19d829a 100644 --- a/src/test/java/io/nats/client/SubscribeOptionsTests.java +++ b/src/test/java/io/nats/client/SubscribeOptionsTests.java @@ -36,13 +36,16 @@ public void testPushAffirmative() { assertNull(so.getName()); assertNull(so.getDeliverSubject()); + String stream = random(); + String durable = random(); + String deliver = random(); so = PushSubscribeOptions.builder() - .stream(STREAM).durable(DURABLE).deliverSubject(DELIVER).build(); + .stream(stream).durable(durable).deliverSubject(deliver).build(); - assertEquals(STREAM, so.getStream()); - assertEquals(DURABLE, so.getDurable()); - assertEquals(DURABLE, so.getName()); - assertEquals(DELIVER, so.getDeliverSubject()); + assertEquals(stream, so.getStream()); + assertEquals(durable, so.getDurable()); + assertEquals(durable, so.getName()); + assertEquals(deliver, so.getDeliverSubject()); // demonstrate that you can clear the builder so = PushSubscribeOptions.builder() @@ -187,14 +190,16 @@ public void testDeliverSubjectValidation() { @Test public void testPullAffirmative() { + String stream = random(); + String durable = random(); PullSubscribeOptions.Builder builder = PullSubscribeOptions.builder() - .stream(STREAM) - .durable(DURABLE); + .stream(stream) + .durable(durable); PullSubscribeOptions so = builder.build(); - assertEquals(STREAM, so.getStream()); - assertEquals(DURABLE, so.getDurable()); - assertEquals(DURABLE, so.getName()); + assertEquals(stream, so.getStream()); + assertEquals(durable, so.getDurable()); + assertEquals(durable, so.getName()); assertTrue(so.isPull()); assertNotNull(so.toString()); // COVERAGE @@ -211,29 +216,31 @@ public void testPushFieldValidation() { assertThrows(IllegalArgumentException.class, () -> ConsumerConfiguration.builder().name(bad).build()); } - assertClientError(JsConsumerNameDurableMismatch, () -> PushSubscribeOptions.builder().name(NAME).durable(DURABLE).build()); + String name = random(); + String durable = random(); + assertClientError(JsConsumerNameDurableMismatch, () -> PushSubscribeOptions.builder().name(name).durable(durable).build()); // durable directly - PushSubscribeOptions uso = PushSubscribeOptions.builder().durable(DURABLE).build(); - assertEquals(DURABLE, uso.getDurable()); - assertEquals(DURABLE, uso.getName()); - uso = PushSubscribeOptions.builder().name(NAME).build(); + PushSubscribeOptions uso = PushSubscribeOptions.builder().durable(durable).build(); + assertEquals(durable, uso.getDurable()); + assertEquals(durable, uso.getName()); + uso = PushSubscribeOptions.builder().name(name).build(); assertNull(uso.getDurable()); - assertEquals(NAME, uso.getName()); + assertEquals(name, uso.getName()); // in configuration - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(DURABLE).build(); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(durable).build(); uso = PushSubscribeOptions.builder().configuration(cc).build(); - assertEquals(DURABLE, uso.getDurable()); - assertEquals(DURABLE, uso.getName()); - cc = ConsumerConfiguration.builder().name(NAME).build(); + assertEquals(durable, uso.getDurable()); + assertEquals(durable, uso.getName()); + cc = ConsumerConfiguration.builder().name(name).build(); uso = PushSubscribeOptions.builder().configuration(cc).build(); assertNull(uso.getDurable()); - assertEquals(NAME, uso.getName()); + assertEquals(name, uso.getName()); // new helper - ConsumerConfiguration.builder().durable(DURABLE).buildPushSubscribeOptions(); - ConsumerConfiguration.builder().name(NAME).buildPushSubscribeOptions(); + ConsumerConfiguration.builder().durable(durable).buildPushSubscribeOptions(); + ConsumerConfiguration.builder().name(name).buildPushSubscribeOptions(); } @Test @@ -247,87 +254,94 @@ public void testPullFieldValidation() { assertThrows(IllegalArgumentException.class, () -> ConsumerConfiguration.builder().name(bad).build()); } - assertClientError(JsConsumerNameDurableMismatch, () -> PullSubscribeOptions.builder().name(NAME).durable(DURABLE).build()); + String durable = random(); + assertClientError(JsConsumerNameDurableMismatch, () -> PullSubscribeOptions.builder().name(random()).durable(durable).build()); // durable directly - PullSubscribeOptions lso = PullSubscribeOptions.builder().durable(DURABLE).build(); - assertEquals(DURABLE, lso.getDurable()); - assertEquals(DURABLE, lso.getName()); + PullSubscribeOptions lso = PullSubscribeOptions.builder().durable(durable).build(); + assertEquals(durable, lso.getDurable()); + assertEquals(durable, lso.getName()); // in configuration - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(DURABLE).build(); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(durable).build(); lso = PullSubscribeOptions.builder().configuration(cc).build(); - assertEquals(DURABLE, lso.getDurable()); - assertEquals(DURABLE, lso.getName()); + assertEquals(durable, lso.getDurable()); + assertEquals(durable, lso.getName()); // new helper - lso = ConsumerConfiguration.builder().durable(DURABLE).buildPullSubscribeOptions(); - assertEquals(DURABLE, lso.getDurable()); - assertEquals(DURABLE, lso.getName()); + lso = ConsumerConfiguration.builder().durable(durable).buildPullSubscribeOptions(); + assertEquals(durable, lso.getDurable()); + assertEquals(durable, lso.getName()); } @Test public void testCreationErrors() { - ConsumerConfiguration cc1 = ConsumerConfiguration.builder().durable(durable((1))).build(); + String durable1 = random(); + String durable2 = random(); + ConsumerConfiguration cc1 = ConsumerConfiguration.builder().durable(durable1).build(); assertClientError(JsSoDurableMismatch, - () -> PushSubscribeOptions.builder().configuration(cc1).durable(durable(2)).build()); + () -> PushSubscribeOptions.builder().configuration(cc1).durable(durable2).build()); - ConsumerConfiguration cc2 = ConsumerConfiguration.builder().deliverGroup(deliver((1))).build(); + String deliver1 = random(); + String deliver2 = random(); + ConsumerConfiguration cc2 = ConsumerConfiguration.builder().deliverGroup(deliver1).build(); assertClientError(JsSoDeliverGroupMismatch, - () -> PushSubscribeOptions.builder().configuration(cc2).deliverGroup(deliver(2)).build()); + () -> PushSubscribeOptions.builder().configuration(cc2).deliverGroup(deliver2).build()); - ConsumerConfiguration cc3 = ConsumerConfiguration.builder().name(name((1))).build(); + String name1 = random(); + String name2 = random(); + ConsumerConfiguration cc3 = ConsumerConfiguration.builder().name(name1).build(); assertClientError(JsSoNameMismatch, - () -> PushSubscribeOptions.builder().configuration(cc3).name(name(2)).build()); + () -> PushSubscribeOptions.builder().configuration(cc3).name(name2).build()); } @Test public void testBindCreationErrors() { - String durOrName = name(); + String random = random(); // bind - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(null, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(EMPTY, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(STREAM, null)); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(STREAM, EMPTY)); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(STREAM).bind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).durable(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().durable(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(STREAM).durable(EMPTY).bind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).name(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().name(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(STREAM).name(EMPTY).bind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(null, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(EMPTY, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(STREAM, null)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(STREAM, EMPTY)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).bind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).durable(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().durable(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).durable(EMPTY).bind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).name(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().name(durOrName).bind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).name(EMPTY).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(null, random)); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(EMPTY, random)); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(random, null)); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.bind(random, EMPTY)); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(random).bind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).durable(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().durable(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(random).durable(EMPTY).bind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).name(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().name(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(random).name(EMPTY).bind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(null, random)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(EMPTY, random)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(random, null)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.bind(random, EMPTY)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).bind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).durable(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().durable(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).durable(EMPTY).bind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).name(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().name(random).bind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).name(EMPTY).bind(true).build()); // fast bind - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(null, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(EMPTY, durOrName)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(STREAM, null)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(STREAM, EMPTY)); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).fastBind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).durable(durOrName).fastBind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().durable(durOrName).fastBind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).durable(EMPTY).fastBind(true).build()); - - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).name(durOrName).fastBind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().name(durOrName).fastBind(true).build()); - assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(STREAM).name(EMPTY).fastBind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(null, random)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(EMPTY, random)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(random, null)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.fastBind(random, EMPTY)); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).fastBind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).durable(random).fastBind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().durable(random).fastBind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).durable(EMPTY).fastBind(true).build()); + + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(EMPTY).name(random).fastBind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().name(random).fastBind(true).build()); + assertThrows(IllegalArgumentException.class, () -> PullSubscribeOptions.builder().stream(random).name(EMPTY).fastBind(true).build()); } @Test @@ -335,17 +349,18 @@ public void testOrderedCreation() { ConsumerConfiguration ccEmpty = ConsumerConfiguration.builder().build(); PushSubscribeOptions.builder().configuration(ccEmpty).ordered(true).build(); + String random = random(); assertClientError(JsSoOrderedNotAllowedWithBind, - () -> PushSubscribeOptions.builder().stream(STREAM).bind(true).ordered(true).build()); + () -> PushSubscribeOptions.builder().stream(random).bind(true).ordered(true).build()); assertClientError(JsSoOrderedNotAllowedWithDeliverGroup, - () -> PushSubscribeOptions.builder().deliverGroup(DELIVER).ordered(true).build()); + () -> PushSubscribeOptions.builder().deliverGroup(random).ordered(true).build()); assertClientError(JsSoOrderedNotAllowedWithDurable, - () -> PushSubscribeOptions.builder().durable(DURABLE).ordered(true).build()); + () -> PushSubscribeOptions.builder().durable(random).ordered(true).build()); assertClientError(JsSoOrderedNotAllowedWithDeliverSubject, - () -> PushSubscribeOptions.builder().deliverSubject(DELIVER).ordered(true).build()); + () -> PushSubscribeOptions.builder().deliverSubject(random).ordered(true).build()); ConsumerConfiguration ccAckNotNone1 = ConsumerConfiguration.builder().ackPolicy(AckPolicy.All).build(); assertClientError(JsSoOrderedRequiresAckPolicyNone, diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index da184c887..9768f2e6d 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -13,12 +13,12 @@ package io.nats.client; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.HashSet; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeoutException; import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; @@ -27,56 +27,49 @@ public class SubscriberTests { @Test public void testCreateInbox() throws Exception { - HashSet check = new HashSet<>(); - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - for (int i=0; i < 10_000; i++) { + runInLrServer(nc -> { + HashSet check = new HashSet<>(); + for (int i=0; i < 100; i++) { String inbox = nc.createInbox(); assertFalse(check.contains(inbox)); check.add(inbox); } - } + }); } @Test public void testSingleMessage() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject"); - nc.publish("subject", new byte[16]); + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + nc.publish(subject, new byte[16]); Message msg = sub.nextMessage(Duration.ofMillis(500)); assertTrue(sub.isActive()); - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertEquals(sub, msg.getSubscription()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); - } + }); } @Test public void testMessageFromSubscriptionContainsConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject"); - nc.publish("subject", new byte[16]); + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + nc.publish(subject, new byte[16]); Message msg = sub.nextMessage(Duration.ofMillis(500)); assertTrue(sub.isActive()); - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertEquals(sub, msg.getSubscription()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); assertSame(msg.getConnection(), nc); - } + }); } @Test @@ -85,7 +78,7 @@ public void testTabInProtocolLine() throws Exception { CompletableFuture sendMsg = new CompletableFuture<>(); NatsServerProtocolMock.Customizer receiveMessageCustomizer = (ts, r,w) -> { - String subLine = ""; + String subLine; // System.out.println("*** Mock Server @" + ts.getPort() + " waiting for SUB ..."); try { @@ -114,10 +107,10 @@ public void testTabInProtocolLine() throws Exception { }; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { - Subscription sub = nc.subscribe("subject"); + String subject = random(); + Subscription sub = nc.subscribe(subject); gotSub.get(); sendMsg.complete(Boolean.TRUE); @@ -126,7 +119,7 @@ public void testTabInProtocolLine() throws Exception { assertTrue(sub.isActive()); assertNotNull(msg); - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertEquals(sub, msg.getSubscription()); assertNull(msg.getReplyTo()); assertEquals(0, msg.getData().length); @@ -137,18 +130,16 @@ public void testTabInProtocolLine() throws Exception { @Test public void testMultiMessage() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject"); - nc.publish("subject", new byte[16]); - nc.publish("subject", new byte[16]); - nc.publish("subject", new byte[16]); + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); Message msg = sub.nextMessage(Duration.ofMillis(500)); - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertEquals(sub, msg.getSubscription()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); @@ -158,26 +149,25 @@ public void testMultiMessage() throws Exception { assertNotNull(msg); msg = sub.nextMessage(100); // coverage for nextMessage(millis) assertNull(msg); - } + }); } @Test - public void testQueueSubscribers() throws Exception, TimeoutException { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - + public void testQueueSubscribers() throws Exception { + runInLrServer(nc -> { int msgs = 100; int received = 0; int sub1Count = 0; int sub2Count = 0; Message msg; - Subscription sub1 = nc.subscribe("subject", "queue"); - Subscription sub2 = nc.subscribe("subject", "queue"); + String subject = random(); + String queue = random(); + Subscription sub1 = nc.subscribe(subject, queue); + Subscription sub2 = nc.subscribe(subject, queue); for (int i = 0; i < msgs; i++) { - nc.publish("subject", new byte[16]); + nc.publish(subject, new byte[16]); } nc.flush(Duration.ofMillis(200));// Get them all to the server @@ -186,7 +176,7 @@ public void testQueueSubscribers() throws Exception, TimeoutException { msg = sub1.nextMessage(null); if (msg != null) { - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); received++; @@ -198,7 +188,7 @@ public void testQueueSubscribers() throws Exception, TimeoutException { msg = sub2.nextMessage(null); if (msg != null) { - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); received++; @@ -208,299 +198,194 @@ public void testQueueSubscribers() throws Exception, TimeoutException { assertEquals(msgs, received); assertEquals(msgs, sub1Count + sub2Count); - - // System.out.println("### Sub 1 " + sub1Count); - // System.out.println("### Sub 2 " + sub2Count); - } - } - - @Test - public void testUnsubscribe() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject"); - nc.publish("subject", new byte[16]); - - Message msg = sub.nextMessage(Duration.ofMillis(500)); - assertNotNull(msg); - - sub.unsubscribe(); - assertFalse(sub.isActive()); - sub.nextMessage(Duration.ofMillis(500)); // Will throw an exception - } }); } @Test - public void testAutoUnsubscribe() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject").unsubscribe(1); - nc.publish("subject", new byte[16]); + public void testUnsubscribe() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + nc.publish(subject, new byte[16]); - Message msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 - assertNotNull(msg); + Message msg = sub.nextMessage(Duration.ofMillis(500)); + assertNotNull(msg); - sub.nextMessage(Duration.ofMillis(500)); // Will throw an exception - } + sub.unsubscribe(); + assertFalse(sub.isActive()); + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(500))); }); } @Test - public void testMultiAutoUnsubscribe() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - int msgCount = 10; - Subscription sub = nc.subscribe("subject").unsubscribe(msgCount); + public void testAutoUnsubscribe() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject).unsubscribe(1); + nc.publish(subject, new byte[16]); - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - - Message msg; - for (int i = 0; i < msgCount; i++) { - msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 - assertNotNull(msg); - } + Message msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 + assertNotNull(msg); - sub.nextMessage(Duration.ofMillis(500)); // Will throw an exception - } + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(500))); }); } @Test - public void testOnlyOneUnsubscribe() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject"); - - sub.unsubscribe(); - sub.unsubscribe(); // Will throw an exception + public void testMultiAutoUnsubscribe() throws Exception { + runInLrServer(nc -> { + String subject = random(); + int msgCount = 10; + Subscription sub = nc.subscribe(subject).unsubscribe(msgCount); + + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } - }); - } - - @Test - public void testOnlyOneAutoUnsubscribe() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - - Subscription sub = nc.subscribe("subject").unsubscribe(1); - nc.publish("subject", new byte[16]); - Message msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 + Message msg; + for (int i = 0; i < msgCount; i++) { + msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 assertNotNull(msg); - - sub.unsubscribe(); // Will throw an exception } + + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(500))); }); } @Test - public void testUnsubscribeInAnotherThread() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); + public void testOnlyOneUnsubscribe() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + sub.unsubscribe(); - Subscription sub = nc.subscribe("subject"); - - new Thread(sub::unsubscribe).start(); - - sub.nextMessage(Duration.ofMillis(5000)); // throw - } + assertThrows(IllegalStateException.class, sub::unsubscribe); }); } @Test - public void testAutoUnsubAfterMaxIsReached() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); + public void testOnlyOneAutoUnsubscribe() throws Exception { + runInLrServer(nc -> { + String subject = random(); - Subscription sub = nc.subscribe("subject"); - - int msgCount = 10; - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - - nc.flush(Duration.ofMillis(1000)); // Slow things down so we have time to unsub - - for (int i = 0; i < msgCount; i++) { - sub.nextMessage(null); - } + Subscription sub = nc.subscribe(subject).unsubscribe(1); + nc.publish(subject, new byte[16]); - sub.unsubscribe(msgCount); // we already have that many + Message msg = sub.nextMessage(Duration.ofMillis(500)); // should get 1 + assertNotNull(msg); - sub.nextMessage(Duration.ofMillis(500)); // Will throw an exception - } + assertThrows(IllegalStateException.class, sub::unsubscribe); }); } @Test - public void testThrowOnNullSubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe(null); - } + public void testUnsubscribeInAnotherThread() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + new Thread(sub::unsubscribe).start(); + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(5000))); }); } @Test - public void testThrowOnEmptySubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe(""); + public void testAutoUnsubAfterMaxIsReached() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + + int msgCount = 10; + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } - }); - } - @Test - public void testThrowOnNullQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe("subject", null); + nc.flush(Duration.ofMillis(1000)); // Slow things down so we have time to unsub + + for (int i = 0; i < msgCount; i++) { + sub.nextMessage(null); } + + sub.unsubscribe(msgCount); // we already have that many + + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(5000))); }); } @Test - public void testThrowOnEmptyQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe("subject", ""); - } + public void testThrowOnNullSubject() throws Exception { + runInLrServer(nc -> { + //noinspection DataFlowIssue + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(null)); }); } @Test - public void testThrowOnNullSubjectWithQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe(null, "quque"); - } - }); + public void testThrowOnEmptySubject() throws Exception { + runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe(""))); } @Test - public void testThrowOnEmptySubjectWithQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.subscribe("", "quque"); - } + public void testThrowOnNullQueue() throws Exception { + runInLrServer(nc -> { + //noinspection DataFlowIssue + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(random(), null)); }); } @Test - public void throwsOnSubscribeIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.close(); - nc.subscribe("subject"); - } - }); + public void testThrowOnEmptyQueue() throws Exception { + runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe(random(), ""))); } @Test - public void throwsOnUnsubscribeIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Subscription sub = nc.subscribe("subject"); - nc.close(); - sub.unsubscribe(); - } + public void testThrowOnNullSubjectWithQueue() throws Exception { + runInLrServer(nc -> { + //noinspection DataFlowIssue + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(null, random())); }); } @Test - public void throwsOnAutoUnsubscribeIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - Subscription sub = nc.subscribe("subject"); - nc.close(); - sub.unsubscribe(1); - } - }); + public void testThrowOnEmptySubjectWithQueue() throws Exception { + runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe("", random()))); } @Test - public void testUnsubscribeWhileWaiting() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); + public void throwsSubscriptionExceptions() throws Exception { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + String subject = random(); + Subscription sub = nc.subscribe(subject); - Subscription sub = nc.subscribe("subject"); - nc.flush(Duration.ofMillis(1000)); + nc.close(); - new Thread(()->{ - try { Thread.sleep(100); } catch(Exception e) { /* ignored */ } - sub.unsubscribe(); - }).start(); + /// can't subscribe when closed + assertThrows(IllegalStateException.class, () -> nc.subscribe(random())); - sub.nextMessage(Duration.ofMillis(5000)); // Should throw - } - }); - } + /// can't unsubscribe when closed + assertThrows(IllegalStateException.class, sub::unsubscribe); - @Test - public void testInvalidSubjectsAndQueueNames() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - Dispatcher d = nc.createDispatcher(m -> {}); - for (String bad : BAD_SUBJECTS_OR_QUEUES) { - assertThrows(IllegalArgumentException.class, () -> nc.subscribe(bad)); - assertThrows(IllegalArgumentException.class, () -> d.subscribe(bad)); - assertThrows(IllegalArgumentException.class, () -> d.subscribe(bad, m -> {})); - assertThrows(IllegalArgumentException.class, () -> d.subscribe(bad, "q")); - assertThrows(IllegalArgumentException.class, () -> d.subscribe(bad, "q", m -> {})); - assertThrows(IllegalArgumentException.class, () -> nc.subscribe("s", bad)); - assertThrows(IllegalArgumentException.class, () -> d.subscribe("s", bad)); - assertThrows(IllegalArgumentException.class, () -> d.subscribe("s", bad, m -> {})); - } + /// can't auto unsubscribe when closed + assertThrows(IllegalStateException.class, () -> sub.unsubscribe(1)); } } - private static int getDataId(Message m) { - return Integer.parseInt(new String(m.getData())); - } - @Test - public void testDispatcherDefaultSubscribeWhenNoDefaultHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - String subject = subject(); - - Dispatcher d = nc.createDispatcher(); - assertThrows(IllegalStateException.class, () -> d.subscribe(subject)); - } + public void testUnsubscribeWhileWaiting() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + nc.flush(Duration.ofMillis(1000)); + + new Thread(() -> { + try { + Thread.sleep(100); + } + catch (Exception e) { /* ignored */ } + sub.unsubscribe(); + }).start(); + + assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(5000))); + }); } } diff --git a/src/test/java/io/nats/client/api/AccountStatisticsTests.java b/src/test/java/io/nats/client/api/AccountStatisticsTests.java index 47ac8c661..76253541e 100644 --- a/src/test/java/io/nats/client/api/AccountStatisticsTests.java +++ b/src/test/java/io/nats/client/api/AccountStatisticsTests.java @@ -39,7 +39,9 @@ public void testAccountStatsImpl() { assertEquals("ngs", as.getDomain()); ApiStats api = as.getApi(); + //noinspection deprecation assertEquals(301, api.getTotal()); // COVERAGE + //noinspection deprecation assertEquals(302, api.getErrors()); // COVERAGE assertEquals(301, api.getTotalApiRequests()); assertEquals(302, api.getErrorCount()); @@ -70,7 +72,9 @@ public void testAccountStatsImpl() { api = as.getApi(); assertNotNull(api); + //noinspection deprecation assertEquals(0, api.getTotal()); // COVERAGE + //noinspection deprecation assertEquals(0, api.getErrors()); // COVERAGE assertEquals(0, api.getTotalApiRequests()); assertEquals(0, api.getErrorCount()); @@ -80,8 +84,10 @@ public void testAccountStatsImpl() { private void validateTier(AccountTier tier, int tierBase, int limitsIdBase) { assertNotNull(tier); + //noinspection deprecation assertEquals(tierBase + 1, tier.getMemory()); // COVERAGE assertEquals(tierBase + 1, tier.getMemoryBytes()); + //noinspection deprecation assertEquals(tierBase + 2, tier.getStorage()); // COVERAGE assertEquals(tierBase + 2, tier.getStorageBytes()); assertEquals(tierBase + 3, tier.getStreams()); diff --git a/src/test/java/io/nats/client/api/ConsumerConfigurationTests.java b/src/test/java/io/nats/client/api/ConsumerConfigurationTests.java index 40b7ef6c4..0e2db8b8c 100644 --- a/src/test/java/io/nats/client/api/ConsumerConfigurationTests.java +++ b/src/test/java/io/nats/client/api/ConsumerConfigurationTests.java @@ -47,8 +47,8 @@ public void testBuilder() throws Exception { .ackWait(Duration.ofSeconds(99)) // duration .deliverPolicy(DeliverPolicy.ByStartSequence) .description("blah") - .name(NAME) - .durable(NAME) + .name("name") + .durable("name") .filterSubject("fs") .maxDeliver(5555) .maxAckPending(6666) @@ -57,7 +57,7 @@ public void testBuilder() throws Exception { .sampleFrequency("10s") .startSequence(2001) .startTime(zdt) - .deliverSubject(DELIVER) + .deliverSubject("deliver") .flowControl(66000) // duration .maxPullWaiting(73) .maxBatch(55) @@ -81,9 +81,10 @@ public void testBuilder() throws Exception { assertNotNull(c.toString()); // COVERAGE assertAsBuilt(c, zdt); - ConsumerCreateRequest ccr = new ConsumerCreateRequest(STREAM, c); + String stream = random(); + ConsumerCreateRequest ccr = new ConsumerCreateRequest(stream, c); assertNotNull(ccr.toString()); // COVERAGE - assertEquals(STREAM, ccr.getStreamName()); + assertEquals(stream, ccr.getStreamName()); assertNotNull(ccr.getConfig()); assertNotNull(ccr.getAction()); assertSame(ConsumerCreateRequest.Action.CreateOrUpdate, ccr.getAction()); @@ -206,7 +207,7 @@ public void testBuilder() throws Exception { assertThrows(IllegalArgumentException.class, () -> ConsumerConfiguration.builder().backoff(DURATION_MIN_LONG - 1).build()); - assertClientError(JsConsumerNameDurableMismatch, () -> ConsumerConfiguration.builder().name(NAME).durable(DURABLE).build()); + assertClientError(JsConsumerNameDurableMismatch, () -> ConsumerConfiguration.builder().name(random()).durable(random()).build()); // filter subjects vs filter subject builder.filterSubjects("subject-0", "subject-1"); @@ -252,8 +253,8 @@ private void assertAsBuilt(ConsumerConfiguration c, ZonedDateTime zdt) { assertEquals(Duration.ofSeconds(99), c.getAckWait()); assertEquals(DeliverPolicy.ByStartSequence, c.getDeliverPolicy()); assertEquals("blah", c.getDescription()); - assertEquals(NAME, c.getDurable()); - assertEquals(NAME, c.getName()); + assertEquals("name", c.getDurable()); + assertEquals("name", c.getName()); assertEquals("fs", c.getFilterSubject()); assertEquals(5555, c.getMaxDeliver()); assertEquals(6666, c.getMaxAckPending()); @@ -262,7 +263,7 @@ private void assertAsBuilt(ConsumerConfiguration c, ZonedDateTime zdt) { assertEquals("10s", c.getSampleFrequency()); assertEquals(2001, c.getStartSequence()); assertEquals(zdt, c.getStartTime()); - assertEquals(DELIVER, c.getDeliverSubject()); + assertEquals("deliver", c.getDeliverSubject()); assertTrue(c.isFlowControl()); assertEquals(Duration.ofSeconds(66), c.getIdleHeartbeat()); assertEquals(73, c.getMaxPullWaiting()); diff --git a/src/test/java/io/nats/client/api/ObjectStoreApiTests.java b/src/test/java/io/nats/client/api/ObjectStoreApiTests.java index 75d0f6239..1a7518366 100644 --- a/src/test/java/io/nats/client/api/ObjectStoreApiTests.java +++ b/src/test/java/io/nats/client/api/ObjectStoreApiTests.java @@ -94,7 +94,7 @@ public void testObjectInfoConstruction() { } private void validateObjectInfo(ObjectInfo oi, ZonedDateTime modified) { - assertEquals(BUCKET, oi.getBucket()); + assertEquals("bucket", oi.getBucket()); assertEquals("object-name", oi.getObjectName()); assertEquals("object-desc", oi.getDescription()); assertEquals(344000, oi.getSize()); @@ -107,11 +107,11 @@ private void validateObjectInfo(ObjectInfo oi, ZonedDateTime modified) { assertEquals(8196, oi.getObjectMeta().getObjectMetaOptions().getChunkSize()); assertNotNull(oi.getHeaders()); assertEquals(2, oi.getHeaders().size()); - List list = oi.getHeaders().get(key(1)); + List list = oi.getHeaders().get("key-1"); assertNotNull(list); assertEquals(1, list.size()); - assertEquals(data(1), oi.getHeaders().getFirst(key(1))); - list = oi.getHeaders().get(key(2)); + assertEquals(data(1), oi.getHeaders().getFirst("key-1")); + list = oi.getHeaders().get("key-2"); assertNotNull(list); assertEquals(2, list.size()); assertTrue(list.contains(data(21))); @@ -126,11 +126,12 @@ private void validateObjectInfo(ObjectInfo oi, ZonedDateTime modified) { @Test public void testObjectInfoCoverage() { - ObjectLink link1a = ObjectLink.object(BUCKET, "name"); - ObjectLink link1b = ObjectLink.object(BUCKET, "name"); - ObjectLink link2 = ObjectLink.object(BUCKET, "name2"); - ObjectLink blink1a = ObjectLink.bucket(BUCKET); - ObjectLink blink1b = ObjectLink.bucket(BUCKET); + String bucket = random(); + ObjectLink link1a = ObjectLink.object(bucket, "name"); + ObjectLink link1b = ObjectLink.object(bucket, "name"); + ObjectLink link2 = ObjectLink.object(bucket, "name2"); + ObjectLink blink1a = ObjectLink.bucket(bucket); + ObjectLink blink1b = ObjectLink.bucket(bucket); ObjectLink blink2 = ObjectLink.bucket("bucket2"); ObjectMetaOptions metaOptions = ObjectMetaOptions.builder().link(link1a).chunkSize(1024).build(); diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java index 7298b504b..0ba28e21a 100644 --- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java +++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java @@ -13,7 +13,6 @@ package io.nats.client.api; -import io.nats.client.JetStreamManagement; import io.nats.client.impl.JetStreamTestBase; import io.nats.client.support.DateTimeUtils; import io.nats.client.support.JsonParseException; @@ -54,9 +53,9 @@ private StreamConfiguration getTestConfiguration() { @Test public void testRoundTrip() throws Exception { - runInJsServer(si -> si.isNewerVersionThan("2.8.4"), nc -> { + runInLrServer((nc, jsm, js) -> { CompressionOption compressionOption = atLeast2_10(ensureRunServerInfo()) ? S2 : None; - String stream = stream(); + String stream = random(); StreamConfiguration sc = StreamConfiguration.builder(getTestConfiguration()) .name(stream) .mirror(null) @@ -71,7 +70,6 @@ public void testRoundTrip() throws Exception { .allowMessageCounter(false) .persistMode(null) .build(); - JetStreamManagement jsm = nc.jetStreamManagement(); validateTestStreamConfiguration(jsm.addStream(sc).getConfiguration(), true, stream); }); } @@ -148,7 +146,7 @@ public void testMissingJsonFields() throws Exception{ public void testInvalidNameInJson() throws Exception{ String originalJson = getStreamConfigurationJson(); JsonValue originalParsedJson = JsonParser.parse(originalJson); - originalParsedJson.map.put(NAME, new JsonValue("Inavlid*Name")); + originalParsedJson.map.put("name", new JsonValue("Invalid*Name")); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.instance(originalParsedJson.toJson())); } @@ -319,7 +317,7 @@ public void testConstruction() { // coverage for null StreamConfiguration, millis maxAge, millis duplicateWindow StreamConfiguration scCov = StreamConfiguration.builder(null) - .name(name()) + .name(random()) .maxAge(1111) .duplicateWindow(2222) .build(); @@ -455,63 +453,74 @@ private void assertNotEqualsEqualsHashcode(Source s, Mirror m, Source.Builder sb @Test public void testSubjects() { - StreamConfiguration.Builder builder = StreamConfiguration.builder().name(name()); + StreamConfiguration.Builder builder = StreamConfiguration.builder().name(random()); + String subject = random(); // subjects(...) replaces - builder.subjects(subject(0)); - assertSubjects(builder.build(), 0); + builder.subjects(subject); + assertSubjects(builder.build(), subject); // subjects(...) replaces builder.subjects(); assertSubjects(builder.build()); // subjects(...) replaces - builder.subjects(subject(1)); - assertSubjects(builder.build(), 1); + subject = random(); + builder.subjects(subject); + assertSubjects(builder.build(), subject); // subjects(...) replaces builder.subjects((String)null); assertSubjects(builder.build()); // subjects(...) replaces - builder.subjects(subject(2), subject(3)); - assertSubjects(builder.build(), 2, 3); + String subjectA = random(); + String subjectB = random(); + builder.subjects(subjectA, subjectB); + assertSubjects(builder.build(), subjectA, subjectB); // subjects(...) replaces - builder.subjects(subject(101), null, subject(102)); - assertSubjects(builder.build(), 101, 102); + subjectA = random(); + subjectB = random(); + builder.subjects(subjectA, null, subjectB); + assertSubjects(builder.build(), subjectA, subjectB); // subjects(...) replaces - builder.subjects(Arrays.asList(subject(4), subject(5))); - assertSubjects(builder.build(), 4, 5); + subjectA = random(); + subjectB = random(); + builder.subjects(Arrays.asList(subjectA, subjectB)); + assertSubjects(builder.build(), subjectA, subjectB); // addSubjects(...) adds unique - builder.addSubjects(subject(5), subject(6)); - assertSubjects(builder.build(), 4, 5, 6); + String subjectC = random(); + builder.addSubjects(subjectB, subjectC); + assertSubjects(builder.build(), subjectA, subjectB, subjectC); // addSubjects(...) adds unique - builder.addSubjects(Arrays.asList(subject(6), subject(7), subject(8))); - assertSubjects(builder.build(), 4, 5, 6, 7, 8); + String subjectD = random(); + String subjectE = random(); + builder.addSubjects(Arrays.asList(subjectC, subjectD, subjectE)); + assertSubjects(builder.build(), subjectA, subjectB, subjectC, subjectD, subjectE); // addSubjects(...) null check builder.addSubjects((String[]) null); - assertSubjects(builder.build(), 4, 5, 6, 7, 8); + assertSubjects(builder.build(), subjectA, subjectB, subjectC, subjectD, subjectE); // addSubjects(...) null check builder.addSubjects((Collection) null); - assertSubjects(builder.build(), 4, 5, 6, 7, 8); + assertSubjects(builder.build(), subjectA, subjectB, subjectC, subjectD, subjectE); } - private void assertSubjects(StreamConfiguration sc, int... subIds) { - assertEquals(subIds.length, sc.getSubjects().size()); - for (int subId : subIds) { - assertTrue(sc.getSubjects().contains(subject(subId))); + private void assertSubjects(StreamConfiguration sc, String... subjects) { + assertEquals(subjects.length, sc.getSubjects().size()); + for (String s : subjects) { + assertTrue(sc.getSubjects().contains(s)); } } @Test public void testRetentionPolicy() { - StreamConfiguration.Builder builder = StreamConfiguration.builder().name(name()); + StreamConfiguration.Builder builder = StreamConfiguration.builder().name(random()); assertEquals(RetentionPolicy.Limits, builder.build().getRetentionPolicy()); builder.retentionPolicy(RetentionPolicy.Limits); @@ -529,7 +538,7 @@ public void testRetentionPolicy() { @Test public void testCompressionOption() { - StreamConfiguration.Builder builder = StreamConfiguration.builder().name(name()); + StreamConfiguration.Builder builder = StreamConfiguration.builder().name(random()); assertEquals(None, builder.build().getCompressionOption()); builder.compressionOption(None); @@ -546,7 +555,7 @@ public void testCompressionOption() { @Test public void testStorageType() { - StreamConfiguration.Builder builder = StreamConfiguration.builder().name(name()); + StreamConfiguration.Builder builder = StreamConfiguration.builder().name(random()); assertEquals(StorageType.File, builder.build().getStorageType()); builder.storageType(StorageType.Memory); @@ -558,7 +567,7 @@ public void testStorageType() { @Test public void testDiscardPolicy() { - StreamConfiguration.Builder builder = StreamConfiguration.builder().name(name()); + StreamConfiguration.Builder builder = StreamConfiguration.builder().name(random()); assertEquals(DiscardPolicy.Old, builder.build().getDiscardPolicy()); builder.discardPolicy(DiscardPolicy.New); diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 2e5dd750e..52ac05ff6 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -17,22 +17,21 @@ import io.nats.client.ErrorListener; import io.nats.client.NatsTestServer; import io.nats.client.Options; -import java.time.Duration; -import java.util.concurrent.atomic.AtomicBoolean; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.concurrent.atomic.AtomicBoolean; + import static io.nats.client.utils.TestBase.*; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class AuthAndConnectTests { @Test public void testIsAuthError() throws Exception { try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = standardConnection(ts.getURI()); + Connection nc = TestBase.standardConnectionWait(ts.getURI()); NatsConnection nats = (NatsConnection)nc; assertTrue(nats.isAuthenticationError("user authentication expired")); @@ -49,7 +48,7 @@ public void testIsAuthError() throws Exception { @Test() public void testConnectWhenClosed() throws Exception { try (NatsTestServer ts = new NatsTestServer(false)) { - NatsConnection nc = (NatsConnection)standardConnection(ts.getURI()); + NatsConnection nc = (NatsConnection) TestBase.standardConnectionWait(ts.getURI()); standardCloseConnection(nc); nc.connect(false); // should do nothing assertClosed(nc); @@ -80,7 +79,7 @@ public void errorOccurred(Connection conn, String error) { .errorListener(noopErrorListener) .build(); - NatsConnection nc = (NatsConnection) standardConnection(options); + NatsConnection nc = (NatsConnection) TestBase.standardConnectionWait(options); // After we've connected, shut down, so we can attempt reconnecting. ts.shutdown(true); diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 67b7d5b59..aef6f272a 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -24,7 +25,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.TestBase.standardCloseConnection; +import static io.nats.client.utils.TestBase.standardConnectionWait; import static org.junit.jupiter.api.Assertions.*; public class ConnectionListenerTests { @@ -42,7 +44,7 @@ public void testCloseCount() throws Exception { server(ts.getURI()). connectionListener(listener). build(); - Connection nc = standardConnection(options); + Connection nc = TestBase.standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); @@ -64,7 +66,7 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception { build(); listener.prepForStatusChange(Events.CONNECTED); - standardCloseConnection( listenerConnectionWait(options, listener) ); + standardCloseConnection( TestBase.listenerConnectionWait(options, listener) ); assertEquals(1, listener.getEventCount(Events.DISCOVERED_SERVERS)); } } @@ -83,7 +85,7 @@ public void testDisconnectReconnectCount() throws Exception { connectionListener(listener). build(); port = ts.getPort(); - nc = standardConnection(options); + nc = TestBase.standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -110,7 +112,7 @@ public void testExceptionInConnectionListener() throws Exception { server(ts.getURI()). connectionListener(listener). build(); - Connection nc = standardConnection(options); + Connection nc = TestBase.standardConnectionWait(options); standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); } @@ -126,7 +128,7 @@ public void testMultipleConnectionListeners() throws Exception { server(ts.getURI()). connectionListener(listener). build(); - Connection nc = standardConnection(options); + Connection nc = TestBase.standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull diff --git a/src/test/java/io/nats/client/impl/DispatcherTests.java b/src/test/java/io/nats/client/impl/DispatcherTests.java index dc69bc526..c7d84e5d7 100644 --- a/src/test/java/io/nats/client/impl/DispatcherTests.java +++ b/src/test/java/io/nats/client/impl/DispatcherTests.java @@ -14,6 +14,10 @@ package io.nats.client.impl; import io.nats.client.*; +import io.nats.client.utils.LongRunningServer; +import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -29,52 +33,165 @@ import static org.junit.jupiter.api.Assertions.*; - // Some tests are a bit tricky, and depend on the fact that the dispatcher -// uses a single queue, so the "subject" messages go through before +// uses a single queue, so the subject messages go through before // the done message (or should) - wanted to note that somewhere public class DispatcherTests { + static Connection nc; + + @BeforeAll + public static void beforeAll() { + try { + nc = TestBase.longConnectionWait(LongRunningServer.options()); + } + catch (IOException e) { + throw new RuntimeException(e); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } + } + + @AfterAll + public static void afterAll() { + try { + nc.close(); + } + catch (Exception ignore) {} + } + @Test - public void testDispatcherMultipleSubscriptionsBySubject() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - String subject1 = subject(); - String subject2 = subject(); - - List dflt = Collections.synchronizedList(new ArrayList<>()); - List sub21 = Collections.synchronizedList(new ArrayList<>()); - List sub22 = Collections.synchronizedList(new ArrayList<>()); - List sub31 = Collections.synchronizedList(new ArrayList<>()); - List sub32 = Collections.synchronizedList(new ArrayList<>()); - Dispatcher d1 = nc.createDispatcher(m -> dflt.add(getDataId(m))); - d1.subscribe(subject1); - d1.subscribe(subject1, m -> sub21.add(getDataId(m))); - d1.subscribe(subject1, m -> sub22.add(getDataId(m))); - d1.subscribe(subject2, m -> sub31.add(getDataId(m))); - d1.subscribe(subject2, m -> sub32.add(getDataId(m))); - - nc.publish(subject1, "1".getBytes()); - nc.publish(subject2, "1".getBytes()); - Thread.sleep(1000); - d1.unsubscribe(subject1); - nc.publish(subject1, "2".getBytes()); - nc.publish(subject2, "2".getBytes()); - Thread.sleep(1000); - - assertTrue(dflt.contains(1)); - assertTrue(sub21.contains(1)); - assertTrue(sub22.contains(1)); - assertTrue(sub31.contains(1)); - assertTrue(sub32.contains(1)); - - assertFalse(dflt.contains(2)); - assertFalse(sub21.contains(2)); - assertFalse(sub22.contains(2)); - assertTrue(sub31.contains(2)); - assertTrue(sub32.contains(2)); + public void testDispatcherSubscribingExceptions() throws Exception { + // InvalidSubjectsAndQueueNames + Dispatcher dx = nc.createDispatcher(m -> { + }); + for (String bad : BAD_SUBJECTS_OR_QUEUES) { + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, m -> { + })); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q")); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q", m -> { + })); + assertThrows(IllegalArgumentException.class, () -> nc.subscribe("s", bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad, m -> { + })); } + + String subject = random(); + dx.subscribe(subject); + + // can't subscribe to empty subject -> subject, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", msg -> {})); + + // can't subscribe to null handler -> subject, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), (MessageHandler) null)); + + // can't subscribe null subject -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(null, random(), msg -> {})); + + // can't subscribe empty subject -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", random(), msg -> {})); + + // can't subscribe with null queue -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), null, msg -> {})); + + // can't subscribe with empty queue -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), "", msg -> {})); + + // can't subscribe with null handler -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), random(), null)); + + // can't unsubscribe with null subject + assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe((String) null)); + + // can't unsubscribe with empty subject + assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe("")); + + nc.closeDispatcher(dx); + + // can't close if already closed + assertThrows(IllegalArgumentException.class, () -> nc.closeDispatcher(dx)); + + // can't unsubscribe if dispatcher is closed + assertThrows(IllegalStateException.class, () -> dx.unsubscribe(subject)); + + // can't subscribe if dispatcher is closed + assertThrows(IllegalStateException.class, () -> dx.subscribe(random())); + + // If dispatcher was made without a default handler, + // you must subscribe with a specific handler + Dispatcher dNoHandler = nc.createDispatcher(); + dNoHandler.subscribe(random(), m -> {}); // This is fine + IllegalStateException ise = assertThrows(IllegalStateException.class, () -> dNoHandler.subscribe(random())); + assertTrue(ise.getMessage().contains("Dispatcher was made without a default handler.")); + nc.closeDispatcher(dNoHandler); + } + + @Test + public void throwsOnCreateIfConnectionClosed() throws Exception { + // custom connection since we must close it. + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = longConnectionWait(ts.getURI())) + { + Dispatcher d = nc.createDispatcher(msg -> {}); + // close connection + nc.close(); + + // can't create if connection is closed + assertThrows(IllegalStateException.class, () -> nc.createDispatcher(msg -> {})); + + // can't subscribe if connection is closed + assertThrows(IllegalStateException.class, () -> d.subscribe(random())); + + // can't subscribe if connection is closed + assertThrows(IllegalStateException.class, () -> d.subscribe(random())); + + // can't close dispatcher if connection is closed + assertThrows(IllegalStateException.class, () -> nc.closeDispatcher(d)); + } + } + + @Test + public void testProperlyUnsubscribeBySubject() throws Exception { + // MultipleSubscriptionsBySubject + String subject1 = random(); + String subject2 = random(); + + List dflt = Collections.synchronizedList(new ArrayList<>()); + List sub21 = Collections.synchronizedList(new ArrayList<>()); + List sub22 = Collections.synchronizedList(new ArrayList<>()); + List sub31 = Collections.synchronizedList(new ArrayList<>()); + List sub32 = Collections.synchronizedList(new ArrayList<>()); + Dispatcher d1 = nc.createDispatcher(m -> dflt.add(getDataId(m))); + d1.subscribe(subject1); + d1.subscribe(subject1, m -> sub21.add(getDataId(m))); + d1.subscribe(subject1, m -> sub22.add(getDataId(m))); + d1.subscribe(subject2, m -> sub31.add(getDataId(m))); + d1.subscribe(subject2, m -> sub32.add(getDataId(m))); + + nc.publish(subject1, "1".getBytes()); + nc.publish(subject2, "1".getBytes()); + Thread.sleep(1000); + d1.unsubscribe(subject1); + nc.publish(subject1, "2".getBytes()); + nc.publish(subject2, "2".getBytes()); + Thread.sleep(1000); + + assertTrue(dflt.contains(1)); + assertTrue(sub21.contains(1)); + assertTrue(sub22.contains(1)); + assertTrue(sub31.contains(1)); + assertTrue(sub32.contains(1)); + + assertFalse(dflt.contains(2)); + assertFalse(sub21.contains(2)); + assertFalse(sub22.contains(2)); + assertTrue(sub31.contains(2)); + assertTrue(sub32.contains(2)); } private static int getDataId(Message m) { @@ -83,174 +200,169 @@ private static int getDataId(Message m) { @Test public void testSingleMessage() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - msgFuture.complete(msg); - }); + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - d.subscribe("subject"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + nc.publish(subject, new byte[16]); - nc.publish("subject", new byte[16]); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + assertTrue(d.isActive()); + assertEquals(subject, msg.getSubject()); + assertNotNull(msg.getSubscription()); + assertNull(msg.getReplyTo()); + assertEquals(16, msg.getData().length); - assertTrue(d.isActive()); - assertEquals("subject", msg.getSubject()); - assertNotNull(msg.getSubscription()); - assertNull(msg.getReplyTo()); - assertEquals(16, msg.getData().length); - } + nc.closeDispatcher(d); } @Test public void testDispatcherMessageContainsConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { final CompletableFuture msgFuture = new CompletableFuture<>(); final CompletableFuture connFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { msgFuture.complete(msg); connFuture.complete(msg.getConnection()); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); nc.flush(Duration.ofMillis(5000));// Get them all to the server - nc.publish("subject", new byte[16]); + nc.publish(subject, new byte[16]); Message msg = msgFuture.get(5000, TimeUnit.MILLISECONDS); Connection conn = connFuture.get(5000, TimeUnit.MILLISECONDS); assertTrue(d.isActive()); - assertEquals("subject", msg.getSubject()); + assertEquals(subject, msg.getSubject()); assertNotNull(msg.getSubscription()); assertNull(msg.getReplyTo()); assertEquals(16, msg.getData().length); - assertTrue(conn == nc); + assertSame(conn, nc); } } @Test public void testMultiSubject() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { final CompletableFuture one = new CompletableFuture<>(); final CompletableFuture two = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("one")) { + String subject1 = random(); + String subject2 = random(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(subject1)) { one.complete(msg); - } else if (msg.getSubject().equals("two")) { + } else if (msg.getSubject().equals(subject2)) { two.complete(msg); } }); - d.subscribe("one"); - d.subscribe("two"); + d.subscribe(subject1); + d.subscribe(subject2); nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish("one", new byte[16]); - nc.publish("two", new byte[16]); + nc.publish(subject1, new byte[16]); + nc.publish(subject2, new byte[16]); Message msg = one.get(500, TimeUnit.MILLISECONDS); - assertEquals("one", msg.getSubject()); + assertEquals(subject1, msg.getSubject()); msg = two.get(500, TimeUnit.MILLISECONDS); - assertEquals("two", msg.getSubject()); + assertEquals(subject2, msg.getSubject()); + + nc.closeDispatcher(d); } } @Test public void testMultiMessage() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + final CompletableFuture done = new CompletableFuture<>(); + int msgCount = 100; - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals("done")) { + done.complete(Boolean.TRUE); + } + else { + q.add(msg); } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + }); - done.get(500, TimeUnit.MILLISECONDS); + String subject = random(); + d.subscribe(subject); + d.subscribe("done"); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - assertEquals(msgCount, q.size()); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } + nc.publish("done", new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + + done.get(500, TimeUnit.MILLISECONDS); + + assertEquals(msgCount, q.size()); } @Test - public void testClose() { - assertThrows(TimeoutException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture phase1 = new CompletableFuture<>(); - final CompletableFuture phase2 = new CompletableFuture<>(); - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("phase1")) { - phase1.complete(Boolean.TRUE); - } else if (msg.getSubject().equals("phase1")) { - phase2.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + public void testClosedDispatcherBehavior() throws Exception { + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); - d.subscribe("subject"); - d.subscribe("phase1"); - d.subscribe("phase2"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + final ConcurrentLinkedQueue received = new ConcurrentLinkedQueue<>(); + String subject = random(); + String phase1 = random(); + String phase2 = random(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); + } + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); + } + else { + received.add(msg); + } + }); - nc.publish("subject", new byte[16]); - nc.publish("phase1", null); + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - phase1.get(200, TimeUnit.MILLISECONDS); + nc.publish(subject, new byte[16]); + nc.publish(phase1, null); - assertEquals(1, q.size()); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fPhase1.get(200, TimeUnit.MILLISECONDS); - nc.closeDispatcher(d); + assertEquals(1, received.size()); - assertFalse(d.isActive()); + nc.closeDispatcher(d); - // This won't arrive - nc.publish("phase2", new byte[16]); + assertFalse(d.isActive()); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - phase2.get(200, TimeUnit.MILLISECONDS); - } - }); - } + // This won't arrive + nc.publish(phase2, new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + assertThrows(TimeoutException.class, () -> fPhase2.get(200, TimeUnit.MILLISECONDS)); + } @Test public void testQueueSubscribers() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = TestBase.standardConnectionWait(ts.getURI())) { int msgs = 100; AtomicInteger received = new AtomicInteger(); AtomicInteger sub1Count = new AtomicInteger(); @@ -259,10 +371,12 @@ public void testQueueSubscribers() throws Exception { final CompletableFuture done1 = new CompletableFuture<>(); final CompletableFuture done2 = new CompletableFuture<>(); - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + String subject = random(); + String done = random(); + String queue = random(); - Dispatcher d1 = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { + Dispatcher d1 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { done1.complete(Boolean.TRUE); } else { sub1Count.incrementAndGet(); @@ -270,8 +384,8 @@ public void testQueueSubscribers() throws Exception { } }); - Dispatcher d2 = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { + Dispatcher d2 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { done2.complete(Boolean.TRUE); } else { sub2Count.incrementAndGet(); @@ -279,17 +393,17 @@ public void testQueueSubscribers() throws Exception { } }); - d1.subscribe("subject", "queue"); - d2.subscribe("subject", "queue"); - d1.subscribe("done"); - d2.subscribe("done"); + d1.subscribe(subject, queue); + d2.subscribe(subject, queue); + d1.subscribe(done); + d2.subscribe(done); nc.flush(Duration.ofMillis(500)); for (int i = 0; i < msgs; i++) { - nc.publish("subject", new byte[16]); + nc.publish(subject, new byte[16]); } - nc.publish("done", null); + nc.publish(done, null); nc.flush(Duration.ofMillis(500)); done1.get(500, TimeUnit.MILLISECONDS); @@ -298,687 +412,448 @@ public void testQueueSubscribers() throws Exception { assertEquals(msgs, received.get()); assertEquals(msgs, sub1Count.get() + sub2Count.get()); - // They won't be equal but print to make sure they are close (human testing) - System.out.println("### Sub 1 " + sub1Count.get()); - System.out.println("### Sub 2 " + sub2Count.get()); + nc.closeDispatcher(d1); + nc.closeDispatcher(d2); } } @Test - public void testCantUnsubSubFromDispatcher() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) - { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + public void testCantUnsubSubFromDispatcher() throws Exception { + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - msgFuture.complete(msg); - }); + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - d.subscribe("subject"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + nc.publish(subject, new byte[16]); - nc.publish("subject", new byte[16]); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe()); - msg.getSubscription().unsubscribe(); // Should throw - assertFalse(true); - } - }); + nc.closeDispatcher(d); } @Test - public void testCantAutoUnsubSubFromDispatcher() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) - { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + public void testCantAutoUnsubSubFromDispatcher() throws Exception { + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - msgFuture.complete(msg); - }); + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - d.subscribe("subject"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + nc.publish(subject, new byte[16]); - nc.publish("subject", new byte[16]); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe(1)); - msg.getSubscription().unsubscribe(1); // Should throw - assertFalse(true); - } - }); + nc.closeDispatcher(d); } @Test - public void testPublishAndFlushFromCallback() - throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + public void testPublishAndFlushFromCallback() throws Exception { + String subject = random(); - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - try { - nc.flush(Duration.ofMillis(1000)); - } catch (Exception ex) { - ex.printStackTrace(); - } - msgFuture.complete(msg); - }); + long startCount = nc.getStatistics().getFlushCounter(); - d.subscribe("subject"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msg -> { + try { + nc.flush(Duration.ofMillis(1000)); + } catch (Exception ex) { + ex.printStackTrace(); + } + msgFuture.complete(msg); + }); - nc.publish("subject", new byte[16]); // publish one to kick it off + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); + nc.publish(subject, new byte[16]); // publish one to kick it off - assertEquals(2, ((NatsStatistics)(nc.getStatistics())).getFlushCounter()); - } + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + + long diffCount = nc.getStatistics().getFlushCounter() - startCount; + assertEquals(2, diffCount); + nc.closeDispatcher(d); } @Test public void testUnsub() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture phase1 = new CompletableFuture<>(); - final CompletableFuture phase2 = new CompletableFuture<>(); - int msgCount = 10; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("phase1")) { - phase1.complete(Boolean.TRUE); - } else if (msg.getSubject().equals("phase2")) { - phase2.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); + int msgCount = 10; - d.subscribe("subject"); - d.subscribe("phase1"); - d.subscribe("phase2"); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + String subject = random(); + String phase1 = random(); + String phase2 = random(); - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); + } + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); } - nc.publish("phase1", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + else { + q.add(msg); + } + }); - phase1.get(5000, TimeUnit.MILLISECONDS); + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(1000));// Get them all to the server - d.unsubscribe("subject"); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase1, new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("phase2", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fPhase1.get(5000, TimeUnit.MILLISECONDS); - phase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + d.unsubscribe(subject); + nc.flush(Duration.ofMillis(1000));// Get them all to the server - assertEquals(msgCount, q.size()); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } + nc.publish(phase2, new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + + fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + + assertEquals(msgCount, q.size()); + + nc.closeDispatcher(d); } @Test public void testAutoUnsub() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture phase1 = new CompletableFuture<>(); - final CompletableFuture phase2 = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - NatsDispatcher d = (NatsDispatcher) nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("phase1")) { - phase1.complete(Boolean.TRUE); - }else if (msg.getSubject().equals("phase2")) { - phase2.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); + int msgCount = 100; - d.subscribe("subject"); - d.subscribe("phase1"); - d.subscribe("phase2"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + String subject = random(); + String phase1 = random(); + String phase2 = random(); - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + NatsDispatcher d = (NatsDispatcher) nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); } - nc.publish("phase1", new byte[16]); + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); + } + else { + q.add(msg); + } + }); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - phase1.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - assertEquals(msgCount, q.size()); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase1, new byte[16]); - d.unsubscribe("subject", msgCount + 1); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fPhase1.get(1000, TimeUnit.MILLISECONDS); // make sure we got them - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("phase2", new byte[16]); + assertEquals(msgCount, q.size()); - nc.flush(Duration.ofMillis(1000)); // Wait for it all to get processed - phase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + d.unsubscribe(subject, msgCount + 1); - assertEquals(msgCount + 1, q.size()); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } + nc.publish(phase2, new byte[16]); + + nc.flush(Duration.ofMillis(1000)); // Wait for it all to get processed + fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + + assertEquals(msgCount + 1, q.size()); + + nc.closeDispatcher(d); } @Test public void testUnsubFromCallback() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final AtomicReference dispatcher = new AtomicReference<>(); - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - final Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } else { - q.add(msg); - dispatcher.get().unsubscribe("subject"); - } - }); + final CompletableFuture fDone = new CompletableFuture<>(); + String subject = random(); + String done = random(); - dispatcher.set(d); + final AtomicReference dispatcher = new AtomicReference<>(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + final Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + dispatcher.get().unsubscribe(subject); + } + }); - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(500));// Get them all to the server + dispatcher.set(d); - nc.publish("subject", new byte[16]); - nc.publish("subject", new byte[16]); - nc.publish("done", new byte[16]); // when we get this we know the others are dispatched - nc.flush(Duration.ofMillis(1000)); // Wait for the publish, or we will get multiples for sure - done.get(200, TimeUnit.MILLISECONDS); // make sure we got them + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(500));// Get them all to the server - assertEquals(1, q.size()); - } + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(done, new byte[16]); // when we get this we know the others are dispatched + nc.flush(Duration.ofMillis(1000)); // Wait for the publish, or we will get multiples for sure + fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them + + assertEquals(1, q.size()); + + nc.closeDispatcher(d); } @Test - public void testAutoUnsubFromCallback() - throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final AtomicReference dispatcher = new AtomicReference<>(); - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - final Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } else { - q.add(msg); - dispatcher.get().unsubscribe("subject", 2); // get 1 more, for a total of 2 - } - }); + public void testAutoUnsubFromCallback() throws Exception { + final CompletableFuture fDone = new CompletableFuture<>(); - dispatcher.set(d); + String subject = random(); + String done = random(); + final AtomicReference dispatcher = new AtomicReference<>(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + final Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + dispatcher.get().unsubscribe(subject, 2); // get 1 more, for a total of 2 + } + }); - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + dispatcher.set(d); - nc.publish("subject", new byte[16]); - nc.publish("subject", new byte[16]); - nc.publish("subject", new byte[16]); - nc.publish("done", new byte[16]); // when we get this we know the others are dispatched - nc.flush(Duration.ofMillis(1000)); // Wait for the publish + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(1000));// Get them all to the server - done.get(200, TimeUnit.MILLISECONDS); // make sure we got them + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(done, new byte[16]); // when we get this we know the others are dispatched + nc.flush(Duration.ofMillis(1000)); // Wait for the publish - assertEquals(2, q.size()); - } + fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them + + assertEquals(2, q.size()); + + nc.closeDispatcher(d); } @Test public void testCloseFromCallback() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = standardConnectionWait(ts.getURI())) + { + final CompletableFuture fDone = new CompletableFuture<>(); - final Dispatcher d = nc.createDispatcher((msg) -> { + String subject = random(); + final Dispatcher d = nc.createDispatcher(msg -> { try { - if (msg.getSubject().equals("done")) { + if (msg.getSubject().equals(subject)) { nc.close(); - done.complete(Boolean.TRUE); + fDone.complete(Boolean.TRUE); } - } catch (InterruptedException e) { + } + catch (InterruptedException e) { e.printStackTrace(); } }); - d.subscribe("done"); + d.subscribe(subject); sleep(500); // Making sure the "subscribe" has been registered on the server - nc.publish("done", new byte[16]); + nc.publish(subject, new byte[16]); - done.get(5000, TimeUnit.MILLISECONDS); - - waitUntilStatus(nc, 5000, Connection.Status.CLOSED); + fDone.get(5000, TimeUnit.MILLISECONDS); } } @Test public void testDispatchHandlesExceptionInHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } else { - q.add(msg); - throw new NumberFormatException(); - } - }); - - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(500));// Get them all to the server - - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("done", new byte[16]); - - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - done.get(200, TimeUnit.MILLISECONDS); - - assertEquals(msgCount, q.size()); - } - } - - @Test - public void testThrowOnNullSubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe(null); - assertFalse(true); + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; + + String subject = random(); + String done = random(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } else { + q.add(msg); + throw new NumberFormatException(); } }); - } - @Test - public void testThrowOnEmptySubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - - d.subscribe(""); - assertFalse(true); - } - }); - } + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(500));// Get them all to the server - @Test - public void testThrowOnEmptyQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("subject", ""); - assertFalse(true); - } - }); - } - - @Test - public void testThrowOnNullSubjectWithQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe(null, "quque"); - assertFalse(true); - } - }); - } + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); - @Test - public void testThrowOnEmptySubjectWithQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("", "quque"); - assertFalse(true); - } - }); - } + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fDone.get(200, TimeUnit.MILLISECONDS); - @Test - public void throwsOnCreateIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - nc.close(); - nc.createDispatcher((msg) -> {}); - assertFalse(true); - } - }); - } + assertEquals(msgCount, q.size()); - @Test - public void throwsOnSubscribeIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - nc.close(); - d.subscribe("subject"); - assertFalse(true); - } - }); + nc.closeDispatcher(d); } @Test - public void testThrowOnSubscribeWhenClosed() throws IOException, InterruptedException, TimeoutException { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - nc.closeDispatcher(d); - d.subscribe("foo"); - assertFalse(true); - } - }); + public void testThrowOnBadInput() { + Dispatcher d = nc.createDispatcher(msg -> {}); + // Null Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe(null)); + // Empty Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); + // Empty Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); + // Null Subject With Queue + assertThrows(IllegalArgumentException.class, () -> d.subscribe(null, random())); + // Empty Subject With Queue + assertThrows(IllegalArgumentException.class, () -> d.subscribe("", random())); + nc.closeDispatcher(d); } @Test - public void testThrowOnUnsubscribeWhenClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("foo"); - nc.closeDispatcher(d); - d.unsubscribe("foo"); - assertFalse(true); - } - }); - } + public void testDoubleSubscribe() throws Exception { + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; - @Test - public void testThrowOnDoubleClose() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - nc.closeDispatcher(d); - nc.closeDispatcher(d); - assertFalse(true); - } - }); - } + String subject = random(); + String done = random(); - @Test - public void testThrowOnConnClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - nc.close(); - nc.closeDispatcher(d); - assertFalse(true); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } else { + q.add(msg); } }); - } - @Test - public void testDoubleSubscribe() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + d.subscribe(subject).subscribe(subject).subscribe(subject).subscribe(done); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - d.subscribe("subject").subscribe("subject").subscribe("subject").subscribe("done"); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + fDone.get(5, TimeUnit.SECONDS); - done.get(5, TimeUnit.SECONDS); + assertEquals(msgCount, q.size()); // Should only get one since all the extra subs do nothing?? - assertEquals(msgCount, q.size()); // Shoudl only get one since all the extra subs do nothing?? - } + nc.closeDispatcher(d); } @Test public void testDoubleSubscribeWithCustomHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final AtomicInteger count = new AtomicInteger(0); - Dispatcher d = nc.createDispatcher((msg) -> {}); + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; - d.subscribe("subject", (msg) -> { count.incrementAndGet(); }); - d.subscribe("subject", "queue", (msg) -> { count.incrementAndGet(); }); - d.subscribe("done", (msg) -> { done.complete(Boolean.TRUE); }); - - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + final AtomicInteger count = new AtomicInteger(0); + Dispatcher d = nc.createDispatcher(msg -> { + }); - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + String subject = random(); + String done = random(); + String queue = random(); + d.subscribe(subject, msg -> count.incrementAndGet()); + d.subscribe(subject, queue, msg -> count.incrementAndGet()); + d.subscribe(done, msg -> fDone.complete(Boolean.TRUE)); - done.get(5, TimeUnit.SECONDS); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); } - } - - @Test - public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - final CompletableFuture done1 = new CompletableFuture<>(); - final CompletableFuture done2 = new CompletableFuture<>(); - int msgCount = 100; - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); - - final AtomicInteger count = new AtomicInteger(0); - Dispatcher d = nc.createDispatcher((msg) -> {}); - Subscription s1 = d.subscribe("subject", (msg) -> { count.incrementAndGet(); }); - Subscription doneSub = d.subscribe("done", (msg) -> { done1.complete(Boolean.TRUE); }); - d.subscribe("subject", (msg) -> { count.incrementAndGet(); }); - - nc.flush(Duration.ofSeconds(5)); // wait for the subs to go through + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - - done1.get(5, TimeUnit.SECONDS); - - assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. - - count.set(0); - d.unsubscribe(s1); - d.unsubscribe(doneSub); - d.subscribe("done", (msg) -> { done2.complete(Boolean.TRUE); }); - nc.flush(Duration.ofSeconds(5)); // wait for the unsub to go through + fDone.get(5, TimeUnit.SECONDS); - for (int i = 0; i < msgCount; i++) { - nc.publish("subject", new byte[16]); - } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - - done2.get(5, TimeUnit.SECONDS); + assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. - assertEquals(msgCount, count.get()); // We only have 1 active subscription, so we should only get msgCount. - } + nc.closeDispatcher(d); } @Test - public void testThrowOnEmptySubjectWithMessageHandler() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("", (msg) -> {}); - assertFalse(true); - } - }); - } - - @Test - public void testThrowOnNullHandler() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("test", (MessageHandler)null); - assertFalse(true); - } - }); - } + public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Exception { + final CompletableFuture fDone1 = new CompletableFuture<>(); + final CompletableFuture fDone2 = new CompletableFuture<>(); + int msgCount = 100; + + String subject = random(); + String done = random(); + final AtomicInteger count = new AtomicInteger(0); + Dispatcher d = nc.createDispatcher(msg -> {}); + Subscription s1 = d.subscribe(subject, msg -> count.incrementAndGet()); + Subscription doneSub = d.subscribe(done, msg -> fDone1.complete(Boolean.TRUE)); + d.subscribe(subject, msg -> count.incrementAndGet()); + + nc.flush(Duration.ofSeconds(5)); // wait for the subs to go through + + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - @Test - public void testThrowOnNullHandlerWithQueue() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("test", "queue", (MessageHandler)null); - assertFalse(true); - } - }); - } + fDone1.get(5, TimeUnit.SECONDS); - @Test - public void testThrowOnEmptyQueueWithMessageHandler() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("subject", "", (msg) -> {}); - assertFalse(true); - } - }); - } + assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. - @Test - public void testThrowOnNullSubjectWithQueueWithMessageHandler() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe(null, "quque", (msg) -> {}); - assertFalse(true); - } - }); - } + count.set(0); + d.unsubscribe(s1); + d.unsubscribe(doneSub); + d.subscribe(done, msg -> fDone2.complete(Boolean.TRUE)); + nc.flush(Duration.ofSeconds(5)); // wait for the unsub to go through - @Test - public void testThrowOnEmptySubjectWithQueueWithMessageHandler() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.subscribe("", "quque", (msg) -> {}); - assertFalse(true); - } - }); - } + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - @Test - public void testThrowOnEmptySubjectInUnsub() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - d.unsubscribe(""); - assertFalse(true); - } - }); - } + fDone2.get(5, TimeUnit.SECONDS); - @Test - public void testThrowOnUnsubWhenClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - Subscription sub = d.subscribe("subject", (msg) -> {}); - nc.closeDispatcher(d); - d.unsubscribe(sub); - assertFalse(true); - } - }); - } + assertEquals(msgCount, count.get()); // We only have 1 active subscription, so we should only get msgCount. - @Test - public void testThrowOnWrongSubscription() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { - Dispatcher d = nc.createDispatcher((msg) -> {}); - Subscription sub2 = nc.subscribe("test"); - d.unsubscribe(sub2); - assertFalse(true); - } - }); + nc.closeDispatcher(d); } @Test public void testDispatcherFactoryCoverage() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(Options.builder().server(ts.getURI()).useDispatcherWithExecutor().build())) + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = longConnectionWait(Options.builder().server(ts.getURI()).useDispatcherWithExecutor().build())) { CountDownLatch latch = new CountDownLatch(1); - Dispatcher d = nc.createDispatcher((msg) -> latch.countDown()); + Dispatcher d = nc.createDispatcher(msg -> latch.countDown()); assertInstanceOf(NatsDispatcherWithExecutor.class, d); String subject = NUID.nextGlobalSequence(); d.subscribe(subject); diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 7f3d18d24..0587fff4b 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -34,7 +35,7 @@ public class DrainTests { @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer(false)) { - final Connection nc = standardConnection(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); + final Connection nc = TestBase.standardConnectionWait(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); nc.subscribe("draintest"); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 6bd7351a4..2cd91d733 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -16,7 +16,9 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Status; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.time.Duration; @@ -26,9 +28,11 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.TestBase.sleep; +import static io.nats.client.utils.TestBase.standardCloseConnection; import static org.junit.jupiter.api.Assertions.*; +@Isolated public class ErrorListenerTests { @Test @@ -312,7 +316,7 @@ public void testDiscardedMessageServerClosed() throws Exception { connectionListener(listener). errorListener(listener). build(); - Connection nc = standardConnection(options); + Connection nc = TestBase.standardConnectionWait(options); try { nc.flush(Duration.ofSeconds(1)); // Get the sub to the server diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index cb49fd537..f85b49e09 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -59,35 +59,29 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedConsumerSync() throws Exception { - jsServer.run(nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - + runInJsServer(nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); // Get this in place before any subscriptions are made - ((NatsJetStream)js)._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; + jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; // Test queue exception IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(tsc.subject(), QUEUE, PushSubscribeOptions.builder().ordered(true).build())); + () -> jstc.js.subscribe(jstc.subject(), random(), PushSubscribeOptions.builder().ordered(true).build())); assertTrue(iae.getMessage().contains(JsSubOrderedNotAllowOnQueues.id())); // Setup sync subscription - _testOrderedConsumerSync(js, tsc, null, PushSubscribeOptions.builder().ordered(true).build()); + _testOrderedConsumerSync(jstc, null, PushSubscribeOptions.builder().ordered(true).build()); - String consumerName = prefix(); - _testOrderedConsumerSync(js, tsc, consumerName, PushSubscribeOptions.builder().name(consumerName).ordered(true).build()); + _testOrderedConsumerSync(jstc, jstc.consumerName(), PushSubscribeOptions.builder().name(jstc.consumerName()).ordered(true).build()); }); } - private static void _testOrderedConsumerSync(JetStream js, TestingStreamContainer tsc, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, TimeoutException, InterruptedException { - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + private static void _testOrderedConsumerSync(JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, TimeoutException, InterruptedException { + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); String firstConsumerName = validateOrderedConsumerNamePrefix(sub, consumerNamePrefix); // Published messages will be intercepted by the OrderedTestDropSimulator - jsPublish(js, tsc.subject(), 101, 6); + jsPublish(jstc.js, jstc.subject(), 101, 6); // Loop through the messages to make sure I get stream sequence 1 to 6 int expectedStreamSeq = 1; @@ -123,27 +117,28 @@ private static void reValidateOrderedConsumerNamePrefix(JetStreamSubscription su @Test public void testOrderedConsumerAsync() throws Exception { - jsServer.run(nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - _testOrderedConsumerAsync(nc, jsm, js, null, PushSubscribeOptions.builder().ordered(true).build()); - String customName = variant(); - _testOrderedConsumerAsync(nc, jsm, js, customName, PushSubscribeOptions.builder().name(customName).ordered(true).build()); + runInJsServer(nc -> { + // without name (prefix) + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + _testOrderedConsumerAsync(nc, jstc, null, + PushSubscribeOptions.builder().ordered(true).build()); + + // with name (prefix) + jstc = new JetStreamTestingContext(nc); + _testOrderedConsumerAsync(nc, jstc, jstc.consumerName(), + PushSubscribeOptions.builder().name(jstc.consumerName()).ordered(true).build()); }); } - private static void _testOrderedConsumerAsync(Connection nc, JetStreamManagement jsm, JetStream js, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, TimeoutException, InterruptedException { - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - + private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, TimeoutException, InterruptedException { // Get this in place before any subscriptions are made - ((NatsJetStream) js)._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; + jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; // We'll need a dispatcher Dispatcher d = nc.createDispatcher(); // Test queue exception - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), QUEUE, d, m -> {}, false, pso)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), random(), d, m -> {}, false, pso)); assertTrue(iae.getMessage().contains(JsSubOrderedNotAllowOnQueues.id())); // Set up an async subscription @@ -158,11 +153,11 @@ private static void _testOrderedConsumerAsync(Connection nc, JetStreamManagement msgLatch.countDown(); }; - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, handler, false, pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, handler, false, pso); String firstConsumerName = validateOrderedConsumerNamePrefix(sub, consumerNamePrefix); // publish after sub b/c interceptor is set during sub, so before messages come in - jsPublish(js, tsc.subject(), 201, 6); + jsPublish(jstc.js, jstc.subject(), 201, 6); // wait for the messages awaitAndAssert(msgLatch); @@ -257,37 +252,35 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testHeartbeatError() throws Exception { - ListenerForTesting listenerForTesting = new ListenerForTesting(); - runInJsServer(listenerForTesting, nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - JetStream js = nc.jetStream(); + ListenerForTesting listener = new ListenerForTesting(); + runInJsServer(listener, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); Dispatcher d = nc.createDispatcher(); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); - + JetStream js = jstc.js; PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); SimulatorState state = setupFactory(js); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); - validate(sub, listenerForTesting, state, null); + JetStreamSubscription sub = js.subscribe(jstc.subject(), pso); + validate(sub, listener, state, null); state = setupFactory(js); - sub = js.subscribe(tsc.subject(), d, m -> {}, false, pso); - validate(sub, listenerForTesting, state, d); + sub = js.subscribe(jstc.subject(), d, m -> {}, false, pso); + validate(sub, listener, state, d); pso = PushSubscribeOptions.builder().ordered(true).configuration(cc).build(); state = setupOrderedFactory(js); - sub = js.subscribe(tsc.subject(), pso); - validate(sub, listenerForTesting, state, null); + sub = js.subscribe(jstc.subject(), pso); + validate(sub, listener, state, null); state = setupOrderedFactory(js); - sub = js.subscribe(tsc.subject(), d, m -> {}, false, pso); - validate(sub, listenerForTesting, state, d); + sub = js.subscribe(jstc.subject(), d, m -> {}, false, pso); + validate(sub, listener, state, d); state = setupPullFactory(js); - sub = js.subscribe(tsc.subject(), PullSubscribeOptions.DEFAULT_PULL_OPTS); + sub = js.subscribe(jstc.subject(), PullSubscribeOptions.DEFAULT_PULL_OPTS); sub.pull(PullRequestOptions.builder(1).idleHeartbeat(100).expiresIn(2000).build()); - validate(sub, listenerForTesting, state, null); + validate(sub, listener, state, null); }); } @@ -342,53 +335,48 @@ private static SimulatorState setupPullFactory(JetStream js) { @Test public void testMultipleSubjectFilters() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(nc, 2); - - jsPublish(js, tsc.subject(0), 10); - jsPublish(js, tsc.subject(1), 5); + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + jsPublish(jstc.js, jstc.subject(0), 10); + jsPublish(jstc.js, jstc.subject(1), 5); // push ephemeral - ConsumerConfiguration cc = ConsumerConfiguration.builder().filterSubjects(tsc.subject(0), tsc.subject(1)).build(); - JetStreamSubscription sub = js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); + ConsumerConfiguration cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).build(); + JetStreamSubscription sub = jstc.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); // pull ephemeral - sub = js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); + sub = jstc.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); // push named - String name = name(); - cc = ConsumerConfiguration.builder().filterSubjects(tsc.subject(0), tsc.subject(1)).name(name).deliverSubject(deliver()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); - sub = js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); - - name = name(); - cc = ConsumerConfiguration.builder().filterSubjects(tsc.subject(0), tsc.subject(1)).name(name).deliverSubject(deliver()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); - sub = js.subscribe(null, PushSubscribeOptions.bind(tsc.stream, name)); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); + String name = random(); + cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).deliverSubject(random()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + sub = jstc.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + + name = random(); + cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).deliverSubject(random()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + sub = jstc.js.subscribe(null, PushSubscribeOptions.bind(jstc.stream, name)); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); // pull named - name = name(); - cc = ConsumerConfiguration.builder().filterSubjects(tsc.subject(0), tsc.subject(1)).name(name).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); - sub = js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); + name = random(); + cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + sub = jstc.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); - name = name(); - cc = ConsumerConfiguration.builder().filterSubjects(tsc.subject(0), tsc.subject(1)).name(name).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); - sub = js.subscribe(null, PullSubscribeOptions.bind(tsc.stream, name)); + name = random(); + cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + sub = jstc.js.subscribe(null, PullSubscribeOptions.bind(jstc.stream, name)); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, tsc.subject(0)); + validateMultipleSubjectFilterSub(sub, jstc.subject(0)); }); } @@ -412,15 +400,13 @@ private static void validateMultipleSubjectFilterSub(JetStreamSubscription sub, @Test public void testRaiseStatusWarnings1194() throws Exception { - ListenerForTesting listenerForTesting = new ListenerForTesting(false, false); - runInJsServer(listenerForTesting, nc -> { + ListenerForTesting listener = new ListenerForTesting(false, false); + runInLrServer(listener, (nc, jstc) -> { // Setup - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext streamContext = nc.getStreamContext(tsc.stream); + StreamContext streamContext = nc.getStreamContext(jstc.stream); // Setting maxBatch=1, so we shouldn't allow fetching more messages at once. - ConsumerConfiguration consumerConfig = ConsumerConfiguration.builder().filterSubject(tsc.subject()).maxBatch(1).build(); + ConsumerConfiguration consumerConfig = ConsumerConfiguration.builder().filterSubject(jstc.subject()).maxBatch(1).build(); ConsumerContext consumerContext = streamContext.createOrUpdateConsumer(consumerConfig); int count = 0; @@ -439,7 +425,7 @@ public void testRaiseStatusWarnings1194() throws Exception { } } assertEquals(0, count); - assertEquals(0, listenerForTesting.getPullStatusWarnings().size()); + assertEquals(0, listener.getPullStatusWarnings().size()); fco = FetchConsumeOptions.builder() .maxMessages(100) @@ -454,7 +440,7 @@ public void testRaiseStatusWarnings1194() throws Exception { } } assertEquals(0, count); - assertEquals(1, listenerForTesting.getPullStatusWarnings().size()); + assertEquals(1, listener.getPullStatusWarnings().size()); }); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index eb5bb4fcb..3520374a5 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -16,7 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsJetStreamUtil; -import io.nats.client.support.RandomUtils; +import io.nats.client.utils.LongRunningServer; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -25,6 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import static io.nats.client.api.ConsumerConfiguration.*; @@ -36,10 +38,9 @@ public class JetStreamGeneralTests extends JetStreamTestBase { @Test public void testJetStreamContextCreate() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); // tries management functions - nc.jetStreamManagement().getAccountStatistics(); // another management - nc.jetStream().publish(tsc.subject(), dataBytes(1)); + runInLrServer((nc, jstc) -> { + jstc.jsm.getAccountStatistics(); // another management + jstc.js.publish(jstc.subject(), dataBytes(1)); }); } @@ -48,7 +49,7 @@ public void testJetNotEnabled() throws Exception { runInServer(nc -> { // get normal context, try to do an operation JetStream js = nc.jetStream(); - assertThrows(IOException.class, () -> js.subscribe(SUBJECT)); + assertThrows(IOException.class, () -> js.subscribe(random())); // get management context, try to do an operation JetStreamManagement jsm = nc.jetStreamManagement(); @@ -58,28 +59,27 @@ public void testJetNotEnabled() throws Exception { @Test public void testJetEnabledGoodAccount() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/js_authorization.conf", false, true)) { + try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_authorization.conf")) { Options options = new Options.Builder().server(ts.getURI()) - .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); - Connection nc = standardConnection(options); - nc.jetStreamManagement(); - nc.jetStream(); + .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); + try (Connection nc = longConnectionWait(options)) { + nc.jetStreamManagement(); + nc.jetStream(); + } } } @Test public void testJetStreamPublishDefaultOptions() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); - PublishAck ack = jsPublish(js, tsc.subject()); + runInLrServer((nc, jstc) -> { + PublishAck ack = jsPublish(jstc.js, jstc.subject()); assertEquals(1, ack.getSeqno()); }); } @Test public void testConnectionClosing() throws Exception { - runInJsServer(nc -> { + runInJsServer(null, null, nc -> { nc.close(); assertThrows(IOException.class, nc::jetStream); assertThrows(IOException.class, nc::jetStreamManagement); @@ -88,7 +88,7 @@ public void testConnectionClosing() throws Exception { @Test public void testCreateWithOptionsForCoverage() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { JetStreamOptions jso = JetStreamOptions.builder().build(); nc.jetStream(jso); nc.jetStreamManagement(jso); @@ -107,227 +107,231 @@ public void testMiscMetaDataCoverage() { @Test public void testJetStreamSubscribe() throws Exception { - jsServer.run(nc -> { - - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - jsPublish(js, tsc.subject()); + runInLrServer((nc, jstc) -> { + jsPublish(jstc.js, jstc.subject()); // default ephemeral subscription. - Subscription s = js.subscribe(tsc.subject()); + Subscription s = jstc.js.subscribe(jstc.subject()); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - List names = jsm.getConsumerNames(tsc.stream); + List names = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(1, names.size()); // default subscribe options // ephemeral subscription. - s = js.subscribe(tsc.subject(), PushSubscribeOptions.builder().build()); + s = jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().build()); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - names = jsm.getConsumerNames(tsc.stream); + names = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(2, names.size()); // set the stream - PushSubscribeOptions pso = PushSubscribeOptions.builder().stream(tsc.stream).durable(DURABLE).build(); - s = js.subscribe(tsc.subject(), pso); + String durable = random(); + PushSubscribeOptions pso = PushSubscribeOptions.builder().stream(jstc.stream).durable(durable).build(); + s = jstc.js.subscribe(jstc.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - names = jsm.getConsumerNames(tsc.stream); + names = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(3, names.size()); // coverage Dispatcher dispatcher = nc.createDispatcher(); - js.subscribe(tsc.subject()); - js.subscribe(tsc.subject(), (PushSubscribeOptions)null); - js.subscribe(tsc.subject(), QUEUE, null); - js.subscribe(tsc.subject(), dispatcher, mh -> {}, false); - js.subscribe(tsc.subject(), dispatcher, mh -> {}, false, null); - js.subscribe(tsc.subject(), QUEUE, dispatcher, mh -> {}, false, null); + jstc.js.subscribe(jstc.subject()); + jstc.js.subscribe(jstc.subject(), (PushSubscribeOptions)null); + jstc.js.subscribe(jstc.subject(), random(), null); + jstc.js.subscribe(jstc.subject(), dispatcher, mh -> {}, false); + jstc.js.subscribe(jstc.subject(), dispatcher, mh -> {}, false, null); + jstc.js.subscribe(jstc.subject(), random(), dispatcher, mh -> {}, false, null); // bind with w/o subject - jsm.addOrUpdateConsumer(tsc.stream, + durable = random(); + String deliver = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder() - .durable(durable(101)) - .deliverSubject(deliver(101)) + .durable(durable) + .deliverSubject(deliver) .build()); - PushSubscribeOptions psoBind = PushSubscribeOptions.bind(tsc.stream, durable(101)); - unsubscribeEnsureNotBound(js.subscribe(null, psoBind)); - unsubscribeEnsureNotBound(js.subscribe("", psoBind)); - JetStreamSubscription sub = js.subscribe(null, dispatcher, mh -> {}, false, psoBind); + PushSubscribeOptions psoBind = PushSubscribeOptions.bind(jstc.stream, durable); + unsubscribeEnsureNotBound(jstc.js.subscribe(null, psoBind)); + unsubscribeEnsureNotBound(jstc.js.subscribe("", psoBind)); + JetStreamSubscription sub = jstc.js.subscribe(null, dispatcher, mh -> {}, false, psoBind); unsubscribeEnsureNotBound(dispatcher, sub); - js.subscribe("", dispatcher, mh -> {}, false, psoBind); + jstc.js.subscribe("", dispatcher, mh -> {}, false, psoBind); - jsm.addOrUpdateConsumer(tsc.stream, + durable = random(); + deliver = random(); + String queue = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder() - .durable(durable(102)) - .deliverSubject(deliver(102)) - .deliverGroup(queue(102)) + .durable(durable) + .deliverSubject(deliver) + .deliverGroup(queue) .build()); - psoBind = PushSubscribeOptions.bind(tsc.stream, durable(102)); - unsubscribeEnsureNotBound(js.subscribe(null, queue(102), psoBind)); - unsubscribeEnsureNotBound(js.subscribe("", queue(102), psoBind)); - sub = js.subscribe(null, queue(102), dispatcher, mh -> {}, false, psoBind); + psoBind = PushSubscribeOptions.bind(jstc.stream, durable); + unsubscribeEnsureNotBound(jstc.js.subscribe(null, queue, psoBind)); + unsubscribeEnsureNotBound(jstc.js.subscribe("", queue, psoBind)); + sub = jstc.js.subscribe(null, queue, dispatcher, mh -> {}, false, psoBind); unsubscribeEnsureNotBound(dispatcher, sub); - js.subscribe("", queue(102), dispatcher, mh -> {}, false, psoBind); + jstc.js.subscribe("", queue, dispatcher, mh -> {}, false, psoBind); if (atLeast2_9_0(nc)) { - ConsumerConfiguration cc = builder().name(name(1)).build(); + String name = random(); + ConsumerConfiguration cc = builder().name(name).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = js.subscribe(tsc.subject(), pso); + sub = jstc.js.subscribe(jstc.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); ConsumerInfo ci = sub.getConsumerInfo(); - assertEquals(name(1), ci.getName()); - assertEquals(name(1), ci.getConsumerConfiguration().getName()); + assertEquals(name, ci.getName()); + assertEquals(name, ci.getConsumerConfiguration().getName()); assertNull(ci.getConsumerConfiguration().getDurable()); - cc = builder().durable(durable(1)).build(); + durable = random(); + cc = builder().durable(durable).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = js.subscribe(tsc.subject(), pso); + sub = jstc.js.subscribe(jstc.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); ci = sub.getConsumerInfo(); - assertEquals(durable(1), ci.getName()); - assertEquals(durable(1), ci.getConsumerConfiguration().getName()); - assertEquals(durable(1), ci.getConsumerConfiguration().getDurable()); + assertEquals(durable, ci.getName()); + assertEquals(durable, ci.getConsumerConfiguration().getName()); + assertEquals(durable, ci.getConsumerConfiguration().getDurable()); - cc = builder().durable(name(2)).name(name(2)).build(); + String durName = random(); + cc = builder().durable(durName).name(durName).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = js.subscribe(tsc.subject(), pso); + sub = jstc.js.subscribe(jstc.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); ci = sub.getConsumerInfo(); - assertEquals(name(2), ci.getName()); - assertEquals(name(2), ci.getConsumerConfiguration().getName()); - assertEquals(name(2), ci.getConsumerConfiguration().getDurable()); + assertEquals(durName, ci.getName()); + assertEquals(durName, ci.getConsumerConfiguration().getName()); + assertEquals(durName, ci.getConsumerConfiguration().getDurable()); // test opt out JetStreamOptions jso = JetStreamOptions.builder().optOut290ConsumerCreate(true).build(); JetStream jsOptOut = nc.jetStream(jso); - ConsumerConfiguration ccOptOut = builder().name(name(99)).build(); + ConsumerConfiguration ccOptOut = builder().name(random()).build(); PushSubscribeOptions psoOptOut = PushSubscribeOptions.builder().configuration(ccOptOut).build(); - assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(tsc.subject(), psoOptOut)); + assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(jstc.subject(), psoOptOut)); } }); } @Test public void testJetStreamSubscribeLenientSubject() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); + runInLrServer((nc, jstc) -> { Dispatcher d = nc.createDispatcher(); - js.subscribe(tsc.subject(), (PushSubscribeOptions)null); - js.subscribe(tsc.subject(), null, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api - js.subscribe(tsc.subject(), d, m -> {}, false, (PushSubscribeOptions)null); - js.subscribe(tsc.subject(), null, d, m -> {}, false, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api + jstc.js.subscribe(jstc.subject(), (PushSubscribeOptions)null); + jstc.js.subscribe(jstc.subject(), null, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api + jstc.js.subscribe(jstc.subject(), d, m -> {}, false, (PushSubscribeOptions)null); + jstc.js.subscribe(jstc.subject(), null, d, m -> {}, false, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api - PushSubscribeOptions pso = ConsumerConfiguration.builder().filterSubject(tsc.subject()).buildPushSubscribeOptions(); - js.subscribe(null, pso); - js.subscribe(null, null, pso); - js.subscribe(null, d, m -> {}, false, pso); - js.subscribe(null, null, d, m -> {}, false, pso); + PushSubscribeOptions pso = ConsumerConfiguration.builder().filterSubject(jstc.subject()).buildPushSubscribeOptions(); + jstc.js.subscribe(null, pso); + jstc.js.subscribe(null, null, pso); + jstc.js.subscribe(null, d, m -> {}, false, pso); + jstc.js.subscribe(null, null, d, m -> {}, false, pso); PushSubscribeOptions psoF = ConsumerConfiguration.builder().buildPushSubscribeOptions(); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, psoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, psoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, null, psoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, d, m -> {}, false, psoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, null, d, m -> {}, false, psoF)); - - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, (PushSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, (PushSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, null, (PushSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, d, m -> {}, false, (PushSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, null, d, m -> {}, false, (PushSubscribeOptions)null)); - - PullSubscribeOptions lso = ConsumerConfiguration.builder().filterSubject(tsc.subject()).buildPullSubscribeOptions(); - js.subscribe(null, lso); - js.subscribe(null, d, m -> {}, lso); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, psoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, psoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, psoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, false, psoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, d, m -> {}, false, psoF)); + + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PushSubscribeOptions)null)); + //noinspection RedundantCast + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, (PushSubscribeOptions)null)); + //noinspection RedundantCast + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, false, (PushSubscribeOptions)null)); + //noinspection RedundantCast + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, d, m -> {}, false, (PushSubscribeOptions)null)); + + PullSubscribeOptions lso = ConsumerConfiguration.builder().filterSubject(jstc.subject()).buildPullSubscribeOptions(); + jstc.js.subscribe(null, lso); + jstc.js.subscribe(null, d, m -> {}, lso); PullSubscribeOptions lsoF = ConsumerConfiguration.builder().buildPullSubscribeOptions(); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, lsoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, d, m -> {}, lsoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, lsoF)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, lsoF)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, (PullSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> js.subscribe(null, d, m -> {}, (PullSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PullSubscribeOptions)null)); + //noinspection RedundantCast + assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, (PullSubscribeOptions)null)); }); } @Test public void testJetStreamSubscribeErrors() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { + String stream = random(); // stream not found - PushSubscribeOptions psoInvalidStream = PushSubscribeOptions.builder().stream(STREAM).build(); - assertThrows(JetStreamApiException.class, () -> js.subscribe(SUBJECT, psoInvalidStream)); + PushSubscribeOptions psoInvalidStream = PushSubscribeOptions.builder().stream(stream).build(); + assertThrows(JetStreamApiException.class, () -> jstc.js.subscribe(random(), psoInvalidStream)); Dispatcher d = nc.createDispatcher(); for (String bad : BAD_SUBJECTS_OR_QUEUES) { if (bad == null || bad.isEmpty()) { // subject - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(bad)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad)); assertTrue(iae.getMessage().startsWith("Subject")); - assertClientError(JsSubSubjectNeededToLookupStream, () -> js.subscribe(bad, (PushSubscribeOptions)null)); + assertClientError(JsSubSubjectNeededToLookupStream, () -> jstc.js.subscribe(bad, (PushSubscribeOptions)null)); } else { // subject - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(bad)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad)); assertTrue(iae.getMessage().startsWith("Subject")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(bad, (PushSubscribeOptions)null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad, (PushSubscribeOptions)null)); assertTrue(iae.getMessage().startsWith("Subject")); // queue - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, bad, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), bad, null)); assertTrue(iae.getMessage().startsWith("Queue")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, bad, d, m -> {}, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), bad, d, m -> {}, false, null)); assertTrue(iae.getMessage().startsWith("Queue")); } } // dispatcher - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, null, null, false)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), null, null, false)); assertTrue(iae.getMessage().startsWith("Dispatcher")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, null, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), null, null, false, null)); assertTrue(iae.getMessage().startsWith("Dispatcher")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, QUEUE, null, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), random(), null, null, false, null)); assertTrue(iae.getMessage().startsWith("Dispatcher")); // handler Dispatcher dispatcher = nc.createDispatcher(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, dispatcher, null, false)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), dispatcher, null, false)); assertTrue(iae.getMessage().startsWith("Handler")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, dispatcher, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), dispatcher, null, false, null)); assertTrue(iae.getMessage().startsWith("Handler")); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(SUBJECT, QUEUE, dispatcher, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), random(), dispatcher, null, false, null)); assertTrue(iae.getMessage().startsWith("Handler")); }); } @Test public void testFilterSubjectEphemeral() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - String subjectWild = SUBJECT + ".*"; - String subjectA = SUBJECT + ".A"; - String subjectB = SUBJECT + ".B"; - TestingStreamContainer tsc = new TestingStreamContainer(nc, subjectWild); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); + String subjectWild = subject + ".*"; + String subjectA = subject + ".A"; + String subjectB = subject + ".B"; + createMemoryStream(jsm, stream, subjectWild); jsPublish(js, subjectA, 1); jsPublish(js, subjectB, 1); @@ -393,15 +397,15 @@ public void testPrefix() throws Exception { String subjectMadeBySrc = "sub-made-by.src"; String subjectMadeByTar = "sub-made-by.tar"; - try (NatsTestServer ts = new NatsTestServer("src/test/resources/js_prefix.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_prefix.conf")) { Options optionsSrc = new Options.Builder().server(ts.getURI()) .userInfo("src".toCharArray(), "spass".toCharArray()).build(); Options optionsTar = new Options.Builder().server(ts.getURI()) .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); - try (Connection ncSrc = Nats.connect(optionsSrc); - Connection ncTar = Nats.connect(optionsTar) + try (Connection ncSrc = standardConnectionWait(optionsSrc); + Connection ncTar = standardConnectionWait(optionsTar) ) { // Setup JetStreamOptions. SOURCE does not need prefix JetStreamOptions jsoSrc = JetStreamOptions.builder().build(); @@ -457,67 +461,61 @@ private void readPrefixMessages(Connection nc, JetStream js, String subject, Str @Test public void testBindPush() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); - - jsPublish(js, tsc.subject(), 1, 1); + runInLrServer((nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 1, 1); PushSubscribeOptions pso = PushSubscribeOptions.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .build(); - JetStreamSubscription s = js.subscribe(tsc.subject(), pso); + JetStreamSubscription s = jstc.js.subscribe(jstc.subject(), pso); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(1), new String(m.getData())); m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(js, tsc.subject(), 2, 1); + jsPublish(jstc.js, jstc.subject(), 2, 1); pso = PushSubscribeOptions.builder() - .stream(tsc.stream) - .durable(tsc.consumerName()) + .stream(jstc.stream) + .durable(jstc.consumerName()) .bind(true) .build(); - s = js.subscribe(tsc.subject(), pso); + s = jstc.js.subscribe(jstc.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(2), new String(m.getData())); m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(js, tsc.subject(), 3, 1); - pso = PushSubscribeOptions.bind(tsc.stream, tsc.consumerName()); - s = js.subscribe(tsc.subject(), pso); + jsPublish(jstc.js, jstc.subject(), 3, 1); + pso = PushSubscribeOptions.bind(jstc.stream, jstc.consumerName()); + s = jstc.js.subscribe(jstc.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(3), new String(m.getData())); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().stream(tsc.stream).bind(true).build()); + () -> PushSubscribeOptions.builder().stream(jstc.stream).bind(true).build()); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().durable(tsc.consumerName()).bind(true).build()); + () -> PushSubscribeOptions.builder().durable(jstc.consumerName()).bind(true).build()); assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).bind(true).build()); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().stream(tsc.stream).durable(EMPTY).bind(true).build()); + () -> PushSubscribeOptions.builder().stream(jstc.stream).durable(EMPTY).bind(true).build()); }); } @Test public void testBindPull() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); - - jsPublish(js, tsc.subject(), 1, 1); + runInLrServer((nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 1, 1); PullSubscribeOptions pso = PullSubscribeOptions.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .build(); - JetStreamSubscription s = js.subscribe(tsc.subject(), pso); + JetStreamSubscription s = jstc.js.subscribe(jstc.subject(), pso); s.pull(1); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -525,13 +523,13 @@ public void testBindPull() throws Exception { m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(js, tsc.subject(), 2, 1); + jsPublish(jstc.js, jstc.subject(), 2, 1); pso = PullSubscribeOptions.builder() - .stream(tsc.stream) - .durable(tsc.consumerName()) + .stream(jstc.stream) + .durable(jstc.consumerName()) .bind(true) .build(); - s = js.subscribe(tsc.subject(), pso); + s = jstc.js.subscribe(jstc.subject(), pso); s.pull(1); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -539,9 +537,9 @@ public void testBindPull() throws Exception { m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(js, tsc.subject(), 3, 1); - pso = PullSubscribeOptions.bind(tsc.stream, tsc.consumerName()); - s = js.subscribe(tsc.subject(), pso); + jsPublish(jstc.js, jstc.subject(), 3, 1); + pso = PullSubscribeOptions.bind(jstc.stream, jstc.consumerName()); + s = jstc.js.subscribe(jstc.subject(), pso); s.pull(1); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -551,329 +549,318 @@ public void testBindPull() throws Exception { @Test public void testBindErrors() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // bind errors - PushSubscribeOptions pushbinderr = PushSubscribeOptions.bind(tsc.stream, "binddur"); - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pushbinderr)); + PushSubscribeOptions pushbinderr = PushSubscribeOptions.bind(jstc.stream, "binddur"); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushbinderr)); assertTrue(iae.getMessage().contains(JsSubConsumerNotFoundRequiredInBind.id())); - PullSubscribeOptions pullbinderr = PullSubscribeOptions.bind(tsc.stream, "binddur"); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pullbinderr)); + PullSubscribeOptions pullbinderr = PullSubscribeOptions.bind(jstc.stream, "binddur"); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullbinderr)); assertTrue(iae.getMessage().contains(JsSubConsumerNotFoundRequiredInBind.id())); }); } @Test public void testFilterMismatchErrors() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - // single subject - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // will work as SubscribeSubject equals Filter Subject - filterMatchSubscribeOk(js, jsm, tsc.stream, tsc.subject(), tsc.subject()); - filterMatchSubscribeOk(js, jsm, tsc.stream, ">", ">"); - filterMatchSubscribeOk(js, jsm, tsc.stream, "*", "*"); + filterMatchSubscribeOk(jstc, jstc.stream, jstc.subject(), jstc.subject()); + filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); + filterMatchSubscribeOk(jstc, jstc.stream, "*", "*"); // will not work - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), ""); - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), ">"); - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), "*"); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ""); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ">"); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), "*"); // multiple subjects no wildcards - jsm.deleteStream(tsc.stream); - createMemoryStream(jsm, tsc.stream, tsc.subject(), subject(2)); + jstc.jsm.deleteStream(jstc.stream); + createMemoryStream(jstc.jsm, jstc.stream, jstc.subject(), random()); // will work as SubscribeSubject equals Filter Subject - filterMatchSubscribeOk(js, jsm, tsc.stream, tsc.subject(), tsc.subject()); - filterMatchSubscribeOk(js, jsm, tsc.stream, ">", ">"); - filterMatchSubscribeOk(js, jsm, tsc.stream, "*", "*"); + filterMatchSubscribeOk(jstc, jstc.stream, jstc.subject(), jstc.subject()); + filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); + filterMatchSubscribeOk(jstc, jstc.stream, "*", "*"); // will not work because stream has more than 1 subject - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), ""); - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), ">"); - filterMatchSubscribeEx(js, jsm, tsc.stream, tsc.subject(), "*"); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ""); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ">"); + filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), "*"); - String subjectGt = tsc.subject() + ".>"; - String subjectStar = tsc.subject() + ".*"; - String subjectDot = tsc.subject() + "." + name(); + String subjectGt = jstc.subject() + ".>"; + String subjectStar = jstc.subject() + ".*"; + String subjectDot = jstc.subject() + "." + random(); // multiple subjects via '>' - jsm.deleteStream(tsc.stream); - createMemoryStream(jsm, tsc.stream, subjectGt); + jstc.jsm.deleteStream(jstc.stream); + createMemoryStream(jstc.jsm, jstc.stream, subjectGt); // will work, exact matches - filterMatchSubscribeOk(js, jsm, tsc.stream, subjectDot, subjectDot); - filterMatchSubscribeOk(js, jsm, tsc.stream, ">", ">"); + filterMatchSubscribeOk(jstc, jstc.stream, subjectDot, subjectDot); + filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); // will not work because mismatch / stream has more than 1 subject - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, ""); - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, ">"); - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, subjectGt); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ""); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ">"); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, subjectGt); // multiple subjects via '*' - jsm.deleteStream(tsc.stream); - createMemoryStream(jsm, tsc.stream, subjectStar); + jstc.jsm.deleteStream(jstc.stream); + createMemoryStream(jstc.jsm, jstc.stream, subjectStar); // will work, exact matches - filterMatchSubscribeOk(js, jsm, tsc.stream, subjectDot, subjectDot); - filterMatchSubscribeOk(js, jsm, tsc.stream, ">", ">"); + filterMatchSubscribeOk(jstc, jstc.stream, subjectDot, subjectDot); + filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); // will not work because mismatch / stream has more than 1 subject - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, ""); - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, ">"); - filterMatchSubscribeEx(js, jsm, tsc.stream, subjectDot, subjectStar); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ""); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ">"); + filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, subjectStar); }); } - private void filterMatchSubscribeOk(JetStream js, JetStreamManagement jsm, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { - int i = RandomUtils.PRAND.nextInt(); // just want a unique number - filterMatchSetupConsumer(jsm, i, stream, filterSubjects); - unsubscribeEnsureNotBound(js.subscribe(subscribeSubject, builder().durable(durable(i)).buildPushSubscribeOptions())); + private void filterMatchSubscribeOk(JetStreamTestingContext jstc, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { + String deliver = random(); + String dur = random(); + filterMatchSetupConsumer(jstc, deliver, dur, stream, filterSubjects); + unsubscribeEnsureNotBound(jstc.js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); } - private void filterMatchSubscribeEx(JetStream js, JetStreamManagement jsm, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { - int i = RandomUtils.PRAND.nextInt(); // just want a unique number - filterMatchSetupConsumer(jsm, i, stream, filterSubjects); + private void filterMatchSubscribeEx(JetStreamTestingContext jstc, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { + String deliver = random(); + String dur = random(); + filterMatchSetupConsumer(jstc, deliver, dur, stream, filterSubjects); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(subscribeSubject, builder().durable(durable(i)).buildPushSubscribeOptions())); + () -> jstc.js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); assertTrue(iae.getMessage().contains(JsSubSubjectDoesNotMatchFilter.id())); } - private void filterMatchSetupConsumer(JetStreamManagement jsm, int i, String stream, String... fs) throws IOException, JetStreamApiException { - jsm.addOrUpdateConsumer(stream, - builder().deliverSubject(deliver(i)).durable(durable(i)).filterSubjects(fs).build()); + private void filterMatchSetupConsumer(JetStreamTestingContext jstc, String deliver, String dur, String stream, String... fs) throws IOException, JetStreamApiException { + jstc.jsm.addOrUpdateConsumer(stream, + builder().deliverSubject(deliver).durable(dur).filterSubjects(fs).build()); } @Test public void testBindDurableDeliverSubject() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - + runInLrServer((nc, jstc) -> { // create a durable push subscriber - has a deliver subject + String dur1 = random(); + String dur2 = random(); + String deliver = random(); ConsumerConfiguration ccDurPush = builder() - .durable(durable(1)) - .deliverSubject(deliver(1)) - .filterSubject(tsc.subject()) + .durable(dur1) + .deliverSubject(deliver) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, ccDurPush); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ccDurPush); // create a durable pull subscriber - notice no deliver subject ConsumerConfiguration ccDurPull = builder() - .durable(durable(2)) - .filterSubject(tsc.subject()) + .durable(dur2) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, ccDurPull); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ccDurPull); // try to pull subscribe against a push durable IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(tsc.subject(), PullSubscribeOptions.builder().durable(durable(1)).build()) + () -> jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(dur1).build()) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPush.id())); // try to pull bind against a push durable iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(tsc.subject(), PullSubscribeOptions.bind(tsc.stream, durable(1))) + () -> jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.bind(jstc.stream, dur1)) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPush.id())); // try to push subscribe against a pull durable iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(tsc.subject(), PushSubscribeOptions.builder().durable(durable(2)).build()) + () -> jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().durable(dur2).build()) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPull.id())); // try to push bind against a pull durable iae = assertThrows(IllegalArgumentException.class, - () -> js.subscribe(tsc.subject(), PushSubscribeOptions.bind(tsc.stream, durable(2))) + () -> jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.bind(jstc.stream, dur2)) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPull.id())); // this one is okay - js.subscribe(tsc.subject(), PushSubscribeOptions.builder().durable(durable(1)).build()); + jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().durable(dur1).build()); }); } @Test public void testConsumerIsNotModified() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - + runInLrServer((nc, jstc) -> { // test with config in issue 105 + String dur = random(); + String q = random(); ConsumerConfiguration cc = builder() .description("desc") .ackPolicy(AckPolicy.Explicit) .deliverPolicy(DeliverPolicy.All) - .deliverSubject(deliver(1)) - .deliverGroup(queue(1)) - .durable(durable(1)) + .deliverSubject(random()) + .deliverGroup(q) + .durable(dur) .maxAckPending(65000) .maxDeliver(5) .maxBatch(10) .maxBytes(11) .replayPolicy(ReplayPolicy.Instant) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - PushSubscribeOptions pushOpts = PushSubscribeOptions.bind(tsc.stream, durable(1)); - js.subscribe(tsc.subject(), queue(1), pushOpts); // should not throw an error + PushSubscribeOptions pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), q, pushOpts); // should not throw an error // testing numerics + dur = random(); cc = builder() .deliverPolicy(DeliverPolicy.ByStartSequence) - .deliverSubject(deliver(21)) - .durable(durable(21)) + .deliverSubject(random()) + .durable(dur) .startSequence(42) .maxDeliver(43) .maxBatch(47) .maxBytes(48) .rateLimit(44) .maxAckPending(45) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - pushOpts = PushSubscribeOptions.bind(tsc.stream, durable(21)); - js.subscribe(tsc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error + dur = random(); cc = builder() - .durable(durable(22)) + .durable(dur) .maxPullWaiting(46) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - PullSubscribeOptions pullOpts = PullSubscribeOptions.bind(tsc.stream, durable(22)); - js.subscribe(tsc.subject(), pullOpts); // should not throw an error + PullSubscribeOptions pullOpts = PullSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), pullOpts); // should not throw an error // testing DateTime + dur = random(); cc = builder() .deliverPolicy(DeliverPolicy.ByStartTime) - .deliverSubject(deliver(3)) - .durable(durable(3)) + .deliverSubject(random()) + .durable(dur) .startTime(ZonedDateTime.now().plusHours(1)) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - pushOpts = PushSubscribeOptions.bind(tsc.stream, durable(3)); - js.subscribe(tsc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error // testing boolean and duration + dur = random(); cc = builder() - .deliverSubject(deliver(4)) - .durable(durable(4)) + .deliverSubject(random()) + .durable(dur) .flowControl(1000) .headersOnly(true) .maxExpires(30000) .ackWait(2000) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - pushOpts = PushSubscribeOptions.bind(tsc.stream, durable(4)); - js.subscribe(tsc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error // testing enums + dur = random(); cc = builder() - .deliverSubject(deliver(5)) - .durable(durable(5)) + .deliverSubject(random()) + .durable(dur) .deliverPolicy(DeliverPolicy.Last) .ackPolicy(AckPolicy.None) .replayPolicy(ReplayPolicy.Original) - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - pushOpts = PushSubscribeOptions.bind(tsc.stream, durable(5)); - js.subscribe(tsc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); + jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error }); } @Test public void testSubscribeDurableConsumerMustMatch() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - - String stream = stream(); - String subject = subject(); - createMemoryStream(nc, stream, subject); + runInLrServer((nc, jstc) -> { + String stream = jstc.stream; + String subject = jstc.subject(); // push - String uname = durable(); - String deliver = deliver(); + String uname = random(); + String deliver = random(); nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).build()); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.Last), "deliverPolicy"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.New), "deliverPolicy"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.None), "ackPolicy"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.All), "ackPolicy"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).replayPolicy(ReplayPolicy.Original), "replayPolicy"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.Last), "deliverPolicy"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.New), "deliverPolicy"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.None), "ackPolicy"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.All), "ackPolicy"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).replayPolicy(ReplayPolicy.Original), "replayPolicy"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).flowControl(10000), "flowControl"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).headersOnly(true), "headersOnly"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).flowControl(10000), "flowControl"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).headersOnly(true), "headersOnly"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).startTime(ZonedDateTime.now()), "startTime"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(Duration.ofMillis(1)), "ackWait"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).description("x"), "description"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).sampleFrequency("x"), "sampleFrequency"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).idleHeartbeat(Duration.ofMillis(1000)), "idleHeartbeat"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxExpires(Duration.ofMillis(1000)), "maxExpires"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).inactiveThreshold(Duration.ofMillis(1000)), "inactiveThreshold"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startTime(ZonedDateTime.now()), "startTime"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(Duration.ofMillis(1)), "ackWait"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).description("x"), "description"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).sampleFrequency("x"), "sampleFrequency"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).idleHeartbeat(Duration.ofMillis(1000)), "idleHeartbeat"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxExpires(Duration.ofMillis(1000)), "maxExpires"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).inactiveThreshold(Duration.ofMillis(1000)), "inactiveThreshold"); // value - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(MAX_DELIVER_MIN), "maxDeliver"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(MAX_DELIVER_MIN), "maxDeliver"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); // value unsigned - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(1), "startSequence"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(1), "rateLimit"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(1), "startSequence"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(1), "rateLimit"); // unset doesn't fail because the server provides a value equal to the unset - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(INTEGER_UNSET)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(INTEGER_UNSET)); // unset doesn't fail because the server does not provide a value // negatives are considered the unset - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(ULONG_UNSET)); - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(-1)); - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(ULONG_UNSET)); - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(-1)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(ULONG_UNSET)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(-1)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(ULONG_UNSET)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(-1)); // unset fail b/c the server does set a value that is not equal to the unset or the minimum - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(LONG_UNSET), "maxAckPending"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(LONG_UNSET), "ackWait"); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(LONG_UNSET), "maxAckPending"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(LONG_UNSET), "ackWait"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); // pull - String lname = durable(); + String lname = random(); nc.jetStreamManagement().addOrUpdateConsumer(stream, pullDurableBuilder(subject, lname).build()); // value - changeExPull(js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(0), "maxPullWaiting"); - changeExPull(js, subject, pullDurableBuilder(subject, lname).maxBatch(0), "maxBatch"); - changeExPull(js, subject, pullDurableBuilder(subject, lname).maxBytes(0), "maxBytes"); + changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(0), "maxPullWaiting"); + changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBatch(0), "maxBatch"); + changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBytes(0), "maxBytes"); // unsets fail b/c the server does set a value - changeExPull(js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(-1), "maxPullWaiting"); + changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(-1), "maxPullWaiting"); // unset - changeOkPull(js, subject, pullDurableBuilder(subject, lname).maxBatch(-1)); - changeOkPull(js, subject, pullDurableBuilder(subject, lname).maxBytes(-1)); + changeOkPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBatch(-1)); + changeOkPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBytes(-1)); // metadata Map metadataA = new HashMap<>(); metadataA.put("a", "A"); @@ -882,18 +869,18 @@ public void testSubscribeDurableConsumerMustMatch() throws Exception { if (atLeast2_10()) { // metadata server null versus new not null nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).build()); - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA), "metadata"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA), "metadata"); // metadata server not null versus new null nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).metadata(metadataA).build()); - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver)); // metadata server not null versus new not null but different - changeExPush(js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataB), "metadata"); + changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataB), "metadata"); if (before2_11()) { // metadata server not null versus new not null and same - changeOkPush(js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA)); + changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA)); } } }); @@ -935,35 +922,24 @@ private Builder pullDurableBuilder(String subject, String durable) { @Test public void testGetConsumerInfoFromSubscription() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - JetStreamSubscription sub = js.subscribe(tsc.subject()); + runInLrServer((nc, jstc) -> { + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server ConsumerInfo ci = sub.getConsumerInfo(); - assertEquals(tsc.stream, ci.getStreamName()); + assertEquals(jstc.stream, ci.getStreamName()); }); } @Test public void testInternalLookupConsumerInfoCoverage() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // - consumer not found // - stream does not exist - JetStreamSubscription sub = js.subscribe(tsc.subject()); - assertNull(((NatsJetStream)js).lookupConsumerInfo(tsc.stream, tsc.consumerName())); + jstc.js.subscribe(jstc.subject()); + assertNull(jstc.js.lookupConsumerInfo(jstc.stream, random())); assertThrows(JetStreamApiException.class, - () -> ((NatsJetStream)js).lookupConsumerInfo(stream(999), tsc.consumerName())); + () -> jstc.js.lookupConsumerInfo(random(), random())); }); } @@ -999,6 +975,7 @@ public void testNatsConnectionTimeCheckLogic() { Options options = Options.builder() .timeTraceLogger(l) .build(); + //noinspection resource NatsConnection nc = new NatsConnection(options); nc.traceTimeCheck("zero", 0); @@ -1025,88 +1002,93 @@ public void testNatsConnectionTimeCheckLogic() { @Test public void testMoreCreateSubscriptionErrors() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - - IllegalStateException ise = assertThrows(IllegalStateException.class, () -> js.subscribe(SUBJECT)); + runInLrServer((nc, jstc) -> { + IllegalStateException ise = assertThrows(IllegalStateException.class, () -> jstc.js.subscribe(random())); assertTrue(ise.getMessage().contains(JsSubNoMatchingStreamForSubject.id())); - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - // general pull push validation - ConsumerConfiguration ccCantHave = builder().durable("pulldur").deliverGroup("cantHave").build(); + + String pulldur = random(); + String dgCantHave = random(); + ConsumerConfiguration ccCantHave = builder().durable(pulldur).deliverGroup(dgCantHave).build(); PullSubscribeOptions pullCantHaveDlvrGrp = PullSubscribeOptions.builder().configuration(ccCantHave).build(); - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pullCantHaveDlvrGrp)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullCantHaveDlvrGrp)); assertTrue(iae.getMessage().contains(JsSubPullCantHaveDeliverGroup.id())); - ccCantHave = builder().durable("pulldur").deliverSubject("cantHave").build(); + ccCantHave = builder().durable(pulldur).deliverSubject(dgCantHave).build(); PullSubscribeOptions pullCantHaveDlvrSub = PullSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pullCantHaveDlvrSub)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullCantHaveDlvrSub)); assertTrue(iae.getMessage().contains(JsSubPullCantHaveDeliverSubject.id())); ccCantHave = builder().maxPullWaiting(1L).build(); PushSubscribeOptions pushCantHaveMpw = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pushCantHaveMpw)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMpw)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxPullWaiting.id())); ccCantHave = builder().maxBatch(1L).build(); PushSubscribeOptions pushCantHaveMb = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pushCantHaveMb)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMb)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxBatch.id())); ccCantHave = builder().maxBytes(1L).build(); PushSubscribeOptions pushCantHaveMby = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), pushCantHaveMby)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMby)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxBytes.id())); // create some consumers - PushSubscribeOptions psoDurNoQ = PushSubscribeOptions.builder().durable("durNoQ").build(); - js.subscribe(tsc.subject(), psoDurNoQ); + String durNoQ = random(); + String durYesQ = random(); - PushSubscribeOptions psoDurYesQ = PushSubscribeOptions.builder().durable("durYesQ").build(); - js.subscribe(tsc.subject(), "yesQ", psoDurYesQ); + PushSubscribeOptions psoDurNoQ = PushSubscribeOptions.builder().durable(durNoQ).build(); + jstc.js.subscribe(jstc.subject(), psoDurNoQ); + + PushSubscribeOptions psoDurYesQ = PushSubscribeOptions.builder().durable(durYesQ).build(); + jstc.js.subscribe(jstc.subject(), "yesQ", psoDurYesQ); // already bound - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), psoDurNoQ)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoDurNoQ)); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyBound.id())); // queue match - PushSubscribeOptions qmatch = PushSubscribeOptions.builder() - .durable("qmatchdur").deliverGroup("qmatchq").build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), "qnotmatch", qmatch)); + String qmatchdur = random(); + String qmatchq = random(); + PushSubscribeOptions qmatch = PushSubscribeOptions.builder().durable(qmatchdur).deliverGroup(qmatchq).build(); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "qnotmatch", qmatch)); assertTrue(iae.getMessage().contains(JsSubQueueDeliverGroupMismatch.id())); // queue vs config - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), "notConfigured", psoDurNoQ)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "notConfigured", psoDurNoQ)); assertTrue(iae.getMessage().contains(JsSubExistingConsumerNotQueue.id())); - PushSubscribeOptions psoNoVsYes = PushSubscribeOptions.builder().durable("durYesQ").build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), psoNoVsYes)); + PushSubscribeOptions psoNoVsYes = PushSubscribeOptions.builder().durable(durYesQ).build(); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoNoVsYes)); assertTrue(iae.getMessage().contains(JsSubExistingConsumerIsQueue.id())); - PushSubscribeOptions psoYesVsNo = PushSubscribeOptions.builder().durable("durYesQ").build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), "qnotmatch", psoYesVsNo)); + PushSubscribeOptions psoYesVsNo = PushSubscribeOptions.builder().durable(durYesQ).build(); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "qnotmatch", psoYesVsNo)); assertTrue(iae.getMessage().contains(JsSubExistingQueueDoesNotMatchRequestedQueue.id())); // flow control heartbeat push / pull - ConsumerConfiguration ccFc = builder().durable("ccFcDur").flowControl(1000).build(); - ConsumerConfiguration ccHb = builder().durable("ccHbDur").idleHeartbeat(1000).build(); + String ccFcDur = random(); + String ccHbDur = random(); + ConsumerConfiguration ccFc = builder().durable(ccFcDur).flowControl(1000).build(); + ConsumerConfiguration ccHb = builder().durable(ccHbDur).idleHeartbeat(1000).build(); PullSubscribeOptions psoPullCcFc = PullSubscribeOptions.builder().configuration(ccFc).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), psoPullCcFc)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoPullCcFc)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidPull.id())); PullSubscribeOptions psoPullCcHb = PullSubscribeOptions.builder().configuration(ccHb).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), psoPullCcHb)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoPullCcHb)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidPull.id())); PushSubscribeOptions psoPushCcFc = PushSubscribeOptions.builder().configuration(ccFc).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), "cantHaveQ", psoPushCcFc)); + String cantHaveQ = random(); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), cantHaveQ, psoPushCcFc)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidQueue.id())); PushSubscribeOptions psoPushCcHb = PushSubscribeOptions.builder().configuration(ccHb).build(); - iae = assertThrows(IllegalArgumentException.class, () -> js.subscribe(tsc.subject(), "cantHaveQ", psoPushCcHb)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), cantHaveQ, psoPushCcHb)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidQueue.id())); }); } @@ -1118,4 +1100,32 @@ public void testNatsJetStreamUtil() { assertNotNull(gen); assertTrue(gen.startsWith("prefix-")); } + + @Test + public void testRequestNoResponder() throws Exception { + runInLrServer((ncCancel, jsm, js) -> { + Options optReport = LongRunningServer.optionsBuilder().reportNoResponders().build(); + try (Connection ncReport = standardConnectionWait(optReport)) { + assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); + ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); + assertInstanceOf(JetStreamStatusException.class, ee.getCause()); + assertTrue(ee.getMessage().contains("503 No Responders Available For Request")); + + String stream = random(); + String subject = random(); + ncCancel.jetStreamManagement().addStream( + StreamConfiguration.builder() + .name(stream).subjects(subject).storageType(StorageType.Memory) + .build()); + + JetStream jsCancel = ncCancel.jetStream(); + JetStream jsReport = ncReport.jetStream(); + + IOException ioe = assertThrows(IOException.class, () -> jsCancel.publish("not-exist", null)); + assertTrue(ioe.getMessage().contains("503")); + ioe = assertThrows(IOException.class, () -> jsReport.publish("trnrNotExist", null)); + assertTrue(ioe.getMessage().contains("503")); + } + }); + } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index f1b83689f..3d406b8cc 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -40,15 +40,17 @@ public class JetStreamManagementTests extends JetStreamTestBase { @Test public void testStreamCreate() throws Exception { - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { long now = ZonedDateTime.now().toEpochSecond(); - JetStreamManagement jsm = nc.jetStreamManagement(); + String stream = random(); + String subject0 = random(); + String subject1 = random(); StreamConfiguration sc = StreamConfiguration.builder() - .name(STREAM) + .name(stream) .storageType(StorageType.Memory) - .subjects(subject(0), subject(1)) + .subjects(subject0, subject1) .build(); StreamInfo si = jsm.addStream(sc); @@ -57,12 +59,12 @@ public void testStreamCreate() throws Exception { assertNotNull(si.getConfiguration()); sc = si.getConfiguration(); - assertEquals(STREAM, sc.getName()); + assertEquals(stream, sc.getName()); assertEquals(2, sc.getSubjects().size()); - assertEquals(subject(0), sc.getSubjects().get(0)); - assertEquals(subject(1), sc.getSubjects().get(1)); - assertTrue(subject(0).compareTo(subject(1)) != 0); // coverage + assertEquals(subject0, sc.getSubjects().get(0)); + assertEquals(subject1, sc.getSubjects().get(1)); + assertTrue(subject0.compareTo(subject1) != 0); // coverage assertEquals(RetentionPolicy.Limits, sc.getRetentionPolicy()); assertEquals(DiscardPolicy.Old, sc.getDiscardPolicy()); @@ -72,6 +74,7 @@ public void testStreamCreate() throws Exception { assertEquals(-1, sc.getMaxConsumers()); assertEquals(-1, sc.getMaxMsgs()); assertEquals(-1, sc.getMaxBytes()); + //noinspection deprecation assertEquals(-1, sc.getMaxMsgSize()); // COVERAGE for deprecated assertEquals(-1, sc.getMaximumMessageSize()); assertEquals(1, sc.getReplicas()); @@ -89,8 +92,7 @@ public void testStreamCreate() throws Exception { assertEquals(0, ss.getConsumerCount()); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { - JetStream js = jsm.jetStream(); - String stream = stream(); + stream = random(); sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) @@ -107,14 +109,12 @@ public void testStreamCreate() throws Exception { @Test public void testStreamMetadata() throws Exception { - jsServer.run(TestBase::atLeast2_9_0, nc -> { + runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); - JetStreamManagement jsm = nc.jetStreamManagement(); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream()) + .name(random()) .storageType(StorageType.Memory) - .subjects(subject()) + .subjects(random()) .metadata(metaData) .build(); @@ -126,12 +126,10 @@ public void testStreamMetadata() throws Exception { @Test public void testStreamCreateWithNoSubject() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { long now = ZonedDateTime.now().toEpochSecond(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - String stream = stream(); + String stream = random(); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) @@ -174,16 +172,19 @@ public void testStreamCreateWithNoSubject() throws Exception { @Test public void testUpdateStream() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - StreamInfo si = addTestStream(jsm); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject0 = random(); + String subject1 = random(); + String subject2 = random(); + StreamInfo si = jsm.addStream(getTestStreamConfiguration(stream, new String[]{subject0, subject1})); StreamConfiguration sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(STREAM, sc.getName()); + assertEquals(stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(2, sc.getSubjects().size()); - assertEquals(subject(0), sc.getSubjects().get(0)); - assertEquals(subject(1), sc.getSubjects().get(1)); + assertEquals(subject0, sc.getSubjects().get(0)); + assertEquals(subject1, sc.getSubjects().get(1)); assertEquals(-1, sc.getMaxMsgs()); assertEquals(-1, sc.getMaxBytes()); assertEquals(-1, sc.getMaximumMessageSize()); @@ -196,9 +197,9 @@ public void testUpdateStream() throws Exception { assertNull(sc.getTemplateOwner()); sc = StreamConfiguration.builder() - .name(STREAM) + .name(stream) .storageType(StorageType.Memory) // File is default, this ensures it's not a change - .subjects(subject(0), subject(1), subject(2)) + .subjects(subject0, subject1, subject2) .maxMessages(42) .maxBytes(43) .maximumMessageSize(44) @@ -213,12 +214,12 @@ public void testUpdateStream() throws Exception { sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(STREAM, sc.getName()); + assertEquals(stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(3, sc.getSubjects().size()); - assertEquals(subject(0), sc.getSubjects().get(0)); - assertEquals(subject(1), sc.getSubjects().get(1)); - assertEquals(subject(2), sc.getSubjects().get(2)); + assertEquals(subject0, sc.getSubjects().get(0)); + assertEquals(subject1, sc.getSubjects().get(1)); + assertEquals(subject2, sc.getSubjects().get(2)); assertEquals(42, sc.getMaxMsgs()); assertEquals(43, sc.getMaxBytes()); assertEquals(44, sc.getMaximumMessageSize()); @@ -232,38 +233,36 @@ public void testUpdateStream() throws Exception { assertNull(sc.getTemplateOwner()); // allowed to change Allow Direct - jsm.deleteStream(STREAM); - jsm.addStream(getTestStreamConfigurationBuilder().allowDirect(false).build()); - jsm.updateStream(getTestStreamConfigurationBuilder().allowDirect(true).build()); - jsm.updateStream(getTestStreamConfigurationBuilder().allowDirect(false).build()); + jsm.deleteStream(stream); + jsm.addStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(false).build()); + jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(true).build()); + jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(false).build()); // allowed to change Mirror Direct - jsm.deleteStream(STREAM); - jsm.addStream(getTestStreamConfigurationBuilder().mirrorDirect(false).build()); - jsm.updateStream(getTestStreamConfigurationBuilder().mirrorDirect(true).build()); - jsm.updateStream(getTestStreamConfigurationBuilder().mirrorDirect(false).build()); + jsm.deleteStream(stream); + jsm.addStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(false).build()); + jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(true).build()); + jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(false).build()); }); } @Test public void testAddStreamInvalids() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { assertThrows(IllegalArgumentException.class, () -> jsm.addStream(null)); - String stream = stream(); + String stream = random(); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) - .description(variant()) + .description(random()) .storageType(StorageType.Memory) - .subjects(subject()) + .subjects(random()) .build(); jsm.addStream(sc); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).subjects(subject()).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).description(variant()).build())); + assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); + assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).description(random()).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); @@ -271,6 +270,7 @@ public void testAddStreamInvalids() throws Exception { assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); + //noinspection deprecation assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); @@ -293,13 +293,11 @@ private void assert10058(Executable executable) { @Test public void testUpdateStreamInvalids() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - + runInLrServer((nc, jsm, js) -> { assertThrows(IllegalArgumentException.class, () -> jsm.updateStream(null)); - String stream = stream(); - String[] subjects = new String[]{subject(), subject()}; + String stream = random(); + String[] subjects = new String[]{random(), random()}; // cannot update non existent stream StreamConfiguration sc = getTestStreamConfiguration(stream, subjects); @@ -316,7 +314,7 @@ public void testUpdateStreamInvalids() throws Exception { assertThrows(JetStreamApiException.class, () -> jsm.updateStream(scMemToFile)); // cannot change MaxConsumers - StreamConfiguration scMaxCon = getTestStreamConfigurationBuilder() + StreamConfiguration scMaxCon = getTestStreamConfigurationBuilder(stream, subjects) .maxConsumers(2) .build(); assertThrows(JetStreamApiException.class, () -> jsm.updateStream(scMaxCon)); @@ -339,29 +337,18 @@ public void testUpdateStreamInvalids() throws Exception { }); } - private static StreamInfo addTestStream(JetStreamManagement jsm) throws IOException, JetStreamApiException { - StreamInfo si = jsm.addStream(getTestStreamConfiguration()); - assertNotNull(si); - return si; - } - - private static StreamConfiguration getTestStreamConfiguration() { - return getTestStreamConfigurationBuilder().build(); + private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(String stream, String subject) { + return StreamConfiguration.builder() + .name(stream) + .storageType(StorageType.Memory) + .subjects(subject); } - private static StreamConfiguration getTestStreamConfiguration(String stream, String... subjects) { + private static StreamConfiguration getTestStreamConfiguration(String stream, String[] subjects) { return getTestStreamConfigurationBuilder(stream, subjects).build(); } - private static StreamConfiguration.Builder getTestStreamConfigurationBuilder() { - return getTestStreamConfigurationBuilder(STREAM); - } - - private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(String stream, String... subjects) { - if (subjects == null || subjects.length == 0) { - subjects = new String[]{subject(0), subject(1)}; - } - + private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(String stream, String[] subjects) { return StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) @@ -370,18 +357,14 @@ private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(Str @Test public void testGetStreamInfo() throws Exception { - jsServer.run(nc -> { - String stream = stream(); - - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer((nc, jsm, js) -> { + String stream = random(); assertThrows(JetStreamApiException.class, () -> jsm.getStreamInfo(stream)); - JetStream js = nc.jetStream(); - String[] subjects = new String[6]; - String subjectIx5 = subject(); + String subjectIx5 = random(); for (int x = 0; x < 5; x++) { - subjects[x] = subject() + x + 1; + subjects[x] = random() + x + 1; } subjects[5] = subjectIx5 + ".>"; @@ -475,105 +458,14 @@ public void testGetStreamInfo() throws Exception { }); } - @Test - public void testGetStreamInfoSubjectPagination() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/pagination.conf", false, true)) { - try (Connection nc = standardConnection(ts.getURI())) { - if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - long rounds = 101; - long size = 1000; - long count = rounds * size; - jsm.addStream(StreamConfiguration.builder() - .name(stream(1)) - .storageType(StorageType.Memory) - .subjects("s.*.*") - .build()); - - jsm.addStream(StreamConfiguration.builder() - .name(stream(2)) - .storageType(StorageType.Memory) - .subjects("t.*.*") - .build()); - - for (int x = 1; x <= rounds; x++) { - for (int y = 1; y <= size; y++) { - js.publish("s." + x + "." + y, null); - } - } - - for (int y = 1; y <= size; y++) { - js.publish("t.7." + y, null); - } - - StreamInfo si = jsm.getStreamInfo(stream(1)); - validateStreamInfo(si.getStreamState(), 0, 0, count); - - si = jsm.getStreamInfo(stream(1), StreamInfoOptions.allSubjects()); - validateStreamInfo(si.getStreamState(), count, count, count); - - si = jsm.getStreamInfo(stream(1), StreamInfoOptions.filterSubjects("s.7.*")); - validateStreamInfo(si.getStreamState(), size, size, count); - - si = jsm.getStreamInfo(stream(1), StreamInfoOptions.filterSubjects("s.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, count); - - si = jsm.getStreamInfo(stream(2), StreamInfoOptions.filterSubjects("t.7.*")); - validateStreamInfo(si.getStreamState(), size, size, size); - - si = jsm.getStreamInfo(stream(2), StreamInfoOptions.filterSubjects("t.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, size); - - List infos = jsm.getStreams(); - assertEquals(2, infos.size()); - si = infos.get(0); - if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { - validateStreamInfo(si.getStreamState(), 0, 0, count); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); - } - else { - validateStreamInfo(si.getStreamState(), 0, 0, size); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); - } - - infos = jsm.getStreams(">"); - assertEquals(2, infos.size()); - - infos = jsm.getStreams("*.7.*"); - assertEquals(2, infos.size()); - - infos = jsm.getStreams("*.7.1"); - assertEquals(2, infos.size()); - - infos = jsm.getStreams("s.7.*"); - assertEquals(1, infos.size()); - assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); - - infos = jsm.getStreams("t.7.1"); - assertEquals(1, infos.size()); - assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); - } - } - } - } - - private void validateStreamInfo(StreamState streamState, long subjectsList, long filteredCount, long subjectCount) { - assertEquals(subjectsList, streamState.getSubjects().size()); - assertEquals(filteredCount, streamState.getSubjects().size()); - assertEquals(subjectCount, streamState.getSubjectCount()); - } - @Test public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - + runInLrServer((nc, jsm, js) -> { // getStreams pages at 256 // getStreamNames pages at 1024 - addStreams(jsm, 300, 0, "x256"); + String prefix = random(); + addStreams(jsm, prefix, 300, 0, "x256"); List list = jsm.getStreams(); assertEquals(300, list.size()); @@ -581,7 +473,7 @@ public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { List names = jsm.getStreamNames(); assertEquals(300, names.size()); - addStreams(jsm, 1100, 300, "x1024"); + addStreams(jsm, prefix, 1100, 300, "x1024"); list = jsm.getStreams(); assertEquals(1400, list.size()); @@ -603,209 +495,221 @@ public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { }); } - private void addStreams(JetStreamManagement jsm, int count, int adj, String div) throws IOException, JetStreamApiException { + private void addStreams(JetStreamManagement jsm, String prefix, int count, int adj, String div) throws IOException, JetStreamApiException { for (int x = 0; x < count; x++) { - createMemoryStream(jsm, "stream-" + (x + adj), "sub" + (x + adj) + "." + div + ".*"); + createMemoryStream(jsm, prefix + "-" + (x + adj), "sub" + (x + adj) + "." + div + ".*"); } } @Test public void testGetStreamNamesBySubjectFilter() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - createMemoryStream(jsm, stream(1), "foo"); - createMemoryStream(jsm, stream(2), "bar"); - createMemoryStream(jsm, stream(3), "a.a"); - createMemoryStream(jsm, stream(4), "a.b"); + runInLrServer((nc, jsm, js) -> { + String stream1 = random(); + String stream2 = random(); + String stream3 = random(); + String stream4 = random(); + createMemoryStream(jsm, stream1, "foo"); + createMemoryStream(jsm, stream2, "bar"); + createMemoryStream(jsm, stream3, "a.a"); + createMemoryStream(jsm, stream4, "a.b"); List list = jsm.getStreamNames("*"); - assertStreamNameList(list, 1, 2); + assertStreamNameList(list, stream1, stream2); list = jsm.getStreamNames(">"); - assertStreamNameList(list, 1, 2, 3, 4); + assertStreamNameList(list, stream1, stream2, stream3, stream4); list = jsm.getStreamNames("*.*"); - assertStreamNameList(list, 3, 4); + assertStreamNameList(list, stream3, stream4); list = jsm.getStreamNames("a.>"); - assertStreamNameList(list, 3, 4); + assertStreamNameList(list, stream3, stream4); list = jsm.getStreamNames("a.*"); - assertStreamNameList(list, 3, 4); + assertStreamNameList(list, stream3, stream4); list = jsm.getStreamNames("foo"); - assertStreamNameList(list, 1); + assertStreamNameList(list, stream1); list = jsm.getStreamNames("a.a"); - assertStreamNameList(list, 3); + assertStreamNameList(list, stream3); list = jsm.getStreamNames("nomatch"); assertStreamNameList(list); }); } - private void assertStreamNameList(List list, int... ids) { + private void assertStreamNameList(List list, String... streams) { assertNotNull(list); - assertEquals(ids.length, list.size()); - for (int id : ids) { - assertTrue(list.contains(stream(id))); + assertEquals(streams.length, list.size()); + for (String s : streams) { + assertTrue(list.contains(s)); } } @Test public void testDeleteStream() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer((nc, jstc) -> { JetStreamApiException jsapiEx = - assertThrows(JetStreamApiException.class, () -> jsm.deleteStream(stream())); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteStream(random())); assertEquals(10059, jsapiEx.getApiErrorCode()); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - assertNotNull(jsm.getStreamInfo(tsc.stream)); - assertTrue(jsm.deleteStream(tsc.stream)); + assertNotNull(jstc.jsm.getStreamInfo(jstc.stream)); + assertTrue(jstc.jsm.deleteStream(jstc.stream)); - jsapiEx = assertThrows(JetStreamApiException.class, () -> jsm.getStreamInfo(tsc.stream)); + jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.getStreamInfo(jstc.stream)); assertEquals(10059, jsapiEx.getApiErrorCode()); - jsapiEx = assertThrows(JetStreamApiException.class, () -> jsm.deleteStream(tsc.stream)); + jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteStream(jstc.stream)); assertEquals(10059, jsapiEx.getApiErrorCode()); }); } @Test public void testPurgeStreamAndOptions() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { // invalid to have both keep and seq assertThrows(IllegalArgumentException.class, () -> PurgeOptions.builder().keep(1).sequence(1).build()); - JetStreamManagement jsm = nc.jetStreamManagement(); - // error to purge a stream that does not exist - assertThrows(JetStreamApiException.class, () -> jsm.purgeStream(stream())); + assertThrows(JetStreamApiException.class, () -> jsm.purgeStream(random())); - TestingStreamContainer tsc = new TestingStreamContainer(nc, 2); - createMemoryStream(jsm, tsc.stream, tsc.subject(0), tsc.subject(1)); + JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + createMemoryStream(jsm, jstc.stream, jstc.subject(0), jstc.subject(1)); - StreamInfo si = jsm.getStreamInfo(tsc.stream); + StreamInfo si = jsm.getStreamInfo(jstc.stream); assertEquals(0, si.getStreamState().getMsgCount()); - jsPublish(nc, tsc.subject(0), 10); - si = jsm.getStreamInfo(tsc.stream); + jsPublish(nc, jstc.subject(0), 10); + si = jsm.getStreamInfo(jstc.stream); assertEquals(10, si.getStreamState().getMsgCount()); PurgeOptions options = PurgeOptions.builder().keep(7).build(); - PurgeResponse pr = jsm.purgeStream(tsc.stream, options); + PurgeResponse pr = jsm.purgeStream(jstc.stream, options); assertTrue(pr.isSuccess()); assertEquals(3, pr.getPurged()); options = PurgeOptions.builder().sequence(9).build(); - pr = jsm.purgeStream(tsc.stream, options); + pr = jsm.purgeStream(jstc.stream, options); assertTrue(pr.isSuccess()); assertEquals(5, pr.getPurged()); - si = jsm.getStreamInfo(tsc.stream); + si = jsm.getStreamInfo(jstc.stream); assertEquals(2, si.getStreamState().getMsgCount()); - pr = jsm.purgeStream(tsc.stream); + pr = jsm.purgeStream(jstc.stream); assertTrue(pr.isSuccess()); assertEquals(2, pr.getPurged()); - si = jsm.getStreamInfo(tsc.stream); + si = jsm.getStreamInfo(jstc.stream); assertEquals(0, si.getStreamState().getMsgCount()); - jsPublish(nc, tsc.subject(0), 10); - jsPublish(nc, tsc.subject(1), 10); - si = jsm.getStreamInfo(tsc.stream); + jsPublish(nc, jstc.subject(0), 10); + jsPublish(nc, jstc.subject(1), 10); + si = jsm.getStreamInfo(jstc.stream); assertEquals(20, si.getStreamState().getMsgCount()); - jsm.purgeStream(tsc.stream, PurgeOptions.subject(tsc.subject(0))); - si = jsm.getStreamInfo(tsc.stream); + jsm.purgeStream(jstc.stream, PurgeOptions.subject(jstc.subject(0))); + si = jsm.getStreamInfo(jstc.stream); assertEquals(10, si.getStreamState().getMsgCount()); - options = PurgeOptions.builder().subject(tsc.subject(0)).sequence(1).build(); - assertEquals(tsc.subject(0), options.getSubject()); + options = PurgeOptions.builder().subject(jstc.subject(0)).sequence(1).build(); + assertEquals(jstc.subject(0), options.getSubject()); assertEquals(1, options.getSequence()); - options = PurgeOptions.builder().subject(tsc.subject(0)).keep(2).build(); + options = PurgeOptions.builder().subject(jstc.subject(0)).keep(2).build(); assertEquals(2, options.getKeep()); }); } @Test public void testAddDeleteConsumer() throws Exception { - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { boolean atLeast2dot9 = nc.getServerInfo().isSameOrNewerThanVersion("2.9"); - JetStreamManagement jsm = nc.jetStreamManagement(); - - createMemoryStream(jsm, STREAM, subjectDot(">")); + String stream = random(); + String subject = random(); + createMemoryStream(jsm, stream, subjectGt(subject)); - List list = jsm.getConsumers(STREAM); + List list = jsm.getConsumers(stream); assertEquals(0, list.size()); final ConsumerConfiguration cc = ConsumerConfiguration.builder().build(); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jsm.addOrUpdateConsumer(null, cc)); assertTrue(iae.getMessage().contains("Stream cannot be null or empty")); - iae = assertThrows(IllegalArgumentException.class, () -> jsm.addOrUpdateConsumer(STREAM, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jsm.addOrUpdateConsumer(stream, null)); assertTrue(iae.getMessage().contains("Config cannot be null")); // durable and name can both be null - ConsumerInfo ci = jsm.addOrUpdateConsumer(STREAM, cc); + ConsumerInfo ci = jsm.addOrUpdateConsumer(stream, cc); assertNotNull(ci.getName()); // threshold can be set for durable - final ConsumerConfiguration cc2 = ConsumerConfiguration.builder().durable(DURABLE).inactiveThreshold(10000).build(); - ci = jsm.addOrUpdateConsumer(STREAM, cc2); - assertEquals(10000, ci.getConsumerConfiguration().getInactiveThreshold().toMillis()); + final ConsumerConfiguration cc2 = ConsumerConfiguration.builder().durable(random()).inactiveThreshold(10000).build(); + ci = jsm.addOrUpdateConsumer(stream, cc2); + assertNotNull(ci.getName()); + ConsumerConfiguration cc2cc = ci.getConsumerConfiguration(); + assertNotNull(cc2cc); + Duration duration = ci.getConsumerConfiguration().getInactiveThreshold(); + assertNotNull(duration); + assertEquals(10000, duration.toMillis()); // prep for next part of test - jsm.deleteStream(STREAM); - createMemoryStream(jsm, STREAM, subjectDot(">")); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subjectGt(subject)); // with and w/o deliver subject for push/pull - addConsumer(jsm, atLeast2dot9, 1, false, null, ConsumerConfiguration.builder() - .durable(durable(1)) + String dur0 = random(); + addConsumer(jsm, stream, atLeast2dot9, dur0, null, null, ConsumerConfiguration.builder() + .durable(dur0) .build()); - addConsumer(jsm, atLeast2dot9, 2, true, null, ConsumerConfiguration.builder() - .durable(durable(2)) - .deliverSubject(deliver(2)) + String dur = random(); + String deliver = random(); + addConsumer(jsm, stream, atLeast2dot9, dur, deliver, null, ConsumerConfiguration.builder() + .durable(dur) + .deliverSubject(deliver) .build()); // test delete here - List consumers = jsm.getConsumerNames(STREAM); + List consumers = jsm.getConsumerNames(stream); assertEquals(2, consumers.size()); - assertTrue(jsm.deleteConsumer(STREAM, durable(1))); - consumers = jsm.getConsumerNames(STREAM); + assertTrue(jsm.deleteConsumer(stream, dur0)); + consumers = jsm.getConsumerNames(stream); assertEquals(1, consumers.size()); - assertThrows(JetStreamApiException.class, () -> jsm.deleteConsumer(STREAM, durable(1))); + assertThrows(JetStreamApiException.class, () -> jsm.deleteConsumer(stream, dur0)); // some testing of new name if (atLeast2dot9) { - addConsumer(jsm, true, 3, false, null, ConsumerConfiguration.builder() - .durable(durable(3)) - .name(durable(3)) + dur = random(); + addConsumer(jsm, stream, true, dur, null, null, ConsumerConfiguration.builder() + .durable(dur) + .name(dur) .build()); - addConsumer(jsm, true, 4, true, null, ConsumerConfiguration.builder() - .durable(durable(4)) - .name(durable(4)) - .deliverSubject(deliver(4)) + dur = random(); + deliver = random(); + addConsumer(jsm, stream, true, dur, deliver, null, ConsumerConfiguration.builder() + .durable(dur) + .name(dur) + .deliverSubject(deliver) .build()); - addConsumer(jsm, true, 5, false, ">", ConsumerConfiguration.builder() - .durable(durable(5)) + dur = random(); + addConsumer(jsm, stream, true, dur, null, ">", ConsumerConfiguration.builder() + .durable(dur) .filterSubject(">") .build()); - addConsumer(jsm, true, 6, false, subjectDot(">"), ConsumerConfiguration.builder() - .durable(durable(6)) - .filterSubject(subjectDot(">")) + dur = random(); + addConsumer(jsm, stream, true, dur, null, subjectGt(subject), ConsumerConfiguration.builder() + .durable(dur) + .filterSubject(subjectGt(subject)) .build()); - addConsumer(jsm, true, 7, false, subjectDot("foo"), ConsumerConfiguration.builder() - .durable(durable(7)) - .filterSubject(subjectDot("foo")) + dur = random(); + addConsumer(jsm, stream, true, dur, null, subjectDot(subject, "foo"), ConsumerConfiguration.builder() + .durable(dur) + .filterSubject(subjectDot(subject, "foo")) .build()); } }); @@ -813,22 +717,20 @@ public void testAddDeleteConsumer() throws Exception { @Test public void testAddPausedConsumer() throws Exception { - jsServer.run(TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - List list = jsm.getConsumers(tsc.stream); + runInLrServer(TestBase::atLeast2_11, (nc, jstc) -> { + List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); ZonedDateTime pauseUntil = ZonedDateTime.now(ZONE_ID_GMT).plusMinutes(2); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .pauseUntil(pauseUntil) .build(); // Consumer should be paused on creation. - ConsumerInfo ci = jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); assertTrue(ci.getPaused()); + assertNotNull(ci.getPauseRemaining()); assertTrue(ci.getPauseRemaining().toMillis() > 60_000); assertEquals(pauseUntil, ci.getConsumerConfiguration().getPauseUntil()); }); @@ -836,154 +738,157 @@ public void testAddPausedConsumer() throws Exception { @Test public void testPauseResumeConsumer() throws Exception { - jsServer.run(TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - List list = jsm.getConsumers(tsc.stream); + runInLrServer(TestBase::atLeast2_11, (nc, jstc) -> { + List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .build(); // durable and name can both be null - ConsumerInfo ci = jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); assertNotNull(ci.getName()); // pause consumer ZonedDateTime pauseUntil = ZonedDateTime.now(ZONE_ID_GMT).plusMinutes(2); - ConsumerPauseResponse pauseResponse = jsm.pauseConsumer(tsc.stream, ci.getName(), pauseUntil); + ConsumerPauseResponse pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), pauseUntil); assertTrue(pauseResponse.isPaused()); assertEquals(pauseUntil, pauseResponse.getPauseUntil()); - ci = jsm.getConsumerInfo(tsc.stream, ci.getName()); + ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); assertTrue(ci.getPaused()); + assertNotNull(ci.getPauseRemaining()); assertTrue(ci.getPauseRemaining().toMillis() > 60_000); // resume consumer - boolean isResumed = jsm.resumeConsumer(tsc.stream, ci.getName()); + boolean isResumed = jstc.jsm.resumeConsumer(jstc.stream, ci.getName()); assertTrue(isResumed); - ci = jsm.getConsumerInfo(tsc.stream, ci.getName()); + ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); assertFalse(ci.getPaused()); // pause again - pauseResponse = jsm.pauseConsumer(tsc.stream, ci.getName(), pauseUntil); + pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), pauseUntil); assertTrue(pauseResponse.isPaused()); assertEquals(pauseUntil, pauseResponse.getPauseUntil()); // resume via pause with no date - pauseResponse = jsm.pauseConsumer(tsc.stream, ci.getName(), null); + pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), null); assertFalse(pauseResponse.isPaused()); assertEquals(DEFAULT_TIME, pauseResponse.getPauseUntil()); - ci = jsm.getConsumerInfo(tsc.stream, ci.getName()); + ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); assertFalse(ci.getPaused()); - assertThrows(JetStreamApiException.class, () -> jsm.pauseConsumer(stream(), tsc.consumerName(), pauseUntil)); - assertThrows(JetStreamApiException.class, () -> jsm.pauseConsumer(tsc.stream, name(), pauseUntil)); - assertThrows(JetStreamApiException.class, () -> jsm.resumeConsumer(stream(), tsc.consumerName())); - assertThrows(JetStreamApiException.class, () -> jsm.resumeConsumer(tsc.stream, name())); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.pauseConsumer(random(), jstc.consumerName(), pauseUntil)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.pauseConsumer(jstc.stream, random(), pauseUntil)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.resumeConsumer(random(), jstc.consumerName())); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.resumeConsumer(jstc.stream, random())); }); } - private static void addConsumer(JetStreamManagement jsm, boolean atLeast2dot9, int id, boolean deliver, String fs, ConsumerConfiguration cc) throws IOException, JetStreamApiException { - ConsumerInfo ci = jsm.addOrUpdateConsumer(STREAM, cc); - assertEquals(durable(id), ci.getName()); + private static void addConsumer(JetStreamManagement jsm, String stream, boolean atLeast2dot9, String name, String deliver, String fs, ConsumerConfiguration cc) throws IOException, JetStreamApiException { + ConsumerInfo ci = jsm.addOrUpdateConsumer(stream, cc); + assertEquals(name, ci.getName()); if (atLeast2dot9) { - assertEquals(durable(id), ci.getConsumerConfiguration().getName()); + assertEquals(name, ci.getConsumerConfiguration().getName()); } - assertEquals(durable(id), ci.getConsumerConfiguration().getDurable()); + assertEquals(name, ci.getConsumerConfiguration().getDurable()); if (fs == null) { assertNull(ci.getConsumerConfiguration().getFilterSubject()); } - if (deliver) { - assertEquals(deliver(id), ci.getConsumerConfiguration().getDeliverSubject()); + if (deliver != null) { + assertEquals(deliver, ci.getConsumerConfiguration().getDeliverSubject()); } } @Test public void testValidConsumerUpdates() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - createMemoryStream(jsm, STREAM, SUBJECT_GT); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); + String subjectGt = subjectGt(subject); + createMemoryStream(jsm, stream, subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jsm); - cc = ConsumerConfiguration.builder(cc).deliverSubject(deliver(2)).build(); - assertValidAddOrUpdate(jsm, cc); + ConsumerConfiguration cc = prepForUpdateTest(jsm, stream, subjectGt, null); + cc = ConsumerConfiguration.builder(cc).deliverSubject(random()).build(); + assertValidAddOrUpdate(jsm, cc, stream); - cc = prepForUpdateTest(jsm); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).ackWait(Duration.ofSeconds(5)).build(); - assertValidAddOrUpdate(jsm, cc); + assertValidAddOrUpdate(jsm, cc, stream); - cc = prepForUpdateTest(jsm); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).rateLimit(100).build(); - assertValidAddOrUpdate(jsm, cc); + assertValidAddOrUpdate(jsm, cc, stream); - cc = prepForUpdateTest(jsm); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxAckPending(100).build(); - assertValidAddOrUpdate(jsm, cc); + assertValidAddOrUpdate(jsm, cc, stream); - cc = prepForUpdateTest(jsm); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxDeliver(4).build(); - assertValidAddOrUpdate(jsm, cc); + assertValidAddOrUpdate(jsm, cc, stream); if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { - cc = prepForUpdateTest(jsm); - cc = ConsumerConfiguration.builder(cc).filterSubject(SUBJECT_STAR).build(); - assertValidAddOrUpdate(jsm, cc); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); + assertValidAddOrUpdate(jsm, cc, stream); } }); } @Test public void testInvalidConsumerUpdates() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - createMemoryStream(jsm, STREAM, SUBJECT_GT); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); + String subjectGt = subjectGt(subject); + createMemoryStream(jsm, stream, subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jsm); + ConsumerConfiguration cc = prepForUpdateTest(jsm, stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverPolicy(DeliverPolicy.New).build(); - assertInvalidConsumerUpdate(jsm, cc); + assertInvalidConsumerUpdate(jsm, cc, stream); if (nc.getServerInfo().isSameOrOlderThanVersion("2.8.4")) { - cc = prepForUpdateTest(jsm); - cc = ConsumerConfiguration.builder(cc).filterSubject(SUBJECT_STAR).build(); - assertInvalidConsumerUpdate(jsm, cc); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); + assertInvalidConsumerUpdate(jsm, cc, stream); } - cc = prepForUpdateTest(jsm); + cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).idleHeartbeat(Duration.ofMillis(111)).build(); - assertInvalidConsumerUpdate(jsm, cc); + assertInvalidConsumerUpdate(jsm, cc, stream); }); } - private ConsumerConfiguration prepForUpdateTest(JetStreamManagement jsm) throws IOException, JetStreamApiException { + private ConsumerConfiguration prepForUpdateTest(JetStreamManagement jsm, String stream, String subjectGt, String durableToDelete) throws IOException, JetStreamApiException { try { - jsm.deleteConsumer(STREAM, durable(1)); + if (durableToDelete != null) { + jsm.deleteConsumer(stream, durableToDelete); + } } catch (Exception e) { /* ignore */ } - ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(durable(1)) + .durable(random()) .ackPolicy(AckPolicy.Explicit) - .deliverSubject(deliver(1)) + .deliverSubject(random()) .maxDeliver(3) - .filterSubject(SUBJECT_GT) + .filterSubject(subjectGt) .build(); - assertValidAddOrUpdate(jsm, cc); + assertValidAddOrUpdate(jsm, cc, stream); return cc; } - private void assertInvalidConsumerUpdate(JetStreamManagement jsm, ConsumerConfiguration cc) { - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jsm.addOrUpdateConsumer(STREAM, cc)); + private void assertInvalidConsumerUpdate(JetStreamManagement jsm, ConsumerConfiguration cc, String stream) { + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jsm.addOrUpdateConsumer(stream, cc)); assertEquals(10012, e.getApiErrorCode()); assertEquals(500, e.getErrorCode()); } - private void assertValidAddOrUpdate(JetStreamManagement jsm, ConsumerConfiguration cc) throws IOException, JetStreamApiException { - ConsumerInfo ci = jsm.addOrUpdateConsumer(STREAM, cc); + private void assertValidAddOrUpdate(JetStreamManagement jsm, ConsumerConfiguration cc, String stream) throws IOException, JetStreamApiException { + ConsumerInfo ci = jsm.addOrUpdateConsumer(stream, cc); ConsumerConfiguration cicc = ci.getConsumerConfiguration(); assertEquals(cc.getDurable(), ci.getName()); assertEquals(cc.getDurable(), cicc.getDurable()); @@ -991,84 +896,81 @@ private void assertValidAddOrUpdate(JetStreamManagement jsm, ConsumerConfigurati assertEquals(cc.getMaxDeliver(), cicc.getMaxDeliver()); assertEquals(cc.getDeliverPolicy(), cicc.getDeliverPolicy()); - List consumers = jsm.getConsumerNames(STREAM); + List consumers = jsm.getConsumerNames(stream); assertEquals(1, consumers.size()); assertEquals(cc.getDurable(), consumers.get(0)); } @Test public void testConsumerMetadata() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jstc) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(tsc.consumerName()) + .durable(random()) .metadata(metaData) .build(); - ConsumerInfo ci = jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); assertMetaData(ci.getConsumerConfiguration().getMetadata()); }); } @Test public void testCreateConsumersWithFilters() throws Exception { - runInJsServer(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - createDefaultTestStream(jsm); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); + createMemoryStream(jsm, stream, subject); // plain subject - ConsumerConfiguration.Builder builder = ConsumerConfiguration.builder().durable(DURABLE); - jsm.addOrUpdateConsumer(STREAM, builder.filterSubject(SUBJECT).build()); - List cis = jsm.getConsumers(STREAM); - assertEquals(SUBJECT, cis.get(0).getConsumerConfiguration().getFilterSubject()); + ConsumerConfiguration.Builder builder = ConsumerConfiguration.builder().durable(random()); + jsm.addOrUpdateConsumer(stream, builder.filterSubject(subject).build()); + List cis = jsm.getConsumers(stream); + assertEquals(subject, cis.get(0).getConsumerConfiguration().getFilterSubject()); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { // 2.10 and later you can set the filter to something that does not match - jsm.addOrUpdateConsumer(STREAM, builder.filterSubject(subjectDot("two-ten-allows-not-matching")).build()); - cis = jsm.getConsumers(STREAM); - assertEquals(subjectDot("two-ten-allows-not-matching"), cis.get(0).getConsumerConfiguration().getFilterSubject()); + jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectDot(subject, "two-ten-allows-not-matching")).build()); + cis = jsm.getConsumers(stream); + assertEquals(subjectDot(subject, "two-ten-allows-not-matching"), cis.get(0).getConsumerConfiguration().getFilterSubject()); } else { assertThrows(JetStreamApiException.class, - () -> jsm.addOrUpdateConsumer(STREAM, builder.filterSubject(subjectDot("not-match")).build())); + () -> jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectDot(subject, "not-match")).build())); } // wildcard subject - jsm.deleteStream(STREAM); - createMemoryStream(jsm, STREAM, SUBJECT_STAR); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subjectStar(subject)); - jsm.addOrUpdateConsumer(STREAM, builder.filterSubject(subjectDot("A")).build()); - cis = jsm.getConsumers(STREAM); - assertEquals(subjectDot("A"), cis.get(0).getConsumerConfiguration().getFilterSubject()); + String subjectA = subjectDot(subject, "A"); + jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectA).build()); + cis = jsm.getConsumers(stream); + assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); // gt subject - jsm.deleteStream(STREAM); - createMemoryStream(jsm, STREAM, SUBJECT_GT); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subjectGt(subject)); - jsm.addOrUpdateConsumer(STREAM, builder.filterSubject(subjectDot("A")).build()); - cis = jsm.getConsumers(STREAM); - assertEquals(subjectDot("A"), cis.get(0).getConsumerConfiguration().getFilterSubject()); + jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectA).build()); + cis = jsm.getConsumers(stream); + assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); }); } @Test public void testGetConsumerInfo() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - assertThrows(JetStreamApiException.class, () -> jsm.getConsumerInfo(tsc.stream, tsc.consumerName())); - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(tsc.consumerName()).build(); - ConsumerInfo ci = jsm.addOrUpdateConsumer(tsc.stream, cc); - assertEquals(tsc.stream, ci.getStreamName()); - assertEquals(tsc.consumerName(), ci.getName()); - ci = jsm.getConsumerInfo(tsc.stream, tsc.consumerName()); - assertEquals(tsc.stream, ci.getStreamName()); - assertEquals(tsc.consumerName(), ci.getName()); - assertThrows(JetStreamApiException.class, () -> jsm.getConsumerInfo(tsc.stream, durable(999))); + runInLrServer((nc, jstc) -> { + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getConsumerInfo(jstc.stream, jstc.consumerName())); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(jstc.consumerName(), ci.getName()); + ci = jstc.jsm.getConsumerInfo(jstc.stream, jstc.consumerName()); + assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(jstc.consumerName(), ci.getName()); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getConsumerInfo(jstc.stream, random())); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { assertNotNull(ci.getTimestamp()); } @@ -1080,24 +982,22 @@ public void testGetConsumerInfo() throws Exception { @Test public void testGetConsumers() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - addConsumers(jsm, tsc.stream, 600, "A"); // getConsumers pages at 256 + runInLrServer((nc, jstc) -> { + addConsumers(jstc.jsm, jstc.stream, 600); // getConsumers pages at 256 - List list = jsm.getConsumers(tsc.stream); + List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(600, list.size()); - addConsumers(jsm, tsc.stream, 500, "B"); // getConsumerNames pages at 1024 - List names = jsm.getConsumerNames(tsc.stream); + addConsumers(jstc.jsm, jstc.stream, 500); // getConsumerNames pages at 1024 + List names = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(1100, names.size()); }); } - private void addConsumers(JetStreamManagement jsm, String stream, int count, String durableVary) throws IOException, JetStreamApiException { + private void addConsumers(JetStreamManagement jsm, String stream, int count) throws IOException, JetStreamApiException { + String base = random() ; for (int x = 1; x <= count; x++) { - String dur = durable(durableVary, x); + String dur = base + "-" + x; ConsumerConfiguration cc = ConsumerConfiguration.builder() .durable(dur) .build(); @@ -1122,88 +1022,59 @@ public void testDeleteMessage() throws Exception { assertFalse(mdr.isErase()); assertTrue(mdr.isNoErase()); - runInJsServer(nc -> { - createDefaultTestStream(nc); - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { Headers h = new Headers(); h.add("foo", "bar"); ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); - js.publish(NatsMessage.builder().subject(SUBJECT).headers(h).data(dataBytes(1)).build()); - js.publish(NatsMessage.builder().subject(SUBJECT).build()); + jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).headers(h).data(dataBytes(1)).build()); + jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).build()); - JetStreamManagement jsm = nc.jetStreamManagement(); - - MessageInfo mi = jsm.getMessage(STREAM, 1); + MessageInfo mi = jstc.jsm.getMessage(jstc.stream, 1); assertNotNull(mi.toString()); - assertEquals(SUBJECT, mi.getSubject()); + assertEquals(jstc.subject(), mi.getSubject()); + assertNotNull(mi.getData()); assertEquals(data(1), new String(mi.getData())); assertEquals(1, mi.getSeq()); + assertNotNull(mi.getTime()); assertTrue(mi.getTime().toEpochSecond() >= timeBeforeCreated.toEpochSecond()); assertNotNull(mi.getHeaders()); - assertEquals("bar", mi.getHeaders().get("foo").get(0)); + List foos = mi.getHeaders().get("foo"); + assertNotNull(foos); + assertEquals("bar", foos.get(0)); - mi = jsm.getMessage(STREAM, 2); + mi = jstc.jsm.getMessage(jstc.stream, 2); assertNotNull(mi.toString()); - assertEquals(SUBJECT, mi.getSubject()); + assertEquals(jstc.subject(), mi.getSubject()); assertNull(mi.getData()); assertEquals(2, mi.getSeq()); + assertNotNull(mi.getTime()); assertTrue(mi.getTime().toEpochSecond() >= timeBeforeCreated.toEpochSecond()); assertTrue(mi.getHeaders() == null || mi.getHeaders().isEmpty()); - assertTrue(jsm.deleteMessage(STREAM, 1, false)); // added coverage for use of erase (no_erase) flag. - assertThrows(JetStreamApiException.class, () -> jsm.deleteMessage(STREAM, 1)); - assertThrows(JetStreamApiException.class, () -> jsm.getMessage(STREAM, 1)); - assertThrows(JetStreamApiException.class, () -> jsm.getMessage(STREAM, 3)); - assertThrows(JetStreamApiException.class, () -> jsm.deleteMessage(stream(999), 1)); - assertThrows(JetStreamApiException.class, () -> jsm.getMessage(stream(999), 1)); + assertTrue(jstc.jsm.deleteMessage(jstc.stream, 1, false)); // added coverage for use of erase (no_erase) flag. + assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteMessage(jstc.stream, 1)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 3)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteMessage(random(), 1)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(random(), 1)); }); } - @Test - public void testAuthCreateUpdateStream() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/js_authorization.conf", false)) { - Options optionsSrc = new Options.Builder().server(ts.getURI()) - .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); - - try (Connection nc = Nats.connect(optionsSrc)) { - JetStreamManagement jsm = nc.jetStreamManagement(); - - // add streams with both account - StreamConfiguration sc = StreamConfiguration.builder() - .name(STREAM) - .storageType(StorageType.Memory) - .subjects(subject(1)) - .build(); - StreamInfo si = jsm.addStream(sc); - - sc = StreamConfiguration.builder(si.getConfiguration()) - .addSubjects(subject(2)) - .build(); - - jsm.updateStream(sc); - } - } - } - @Test public void testSealed() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer((nc, jstc) -> { + assertFalse(jstc.si.getConfiguration().getSealed()); - TestingStreamContainer tsc = new TestingStreamContainer(nc); - assertFalse(tsc.si.getConfiguration().getSealed()); + jstc.js.publish(jstc.subject(), "data1".getBytes()); - JetStream js = nc.jetStream(); - js.publish(tsc.subject(), "data1".getBytes()); - - StreamConfiguration sc = new StreamConfiguration.Builder(tsc.si.getConfiguration()) - .seal().build(); - StreamInfo si = jsm.updateStream(sc); + StreamConfiguration sc = new StreamConfiguration.Builder(jstc.si.getConfiguration()) + .seal() + .build(); + StreamInfo si = jstc.jsm.updateStream(sc); assertTrue(si.getConfiguration().getSealed()); - assertThrows(JetStreamApiException.class, () -> js.publish(tsc.subject(), "data2".getBytes())); + assertThrows(JetStreamApiException.class, () -> jstc.js.publish(jstc.subject(), "data2".getBytes())); }); } @@ -1218,113 +1089,107 @@ public void testStorageTypeCoverage() { @Test public void testConsumerReplica() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { final ConsumerConfiguration cc0 = ConsumerConfiguration.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .build(); - ConsumerInfo ci = jsm.addOrUpdateConsumer(tsc.stream, cc0); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc0); // server returns 0 when value is not set assertEquals(0, ci.getConsumerConfiguration().getNumReplicas()); final ConsumerConfiguration cc1 = ConsumerConfiguration.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .numReplicas(1) .build(); - ci = jsm.addOrUpdateConsumer(tsc.stream, cc1); + ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc1); assertEquals(1, ci.getConsumerConfiguration().getNumReplicas()); }); } @Test public void testGetMessage() throws Exception { - jsServer.run(nc -> { - if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - TestingStreamContainer tsc = new TestingStreamContainer(nc, 2); - assertFalse(tsc.si.getConfiguration().getAllowDirect()); - - ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); - sleep(100); - js.publish(buildTestGetMessage(tsc, 0, 1)); - js.publish(buildTestGetMessage(tsc, 1, 2)); - js.publish(buildTestGetMessage(tsc, 0, 3)); - js.publish(buildTestGetMessage(tsc, 1, 4)); - js.publish(buildTestGetMessage(tsc, 0, 5)); - js.publish(buildTestGetMessage(tsc, 1, 6)); - - validateGetMessage(jsm, tsc, timeBeforeCreated); - - StreamConfiguration sc = StreamConfiguration.builder(tsc.si.getConfiguration()).allowDirect(true).build(); - StreamInfo si = jsm.updateStream(sc); - assertTrue(si.getConfiguration().getAllowDirect()); - validateGetMessage(jsm, tsc, timeBeforeCreated); - - // error case stream doesn't exist - assertThrows(JetStreamApiException.class, () -> jsm.getMessage(stream(999), 1)); - } + runInLrServer((nc, jsm, js) -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + assertFalse(jstc.si.getConfiguration().getAllowDirect()); + + ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); + sleep(100); + jstc.js.publish(buildTestGetMessage(jstc, 0, 1)); + jstc.js.publish(buildTestGetMessage(jstc, 1, 2)); + jstc.js.publish(buildTestGetMessage(jstc, 0, 3)); + jstc.js.publish(buildTestGetMessage(jstc, 1, 4)); + jstc.js.publish(buildTestGetMessage(jstc, 0, 5)); + jstc.js.publish(buildTestGetMessage(jstc, 1, 6)); + + validateGetMessage(jstc.jsm, jstc, timeBeforeCreated); + + StreamConfiguration sc = StreamConfiguration.builder(jstc.si.getConfiguration()).allowDirect(true).build(); + StreamInfo si = jstc.jsm.updateStream(sc); + assertTrue(si.getConfiguration().getAllowDirect()); + validateGetMessage(jstc.jsm, jstc, timeBeforeCreated); + + // error case stream doesn't exist + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(random(), 1)); }); } - private static NatsMessage buildTestGetMessage(TestingStreamContainer tsc, int s, int q) { - String data = "s" + s + "-q" + q; + private static NatsMessage buildTestGetMessage(JetStreamTestingContext jstc, int n, int q) { + String data = "s" + n + "-q" + q; return NatsMessage.builder() - .subject(tsc.subject(s)) + .subject(jstc.subject(n)) .data("d-" + data) .headers(new Headers().put("h", "h-" + data)) .build(); } - private void validateGetMessage(JetStreamManagement jsm, TestingStreamContainer tsc, ZonedDateTime timeBeforeCreated) throws IOException, JetStreamApiException { - - assertMessageInfo(tsc, 0, 1, jsm.getMessage(tsc.stream, 1), timeBeforeCreated); - assertMessageInfo(tsc, 0, 5, jsm.getLastMessage(tsc.stream, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 6, jsm.getLastMessage(tsc.stream, tsc.subject(1)), timeBeforeCreated); - - assertMessageInfo(tsc, 0, 1, jsm.getNextMessage(tsc.stream, -1, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getNextMessage(tsc.stream, -1, tsc.subject(1)), timeBeforeCreated); - assertMessageInfo(tsc, 0, 1, jsm.getNextMessage(tsc.stream, 0, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getNextMessage(tsc.stream, 0, tsc.subject(1)), timeBeforeCreated); - assertMessageInfo(tsc, 0, 1, jsm.getFirstMessage(tsc.stream, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getFirstMessage(tsc.stream, tsc.subject(1)), timeBeforeCreated); - assertMessageInfo(tsc, 0, 1, jsm.getFirstMessage(tsc.stream, timeBeforeCreated), timeBeforeCreated); - assertMessageInfo(tsc, 0, 1, jsm.getFirstMessage(tsc.stream, timeBeforeCreated, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getFirstMessage(tsc.stream, timeBeforeCreated, tsc.subject(1)), timeBeforeCreated); - - assertMessageInfo(tsc, 0, 1, jsm.getNextMessage(tsc.stream, 1, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getNextMessage(tsc.stream, 1, tsc.subject(1)), timeBeforeCreated); - - assertMessageInfo(tsc, 0, 3, jsm.getNextMessage(tsc.stream, 2, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 2, jsm.getNextMessage(tsc.stream, 2, tsc.subject(1)), timeBeforeCreated); - - assertMessageInfo(tsc, 0, 5, jsm.getNextMessage(tsc.stream, 5, tsc.subject(0)), timeBeforeCreated); - assertMessageInfo(tsc, 1, 6, jsm.getNextMessage(tsc.stream, 5, tsc.subject(1)), timeBeforeCreated); - - assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(tsc.stream, -1))); - assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(tsc.stream, 0))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(tsc.stream, 9))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getLastMessage(tsc.stream, "not-a-subject"))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getFirstMessage(tsc.stream, "not-a-subject"))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(tsc.stream, 9, tsc.subject(0)))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(tsc.stream, 1, "not-a-subject"))); + private void validateGetMessage(JetStreamManagement jsm, JetStreamTestingContext jstc, ZonedDateTime timeBeforeCreated) throws IOException, JetStreamApiException { + + assertMessageInfo(jstc, 0, 1, jsm.getMessage(jstc.stream, 1), timeBeforeCreated); + assertMessageInfo(jstc, 0, 5, jsm.getLastMessage(jstc.stream, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 6, jsm.getLastMessage(jstc.stream, jstc.subject(1)), timeBeforeCreated); + + assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, -1, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, -1, jstc.subject(1)), timeBeforeCreated); + assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, 0, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 0, jstc.subject(1)), timeBeforeCreated); + assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getFirstMessage(jstc.stream, jstc.subject(1)), timeBeforeCreated); + assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, timeBeforeCreated), timeBeforeCreated); + assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, timeBeforeCreated, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getFirstMessage(jstc.stream, timeBeforeCreated, jstc.subject(1)), timeBeforeCreated); + + assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, 1, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 1, jstc.subject(1)), timeBeforeCreated); + + assertMessageInfo(jstc, 0, 3, jsm.getNextMessage(jstc.stream, 2, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 2, jstc.subject(1)), timeBeforeCreated); + + assertMessageInfo(jstc, 0, 5, jsm.getNextMessage(jstc.stream, 5, jstc.subject(0)), timeBeforeCreated); + assertMessageInfo(jstc, 1, 6, jsm.getNextMessage(jstc.stream, 5, jstc.subject(1)), timeBeforeCreated); + + assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, -1))); + assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, 0))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, 9))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getLastMessage(jstc.stream, "not-a-subject"))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getFirstMessage(jstc.stream, "not-a-subject"))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(jstc.stream, 9, jstc.subject(0)))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(jstc.stream, 1, "not-a-subject"))); } private void assertStatus(int apiErrorCode, JetStreamApiException jsae) { assertEquals(apiErrorCode, jsae.getApiErrorCode()); } - private void assertMessageInfo(TestingStreamContainer tsc, int subj, long seq, MessageInfo mi, ZonedDateTime timeBeforeCreated) { - assertEquals(tsc.stream, mi.getStream()); - assertEquals(tsc.subject(subj), mi.getSubject()); + private void assertMessageInfo(JetStreamTestingContext jstc, int subj, long seq, MessageInfo mi, ZonedDateTime timeBeforeCreated) { + assertEquals(jstc.stream, mi.getStream()); + assertEquals(jstc.subject(subj), mi.getSubject()); assertEquals(seq, mi.getSeq()); assertNotNull(mi.getTime()); assertTrue(mi.getTime().toEpochSecond() >= timeBeforeCreated.toEpochSecond()); String expectedData = "s" + subj + "-q" + seq; + assertNotNull(mi.getData()); assertEquals("d-" + expectedData, new String(mi.getData())); + assertNotNull(mi.getHeaders()); assertEquals("h-" + expectedData, mi.getHeaders().getFirst("h")); assertNull(mi.getHeaders().getFirst(NATS_SUBJECT)); assertNull(mi.getHeaders().getFirst(NATS_SEQUENCE)); @@ -1370,14 +1235,19 @@ private void validateMessageGetRequestObject( @Test public void testMessageGetRequestObjectDeprecatedMethods() { // coverage for deprecated methods + //noinspection deprecation MessageGetRequest.seqBytes(1); - MessageGetRequest.lastBySubjectBytes(SUBJECT); + //noinspection deprecation + MessageGetRequest.lastBySubjectBytes(random()); + //noinspection deprecation new MessageGetRequest(1); - new MessageGetRequest(SUBJECT); + //noinspection deprecation + new MessageGetRequest(random()); // coverage for MessageInfo, has error String json = dataAsString("GenericErrorResponse.json"); NatsMessage m = new NatsMessage("sub", null, json.getBytes(StandardCharsets.US_ASCII)); + //noinspection deprecation MessageInfo mi = new MessageInfo(m); assertTrue(mi.hasError()); assertEquals(-1, mi.getLastSeq()); @@ -1386,10 +1256,9 @@ public void testMessageGetRequestObjectDeprecatedMethods() { @Test public void testDirectMessageRepublishedSubject() throws Exception { - jsServer.run(TestBase::atLeast2_9_0, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - String streamBucketName = "sb-" + variant(null); - String subject = subject(); + runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { + String streamBucketName = "sb-" + random(); + String subject = random(); String streamSubject = subject + ".>"; String publishSubject1 = subject + ".one"; String publishSubject2 = subject + ".two"; @@ -1431,8 +1300,8 @@ public void testDirectMessageRepublishedSubject() throws Exception { @Test public void testCreateConsumerUpdateConsumer() throws Exception { - jsServer.run(TestBase::atLeast2_9_0, nc -> { - String streamPrefix = variant(); + runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { + String streamPrefix = random(); JetStreamManagement jsmNew = nc.jetStreamManagement(); JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build()); @@ -1440,8 +1309,8 @@ public void testCreateConsumerUpdateConsumer() throws Exception { // New without filter // -------------------------------------------------------- String stream1 = streamPrefix + "-new"; - String name = name(); - String subject = name(); + String name = random(); + String subject = random(); createMemoryStream(jsmNew, stream1, subject + ".*"); ConsumerConfiguration cc11 = ConsumerConfiguration.builder().name(name).build(); @@ -1460,7 +1329,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { assertEquals(10148, e.getApiErrorCode()); // update ok when exists - ConsumerConfiguration cc12 = ConsumerConfiguration.builder().name(name).description(variant()).build(); + ConsumerConfiguration cc12 = ConsumerConfiguration.builder().name(name).description(random()).build(); ci = jsmNew.updateConsumer(stream1, cc12); assertEquals(name, ci.getName()); assertNull(ci.getConsumerConfiguration().getFilterSubject()); @@ -1469,8 +1338,8 @@ public void testCreateConsumerUpdateConsumer() throws Exception { // New with filter subject // -------------------------------------------------------- String stream2 = streamPrefix + "-new-fs"; - name = name(); - subject = name(); + name = random(); + subject = random(); String fs1 = subject + ".A"; String fs2 = subject + ".B"; createMemoryStream(jsmNew, stream2, subject + ".*"); @@ -1500,8 +1369,8 @@ public void testCreateConsumerUpdateConsumer() throws Exception { // Pre 290 durable pathway // -------------------------------------------------------- String stream3 = streamPrefix + "-old-durable"; - name = name(); - subject = name(); + name = random(); + subject = random(); fs1 = subject + ".A"; fs2 = subject + ".B"; String fs3 = subject + ".C"; @@ -1535,7 +1404,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { // -------------------------------------------------------- // Pre 290 ephemeral pathway // -------------------------------------------------------- - subject = name(); + subject = random(); String stream4 = streamPrefix + "-old-ephemeral"; fs1 = subject + ".A"; @@ -1556,12 +1425,9 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - jsServer.run(new Options.Builder().errorListener(listener), TestBase::atLeast2_10_26, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - String stream = stream(); - String subject = subject(); + runInLrServer(new Options.Builder().errorListener(listener), TestBase::atLeast2_10_26, (nc, jsm, js) -> { + String stream = random(); + String subject = random(); assertThrows(JetStreamApiException.class, () -> jsm.getMessage(stream, 1)); @@ -1633,7 +1499,7 @@ private static ConsumerContext setupFor1026Simplification(Connection nc, JetStre } private static String create1026Consumer(JetStreamManagement jsm, String stream, String subject) throws IOException, JetStreamApiException { - String consumer = name(); + String consumer = random(); jsm.addOrUpdateConsumer(stream, ConsumerConfiguration.builder() .durable(consumer) .filterSubject(subject) @@ -1688,22 +1554,20 @@ public void testMessageDeleteRequest() { @Test public void testStreamPersistMode() throws Exception { - jsServer.run(TestBase::atLeast2_12, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - + runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() - .name(stream()) + .name(random()) .storageType(StorageType.File) - .subjects(subject()) + .subjects(random()) .build(); StreamInfo si = jsm.addStream(sc); assertTrue(si.getConfiguration().getPersistMode() == null || si.getConfiguration().getPersistMode() == PersistMode.Default); sc = StreamConfiguration.builder() - .name(stream()) + .name(random()) .storageType(StorageType.File) - .subjects(subject()) + .subjects(random()) .persistMode(PersistMode.Default) .build(); @@ -1711,9 +1575,9 @@ public void testStreamPersistMode() throws Exception { assertTrue(si.getConfiguration().getPersistMode() == null || si.getConfiguration().getPersistMode() == PersistMode.Default); sc = StreamConfiguration.builder() - .name(stream()) + .name(random()) .storageType(StorageType.File) - .subjects(subject()) + .subjects(random()) .persistMode(PersistMode.Async) .build(); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java new file mode 100644 index 000000000..3844d97f4 --- /dev/null +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -0,0 +1,147 @@ +// Copyright 2020-2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.*; +import io.nats.client.api.*; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static io.nats.client.NatsTestServer.configuredJsServer; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class JetStreamManagementWithConfTests extends JetStreamTestBase { + + @Test + public void testGetStreamInfoSubjectPagination() throws Exception { + try (NatsTestServer ts = configuredJsServer("pagination.conf")) { + try (Connection nc = standardConnectionWait(ts.getURI())) { + if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { + JetStreamManagement jsm = nc.jetStreamManagement(); + JetStream js = nc.jetStream(); + + String stream1 = random(); + String stream2 = random(); + long rounds = 101; + long size = 1000; + long count = rounds * size; + jsm.addStream(StreamConfiguration.builder() + .name(stream1) + .storageType(StorageType.Memory) + .subjects("s.*.*") + .build()); + + jsm.addStream(StreamConfiguration.builder() + .name(stream2) + .storageType(StorageType.Memory) + .subjects("t.*.*") + .build()); + + for (int x = 1; x <= rounds; x++) { + for (int y = 1; y <= size; y++) { + js.publish("s." + x + "." + y, null); + } + } + + for (int y = 1; y <= size; y++) { + js.publish("t.7." + y, null); + } + + StreamInfo si = jsm.getStreamInfo(stream1); + validateStreamInfo(si.getStreamState(), 0, 0, count); + + si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); + validateStreamInfo(si.getStreamState(), count, count, count); + + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); + validateStreamInfo(si.getStreamState(), size, size, count); + + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, count); + + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); + validateStreamInfo(si.getStreamState(), size, size, size); + + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, size); + + List infos = jsm.getStreams(); + assertEquals(2, infos.size()); + si = infos.get(0); + if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { + validateStreamInfo(si.getStreamState(), 0, 0, count); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); + } + else { + validateStreamInfo(si.getStreamState(), 0, 0, size); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); + } + + infos = jsm.getStreams(">"); + assertEquals(2, infos.size()); + + infos = jsm.getStreams("*.7.*"); + assertEquals(2, infos.size()); + + infos = jsm.getStreams("*.7.1"); + assertEquals(2, infos.size()); + + infos = jsm.getStreams("s.7.*"); + assertEquals(1, infos.size()); + assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + + infos = jsm.getStreams("t.7.1"); + assertEquals(1, infos.size()); + assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + } + } + } + } + + private void validateStreamInfo(StreamState streamState, long subjectsList, long filteredCount, long subjectCount) { + assertEquals(subjectsList, streamState.getSubjects().size()); + assertEquals(filteredCount, streamState.getSubjects().size()); + assertEquals(subjectCount, streamState.getSubjectCount()); + } + + @Test + public void testAuthCreateUpdateStream() throws Exception { + try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { + Options optionsSrc = new Options.Builder().server(ts.getURI()) + .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); + + try (Connection nc = standardConnectionWait(optionsSrc)) { + JetStreamManagement jsm = nc.jetStreamManagement(); + + // add streams with both account + String stream = random(); + String subject1 = random(); + String subject2 = random(); + StreamConfiguration sc = StreamConfiguration.builder() + .name(stream) + .storageType(StorageType.Memory) + .subjects(subject1) + .build(); + StreamInfo si = jsm.addStream(sc); + + sc = StreamConfiguration.builder(si.getConfiguration()) + .addSubjects(subject2) + .build(); + + jsm.updateStream(sc); + } + } + } +} diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index 3f8c0cb31..ca6f79c67 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -13,9 +13,13 @@ package io.nats.client.impl; -import io.nats.client.*; +import io.nats.client.JetStreamApiException; +import io.nats.client.JetStreamSubscription; +import io.nats.client.Message; +import io.nats.client.PushSubscribeOptions; import io.nats.client.api.*; import io.nats.client.support.DateTimeUtils; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -29,16 +33,16 @@ public class JetStreamMirrorAndSourcesTests extends JetStreamTestBase { @Test public void testMirrorBasics() throws Exception { - String S1 = stream(); - String U1 = subject(); - String U2 = subject(); - String U3 = subject(); - String M1 = mirror(); - - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - + String S1 = random(); + String S2 = random(); + String S3 = random(); + String S4 = random(); + String U1 = random(); + String U2 = random(); + String U3 = random(); + String M1 = random(); + + runInLrServer((nc, jsm, js) -> { Mirror mirror = Mirror.builder().sourceName(S1).build(); // Create source stream @@ -74,53 +78,50 @@ public void testMirrorBasics() throws Exception { // Create second mirror sc = StreamConfiguration.builder() - .name(mirror(2)) + .name(S2) .storageType(StorageType.Memory) .mirror(mirror) .build(); jsm.addStream(sc); // Check the state - assertMirror(jsm, mirror(2), S1, 50L, 101L); + assertMirror(jsm, S2, S1, 50L, 101L); jsPublish(js, U3, 100); // third mirror checks start seq sc = StreamConfiguration.builder() - .name(mirror(3)) + .name(S3) .storageType(StorageType.Memory) .mirror(Mirror.builder().sourceName(S1).startSeq(150).build()) .build(); jsm.addStream(sc); // Check the state - assertMirror(jsm, mirror(3), S1, 101L, 150L); + assertMirror(jsm, S3, S1, 101L, 150L); // third mirror checks start seq ZonedDateTime zdt = DateTimeUtils.fromNow(Duration.ofHours(-2)); sc = StreamConfiguration.builder() - .name(mirror(4)) + .name(S4) .storageType(StorageType.Memory) .mirror(Mirror.builder().sourceName(S1).startTime(zdt).build()) .build(); jsm.addStream(sc); // Check the state - assertMirror(jsm, mirror(4), S1, 150L, 101L); + assertMirror(jsm, S4, S1, 150L, 101L); }); } @Test public void testMirrorReading() throws Exception { - String S1 = stream(); - String U1 = subject(); - String U2 = subject(); - String M1 = mirror(); - - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); + String S1 = random(); + String U1 = random(); + String U2 = random(); + String M1 = random(); + runInLrServer((nc, jsm, js) -> { // Create source stream StreamConfiguration sc = StreamConfiguration.builder() .name(S1) @@ -184,14 +185,12 @@ public void testMirrorReading() throws Exception { @Test public void testMirrorExceptions() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - Mirror mirror = Mirror.builder().sourceName(STREAM).build(); + runInLrServer((nc, jsm, js) -> { + Mirror mirror = Mirror.builder().sourceName(random()).build(); StreamConfiguration scEx = StreamConfiguration.builder() - .name(mirror()) - .subjects(subject()) + .name(random()) + .subjects(random()) .mirror(mirror) .build(); assertThrows(JetStreamApiException.class, () -> jsm.addStream(scEx)); @@ -200,49 +199,47 @@ public void testMirrorExceptions() throws Exception { @Test public void testSourceBasics() throws Exception { - String S1 = stream(); - String S2 = stream(); - String S3 = stream(); - String S4 = stream(); - String S5 = stream(); - String S99 = stream(); - String R1 = source(); - String R2 = source(); - - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - + String N1 = random(); + String N2 = random(); + String N3 = random(); + String N4 = random(); + String N5 = random(); + String N6 = random(); + String U1 = random(); + String R1 = random(); + String R2 = random(); + + runInLrServer((nc, jsm, js) -> { // Create streams StreamInfo si = jsm.addStream(StreamConfiguration.builder() - .name(S1).storageType(StorageType.Memory).build()); + .name(N1).storageType(StorageType.Memory).build()); StreamConfiguration sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(S1, sc.getName()); + assertEquals(N1, sc.getName()); si = jsm.addStream(StreamConfiguration.builder() - .name(S2).storageType(StorageType.Memory).build()); + .name(N2).storageType(StorageType.Memory).build()); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(S2, sc.getName()); + assertEquals(N2, sc.getName()); si = jsm.addStream(StreamConfiguration.builder() - .name(S3).storageType(StorageType.Memory).build()); + .name(N3).storageType(StorageType.Memory).build()); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(S3, sc.getName()); + assertEquals(N3, sc.getName()); // Populate each one. - jsPublish(js, S1, 10); - jsPublish(js, S2, 15); - jsPublish(js, S3, 25); + jsPublish(js, N1, 10); + jsPublish(js, N2, 15); + jsPublish(js, N3, 25); sc = StreamConfiguration.builder() .name(R1) .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(S1).build(), - Source.builder().sourceName(S2).build(), - Source.builder().sourceName(S3).build()) + .sources(Source.builder().sourceName(N1).build(), + Source.builder().sourceName(N2).build(), + Source.builder().sourceName(N3).build()) .build(); jsm.addStream(sc); @@ -252,53 +249,52 @@ public void testSourceBasics() throws Exception { sc = StreamConfiguration.builder() .name(R1) .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(S1).build(), - Source.builder().sourceName(S2).build(), - Source.builder().sourceName(S4).build()) + .sources(Source.builder().sourceName(N1).build(), + Source.builder().sourceName(N2).build(), + Source.builder().sourceName(N4).build()) .build(); jsm.updateStream(sc); sc = StreamConfiguration.builder() - .name(S99) + .name(N5) .storageType(StorageType.Memory) - .subjects(S4, S5) + .subjects(N4, U1) .build(); jsm.addStream(sc); - jsPublish(js, S4, 20); - jsPublish(js, S5, 20); - jsPublish(js, S4, 10); + jsPublish(js, N4, 20); + jsPublish(js, U1, 20); + jsPublish(js, N4, 10); sc = StreamConfiguration.builder() .name(R2) .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(S99).startSeq(26).build()) + .sources(Source.builder().sourceName(N5).startSeq(26).build()) .build(); jsm.addStream(sc); assertSource(jsm, R2, 25L, null); MessageInfo info = jsm.getMessage(R2, 1); - assertStreamSource(info, S99, 26); + assertStreamSource(info, N5, 26); sc = StreamConfiguration.builder() - .name(source(3)) + .name(N6) .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(S99).startSeq(11).filterSubject(S4).build()) + .sources(Source.builder().sourceName(N5).startSeq(11).filterSubject(N4).build()) .build(); jsm.addStream(sc); - assertSource(jsm, source(3), 20L, null); + assertSource(jsm, N6, 20L, null); - info = jsm.getMessage(source(3), 1); - assertStreamSource(info, S99, 11); + info = jsm.getMessage(N6, 1); + assertStreamSource(info, N5, 11); }); } @Test @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { - jsServer.run(si -> atLeast2_10(), nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); @@ -340,8 +336,7 @@ public void testSourceAndTransformsRoundTrips() throws Exception { @Test public void testMirror() throws Exception { - jsServer.run(si -> atLeast2_10(), nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scMirror = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationMirrorSubjectTransform.json"); diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index 52f0a89e7..dc6aeea7b 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -34,49 +34,45 @@ public class JetStreamPubTests extends JetStreamTestBase { @Test public void testPublishVarieties() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); + runInLrServer((nc, jstc) -> { + PublishAck pa = jstc.js.publish(jstc.subject(), dataBytes(1)); + assertPublishAck(pa, jstc.stream, 1); - JetStream js = nc.jetStream(); - - PublishAck pa = js.publish(tsc.subject(), dataBytes(1)); - assertPublishAck(pa, tsc.stream, 1); - - Message msg = NatsMessage.builder().subject(tsc.subject()).data(dataBytes(2)).build(); - pa = js.publish(msg); - assertPublishAck(pa, tsc.stream, 2); + Message msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(2)).build(); + pa = jstc.js.publish(msg); + assertPublishAck(pa, jstc.stream, 2); PublishOptions po = PublishOptions.builder().build(); - pa = js.publish(tsc.subject(), dataBytes(3), po); - assertPublishAck(pa, tsc.stream, 3); + pa = jstc.js.publish(jstc.subject(), dataBytes(3), po); + assertPublishAck(pa, jstc.stream, 3); - msg = NatsMessage.builder().subject(tsc.subject()).data(dataBytes(4)).build(); - pa = js.publish(msg, po); - assertPublishAck(pa, tsc.stream, 4); + msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(4)).build(); + pa = jstc.js.publish(msg, po); + assertPublishAck(pa, jstc.stream, 4); - pa = js.publish(tsc.subject(), null); - assertPublishAck(pa, tsc.stream, 5); + pa = jstc.js.publish(jstc.subject(), null); + assertPublishAck(pa, jstc.stream, 5); - msg = NatsMessage.builder().subject(tsc.subject()).build(); - pa = js.publish(msg); - assertPublishAck(pa, tsc.stream, 6); + msg = NatsMessage.builder().subject(jstc.subject()).build(); + pa = jstc.js.publish(msg); + assertPublishAck(pa, jstc.stream, 6); - pa = js.publish(tsc.subject(), null, po); - assertPublishAck(pa, tsc.stream, 7); + pa = jstc.js.publish(jstc.subject(), null, po); + assertPublishAck(pa, jstc.stream, 7); - msg = NatsMessage.builder().subject(tsc.subject()).build(); - pa = js.publish(msg, po); - assertPublishAck(pa, tsc.stream, 8); + msg = NatsMessage.builder().subject(jstc.subject()).build(); + pa = jstc.js.publish(msg, po); + assertPublishAck(pa, jstc.stream, 8); Headers h = new Headers().put("foo", "bar9"); - pa = js.publish(tsc.subject(), h, dataBytes(9)); - assertPublishAck(pa, tsc.stream, 9); + pa = jstc.js.publish(jstc.subject(), h, dataBytes(9)); + assertPublishAck(pa, jstc.stream, 9); h = new Headers().put("foo", "bar10"); - pa = js.publish(tsc.subject(), h, dataBytes(10), po); - assertPublishAck(pa, tsc.stream, 10); + pa = jstc.js.publish(jstc.subject(), h, dataBytes(10), po); + assertPublishAck(pa, jstc.stream, 10); - Subscription s = js.subscribe(tsc.subject()); + Subscription s = jstc.js.subscribe(jstc.subject()); assertNextMessage(s, data(1), null); assertNextMessage(s, data(2), null); assertNextMessage(s, data(3), null); @@ -89,7 +85,7 @@ public void testPublishVarieties() throws Exception { assertNextMessage(s, data(10), "bar10"); // 503 - assertThrows(IOException.class, () -> js.publish(subject(999), null)); + assertThrows(IOException.class, () -> jstc.js.publish(random(), null)); }); } @@ -119,40 +115,37 @@ private void assertPublishAck(PublishAck pa, String stream, long seqno) { @Test public void testPublishAsyncVarieties() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { List> futures = new ArrayList<>(); - futures.add(js.publishAsync(tsc.subject(), dataBytes(1))); + futures.add(jstc.js.publishAsync(jstc.subject(), dataBytes(1))); - Message msg = NatsMessage.builder().subject(tsc.subject()).data(dataBytes(2)).build(); - futures.add(js.publishAsync(msg)); + Message msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(2)).build(); + futures.add(jstc.js.publishAsync(msg)); PublishOptions po = PublishOptions.builder().build(); - futures.add(js.publishAsync(tsc.subject(), dataBytes(3), po)); + futures.add(jstc.js.publishAsync(jstc.subject(), dataBytes(3), po)); - msg = NatsMessage.builder().subject(tsc.subject()).data(dataBytes(4)).build(); - futures.add(js.publishAsync(msg, po)); + msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(4)).build(); + futures.add(jstc.js.publishAsync(msg, po)); Headers h = new Headers().put("foo", "bar5"); - futures.add(js.publishAsync(tsc.subject(), h, dataBytes(5))); + futures.add(jstc.js.publishAsync(jstc.subject(), h, dataBytes(5))); h = new Headers().put("foo", "bar6"); - futures.add(js.publishAsync(tsc.subject(), h, dataBytes(6), po)); + futures.add(jstc.js.publishAsync(jstc.subject(), h, dataBytes(6), po)); sleep(100); // just make sure all the publish complete for (int i = 1; i <= 6; i++) { CompletableFuture future = futures.get(i-1); PublishAck pa = future.get(); - assertEquals(tsc.stream, pa.getStream()); + assertEquals(jstc.stream, pa.getStream()); assertFalse(pa.isDuplicate()); assertEquals(i, pa.getSeqno()); } - Subscription s = js.subscribe(tsc.subject()); + Subscription s = jstc.js.subscribe(jstc.subject()); for (int x = 1; x <= 6; x++) { Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -164,50 +157,50 @@ public void testPublishAsyncVarieties() throws Exception { } } - assertFutureIOException(js.publishAsync(subject(999), null)); + assertFutureIOException(jstc.js.publishAsync(random(), null)); - msg = NatsMessage.builder().subject(subject(999)).build(); - assertFutureIOException(js.publishAsync(msg)); + msg = NatsMessage.builder().subject(random()).build(); + assertFutureIOException(jstc.js.publishAsync(msg)); PublishOptions pox1 = PublishOptions.builder().build(); - assertFutureIOException(js.publishAsync(subject(999), null, pox1)); + assertFutureIOException(jstc.js.publishAsync(random(), null, pox1)); - msg = NatsMessage.builder().subject(subject(999)).build(); - assertFutureIOException(js.publishAsync(msg, pox1)); + msg = NatsMessage.builder().subject(random()).build(); + assertFutureIOException(jstc.js.publishAsync(msg, pox1)); - PublishOptions pox2 = PublishOptions.builder().expectedLastMsgId(messageId(999)).build(); + PublishOptions pox2 = PublishOptions.builder().expectedLastMsgId(random()).build(); - assertFutureJetStreamApiException(js.publishAsync(tsc.subject(), null, pox2)); + assertFutureJetStreamApiException(jstc.js.publishAsync(jstc.subject(), null, pox2)); - msg = NatsMessage.builder().subject(tsc.subject()).build(); - assertFutureJetStreamApiException(js.publishAsync(msg, pox2)); + msg = NatsMessage.builder().subject(jstc.subject()).build(); + assertFutureJetStreamApiException(jstc.js.publishAsync(msg, pox2)); }); } @Test public void testMultithreadedPublishAsync() throws Exception { + //noinspection resource final ExecutorService executorService = Executors.newFixedThreadPool(3); try { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); + runInLrServer((nc, jstc) -> { final int messagesToPublish = 6; // create a new connection that does not have the inbox dispatcher set try (NatsConnection nc2 = new NatsConnection(nc.getOptions())){ nc2.connect(true); - JetStream js = nc2.jetStream(); + JetStream js2 = nc2.jetStream(); List>> futures = new ArrayList<>(); for (int i = 0; i < messagesToPublish; i++) { final Future> submitFuture = executorService.submit(() -> - js.publishAsync(tsc.subject(), dataBytes(1))); + js2.publishAsync(jstc.subject(), dataBytes(1))); futures.add(submitFuture); } // verify all messages were published for (int i = 0; i < messagesToPublish; i++) { CompletableFuture future = futures.get(i).get(200, TimeUnit.MILLISECONDS); PublishAck pa = future.get(200, TimeUnit.MILLISECONDS); - assertEquals(tsc.stream, pa.getStream()); + assertEquals(jstc.stream, pa.getStream()); assertFalse(pa.isDuplicate()); } } @@ -231,146 +224,149 @@ private void assertFutureJetStreamApiException(CompletableFuture fut @Test public void testPublishExpectations() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - String subjectPrefix = variant(); + runInLrServer((nc, jsm, js) -> { + String stream1 = random(); + String subjectPrefix = random(); String streamSubject = subjectPrefix + ".>"; String sub1 = subjectPrefix + ".foo.1"; String sub2 = subjectPrefix + ".foo.2"; String sub3 = subjectPrefix + ".bar.3"; - TestingStreamContainer tsc = new TestingStreamContainer(nc, streamSubject); - String stream1 = tsc.stream; createMemoryStream(jsm, stream1, streamSubject); + String mid = random(); PublishOptions po = PublishOptions.builder() - .expectedStream(tsc.stream) - .messageId(messageId(1)) + .expectedStream(stream1) + .messageId(mid) .build(); PublishAck pa = js.publish(sub1, dataBytes(1), po); - assertPublishAck(pa, tsc.stream, 1); + assertPublishAck(pa, stream1, 1); + String lastId = mid; + mid = random(); po = PublishOptions.builder() - .expectedLastMsgId(messageId(1)) - .messageId(messageId(2)) + .expectedLastMsgId(lastId) + .messageId(mid) .build(); pa = js.publish(sub1, dataBytes(2), po); - assertPublishAck(pa, tsc.stream, 2); + assertPublishAck(pa, stream1, 2); + mid = random(); po = PublishOptions.builder() .expectedLastSequence(2) - .messageId(messageId(3)) + .messageId(mid) .build(); pa = js.publish(sub1, dataBytes(3), po); - assertPublishAck(pa, tsc.stream, 3); + assertPublishAck(pa, stream1, 3); + mid = random(); po = PublishOptions.builder() .expectedLastSequence(3) - .messageId(messageId(4)) + .messageId(mid) .build(); pa = js.publish(sub2, dataBytes(4), po); - assertPublishAck(pa, tsc.stream, 4); + assertPublishAck(pa, stream1, 4); + mid = random(); po = PublishOptions.builder() .expectedLastSubjectSequence(3) - .messageId(messageId(5)) + .messageId(mid) .build(); pa = js.publish(sub1, dataBytes(5), po); - assertPublishAck(pa, tsc.stream, 5); + assertPublishAck(pa, stream1, 5); + mid = random(); po = PublishOptions.builder() .expectedLastSubjectSequence(4) - .messageId(messageId(6)) + .messageId(mid) .build(); pa = js.publish(sub2, dataBytes(6), po); - assertPublishAck(pa, tsc.stream, 6); + assertPublishAck(pa, stream1, 6); - PublishOptions po1 = PublishOptions.builder().expectedStream(stream(999)).build(); - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(999), po1)); + PublishOptions po1 = PublishOptions.builder().expectedStream(random()).build(); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po1)); assertEquals(10060, e.getApiErrorCode()); - PublishOptions po2 = PublishOptions.builder().expectedLastMsgId(messageId(999)).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(999), po2)); + PublishOptions po2 = PublishOptions.builder().expectedLastMsgId(random()).build(); + e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po2)); assertEquals(10070, e.getApiErrorCode()); PublishOptions po3 = PublishOptions.builder().expectedLastSequence(999).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(999), po3)); + e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po3)); assertEquals(10071, e.getApiErrorCode()); PublishOptions po4 = PublishOptions.builder().expectedLastSubjectSequence(999).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(999), po4)); + e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po4)); assertEquals(10071, e.getApiErrorCode()); // 0 has meaning to expectedLastSubjectSequence - tsc = new TestingStreamContainer(nc); - createMemoryStream(jsm, tsc.stream, tsc.subject()); + JetStreamTestingContext tsc2 = new JetStreamTestingContext(nc); + createMemoryStream(jsm, tsc2.stream, tsc2.subject()); PublishOptions poLss = PublishOptions.builder().expectedLastSubjectSequence(0).build(); - pa = js.publish(tsc.subject(), dataBytes(22), poLss); - assertPublishAck(pa, tsc.stream, 1); + pa = tsc2.js.publish(tsc2.subject(), dataBytes(22), poLss); + assertPublishAck(pa, tsc2.stream, 1); - final String fSubject = tsc.subject(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(fSubject, dataBytes(999), poLss)); + final String fSubject = tsc2.subject(); + e = assertThrows(JetStreamApiException.class, () -> tsc2.js.publish(fSubject, dataBytes(), poLss)); assertEquals(10071, e.getApiErrorCode()); // 0 has meaning - tsc = new TestingStreamContainer(nc); + JetStreamTestingContext tsc3 = new JetStreamTestingContext(nc); PublishOptions poLs = PublishOptions.builder().expectedLastSequence(0).build(); - pa = js.publish(tsc.subject(), dataBytes(331), poLs); - assertPublishAck(pa, tsc.stream, 1); + pa = tsc3.js.publish(tsc3.subject(), dataBytes(331), poLs); + assertPublishAck(pa, tsc3.stream, 1); - tsc = new TestingStreamContainer(nc); + JetStreamTestingContext tsc4 = new JetStreamTestingContext(nc); poLs = PublishOptions.builder().expectedLastSubjectSequence(0).build(); - pa = js.publish(tsc.subject(), dataBytes(441), poLs); - assertPublishAck(pa, tsc.stream, 1); + pa = tsc4.js.publish(tsc4.subject(), dataBytes(441), poLs); + assertPublishAck(pa, tsc4.stream, 1); // expectedLastSubjectSequenceSubject - pa = js.publish(sub3, dataBytes(500)); + pa = tsc4.js.publish(sub3, dataBytes(500)); assertPublishAck(pa, stream1, 7); PublishOptions poLsss = PublishOptions.builder() .expectedLastSubjectSequence(5) .build(); - pa = js.publish(sub1, dataBytes(501), poLsss); + pa = tsc4.js.publish(sub1, dataBytes(501), poLsss); assertPublishAck(pa, stream1, 8); poLsss = PublishOptions.builder() .expectedLastSubjectSequence(6) .build(); - pa = js.publish(sub2, dataBytes(502), poLsss); + pa = tsc4.js.publish(sub2, dataBytes(502), poLsss); assertPublishAck(pa, stream1, 9); poLsss = PublishOptions.builder() .expectedLastSubjectSequence(9) .expectedLastSubjectSequenceSubject(streamSubject) .build(); - pa = js.publish(sub2, dataBytes(503), poLsss); + pa = tsc4.js.publish(sub2, dataBytes(503), poLsss); assertPublishAck(pa, stream1, 10); poLsss = PublishOptions.builder() .expectedLastSubjectSequence(10) .expectedLastSubjectSequenceSubject(subjectPrefix + ".foo.*") .build(); - pa = js.publish(sub2, dataBytes(504), poLsss); + pa = tsc4.js.publish(sub2, dataBytes(504), poLsss); assertPublishAck(pa, stream1, 11); PublishOptions final1 = poLsss; - assertThrows(JetStreamApiException.class, () -> js.publish(sub2, dataBytes(505), final1)); + assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub2, dataBytes(505), final1)); poLsss = PublishOptions.builder() .expectedLastSubjectSequence(7) .expectedLastSubjectSequenceSubject(subjectPrefix + ".bar.*") .build(); - pa = js.publish(sub3, dataBytes(506), poLsss); + pa = tsc4.js.publish(sub3, dataBytes(506), poLsss); assertPublishAck(pa, stream1, 12); poLsss = PublishOptions.builder() .expectedLastSubjectSequence(12) .expectedLastSubjectSequenceSubject(streamSubject) .build(); - pa = js.publish(sub3, dataBytes(507), poLsss); + pa = tsc4.js.publish(sub3, dataBytes(507), poLsss); assertPublishAck(pa, stream1, 13); poLsss = PublishOptions.builder() @@ -378,10 +374,10 @@ public void testPublishExpectations() throws Exception { .build(); if (atLeast2_12()) { PublishOptions fpoLsss = poLsss; - assertThrows(JetStreamApiException.class, () -> js.publish(sub3, dataBytes(508), fpoLsss)); + assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(508), fpoLsss)); } else { - pa = js.publish(sub3, dataBytes(508), poLsss); + pa = tsc4.js.publish(sub3, dataBytes(508), poLsss); assertPublishAck(pa, stream1, 14); } @@ -391,10 +387,10 @@ public void testPublishExpectations() throws Exception { .build(); if (atLeast2_12()) { PublishOptions fpoLsss = poLsss; - assertThrows(JetStreamApiException.class, () -> js.publish(sub3, dataBytes(509), fpoLsss)); + assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(509), fpoLsss)); } else { - pa = js.publish(sub3, dataBytes(509), poLsss); + pa = tsc4.js.publish(sub3, dataBytes(509), poLsss); assertPublishAck(pa, stream1, 15); } @@ -404,28 +400,25 @@ public void testPublishExpectations() throws Exception { .build(); PublishOptions final2 = poLsss; // JetStreamApiException: wrong last sequence: 0 [10071] - assertThrows(JetStreamApiException.class, () -> js.publish(sub3, dataBytes(510), final2)); + assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(510), final2)); }); } @Test public void testPublishMiscExceptions() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { // stream supplied and matches //noinspection deprecation - PublishOptions po = PublishOptions.builder().stream(tsc.stream).build(); - js.publish(tsc.subject(), dataBytes(9), po); + PublishOptions po = PublishOptions.builder().stream(jstc.stream).build(); + jstc.js.publish(jstc.subject(), dataBytes(9), po); // mismatch stream to PO stream //noinspection deprecation - PublishOptions pox = PublishOptions.builder().stream(stream()).build(); - assertThrows(IOException.class, () -> js.publish(tsc.subject(), dataBytes(99), pox)); + PublishOptions pox = PublishOptions.builder().stream(random()).build(); + assertThrows(IOException.class, () -> jstc.js.publish(jstc.subject(), dataBytes(), pox)); // invalid subject - assertThrows(IOException.class, () -> js.publish(subject(), dataBytes(999))); + assertThrows(IOException.class, () -> jstc.js.publish(random(), dataBytes())); }); } @@ -441,22 +434,20 @@ public void testPublishAckJson() throws IOException, JetStreamApiException { @Test public void testPublishNoAck() throws Exception { - jsServer.run(nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { JetStreamOptions jso = JetStreamOptions.builder().publishNoAck(true).build(); - JetStream js = nc.jetStream(jso); + JetStream customJs = nc.jetStream(jso); String data1 = "noackdata1"; String data2 = "noackdata2"; - PublishAck pa = js.publish(tsc.subject(), data1.getBytes()); + PublishAck pa = customJs.publish(jstc.subject(), data1.getBytes()); assertNull(pa); - CompletableFuture f = js.publishAsync(tsc.subject(), data2.getBytes()); + CompletableFuture f = customJs.publishAsync(jstc.subject(), data2.getBytes()); assertNull(f); - JetStreamSubscription sub = js.subscribe(tsc.subject()); + JetStreamSubscription sub = customJs.subscribe(jstc.subject()); Message m = sub.nextMessage(Duration.ofSeconds(2)); assertNotNull(m); assertEquals(data1, new String(m.getData())); @@ -476,7 +467,7 @@ public void testMaxPayloadJs() throws Exception { { Options options = standardOptionsBuilder().noReconnect().server(ts.getURI()).build(); long expectedSeq = 0; - try (Connection nc = standardConnection(options)){ + try (Connection nc = standardConnectionWait(options)){ JetStreamManagement jsm = nc.jetStreamManagement(); try { jsm.deleteStream(streamName); } catch (JetStreamApiException ignore) {} jsm.addStream(StreamConfiguration.builder() @@ -504,7 +495,7 @@ public void testMaxPayloadJs() throws Exception { } } - try (Connection nc = standardConnection(options)){ + try (Connection nc = standardConnectionWait(options)){ JetStream js = nc.jetStream(); for (int x = 1; x <= 3; x++) { @@ -528,51 +519,49 @@ public void testMaxPayloadJs() throws Exception { @Test public void testPublishWithTTL() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - String stream = stream(); - String subject = subject(); + runInLrServer((nc, jstc) -> { + String stream = random(); + String subject = random(); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) .allowMessageTtl() .subjects(subject).build(); - jsm.addStream(sc); + jstc.jsm.addStream(sc); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); - PublishAck pa1 = js.publish(subject, null, opts); + PublishAck pa1 = jstc.js.publish(subject, null, opts); assertNotNull(pa1); opts = PublishOptions.builder().messageTtlNever().build(); - PublishAck paNever = js.publish(subject, null, opts); + PublishAck paNever = jstc.js.publish(subject, null, opts); assertNotNull(paNever); - MessageInfo mi1 = jsm.getMessage(stream, pa1.getSeqno()); - assertEquals("1s", mi1.getHeaders().getFirst(MSG_TTL_HDR)); + MessageInfo mi1 = jstc.jsm.getMessage(stream, pa1.getSeqno()); + Headers h = mi1.getHeaders(); + assertNotNull(h); + assertEquals("1s",h.getFirst(MSG_TTL_HDR)); - MessageInfo miNever = jsm.getMessage(stream, paNever.getSeqno()); - assertEquals("never", miNever.getHeaders().getFirst(MSG_TTL_HDR)); + MessageInfo miNever = jstc.jsm.getMessage(stream, paNever.getSeqno()); + h = miNever.getHeaders(); + assertNotNull(h); + assertEquals("never",h.getFirst(MSG_TTL_HDR)); sleep(1200); - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jsm.getMessage(stream, pa1.getSeqno())); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(stream, pa1.getSeqno())); assertEquals(10037, e.getApiErrorCode()); - assertNotNull((jsm.getMessage(stream, paNever.getSeqno()))); + assertNotNull((jstc.jsm.getMessage(stream, paNever.getSeqno()))); }); } @Test public void testMsgDeleteMarkerMaxAge() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - String stream = stream(); - String subject = subject(); + runInLrServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) @@ -590,8 +579,10 @@ public void testMsgDeleteMarkerMaxAge() throws Exception { sleep(1200); MessageInfo mi = jsm.getLastMessage(stream, subject); - assertEquals("MaxAge", mi.getHeaders().getFirst(NATS_MARKER_REASON_HDR)); - assertEquals("50s", mi.getHeaders().getFirst(MSG_TTL_HDR)); + Headers h = mi.getHeaders(); + assertNotNull(h); + assertEquals("MaxAge", h.getFirst(NATS_MARKER_REASON_HDR)); + assertEquals("50s", h.getFirst(MSG_TTL_HDR)); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.builder() .name(stream) diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index e26d6255d..4d9512109 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -56,13 +56,7 @@ private Options.Builder noPullWarnings() { @Test public void testFetch() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { long fetchMs = 3000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -72,12 +66,12 @@ public void testFetch() throws Exception { .build(); PullSubscribeOptions options = PullSubscribeOptions.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), options); - assertSubscription(sub, tsc.stream, tsc.consumerName(), null, true); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server List messages = sub.fetch(10, fetchDur); @@ -85,12 +79,12 @@ public void testFetch() throws Exception { messages.forEach(Message::ack); sleep(ackWaitDur.toMillis()); // let the pull expire - jsPublish(js, tsc.subject(), "A", 10); + jsPublish(jstc.js, jstc.subject(), "A", 10); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "B", 20); + jsPublish(jstc.js, jstc.subject(), "B", 20); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); @@ -99,13 +93,13 @@ public void testFetch() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "C", 5); + jsPublish(jstc.js, jstc.subject(), "C", 5); messages = sub.fetch(10, fetchDur); validateRead(5, messages.size()); messages.forEach(Message::ack); sleep(fetchMs); // let the pull expire - jsPublish(js, tsc.subject(), "D", 15); + jsPublish(jstc.js, jstc.subject(), "D", 15); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); @@ -114,7 +108,7 @@ public void testFetch() throws Exception { validateRead(5, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "E", 10); + jsPublish(jstc.js, jstc.subject(), "E", 10); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); sleep(ackWaitDur.toMillis()); // let the acks wait expire, pull will also expire it's shorter @@ -131,13 +125,7 @@ public void testFetch() throws Exception { @Test public void testIterate() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { long fetchMs = 5000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -147,12 +135,12 @@ public void testIterate() throws Exception { .build(); PullSubscribeOptions options = PullSubscribeOptions.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), options); - assertSubscription(sub, tsc.stream, tsc.consumerName(), null, true); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server Iterator iterator = sub.iterate(10, fetchDur); @@ -160,13 +148,13 @@ public void testIterate() throws Exception { validateRead(0, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "A", 10); + jsPublish(jstc.js, jstc.subject(), "A", 10); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "B", 20); + jsPublish(jstc.js, jstc.subject(), "B", 20); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -177,14 +165,14 @@ public void testIterate() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "C", 5); + jsPublish(jstc.js, jstc.subject(), "C", 5); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(5, messages.size()); messages.forEach(Message::ack); sleep(fetchMs); // give time for the pull to expire - jsPublish(js, tsc.subject(), "D", 15); + jsPublish(jstc.js, jstc.subject(), "D", 15); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -196,7 +184,7 @@ public void testIterate() throws Exception { messages.forEach(Message::ack); sleep(fetchMs); // give time for the pull to expire - jsPublish(js, tsc.subject(), "E", 10); + jsPublish(jstc.js, jstc.subject(), "E", 10); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -207,7 +195,7 @@ public void testIterate() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(js, tsc.subject(), "F", 1); + jsPublish(jstc.js, jstc.subject(), "F", 1); iterator = sub.iterate(1, fetchDur); //noinspection ResultOfMethodCallIgnored iterator.hasNext(); // calling hasNext twice in a row is for coverage @@ -218,23 +206,17 @@ public void testIterate() throws Exception { @Test public void testBasic() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(tsc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = js.subscribe(tsc.subject(), options); - assertSubscription(sub, tsc.stream, tsc.consumerName(), null, true); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // publish some amount of messages, but not entire pull size - jsPublish(js, tsc.subject(), "A", 4); + jsPublish(jstc.js, jstc.subject(), "A", 4); // start the pull sub.pull(10); @@ -245,7 +227,7 @@ public void testBasic() throws Exception { validateRedAndTotal(4, messages.size(), 4, total); // publish some more covering our initial pull and more - jsPublish(js, tsc.subject(), "B", 10); + jsPublish(jstc.js, jstc.subject(), "B", 10); // read what is available, expect 6 more messages = readMessagesAck(sub); @@ -266,7 +248,7 @@ public void testBasic() throws Exception { validateRedAndTotal(4, messages.size(), 14, total); // publish some more - jsPublish(js, tsc.subject(), "C", 10); + jsPublish(jstc.js, jstc.subject(), "C", 10); // read what is available, should be 6 since we didn't finish the last batch messages = readMessagesAck(sub); @@ -298,16 +280,16 @@ public void testBasic() throws Exception { validateRedAndTotal(0, messages.size(), 24, total); // publish some more to test null timeout - jsPublish(js, tsc.subject(), "D", 10); - sub = js.subscribe(tsc.subject(), PullSubscribeOptions.builder().durable(durable(2)).build()); + jsPublish(jstc.js, jstc.subject(), "D", 10); + sub = jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(random()).build()); sub.pull(10); sleep(500); messages = readMessagesAck(sub, null); validateRedAndTotal(10, messages.size(), 10, messages.size()); // publish some more to test never timeout - jsPublish(js, tsc.subject(), "E", 10); - sub = js.subscribe(tsc.subject(), PullSubscribeOptions.builder().durable(durable(2)).build()); + jsPublish(jstc.js, jstc.subject(), "E", 10); + sub = jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(random()).build()); sub.pull(10); sleep(500); messages = readMessagesAck(sub, Duration.ZERO, 10); @@ -317,24 +299,18 @@ public void testBasic() throws Exception { @Test public void testNoWait() throws Exception { - runInJsServer(noPullWarnings(), nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(tsc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = js.subscribe(tsc.subject(), options); - assertSubscription(sub, tsc.stream, tsc.consumerName(), null, true); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // publish 10 messages // no wait, batch size 10, there are 10 messages, we will read them all and not trip nowait - jsPublish(js, tsc.subject(), "A", 10); + jsPublish(jstc.js, jstc.subject(), "A", 10); sub.pullNoWait(10); List messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -342,7 +318,7 @@ public void testNoWait() throws Exception { // publish 20 messages // no wait, batch size 10, there are 20 messages, we will read 10 - jsPublish(js, tsc.subject(), "B", 20); + jsPublish(jstc.js, jstc.subject(), "B", 20); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -355,14 +331,14 @@ public void testNoWait() throws Exception { // publish 5 messages // no wait, batch size 10, there are 5 messages, we WILL trip nowait - jsPublish(js, tsc.subject(), "C", 5); + jsPublish(jstc.js, jstc.subject(), "C", 5); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(5, messages.size()); // publish 12 messages // no wait, batch size 10, there are more than batch messages we will read 10 - jsPublish(js, tsc.subject(), "D", 12); + jsPublish(jstc.js, jstc.subject(), "D", 12); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -376,7 +352,7 @@ public void testNoWait() throws Exception { // this is just coverage of the pullNoWait api + expires, not really validating server functionality // publish 12 messages // no wait, batch size 10, there are more than batch messages we will read 10 - jsPublish(js, tsc.subject(), "E", 12); + jsPublish(jstc.js, jstc.subject(), "E", 12); sub.pullNoWait(10, 10000); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -391,81 +367,75 @@ public void testNoWait() throws Exception { @Test public void testPullExpires() throws Exception { - runInJsServer(noPullWarnings(), nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(tsc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = js.subscribe(tsc.subject(), options); - assertSubscription(sub, tsc.stream, tsc.consumerName(), null, true); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server long expires = 500; // millis // publish 10 messages - jsPublish(js, tsc.subject(), "A", 5); + jsPublish(jstc.js, jstc.subject(), "A", 5); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here List messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "B", 10); + jsPublish(jstc.js, jstc.subject(), "B", 10); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here messages = readMessagesAck(sub); assertEquals(10, messages.size()); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "C", 5); + jsPublish(jstc.js, jstc.subject(), "C", 5); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "D", 10); + jsPublish(jstc.js, jstc.subject(), "D", 10); sub.pull(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); - jsPublish(js, tsc.subject(), "E", 5); + jsPublish(jstc.js, jstc.subject(), "E", 5); sub.pullExpiresIn(10, expires); // using millis version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "F", 10); + jsPublish(jstc.js, jstc.subject(), "F", 10); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); - jsPublish(js, tsc.subject(), "G", 5); + jsPublish(jstc.js, jstc.subject(), "G", 5); sub.pullExpiresIn(10, expires); // using millis version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "H", 10); + jsPublish(jstc.js, jstc.subject(), "H", 10); messages = sub.fetch(10, expires); assertEquals(10, messages.size()); assertAllJetStream(messages); - jsPublish(js, tsc.subject(), "I", 5); + jsPublish(jstc.js, jstc.subject(), "I", 5); sub.pullExpiresIn(10, expires); messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(js, tsc.subject(), "J", 10); + jsPublish(jstc.js, jstc.subject(), "J", 10); Iterator i = sub.iterate(10, expires); int count = 0; while (i.hasNext()) { @@ -482,19 +452,13 @@ public void testPullExpires() throws Exception { @Test public void testAckNak() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(DURABLE).build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + runInLrServer((nc, jstc) -> { + PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // NAK - jsPublish(js, tsc.subject(), "NAK", 1); + jsPublish(jstc.js, jstc.subject(), "NAK", 1); sub.pull(1); @@ -518,19 +482,13 @@ public void testAckNak() throws Exception { @Test public void testAckTerm() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(DURABLE).build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + runInLrServer((nc, jstc) -> { + PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // TERM - jsPublish(js, tsc.subject(), "TERM", 1); + jsPublish(jstc.js, jstc.subject(), "TERM", 1); sub.pull(1); Message message = sub.nextMessage(Duration.ofSeconds(1)); @@ -546,51 +504,39 @@ public void testAckTerm() throws Exception { @Test public void testAckReplySyncCoverage() throws Exception { - jsServer.run(nc -> { - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - // Create our JetStream context. - JetStream js = nc.jetStream(); - - JetStreamSubscription sub = js.subscribe(tsc.subject()); + runInLrServer((nc, jstc) -> { + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server - jsPublish(js, tsc.subject(), "COVERAGE", 1); + jsPublish(jstc.js, jstc.subject(), "COVERAGE", 1); Message message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); - NatsJetStreamMessage njsm = (NatsJetStreamMessage)message; + NatsJetStreamMessage njsMsg = (NatsJetStreamMessage)message; - njsm.replyTo = "$JS.ACK.stream.LS0k4eeN.1.1.1.1627472530542070600.0"; + njsMsg.replyTo = "$tsc.js.ACK.stream.LS0k4eeN.1.1.1.1627472530542070600.0"; - assertThrows(TimeoutException.class, () -> njsm.ackSync(Duration.ofSeconds(1))); + assertThrows(TimeoutException.class, () -> njsMsg.ackSync(Duration.ofSeconds(1))); }); } @Test public void testAckWaitTimeout() throws Exception { - jsServer.run(nc -> { - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - // Create our JetStream context. - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder() .ackWait(1500) .build(); PullSubscribeOptions pso = PullSubscribeOptions.builder() - .durable(tsc.consumerName()) + .durable(jstc.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // Ack Wait timeout - jsPublish(js, tsc.subject(), "WAIT", 2); + jsPublish(jstc.js, jstc.subject(), "WAIT", 2); sub.pull(2); Message m = sub.nextMessage(1000); @@ -622,81 +568,75 @@ public void testAckWaitTimeout() throws Exception { @Test public void testDurable() throws Exception { - runInJsServer(noPullWarnings(), nc -> { - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - String durable = durable(); + runInLrServer(noPullWarnings(), (nc, jstc) -> { + String durable = random(); // Create our JetStream context. JetStream js = nc.jetStream(); // Build our subscription options normally PullSubscribeOptions options1 = PullSubscribeOptions.builder().durable(durable).build(); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(tsc.subject(), options1)); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(jstc.subject(), options1)); // bind long form PullSubscribeOptions options2 = PullSubscribeOptions.builder() - .stream(tsc.stream) + .stream(jstc.stream) .durable(durable) .bind(true) .build(); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options2)); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options2)); // fast bind long form PullSubscribeOptions options3 = PullSubscribeOptions.builder() - .stream(tsc.stream) + .stream(jstc.stream) .durable(durable) .fastBind(true) .build(); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options3)); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options3)); // bind short form - PullSubscribeOptions options4 = PullSubscribeOptions.bind(tsc.stream, durable); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options4)); + PullSubscribeOptions options4 = PullSubscribeOptions.bind(jstc.stream, durable); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options4)); // fast bind short form - PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(tsc.stream, durable); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options5)); + PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(jstc.stream, durable); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options5)); }); } @Test public void testNamed() throws Exception { - runInJsServer(noPullWarnings(), TestBase::atLeast2_9_0, nc -> { - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - String name = name(); + runInLrServer(noPullWarnings(), TestBase::atLeast2_9_0, (nc, jstc) -> { + String name = random(); - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder() + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() .name(name) .inactiveThreshold(10_000) .build()); // bind long form PullSubscribeOptions options2 = PullSubscribeOptions.builder() - .stream(tsc.stream) + .stream(jstc.stream) .name(name) .bind(true) .build(); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options2)); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options2)); // fast bind long form PullSubscribeOptions options3 = PullSubscribeOptions.builder() - .stream(tsc.stream) + .stream(jstc.stream) .name(name) .fastBind(true) .build(); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options3)); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options3)); // bind short form - PullSubscribeOptions options4 = PullSubscribeOptions.bind(tsc.stream, name); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options4)); + PullSubscribeOptions options4 = PullSubscribeOptions.bind(jstc.stream, name); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options4)); // fast bind short form - PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(tsc.stream, name); - _testDurableOrNamed(js, tsc.subject(), () -> js.subscribe(null, options5)); + PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(jstc.stream, name); + _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options5)); }); } @@ -777,7 +717,7 @@ public void testPullRequestOptionsBuilder() { } interface ConflictSetup { - JetStreamSubscription setup(Connection nc, JetStreamManagement jsm, JetStream js, TestingStreamContainer tsc, ListenerForTesting listener) throws Exception; + JetStreamSubscription setup(Connection nc, JetStreamManagement jsm, JetStream js, JetStreamTestingContext jstc, ListenerForTesting listener) throws Exception; } private boolean versionIsBefore(Connection nc, String targetVersion) { @@ -801,15 +741,12 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { private void testConflictStatus(int statusCode, String statusText, int type, String targetVersion, ConflictSetup setup) throws Exception { ListenerForTesting listener = new ListenerForTesting(); AtomicBoolean skip = new AtomicBoolean(false); - runInJsServer(listener, nc -> { + runInLrServer(listener, (nc, jstc) -> { skip.set(versionIsBefore(nc, targetVersion)); if (skip.get()) { return; } - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStreamSubscription sub = setup.setup(nc, jsm, js, tsc, listener); + JetStreamSubscription sub = setup.setup(nc, jstc.jsm, jstc.js, jstc, listener); if (sub.getDispatcher() == null) { if (type == TYPE_ERROR) { JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE)); @@ -837,9 +774,9 @@ else if (type == TYPE_WARNING) { @Test public void testExceedsMaxWaitingSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pull(1); sub.pull(1); return sub; @@ -848,10 +785,10 @@ public void testExceedsMaxWaitingSyncSub() throws Exception { @Test public void testExceedsMaxWaitingAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pull(1); sub.pull(1); return sub; @@ -860,9 +797,9 @@ public void testExceedsMaxWaitingAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBatchSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pull(2); return sub; }); @@ -870,10 +807,10 @@ public void testExceedsMaxRequestBatchSyncSub() throws Exception { @Test public void testExceedsMaxRequestBatchAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pull(2); return sub; }); @@ -881,10 +818,10 @@ public void testExceedsMaxRequestBatchAsyncSub() throws Exception { @Test public void testMessageSizeExceedsMaxBytesSyncSub() throws Exception { - testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b); - js.publish(tsc.subject(), new byte[1000]); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + jstc.js.publish(jstc.subject(), new byte[1000]); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); return sub; }); @@ -892,11 +829,11 @@ public void testMessageSizeExceedsMaxBytesSyncSub() throws Exception { @Test public void testMessageSizeExceedsMaxBytesAsyncSub() throws Exception { - testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); - js.publish(tsc.subject(), new byte[1000]); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + jstc.js.publish(jstc.subject(), new byte[1000]); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); return sub; }); @@ -904,9 +841,9 @@ public void testMessageSizeExceedsMaxBytesAsyncSub() throws Exception { @Test public void testExceedsMaxRequestExpiresSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pullExpiresIn(1, 2000); return sub; }); @@ -914,10 +851,10 @@ public void testExceedsMaxRequestExpiresSyncSub() throws Exception { @Test public void testExceedsMaxRequestExpiresAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pullExpiresIn(1, 2000); return sub; }); @@ -925,13 +862,14 @@ public void testExceedsMaxRequestExpiresAsyncSub() throws Exception { @Test public void testConsumerIsPushBasedSyncSub() throws Exception { - testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, tsc, handler) -> { - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).ackPolicy(AckPolicy.None).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, durable(1)); - JetStreamSubscription sub = js.subscribe(null, so); - jsm.deleteConsumer(tsc.stream, durable(1)); + testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { + String dur = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); + JetStreamSubscription sub = jstc.js.subscribe(null, so); + jstc.jsm.deleteConsumer(jstc.stream, dur); // consumer with same name but is push now - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).deliverSubject(deliver(1)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).deliverSubject(dur).build()); sub.pull(1); return sub; }); @@ -939,14 +877,15 @@ public void testConsumerIsPushBasedSyncSub() throws Exception { @Test public void testConsumerIsPushBasedAsyncSub() throws Exception { - testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, tsc, handler) -> { - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).ackPolicy(AckPolicy.None).build()); + testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { + String dur = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, durable(1)); - JetStreamSubscription sub = js.subscribe(null, d, m -> {}, so); - jsm.deleteConsumer(tsc.stream, durable(1)); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); + JetStreamSubscription sub = jstc.js.subscribe(null, d, m -> {}, so); + jstc.jsm.deleteConsumer(jstc.stream, dur); // consumer with same name but is push now - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).deliverSubject(deliver(1)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).deliverSubject(dur).build()); sub.pull(1); return sub; }); @@ -956,13 +895,14 @@ public void testConsumerIsPushBasedAsyncSub() throws Exception { @Test @Disabled public void testConsumerDeletedSyncSub() throws Exception { - testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, tsc, handler) -> { - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).ackPolicy(AckPolicy.None).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, durable(1)); - JetStreamSubscription sub = js.subscribe(null, so); + testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, jstc, handler) -> { + String dur = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); + JetStreamSubscription sub = jstc.js.subscribe(null, so); sub.pullExpiresIn(1, 30000); - jsm.deleteConsumer(tsc.stream, durable(1)); - js.publish(tsc.subject(), null); + jstc.jsm.deleteConsumer(jstc.stream, dur); + jstc.js.publish(jstc.subject(), null); return sub; }); } @@ -971,14 +911,15 @@ public void testConsumerDeletedSyncSub() throws Exception { @Test @Disabled public void testConsumerDeletedAsyncSub() throws Exception { - testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, tsc, handler) -> { - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).ackPolicy(AckPolicy.None).build()); + testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, jstc, handler) -> { + String dur = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, durable(1)); - JetStreamSubscription sub = js.subscribe(null, d, m -> {}, so); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); + JetStreamSubscription sub = jstc.js.subscribe(null, d, m -> {}, so); sub.pullExpiresIn(1, 30000); - jsm.deleteConsumer(tsc.stream, durable(1)); - js.publish(tsc.subject(), null); + jstc.jsm.deleteConsumer(jstc.stream, dur); + jstc.js.publish(jstc.subject(), null); return sub; }); } @@ -1001,9 +942,9 @@ public String toJson() { @Test public void testBadRequestSyncSub() throws Exception { - testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pull(new BadPullRequestOptions()); return sub; }); @@ -1011,10 +952,10 @@ public void testBadRequestSyncSub() throws Exception { @Test public void testBadRequestAsyncSub() throws Exception { - testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pull(new BadPullRequestOptions()); return sub; }); @@ -1022,9 +963,9 @@ public void testBadRequestAsyncSub() throws Exception { @Test public void testNotFoundSyncSub() throws Exception { - testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pullNoWait(1); return sub; }); @@ -1032,10 +973,10 @@ public void testNotFoundSyncSub() throws Exception { @Test public void testNotFoundAsyncSub() throws Exception { - testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pullNoWait(1); return sub; }); @@ -1043,9 +984,9 @@ public void testNotFoundAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); return sub; }); @@ -1053,10 +994,10 @@ public void testExceedsMaxRequestBytes1stMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, tsc, handler) -> { + testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), d, m -> {}, so); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); return sub; }); @@ -1065,22 +1006,19 @@ public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(TestBase::atLeast2_9_1, listener, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - jsm.addOrUpdateConsumer(tsc.stream, builder().durable(durable(1)).ackPolicy(AckPolicy.None).filterSubjects(tsc.subject()).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, durable(1)); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + runInLrServer(listener, TestBase::atLeast2_9_1, (nc, jstc) -> { + String dur = random(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(jstc.subject()).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); // subject 7 + reply 52 + bytes 100 = 159 // subject 7 + reply 52 + bytes 100 + headers 21 = 180 - js.publish(tsc.subject(), new byte[100]); - js.publish(tsc.subject(), new Headers().add("foo", "bar"), new byte[100]); + jstc.js.publish(jstc.subject(), new byte[100]); + jstc.js.publish(jstc.subject(), new Headers().add("foo", "bar"), new byte[100]); // 1000 - 159 - 180 = 661 // subject 7 + reply 52 + bytes 610 = 669 > 661 - js.publish(tsc.subject(), new byte[610]); + jstc.js.publish(jstc.subject(), new byte[610]); sub.pull(PullRequestOptions.builder(10).maxBytes(1000).expiresIn(1000).build()); assertNotNull(sub.nextMessage(500)); @@ -1093,24 +1031,24 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesExactBytes() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(TestBase::atLeast2_9_1, listener, nc -> { - String stream = "sixsix"; // six letters so I can count - String subject = "seven"; // seven letters so I can count - String durable = durable(0); // short keeps under max bytes + runInLrServer(listener, TestBase::atLeast2_9_1, (nc, jstc) -> { + String stream = randomWide(6); // six letters so I can count + String subject = randomWide(5); // five letters so I can count + String durable = randomWide(10); // short keeps under max bytes createMemoryStream(nc, stream, subject); JetStreamManagement jsm = nc.jetStreamManagement(); JetStream js = nc.jetStream(); - jsm.addOrUpdateConsumer(stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); + jstc.jsm.addOrUpdateConsumer(stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(stream, durable); - JetStreamSubscription sub = js.subscribe(subject, so); + JetStreamSubscription sub = jstc.js.subscribe(subject, so); - // 159 + 180 + 661 = 1000 + // 159 + 180 + 661 = 1000 // subject includes crlf // subject 7 + reply 52 + bytes 100 = 159 // subject 7 + reply 52 + bytes 100 + headers 21 = 180 // subject 7 + reply 52 + bytes 602 = 661 - js.publish(subject, new byte[100]); - js.publish(subject, new Headers().add("foo", "bar"), new byte[100]); - js.publish(subject, new byte[602]); + jstc.js.publish(subject, new byte[100]); + jstc.js.publish(subject, new Headers().add("foo", "bar"), new byte[100]); + jstc.js.publish(subject, new byte[602]); sub.pull(PullRequestOptions.builder(10).maxBytes(1000).expiresIn(1000).build()); assertNotNull(sub.nextMessage(500)); @@ -1123,17 +1061,13 @@ public void testExceedsMaxRequestBytesExactBytes() throws Exception { @Test public void testReader() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - + runInLrServer((nc, jstc) -> { // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(tsc.consumerName()).filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - PullSubscribeOptions so = PullSubscribeOptions.bind(tsc.stream, tsc.consumerName()); - JetStreamSubscription sub = js.subscribe(tsc.subject(), so); + PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, jstc.consumerName()); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); JetStreamReader reader = sub.reader(500, 125); int stopCount = 500; @@ -1142,7 +1076,7 @@ public void testReader() throws Exception { AtomicInteger count = new AtomicInteger(); Thread readerThread = getReaderThread(count, stopCount, reader); - Publisher publisher = new Publisher(js, tsc.subject(), 25); + Publisher publisher = new Publisher(jstc.js, jstc.subject(), 25); Thread pubThread = new Thread(publisher); pubThread.start(); @@ -1185,35 +1119,31 @@ private static Thread getReaderThread(AtomicInteger count, int stopCount, JetStr @Test public void testOverflow() throws Exception { - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - jsServer.run(b, TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - jsPublish(js, tsc.subject(), 100); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 100); // Setting PriorityPolicy requires at least one PriorityGroup to be set ConsumerConfiguration ccNoGroup = ConsumerConfiguration.builder() .priorityPolicy(PriorityPolicy.Overflow) .build(); JetStreamApiException jsae = assertThrows(JetStreamApiException.class, - () -> jsm.addOrUpdateConsumer(tsc.stream, ccNoGroup)); + () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, ccNoGroup)); assertEquals(10159, jsae.getApiErrorCode()); // Testing errors - String group = variant(); - String consumer = variant(); + String group = random(); + String consumer = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(consumer) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - PullSubscribeOptions so = PullSubscribeOptions.fastBind(tsc.stream, consumer); - JetStreamSubscription sub = js.subscribe(null, so); + PullSubscribeOptions so = PullSubscribeOptions.fastBind(jstc.stream, consumer); + JetStreamSubscription sub = jstc.js.subscribe(null, so); // 400 Bad Request - Priority Group missing sub.pull(1); @@ -1224,20 +1154,20 @@ public void testOverflow() throws Exception { assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(1000)); // Testing min ack pending - group = variant(); - consumer = variant(); + group = random(); + consumer = random(); cc = ConsumerConfiguration.builder() .name(consumer) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(60_000) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - so = PullSubscribeOptions.fastBind(tsc.stream, consumer); - JetStreamSubscription subPrime = js.subscribe(null, so); - JetStreamSubscription subOver = js.subscribe(null, so); + so = PullSubscribeOptions.fastBind(jstc.stream, consumer); + JetStreamSubscription subPrime = jstc.js.subscribe(null, so); + JetStreamSubscription subOver = jstc.js.subscribe(null, so); PullRequestOptions proNoMin = PullRequestOptions.builder(5) .group(group) @@ -1261,19 +1191,19 @@ public void testOverflow() throws Exception { _overflowCheck(subOver, proOverB, true, 0); // Testing min pending - group = variant(); - consumer = variant(); + group = random(); + consumer = random(); cc = ConsumerConfiguration.builder() .name(consumer) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - so = PullSubscribeOptions.fastBind(tsc.stream, consumer); - subPrime = js.subscribe(null, so); - subOver = js.subscribe(null, so); + so = PullSubscribeOptions.fastBind(jstc.stream, consumer); + subPrime = jstc.js.subscribe(null, so); + subOver = jstc.js.subscribe(null, so); proNoMin = PullRequestOptions.builder(5) .group(group) @@ -1315,24 +1245,19 @@ public void testPrioritized() throws Exception { // start a priority 1 (#1) and a priority 2 (#2) consumer, #1 should get messages, #2 should get none // close the #1, #2 should get messages // start another priority 1 (#3), #2 should stop getting messages #3 should get messages - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - jsServer.run(b, TestBase::atLeast2_12, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - - String consumer = name(); - String group = variant(); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, TestBase::atLeast2_12, (nc, jstc) -> { + String consumer = random(); + String group = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .name(consumer) .priorityGroups(group) .priorityPolicy(PriorityPolicy.Prioritized) .build(); - StreamContext streamContext = nc.getStreamContext(tsc.stream); + StreamContext streamContext = nc.getStreamContext(jstc.stream); ConsumerContext consumerContext1 = streamContext.createOrUpdateConsumer(cc); ConsumerContext consumerContext2 = streamContext.getConsumerContext(consumer); @@ -1378,7 +1303,7 @@ public void testPrioritized() throws Exception { while (pub.get()) { ++count; try { - js.publish(tsc.subject(), ("x" + count).getBytes()); + jstc.js.publish(jstc.subject(), ("x" + count).getBytes()); sleep(20); } catch (Exception e) { @@ -1417,24 +1342,19 @@ public void testPinnedClient() throws Exception { // have 3 consumers in the same group all PriorityPolicy.PinnedClient // start consuming, tracking pin ids and counts // unpin 10 times and make sure that new pins are made - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - jsServer.run(b, TestBase::atLeast2_12, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - - String consumer = name(); - String group = variant(); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, TestBase::atLeast2_12, (nc, jstc) -> { + String consumer = random(); + String group = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .name(consumer) .priorityGroups(group) .priorityPolicy(PriorityPolicy.PinnedClient) .build(); - StreamContext streamContext = nc.getStreamContext(tsc.stream); + StreamContext streamContext = nc.getStreamContext(jstc.stream); ConsumerContext consumerContext1 = streamContext.createOrUpdateConsumer(cc); ConsumerContext consumerContext2 = streamContext.getConsumerContext(consumer); ConsumerContext consumerContext3 = streamContext.getConsumerContext(consumer); @@ -1487,7 +1407,7 @@ public void testPinnedClient() throws Exception { while (pub.get()) { ++count; try { - js.publish(tsc.subject(), ("x" + count).getBytes()); + jstc.js.publish(jstc.subject(), ("x" + count).getBytes()); sleep(20); } catch (Exception e) { @@ -1512,7 +1432,7 @@ public void testPinnedClient() throws Exception { assertTrue(consumerContext3.unpin(group)); break; case 3: - assertTrue(jsm.unpinConsumer(tsc.stream, consumer, group)); + assertTrue(jstc.jsm.unpinConsumer(jstc.stream, consumer, group)); break; } assertTrue(consumerContext1.unpin(group)); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index b49510f1c..8588b4e74 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -31,15 +31,9 @@ public class JetStreamPushAsyncTests extends JetStreamTestBase { @Test public void testHandlerSub() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // publish some messages - jsPublish(js, tsc.subject(), 10); + jsPublish(jstc.js, jstc.subject(), 10); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -55,7 +49,7 @@ public void testHandlerSub() throws Exception { }; // Subscribe using the handler - js.subscribe(tsc.subject(), dispatcher, handler, false); + jstc.js.subscribe(jstc.subject(), dispatcher, handler, false); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -67,15 +61,9 @@ public void testHandlerSub() throws Exception { @Test public void testHandlerAutoAck() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // publish some messages - jsPublish(js, tsc.subject(), 10); + jsPublish(jstc.js, jstc.subject(), 10); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -91,8 +79,8 @@ public void testHandlerAutoAck() throws Exception { }; // subscribe using the handler, auto ack true - PushSubscribeOptions pso1 = PushSubscribeOptions.builder().durable(durable(1)).build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), dispatcher, handler1, true, pso1); + PushSubscribeOptions pso1 = PushSubscribeOptions.builder().durable(random()).build(); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), dispatcher, handler1, true, pso1); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -102,7 +90,7 @@ public void testHandlerAutoAck() throws Exception { // check that all the messages were read by the durable dispatcher.unsubscribe(sub); - sub = js.subscribe(tsc.subject(), pso1); + sub = jstc.js.subscribe(jstc.subject(), pso1); assertNull(sub.nextMessage(Duration.ofSeconds(1))); // 2. auto ack false @@ -117,8 +105,8 @@ public void testHandlerAutoAck() throws Exception { // subscribe using the handler, auto ack false ConsumerConfiguration cc = ConsumerConfiguration.builder().ackWait(Duration.ofMillis(500)).build(); - PushSubscribeOptions pso2 = PushSubscribeOptions.builder().durable(durable(2)).configuration(cc).build(); - sub = js.subscribe(tsc.subject(), dispatcher, handler2, false, pso2); + PushSubscribeOptions pso2 = PushSubscribeOptions.builder().durable(random()).configuration(cc).build(); + sub = jstc.js.subscribe(jstc.subject(), dispatcher, handler2, false, pso2); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -131,7 +119,7 @@ public void testHandlerAutoAck() throws Exception { sleep(1000); // just give it time for the server to realize the messages are not ack'ed dispatcher.unsubscribe(sub); - sub = js.subscribe(tsc.subject(), pso2); + sub = jstc.js.subscribe(jstc.subject(), pso2); List list = readMessagesAck(sub, false); assertEquals(10, list.size()); }); @@ -139,14 +127,8 @@ public void testHandlerAutoAck() throws Exception { @Test public void testCantNextMessageOnAsyncPushSub() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - JetStreamSubscription sub = js.subscribe(tsc.subject(), nc.createDispatcher(), msg -> {}, false); + runInLrServer((nc, jstc) -> { + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), nc.createDispatcher(), msg -> {}, false); // this should exception, can't next message on an async push sub assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(1000))); @@ -156,16 +138,8 @@ public void testCantNextMessageOnAsyncPushSub() throws Exception { @Test public void testPushAsyncFlowControl() throws Exception { - ListenerForTesting listenerForTesting = new ListenerForTesting(); - Options.Builder ob = new Options.Builder().errorListener(listenerForTesting); - - runInJsServer(ob, nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, (nc, jstc) -> { byte[] data = new byte[8192]; int MSG_COUNT = 1000; @@ -174,7 +148,7 @@ public void testPushAsyncFlowControl() throws Exception { for (int x = 100_000; x < MSG_COUNT + 100_000; x++) { byte[] fill = (""+ x).getBytes(); System.arraycopy(fill, 0, data, 0, 6); - js.publish(NatsMessage.builder().subject(tsc.subject()).data(data).build()); + jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).data(data).build()); } // create a dispatcher without a default handler. @@ -197,29 +171,26 @@ public void testPushAsyncFlowControl() throws Exception { ConsumerConfiguration cc = ConsumerConfiguration.builder().flowControl(1000).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - js.subscribe(tsc.subject(), dispatcher, handler, false, pso); + jstc.js.subscribe(jstc.subject(), dispatcher, handler, false, pso); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever awaitAndAssert(msgLatch); assertEquals(MSG_COUNT, count.get()); - assertFalse(listenerForTesting.getFlowControlProcessedEvents().isEmpty()); + assertFalse(listener.getFlowControlProcessedEvents().isEmpty()); }); } @Test - public void testDontAutoAckSituations() throws Exception { - String mockAckReply = "mock-ack-reply."; + public void testDoNotAutoAckSituations() throws Exception { + String mockAckReply = random(); // "mock-ack-reply."; - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { // create the stream. - String stream = stream(); - String subject = subject(); - createMemoryStream(nc, stream, subject, mockAckReply + "*"); - - // Create our JetStream context. - JetStream js = nc.jetStream(); + String stream = random(); + String subject = random(); + createMemoryStream(nc, stream, subject, subjectStar(mockAckReply)); int pubCount = 5; @@ -243,23 +214,23 @@ public void testDontAutoAckSituations() throws Exception { int f = count.incrementAndGet(); if (f == 1) { - m.replyTo = mockAckReply + "ack"; + m.replyTo = subjectDot(mockAckReply, "ack"); m.ack(); } else if (f == 2) { - m.replyTo = mockAckReply + "nak"; + m.replyTo = subjectDot(mockAckReply, "nak"); m.nak(); } else if (f == 3) { - m.replyTo = mockAckReply + "term"; + m.replyTo = subjectDot(mockAckReply, "term"); m.term(); } else if (f == 4) { - m.replyTo = mockAckReply + "progress"; + m.replyTo = subjectDot(mockAckReply, "progress"); m.inProgress(); } else { - m.replyTo = mockAckReply + "auto"; + m.replyTo = subjectDot(mockAckReply, "auto"); } msgLatchRef.get().countDown(); }; @@ -273,30 +244,30 @@ else if (f == 4) { assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); - JetStreamSubscription mockAckReplySub = js.subscribe(mockAckReply + "*"); + JetStreamSubscription mockAckReplySub = js.subscribe(subjectStar(mockAckReply)); Message msg = mockAckReplySub.nextMessage(2000); - assertEquals(mockAckReply + "ack", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "ack"), msg.getSubject()); assertEquals("+ACK", new String(msg.getData())); msg = mockAckReplySub.nextMessage(500); - assertEquals(mockAckReply + "nak", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "nak"), msg.getSubject()); assertEquals("-NAK", new String(msg.getData())); msg = mockAckReplySub.nextMessage(500); - assertEquals(mockAckReply + "term", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "term"), msg.getSubject()); assertEquals("+TERM", new String(msg.getData())); msg = mockAckReplySub.nextMessage(500); - assertEquals(mockAckReply + "progress", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "progress"), msg.getSubject()); assertEquals("+WPI", new String(msg.getData())); // because it was in progress which is not a terminal ack, the auto ack acks msg = mockAckReplySub.nextMessage(500); - assertEquals(mockAckReply + "progress", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "progress"), msg.getSubject()); assertEquals("+ACK", new String(msg.getData())); msg = mockAckReplySub.nextMessage(500); - assertEquals(mockAckReply + "auto", msg.getSubject()); + assertEquals(subjectDot(mockAckReply, "auto"), msg.getSubject()); assertEquals("+ACK", new String(msg.getData())); // coverage explicit no ack flag @@ -334,10 +305,11 @@ public void onMessage(Message msg) throws InterruptedException { @Test public void testMemoryStorageServerBugPR2719() throws Exception { - String stream = stream(); - String sub = "msbsub.>"; - String key1 = "msbsub.key1"; - String key2 = "msbsub.key2"; + String stream = random(); + String subBase = random(); + String sub = subjectGt(subBase); + String key1 = subjectDot(subBase, "key1"); + String key2 = subjectDot(subBase, "key2"); Headers deleteHeaders = new Headers() .put(KV_OPERATION_HEADER_KEY, KeyValueOperation.DELETE.name()); @@ -345,7 +317,7 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .put(KV_OPERATION_HEADER_KEY, KeyValueOperation.PURGE.name()) .put(ROLLUP_HDR, ROLLUP_HDR_SUBJECT); - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) @@ -354,9 +326,7 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .denyDelete(true) .build(); - nc.jetStreamManagement().addStream(sc); - - JetStream js = nc.jetStream(); + jsm.addStream(sc); MemStorBugHandler fullHandler = new MemStorBugHandler(); MemStorBugHandler onlyHandler = new MemStorBugHandler(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java index 47064559b..2323ed069 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java @@ -32,26 +32,21 @@ public class JetStreamPushQueueTests extends JetStreamTestBase { @Test public void testQueueSubWorkflow() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { // Set up the subscribers // - the PushSubscribeOptions can be re-used since all the subscribers are the same // - use a concurrent integer to track all the messages received // - have a list of subscribers and threads so I can track them - PushSubscribeOptions pso = PushSubscribeOptions.builder().durable(tsc.consumerName()).build(); + PushSubscribeOptions pso = PushSubscribeOptions.builder().durable(jstc.consumerName()).build(); AtomicInteger allReceived = new AtomicInteger(); List subscribers = new ArrayList<>(); + String queue = random(); List subThreads = new ArrayList<>(); for (int id = 1; id <= 3; id++) { // set up the subscription - JetStreamSubscription sub = js.subscribe(tsc.subject(), QUEUE, pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), queue, pso); // create and track the runnable - JsQueueSubscriber qs = new JsQueueSubscriber(100, js, sub, allReceived); + JsQueueSubscriber qs = new JsQueueSubscriber(100, jstc.js, sub, allReceived); subscribers.add(qs); // create, track and start the thread Thread t = new Thread(qs); @@ -61,7 +56,7 @@ public void testQueueSubWorkflow() throws Exception { nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // create and start the publishing - Thread pubThread = new Thread(new JsPublisher(js, tsc.subject(), 100)); + Thread pubThread = new Thread(new JsPublisher(jstc.js, jstc.subject(), 100)); pubThread.start(); // wait for all threads to finish diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index cda2f9c7a..9201edeaa 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -41,26 +41,21 @@ public void testPushEphemeralNullDeliver() throws Exception { @Test public void testPushEphemeralWithDeliver() throws Exception { - _testPushEphemeral(DELIVER); + _testPushEphemeral(random()); } private void _testPushEphemeral(String deliverSubject) throws Exception { - jsServer.run(nc -> { - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - // Create our JetStream context. - JetStream js = nc.jetStream(); - + runInJsServer(nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); // publish some messages - jsPublish(js, tsc.subject(), 1, 5); + jsPublish(jstc.js, jstc.subject(), 1, 5); // Build our subscription options. PushSubscribeOptions options = PushSubscribeOptions.builder().deliverSubject(deliverSubject).build(); // Subscription 1 - JetStreamSubscription sub1 = js.subscribe(tsc.subject(), options); - assertSubscription(sub1, tsc.stream, null, deliverSubject, false); + JetStreamSubscription sub1 = jstc.js.subscribe(jstc.subject(), options); + assertSubscription(sub1, jstc.stream, null, deliverSubject, false); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // read what is available @@ -79,7 +74,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { unsubscribeEnsureNotBound(sub1); // Subscription 2 - JetStreamSubscription sub2 = js.subscribe(tsc.subject(), options); + JetStreamSubscription sub2 = jstc.js.subscribe(jstc.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // read what is available, same messages @@ -97,7 +92,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { unsubscribeEnsureNotBound(sub2); // Subscription 3 testing null timeout - JetStreamSubscription sub3 = js.subscribe(tsc.subject(), options); + JetStreamSubscription sub3 = jstc.js.subscribe(jstc.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server sleep(1000); // give time to make sure the messages get to the client @@ -105,7 +100,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { validateRedAndTotal(5, messages0.size(), 5, 5); // Subscription 4 testing timeout <= 0 duration / millis - JetStreamSubscription sub4 = js.subscribe(tsc.subject(), options); + JetStreamSubscription sub4 = jstc.js.subscribe(jstc.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server sleep(1000); // give time to make sure the messages get to the client assertNotNull(sub4.nextMessage(Duration.ZERO)); @@ -128,68 +123,64 @@ public void testPushDurableWithDeliver() throws Exception { } private void _testPushDurable(boolean useDeliverSubject) throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jstc) -> { // create the stream. - String stream = stream(); - String subjectDotGt = subject() + ".>"; + String stream = random(); + String subjectDotGt = random() + ".>"; createMemoryStream(nc, stream, subjectDotGt); - // Create our JetStream context. - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - // For async, create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); // normal, no bind - _testPushDurableSubSync(jsm, js, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { + _testPushDurableSubSync(jstc, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder() .durable(cc.getDurable()) .deliverSubject(cc.getDeliverSubject()) .build(); - return js.subscribe(s, options); + return jstc.js.subscribe(s, options); }); - _testPushDurableSubAsync(jsm, js, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { + _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder() .durable(cc.getDurable()) .deliverSubject(cc.getDeliverSubject()) .build(); - return js.subscribe(s, d, h, false, options); + return jstc.js.subscribe(s, d, h, false, options); }); // use configuration, no bind - _testPushDurableSubSync(jsm, js, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { + _testPushDurableSubSync(jstc, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().configuration(cc).build(); - return js.subscribe(s, options); + return jstc.js.subscribe(s, options); }); - _testPushDurableSubAsync(jsm, js, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { + _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().configuration(cc).build(); - return js.subscribe(s, d, h, false, options); + return jstc.js.subscribe(s, d, h, false, options); }); if (useDeliverSubject) { // bind long form - _testPushDurableSubSync(jsm, js, stream, subjectDotGt, true, true, (s, cc) -> { + _testPushDurableSubSync(jstc, stream, subjectDotGt, true, true, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().stream(stream).durable(cc.getDurable()).bind(true).build(); - return js.subscribe(s, options); + return jstc.js.subscribe(s, options); }); - _testPushDurableSubAsync(jsm, js, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { + _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().stream(stream).durable(cc.getDurable()).bind(true).build(); - return js.subscribe(s, d, h, false, options); + return jstc.js.subscribe(s, d, h, false, options); }); // bind short form - _testPushDurableSubSync(jsm, js, stream, subjectDotGt, true, true, (s, cc) -> { + _testPushDurableSubSync(jstc, stream, subjectDotGt, true, true, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.bind(stream, cc.getDurable()); - return js.subscribe(s, options); + return jstc.js.subscribe(s, options); }); - _testPushDurableSubAsync(jsm, js, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { + _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.bind(stream, cc.getDurable()); - return js.subscribe(s, d, h, false, options); + return jstc.js.subscribe(s, d, h, false, options); }); } }); @@ -203,10 +194,10 @@ private interface SubscriptionSupplierAsync { JetStreamSubscription get(String subject, Dispatcher dispatcher, MessageHandler handler, ConsumerConfiguration cc) throws IOException, JetStreamApiException; } - private void _testPushDurableSubSync(JetStreamManagement jsm, JetStream js, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplier supplier) throws Exception { - String subject = subjectDotGt.replace(">", subject()); - String durable = durable(); - String deliverSubject = useDeliverSubject ? deliver() : null; + private void _testPushDurableSubSync(JetStreamTestingContext jstc, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplier supplier) throws Exception { + String subject = subjectDotGt.replace(">", random()); + String durable = random(); + String deliverSubject = useDeliverSubject ? random() : null; ConsumerConfiguration cc = ConsumerConfiguration.builder() .durable(durable) .deliverSubject(deliverSubject) @@ -214,11 +205,11 @@ private void _testPushDurableSubSync(JetStreamManagement jsm, JetStream js, Stri .build(); if (bind) { - jsm.addOrUpdateConsumer(stream, cc); + jstc.jsm.addOrUpdateConsumer(stream, cc); } // publish some messages - jsPublish(js, subject, 1, 5); + jsPublish(jstc.js, subject, 1, 5); JetStreamSubscription sub = supplier.get(subject, cc); assertSubscription(sub, stream, durable, deliverSubject, false); @@ -246,20 +237,20 @@ private void _testPushDurableSubSync(JetStreamManagement jsm, JetStream js, Stri unsubscribeEnsureNotBound(sub); } - private void _testPushDurableSubAsync(JetStreamManagement jsm, JetStream js, Dispatcher dispatcher, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplierAsync supplier) throws IOException, JetStreamApiException, InterruptedException { - String subject = subjectDotGt.replace(">", subject()); - String deliverSubject = useDeliverSubject ? deliver() : null; + private void _testPushDurableSubAsync(JetStreamTestingContext jstc, Dispatcher dispatcher, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplierAsync supplier) throws IOException, JetStreamApiException, InterruptedException { + String subject = subjectDotGt.replace(">", random()); + String deliverSubject = useDeliverSubject ? random() : null; ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(durable()) + .durable(random()) .deliverSubject(deliverSubject) .filterSubject(subject) .build(); if (bind) { - jsm.addOrUpdateConsumer(stream, cc); + jstc.jsm.addOrUpdateConsumer(stream, cc); } // publish some messages - jsPublish(js, subject, 5); + jsPublish(jstc.js, subject, 5); CountDownLatch msgLatch = new CountDownLatch(5); AtomicInteger received = new AtomicInteger(); @@ -283,22 +274,16 @@ private void _testPushDurableSubAsync(JetStreamManagement jsm, JetStream js, Dis @Test public void testCantPullOnPushSub() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - - JetStreamSubscription sub = js.subscribe(tsc.subject()); - assertSubscription(sub, tsc.stream, null, null, false); + runInLrServer((nc, jstc) -> { + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); + assertSubscription(sub, jstc.stream, null, null, false); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server assertCantPullOnPushSub(sub); unsubscribeEnsureNotBound(sub); PushSubscribeOptions pso = PushSubscribeOptions.builder().ordered(true).build(); - sub = js.subscribe(tsc.subject(), pso); + sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server assertCantPullOnPushSub(sub); @@ -322,17 +307,12 @@ private void assertCantPullOnPushSub(JetStreamSubscription sub) { @Test public void testHeadersOnly() throws Exception { - jsServer.run(nc -> { - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { PushSubscribeOptions pso = ConsumerConfiguration.builder().headersOnly(true).buildPushSubscribeOptions(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server - jsPublish(js, tsc.subject(), 5); + jsPublish(jstc.js, jstc.subject(), 5); List messages = readMessagesAck(sub, Duration.ZERO, 5); assertEquals(5, messages.size()); @@ -344,20 +324,14 @@ public void testHeadersOnly() throws Exception { @Test public void testAcks() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder().ackWait(Duration.ofMillis(1500)).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // TERM - jsPublish(js, tsc.subject(), "TERM", 1); + jsPublish(jstc.js, jstc.subject(), "TERM", 1); Message message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -369,7 +343,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // Ack Wait timeout - jsPublish(js, tsc.subject(), "WAIT", 1); + jsPublish(jstc.js, jstc.subject(), "WAIT", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -385,7 +359,7 @@ public void testAcks() throws Exception { assertEquals("WAIT1", data); // In Progress - jsPublish(js, tsc.subject(), "PRO", 1); + jsPublish(jstc.js, jstc.subject(), "PRO", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -409,7 +383,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // ACK Sync - jsPublish(js, tsc.subject(), "ACKSYNC", 1); + jsPublish(jstc.js, jstc.subject(), "ACKSYNC", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -421,7 +395,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // NAK - jsPublish(js, tsc.subject(), "NAK", 1, 1); + jsPublish(jstc.js, jstc.subject(), "NAK", 1, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -439,7 +413,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); - jsPublish(js, tsc.subject(), "NAK", 2, 1); + jsPublish(jstc.js, jstc.subject(), "NAK", 2, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -459,7 +433,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); - jsPublish(js, tsc.subject(), "NAK", 3, 1); + jsPublish(jstc.js, jstc.subject(), "NAK", 3, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -483,16 +457,15 @@ public void testAcks() throws Exception { @Test public void testDeliveryPolicy() throws Exception { - jsServer.run(nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - + runInLrServer((nc, jsm, js) -> { // create the stream. - String stream = stream(); - createMemoryStream(jsm, stream, SUBJECT_STAR); + String stream = random(); + String subject = random(); + String subjectStar = subjectStar(subject); + createMemoryStream(jsm, stream, subjectStar); - String subjectA = subjectDot("A"); - String subjectB = subjectDot("B"); + String subjectA = subjectDot(subject, "A"); + String subjectB = subjectDot(subject, "B"); js.publish(subjectA, dataBytes(1)); js.publish(subjectA, dataBytes(2)); @@ -601,24 +574,17 @@ private void assertMessage(Message m, int i) { @Test public void testPushSyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - Options.Builder ob = new Options.Builder().errorListener(listener); - - runInJsServer(ob, nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); + runInJsServer(listener, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); byte[] data = new byte[1024*10]; - int MSG_COUNT = 1000; // publish some messages for (int x = 100_000; x < MSG_COUNT + 100_000; x++) { byte[] fill = ("" + x).getBytes(); System.arraycopy(fill, 0, data, 0, 6); - js.publish(NatsMessage.builder().subject(tsc.subject()).data(data).build()); + jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).data(data).build()); } // reset the counters @@ -626,7 +592,7 @@ public void testPushSyncFlowControl() throws Exception { ConsumerConfiguration cc = ConsumerConfiguration.builder().flowControl(1000).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = js.subscribe(tsc.subject(), pso); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); for (int x = 0; x < MSG_COUNT; x++) { Message msg = sub.nextMessage(1000); set.add(new String(Arrays.copyOf(msg.getData(), 6))); @@ -640,19 +606,13 @@ public void testPushSyncFlowControl() throws Exception { // coverage for subscribe options heartbeat directly cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - js.subscribe(tsc.subject(), pso); + jstc.js.subscribe(jstc.subject(), pso); }); } @Test public void testPendingLimits() throws Exception { - jsServer.run(nc -> { - // Create our JetStream context. - JetStream js = nc.jetStream(); - - // create the stream. - TestingStreamContainer tsc = new TestingStreamContainer(nc); - + runInLrServer((nc, jstc) -> { int customMessageLimit = 1000; int customByteLimit = 1024 * 1024; @@ -674,19 +634,19 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(-1) .build(); - JetStreamSubscription syncSub = js.subscribe(tsc.subject(), psoDefaultSync); + JetStreamSubscription syncSub = jstc.js.subscribe(jstc.subject(), psoDefaultSync); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, syncSub.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, syncSub.getPendingByteLimit()); - syncSub = js.subscribe(tsc.subject(), psoCustomSync); + syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSync); assertEquals(customMessageLimit, syncSub.getPendingMessageLimit()); assertEquals(customByteLimit, syncSub.getPendingByteLimit()); - syncSub = js.subscribe(tsc.subject(), psoCustomSyncUnlimited0); + syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSyncUnlimited0); assertEquals(0, syncSub.getPendingMessageLimit()); assertEquals(0, syncSub.getPendingByteLimit()); - syncSub = js.subscribe(tsc.subject(), psoCustomSyncUnlimitedUnlimitedNegative); + syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSyncUnlimitedUnlimitedNegative); assertEquals(0, syncSub.getPendingMessageLimit()); assertEquals(0, syncSub.getPendingByteLimit()); @@ -701,11 +661,11 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(Consumer.DEFAULT_MAX_BYTES) .build(); - JetStreamSubscription subAsync = js.subscribe(tsc.subject(), d, m -> {}, false, psoAsyncDefault); + JetStreamSubscription subAsync = jstc.js.subscribe(jstc.subject(), d, m -> {}, false, psoAsyncDefault); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, subAsync.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, subAsync.getPendingByteLimit()); - subAsync = js.subscribe(tsc.subject(), d, m -> {}, false, psoAsyncNonDefaultValid); + subAsync = jstc.js.subscribe(jstc.subject(), d, m -> {}, false, psoAsyncNonDefaultValid); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, subAsync.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, subAsync.getPendingByteLimit()); @@ -725,10 +685,10 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(0) .build(); - assertClientError(JsSubPushAsyncCantSetPending, () -> js.subscribe(SUBJECT, d, m ->{}, false, psoAsyncNopeMessages)); - assertClientError(JsSubPushAsyncCantSetPending, () -> js.subscribe(SUBJECT, d, m ->{}, false, psoAsyncNopeBytes)); - assertClientError(JsSubPushAsyncCantSetPending, () -> js.subscribe(SUBJECT, d, m ->{}, false, psoAsyncNope2Messages)); - assertClientError(JsSubPushAsyncCantSetPending, () -> js.subscribe(SUBJECT, d, m ->{}, false, psoAsyncNope2Bytes)); + assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeMessages)); + assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeBytes)); + assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Messages)); + assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Bytes)); }); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamTestBase.java b/src/test/java/io/nats/client/impl/JetStreamTestBase.java index da4333189..d1ddee064 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestBase.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestBase.java @@ -16,14 +16,13 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.utils.TestBase; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.function.Executable; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; @@ -43,20 +42,6 @@ public class JetStreamTestBase extends TestBase { public static final String InvalidMeta10Tokens = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000"; public static final String InvalidMetaData = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000.not-a-number"; - public static LongRunningNatsTestServer jsServer; - - @BeforeAll - public static void beforeAll() throws IOException, InterruptedException { - jsServer = new LongRunningNatsTestServer(false, true, null); - } - - @AfterAll - public static void afterAll() throws Exception { - if (jsServer != null) { - jsServer.close(); - } - } - public static final Duration DEFAULT_TIMEOUT = Duration.ofMillis(1000); private static final AtomicInteger MOCK_SID_HOLDER = new AtomicInteger(4273); @@ -88,106 +73,6 @@ public NatsMessage getTestMessage(String replyTo, String sid) { return new IncomingMessageFactory(sid, "subj", replyTo, 0, false).getMessage(); } - // ---------------------------------------------------------------------------------------------------- - // Management - // ---------------------------------------------------------------------------------------------------- - public static class TestingStreamContainer { - private String defaultSubjectVariant; - private final String defaultNameVariant = TestBase.name(); - public final StreamInfo si; - public final String stream = stream(); - private final Map subjects = new HashMap<>(); - private final Map names = new HashMap<>(); - - public TestingStreamContainer(Connection nc) throws JetStreamApiException, IOException { - this(nc.jetStreamManagement(), (String[])null); - } - - public TestingStreamContainer(Connection nc, int subjectCount) throws JetStreamApiException, IOException { - this(nc.jetStreamManagement(), subjectCount); - } - - public TestingStreamContainer(Connection nc, String... subjects) throws JetStreamApiException, IOException { - this(nc.jetStreamManagement(), subjects); - } - - public TestingStreamContainer(JetStreamManagement jsm) throws JetStreamApiException, IOException { - this(jsm, (String[])null); - } - - public TestingStreamContainer(JetStreamManagement jsm, String... subjects) throws JetStreamApiException, IOException { - if (subjects == null) { - this.si = createMemoryStream(jsm, stream, subject()); - } - else { - this.si = createMemoryStream(jsm, stream, subjects); - } - } - - public TestingStreamContainer(JetStreamManagement jsm, int subjectCount) throws JetStreamApiException, IOException { - String[] subjects = new String[subjectCount]; - for (int x = 0; x < subjectCount; x++) { - subjects[x] = subject(x); - } - this.si = createMemoryStream(jsm, stream, subjects); - } - - public String subject() { - if (defaultSubjectVariant == null) { - defaultSubjectVariant = TestBase.variant(null); - } - return subject(defaultSubjectVariant); - } - - public String subject(Object variant) { - return subjects.computeIfAbsent(variant, TestBase::subject); - } - - public String consumerName() { - return consumerName(defaultNameVariant); - } - - public String consumerName(Object variant) { - return names.computeIfAbsent(variant, TestBase::name); - } - } - - public static StreamInfo createMemoryStream(JetStreamManagement jsm, String streamName, String... subjects) throws IOException, JetStreamApiException { - if (streamName == null) { - streamName = stream(); - } - - if (subjects == null || subjects.length == 0) { - subjects = new String[]{subject()}; - } - - StreamConfiguration sc = StreamConfiguration.builder() - .name(streamName) - .storageType(StorageType.Memory) - .subjects(subjects).build(); - - return jsm.addStream(sc); - } - - public static StreamInfo createMemoryStream(Connection nc, String streamName, String... subjects) - throws IOException, JetStreamApiException { - return createMemoryStream(nc.jetStreamManagement(), streamName, subjects); - } - - public static StreamInfo createDefaultTestStream(Connection nc) throws IOException, JetStreamApiException { - return createMemoryStream(nc, STREAM, SUBJECT); - } - - public static StreamInfo createDefaultTestStream(JetStreamManagement jsm) throws IOException, JetStreamApiException { - return createMemoryStream(jsm, STREAM, SUBJECT); - } - - public static T assertThrowsPrint(Class expectedType, Executable executable) { - T t = org.junit.jupiter.api.Assertions.assertThrows(expectedType, executable); - t.printStackTrace(); - return t; - } - // ---------------------------------------------------------------------------------------------------- // Publish / Read // ---------------------------------------------------------------------------------------------------- @@ -242,10 +127,6 @@ public static PublishAck jsPublish(JetStream js, String subject, String data) th return js.publish(NatsMessage.builder().subject(subject).data(data.getBytes(StandardCharsets.US_ASCII)).build()); } - public static PublishAck jsPublish(JetStream js) throws IOException, JetStreamApiException { - return jsPublish(js, SUBJECT, DATA); - } - public static PublishAck jsPublish(JetStream js, String subject) throws IOException, JetStreamApiException { return jsPublish(js, subject, DATA); } @@ -323,7 +204,7 @@ public void run() { try { while (keepGoing.get()) { if (jitter > 0) { - Thread.sleep(ThreadLocalRandom.current().nextLong(jitter)); + sleep(ThreadLocalRandom.current().nextLong(jitter)); } js.publish(subject, dataBytes(++dataId)); } @@ -457,7 +338,10 @@ public static void assertConfig(String stream, Long msgCount, Long firstSeq, Str } public static void assertStreamSource(MessageInfo info, String stream, int i) { - String hval = info.getHeaders().get("Nats-Stream-Source").get(0); + assertNotNull(info.getHeaders()); + List nss = info.getHeaders().get("Nats-Stream-Source"); + assertNotNull(nss); + String hval = nss.get(0); assertTrue(hval.contains(stream)); assertTrue(hval.contains("" + i)); } diff --git a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java new file mode 100644 index 000000000..e66b0e4e8 --- /dev/null +++ b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java @@ -0,0 +1,81 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.Connection; +import io.nats.client.JetStreamApiException; +import io.nats.client.api.StreamInfo; +import io.nats.client.utils.TestBase; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class JetStreamTestingContext implements AutoCloseable { + public final NatsJetStreamManagement jsm; + public final NatsJetStream js; + public final String stream; + public StreamInfo si; + + private final String subjectBase; + private final Map subjects; + private final String consumerNameBase; + private final Map consumerNames; + + public JetStreamTestingContext(Connection nc) throws JetStreamApiException, IOException { + this(nc, 1); + } + + public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStreamApiException, IOException { + this.jsm = (NatsJetStreamManagement)nc.jetStreamManagement(); + this.js = (NatsJetStream)nc.jetStream(); + stream = TestBase.random(); + subjectBase = TestBase.random(); + this.subjects = new HashMap<>(); + consumerNameBase = TestBase.random(); + this.consumerNames = new HashMap<>(); + + subjectCount = Math.max(subjectCount, 1); + String[] subjects = new String[subjectCount]; + for (int x = 0; x < subjectCount; x++) { + subjects[x] = subject(x); + } + this.si = TestBase.createMemoryStream(jsm, stream, subjects); + } + + @Override + public void close() throws Exception { + try { + jsm.deleteStream(stream); + } + catch (Exception ignore) { + } + } + + public String subject() { + return subject(0); + } + + public String subject(Object variant) { + return subjects.computeIfAbsent(variant, v -> subjectBase + "-" + v); + } + + public String consumerName() { + return consumerNameBase; + } + + public String consumerName(Object variant) { + return consumerNames.computeIfAbsent(variant, v -> consumerNameBase + "-" + v); + } +} diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index d0313e4fc..0e909f036 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -42,16 +42,16 @@ public class KeyValueTests extends JetStreamTestBase { public void testWorkflow() throws Exception { long now = ZonedDateTime.now().toEpochSecond(); - String byteKey = "key.byte" + variant(); - String stringKey = "key.string" + variant(); - String longKey = "key.long" + variant(); - String notFoundKey = "notFound" + variant(); + String byteKey = "key.byte" + random(); + String stringKey = "key.string" + random(); + String longKey = "key.long" + random(); + String notFoundKey = "notFound" + random(); String byteValue1 = "Byte Value 1"; String byteValue2 = "Byte Value 2"; String stringValue1 = "String Value 1"; String stringValue2 = "String Value 2"; - jsServer.run(TestBase::atLeast2_10, nc -> { + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { // get the kv management context KeyValueManagement kvm = nc.keyValueManagement(); nc.keyValueManagement(KeyValueOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage @@ -60,8 +60,8 @@ public void testWorkflow() throws Exception { metadata.put(META_KEY, META_VALUE); // create the bucket - String bucket = bucket(); - String desc = variant(); + String bucket = random(); + String desc = random(); KeyValueConfiguration kvc = KeyValueConfiguration.builder() .name(bucket) .description(desc) @@ -91,9 +91,20 @@ public void testWorkflow() throws Exception { // retrieve the values. all types are stored as bytes // so you can always get the bytes directly - assertEquals(byteValue1, new String(kv.get(byteKey).getValue())); - assertEquals(stringValue1, new String(kv.get(stringKey).getValue())); - assertEquals("1", new String(kv.get(longKey).getValue())); + KeyValueEntry entry = kv.get(byteKey); + assertNotNull(entry); + assertNotNull(entry.getValue()); + assertEquals(byteValue1, new String(entry.getValue())); + + entry = kv.get(stringKey); + assertNotNull(entry); + assertNotNull(entry.getValue()); + assertEquals(stringValue1, new String(entry.getValue())); + + entry = kv.get(longKey); + assertNotNull(entry); + assertNotNull(entry.getValue()); + assertEquals("1", new String(entry.getValue())); // if you know the value is not binary and can safely be read // as a UTF-8 string, the getStringValue method is ok to use @@ -130,6 +141,7 @@ public void testWorkflow() throws Exception { // let's check the bucket info status = kvm.getStatus(bucket); assertState(status, 3, 3); + //noinspection deprecation status = kvm.getBucketInfo(bucket); // coverage for deprecated assertState(status, 3, 3); @@ -159,7 +171,10 @@ public void testWorkflow() throws Exception { assertEquals(7, kv.put(longKey, 2)); // values after updates - assertEquals(byteValue2, new String(kv.get(byteKey).getValue())); + entry = kv.get(byteKey); + assertNotNull(entry); + assertNotNull(entry.getValue()); + assertEquals(byteValue2, new String(entry.getValue())); assertEquals(stringValue2, kv.get(stringKey).getValueAsString()); assertEquals(2, kv.get(longKey).getValueAsLong()); @@ -321,7 +336,9 @@ private void assertInitialStatus(KeyValueStatus status, String bucket, String de assertEquals(3, kvc.getMaxHistoryPerKey()); assertEquals(-1, status.getMaxBucketSize()); assertEquals(-1, kvc.getMaxBucketSize()); + //noinspection deprecation assertEquals(-1, status.getMaxValueSize()); // COVERAGE for deprecated + //noinspection deprecation assertEquals(-1, kvc.getMaxValueSize()); assertEquals(-1, status.getMaximumValueSize()); assertEquals(-1, kvc.getMaximumValueSize()); @@ -346,17 +363,17 @@ private void assertInitialStatus(KeyValueStatus status, String bucket, String de @Test public void testGetRevision() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) .maxHistoryPerKey(2) .build()); - String key = key(); + String key = random(); KeyValue kv = nc.keyValue(bucket); long seq1 = kv.put(key, 1); long seq2 = kv.put(key, 2); @@ -384,11 +401,11 @@ public void testGetRevision() throws Exception { @Test public void testKeys() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -474,11 +491,11 @@ private static List getKeysFromQueue(LinkedBlockingQueue q) { @Test public void testMaxHistoryPerKey() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket1 = bucket(); - String bucket2 = bucket(); + String bucket1 = random(); + String bucket2 = random(); // default maxHistoryPerKey is 1 kvm.create(KeyValueConfiguration.builder() .name(bucket1) @@ -486,7 +503,7 @@ public void testMaxHistoryPerKey() throws Exception { .build()); KeyValue kv = nc.keyValue(bucket1); - String key = key(); + String key = random(); kv.put(key, 1); kv.put(key, 2); @@ -500,7 +517,7 @@ public void testMaxHistoryPerKey() throws Exception { .storageType(StorageType.Memory) .build()); - key = key(); + key = random(); kv = nc.keyValue(bucket2); kv.put(key, 1); kv.put(key, 2); @@ -515,10 +532,10 @@ public void testMaxHistoryPerKey() throws Exception { @Test public void testCreateUpdate() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); // doesn't exist yet assertThrows(JetStreamApiException.class, () -> kvm.getStatus(bucket)); @@ -539,7 +556,7 @@ public void testCreateUpdate() throws Exception { assertEquals(0, kvs.getEntryCount()); assertEquals("JetStream", kvs.getBackingStore()); - String key = key(); + String key = random(); KeyValue kv = nc.keyValue(bucket); kv.put(key, 1); kv.put(key, 2); @@ -549,7 +566,7 @@ public void testCreateUpdate() throws Exception { assertEquals(2, history.get(0).getValueAsLong()); boolean compression = atLeast2_10(ensureRunServerInfo()); - String desc = variant(); + String desc = random(); KeyValueConfiguration kvc = KeyValueConfiguration.builder(kvs.getConfiguration()) .description(desc) .maxHistoryPerKey(3) @@ -565,6 +582,7 @@ public void testCreateUpdate() throws Exception { assertEquals(desc, kvs.getDescription()); assertEquals(3, kvs.getMaxHistoryPerKey()); assertEquals(10_000, kvs.getMaxBucketSize()); + //noinspection deprecation assertEquals(100, kvs.getMaxValueSize()); // COVERAGE for deprecated assertEquals(100, kvs.getMaximumValueSize()); assertEquals(Duration.ofHours(1), kvs.getTtl()); @@ -587,11 +605,11 @@ public void testCreateUpdate() throws Exception { @Test public void testHistoryDeletePurge() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -599,7 +617,7 @@ public void testHistoryDeletePurge() throws Exception { .build()); KeyValue kv = nc.keyValue(bucket); - String key = key(); + String key = random(); kv.put(key, "a"); kv.put(key, "b"); kv.put(key, "c"); @@ -618,11 +636,11 @@ public void testHistoryDeletePurge() throws Exception { @Test public void testAtomicDeleteAtomicPurge() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -630,7 +648,7 @@ public void testAtomicDeleteAtomicPurge() throws Exception { .build()); KeyValue kv = nc.keyValue(bucket); - String key = key(); + String key = random(); kv.put(key, "a"); kv.put(key, "b"); kv.put(key, "c"); @@ -669,17 +687,17 @@ public void testAtomicDeleteAtomicPurge() throws Exception { // Correct revision writes roll-up purge tombstone kv.purge(key, 5); - assertHistory(Arrays.asList(KeyValueOperation.PURGE), kv.history(key)); + assertHistory(Collections.singletonList(KeyValueOperation.PURGE), kv.history(key)); }); } @Test public void testPurgeDeletes() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -687,14 +705,15 @@ public void testPurgeDeletes() throws Exception { .build()); KeyValue kv = nc.keyValue(bucket); - kv.put(key(1), "a"); - kv.delete(key(1)); - kv.put(key(2), "b"); - kv.put(key(3), "c"); - kv.put(key(4), "d"); - kv.purge(key(4)); - - JetStream js = nc.jetStream(); + String keyA = random(); + String keyD = random(); + kv.put(keyA, "a"); + kv.delete(keyA); + kv.put(random(), "b"); + kv.put(random(), "c"); + kv.put(keyD, "d"); + kv.purge(keyD); + assertPurgeDeleteEntries(js, bucket, new String[]{"a", null, "b", "c", null}); // default purge deletes uses the default threshold @@ -734,11 +753,11 @@ private void assertPurgeDeleteEntries(JetStream js, String bucket, String[] expe @Test public void testCreateAndUpdate() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -747,7 +766,7 @@ public void testCreateAndUpdate() throws Exception { KeyValue kv = nc.keyValue(bucket); - String key = key(); + String key = random(); // 1. allowed to create something that does not exist long rev1 = kv.create(key, "a".getBytes()); @@ -800,7 +819,7 @@ private void assertHistory(List manualHistory, List apiHi for (int x = 0; x < apiHistory.size(); x++) { Object o = manualHistory.get(x); if (o instanceof KeyValueOperation) { - assertEquals((KeyValueOperation)o, apiHistory.get(x).getOperation()); + assertEquals(o, apiHistory.get(x).getOperation()); } else { assertKvEquals((KeyValueEntry)o, apiHistory.get(x)); @@ -816,6 +835,7 @@ private KeyValueEntry assertEntry(String bucket, String key, KeyValueOperation o assertEquals(seq, entry.getRevision()); assertEquals(0, entry.getDelta()); if (op == KeyValueOperation.PUT) { + assertNotNull(entry.getValue()); assertEquals(value, new String(entry.getValue())); } else { @@ -841,25 +861,25 @@ private void assertKvEquals(KeyValueEntry kv1, KeyValueEntry kv2) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket 1 - String bucket1 = bucket(); + String bucket1 = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket1) .storageType(StorageType.Memory) .build()); // create bucket 2 - String bucket2 = bucket(); + String bucket2 = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket2) .storageType(StorageType.Memory) .build()); - createMemoryStream(nc, stream(1)); - createMemoryStream(nc, stream(2)); + createMemoryStream(nc, random()); + createMemoryStream(nc, random()); List infos = kvm.getStatuses(); assertEquals(2, infos.size()); @@ -1000,7 +1020,7 @@ public void testWatch() throws Exception { List allKeys = Arrays.asList(TEST_WATCH_KEY_1, TEST_WATCH_KEY_2, TEST_WATCH_KEY_NULL); - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { _testWatch(nc, key1FullWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1FullWatcher, key1FullWatcher.watchOptions)); _testWatch(nc, key1MetaWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1MetaWatcher, key1MetaWatcher.watchOptions)); _testWatch(nc, key1StartNewWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartNewWatcher, key1StartNewWatcher.watchOptions)); @@ -1037,7 +1057,7 @@ public void testWatch() throws Exception { private void _testWatch(Connection nc, TestKeyValueWatcher watcher, Object[] expectedKves, long fromRevision, TestWatchSubSupplier supplier) throws Exception { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = variant() + watcher.name + "Bucket"; + String bucket = random() + watcher.name + "Bucket"; kvm.create(KeyValueConfiguration.builder() .name(bucket) .maxHistoryPerKey(10) @@ -1085,6 +1105,7 @@ private void _testWatch(Connection nc, TestKeyValueWatcher watcher, Object[] exp if (!watcher.metaOnly) { List names = nc.jetStreamManagement().getConsumerNames("KV_" + bucket); assertEquals(1, names.size()); + assertNotNull(watcher.getConsumerNamePrefix()); assertTrue(names.get(0).startsWith(watcher.getConsumerNamePrefix())); } @@ -1165,11 +1186,11 @@ public void testWithAccount() throws Exception { KeyValueManagement kvmUserIBcktA = connUserI.keyValueManagement(jsOpt_UserI_BucketA_WithPrefix); KeyValueManagement kvmUserIBcktI = connUserI.keyValueManagement(jsOpt_UserI_BucketI_WithPrefix); - String bucketA = bucket(); + String bucketA = random(); KeyValueConfiguration kvcA = KeyValueConfiguration.builder() .name(bucketA).storageType(StorageType.Memory).maxHistoryPerKey(64).build(); - String bucketI = bucket(); + String bucketI = random(); KeyValueConfiguration kvcI = KeyValueConfiguration.builder() .name(bucketI).storageType(StorageType.Memory).maxHistoryPerKey(64).build(); @@ -1207,23 +1228,27 @@ public void testWithAccount() throws Exception { kv_connI_bucketA.watchAll(watcher_connI_BucketA); kv_connI_bucketI.watchAll(watcher_connI_BucketI); + String key11 = random(); + String key12 = random(); + String key21 = random(); + String key22 = random(); // bucket a from user a: AA, check AA, IA - assertKveAccount(kv_connA_bucketA, key(11), kv_connA_bucketA, kv_connI_bucketA); + assertKveAccount(kv_connA_bucketA, key11, kv_connA_bucketA, kv_connI_bucketA); // bucket a from user i: IA, check AA, IA - assertKveAccount(kv_connI_bucketA, key(12), kv_connA_bucketA, kv_connI_bucketA); + assertKveAccount(kv_connI_bucketA, key12, kv_connA_bucketA, kv_connI_bucketA); // bucket i from user a: AI, check AI, II - assertKveAccount(kv_connA_bucketI, key(21), kv_connA_bucketI, kv_connI_bucketI); + assertKveAccount(kv_connA_bucketI, key21, kv_connA_bucketI, kv_connI_bucketI); // bucket i from user i: II, check AI, II - assertKveAccount(kv_connI_bucketI, key(22), kv_connA_bucketI, kv_connI_bucketI); + assertKveAccount(kv_connI_bucketI, key22, kv_connA_bucketI, kv_connI_bucketI); // check keys from each kv - assertKvAccountKeys(kv_connA_bucketA.keys(), key(11), key(12)); - assertKvAccountKeys(kv_connI_bucketA.keys(), key(11), key(12)); - assertKvAccountKeys(kv_connA_bucketI.keys(), key(21), key(22)); - assertKvAccountKeys(kv_connI_bucketI.keys(), key(21), key(22)); + assertKvAccountKeys(kv_connA_bucketA.keys(), key11, key12); + assertKvAccountKeys(kv_connI_bucketA.keys(), key11, key12); + assertKvAccountKeys(kv_connA_bucketI.keys(), key21, key22); + assertKvAccountKeys(kv_connI_bucketI.keys(), key21, key22); Object[] expecteds = new Object[]{ data(0), data(1), KeyValueOperation.DELETE, KeyValueOperation.PURGE, data(2), @@ -1300,13 +1325,15 @@ private void assertKveAccountGet(KeyValue kvUserA, KeyValue kvUserI, String key, @SuppressWarnings({"SimplifiableAssertion", "ConstantConditions", "EqualsWithItself"}) @Test public void testCoverBucketAndKey() { - NatsKeyValueUtil.BucketAndKey bak1 = new NatsKeyValueUtil.BucketAndKey(DOT + BUCKET + DOT + KEY); - NatsKeyValueUtil.BucketAndKey bak2 = new NatsKeyValueUtil.BucketAndKey(DOT + BUCKET + DOT + KEY); - NatsKeyValueUtil.BucketAndKey bak3 = new NatsKeyValueUtil.BucketAndKey(DOT + bucket(1) + DOT + KEY); - NatsKeyValueUtil.BucketAndKey bak4 = new NatsKeyValueUtil.BucketAndKey(DOT + BUCKET + DOT + key(1)); - - assertEquals(BUCKET, bak1.bucket); - assertEquals(KEY, bak1.key); + String bucket = random(); + String key = random(); + NatsKeyValueUtil.BucketAndKey bak1 = new NatsKeyValueUtil.BucketAndKey(DOT + bucket + DOT + key); + NatsKeyValueUtil.BucketAndKey bak2 = new NatsKeyValueUtil.BucketAndKey(DOT + bucket + DOT + key); + NatsKeyValueUtil.BucketAndKey bak3 = new NatsKeyValueUtil.BucketAndKey(DOT + random() + DOT + key); + NatsKeyValueUtil.BucketAndKey bak4 = new NatsKeyValueUtil.BucketAndKey(DOT + bucket + DOT + random()); + + assertEquals(bucket, bak1.bucket); + assertEquals(key, bak1.key); assertEquals(bak1, bak1); assertEquals(bak1, bak2); assertEquals(bak2, bak1); @@ -1330,18 +1357,18 @@ public void testCoverPrefix() { @Test public void testKeyValueEntryEqualsImpl() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket 1 - String bucket1 = bucket(); + String bucket1 = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket1) .storageType(StorageType.Memory) .build()); // create bucket 2 - String bucket2 = bucket(); + String bucket2 = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket2) .storageType(StorageType.Memory) @@ -1349,37 +1376,42 @@ public void testKeyValueEntryEqualsImpl() throws Exception { KeyValue kv1 = nc.keyValue(bucket1); KeyValue kv2 = nc.keyValue(bucket2); - kv1.put(key(1), "ONE"); - kv1.put(key(2), "TWO"); - kv2.put(key(1), "ONE"); + String key1 = random(); + String key2 = random(); + String key3 = random(); + kv1.put(key1, "ONE"); + kv1.put(key2, "TWO"); + kv2.put(key1, "ONE"); - KeyValueEntry kve1_1 = kv1.get(key(1)); - KeyValueEntry kve1_2 = kv1.get(key(2)); - KeyValueEntry kve2_1 = kv2.get(key(1)); + KeyValueEntry kve1_1 = kv1.get(key1); + KeyValueEntry kve1_2 = kv1.get(key2); + KeyValueEntry kve2_1 = kv2.get(key1); //noinspection EqualsWithItself assertEquals(kve1_1, kve1_1); - assertEquals(kve1_1, kv1.get(key(1))); + assertEquals(kve1_1, kv1.get(key1)); assertNotEquals(kve1_1, kve1_2); assertNotEquals(kve1_1, kve2_1); - kv1.put(key(1), "ONE-PRIME"); - assertNotEquals(kve1_1, kv1.get(key(1))); + kv1.put(key1, "ONE-PRIME"); + assertNotEquals(kve1_1, kv1.get(key1)); - kv1.put(key(9), (byte[]) null); - KeyValueEntry kve9 = kv1.get(key(9)); + kv1.put(key3, (byte[]) null); + KeyValueEntry kve9 = kv1.get(key3); assertNull(kve9.getValue()); assertNull(kve9.getValueAsString()); assertNull(kve9.getValueAsLong()); - kv1.put(key(9), new byte[0]); - kve9 = kv1.get(key(9)); + kv1.put(key3, new byte[0]); + kve9 = kv1.get(key3); assertNull(kve9.getValue()); assertNull(kve9.getValueAsString()); assertNull(kve9.getValueAsLong()); // coverage + //noinspection MisorderedAssertEqualsArguments assertNotEquals(kve1_1, null); + //noinspection MisorderedAssertEqualsArguments assertNotEquals(kve1_1, new Object()); }); } @@ -1449,11 +1481,11 @@ public void testKeyValuePurgeOptionsBuilderCoverage() { @Test public void testCreateDiscardPolicy() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket1 = bucket(); + String bucket1 = random(); KeyValueStatus status = kvm.create(KeyValueConfiguration.builder() .name(bucket1) .storageType(StorageType.Memory) @@ -1471,11 +1503,11 @@ public void testCreateDiscardPolicy() throws Exception { @Test public void testEntryCoercion() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); // create bucket - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1484,7 +1516,18 @@ public void testEntryCoercion() throws Exception { KeyValue kv = nc.keyValue(bucket); kv.put("a", "a"); KeyValueEntry kve = kv.get("a"); - assertThrows(NumberFormatException.class, kve::getValueAsLong); + assertNotNull(kve); + assertNotNull(kve.getValue()); + try { + kve.getValueAsLong(); + fail(); + } + catch (NumberFormatException nfe) { + // correct! + } + catch (Exception e) { + fail(e); + } kv.delete("a"); List list = kv.history("a"); @@ -1494,7 +1537,7 @@ public void testEntryCoercion() throws Exception { } @Test - public void testKeyResultConstruction() throws Exception { + public void testKeyResultConstruction() { KeyResult r = new KeyResult(); assertNull(r.getKey()); assertNull(r.getException()); @@ -1519,21 +1562,29 @@ public void testKeyResultConstruction() throws Exception { } @Test - public void testMirrorSourceBuilderPrefixConversion() throws Exception { - String bucket = bucket(); - String name = variant(); + public void testMirrorSourceBuilderPrefixConversion() { + String bucket = random(); + String name = random(); String kvName = "KV_" + name; KeyValueConfiguration kvc = KeyValueConfiguration.builder() .name(bucket) .mirror(Mirror.builder().name(name).build()) .build(); - assertEquals(kvName, kvc.getBackingConfig().getMirror().getName()); + StreamConfiguration sc = kvc.getBackingConfig(); + assertNotNull(sc); + Mirror mirror = sc.getMirror(); + assertNotNull(mirror); + assertEquals(kvName, mirror.getName()); kvc = KeyValueConfiguration.builder() .name(bucket) .mirror(Mirror.builder().name(kvName).build()) .build(); - assertEquals(kvName, kvc.getBackingConfig().getMirror().getName()); + sc = kvc.getBackingConfig(); + assertNotNull(sc); + mirror = sc.getMirror(); + assertNotNull(mirror); + assertEquals(kvName, mirror.getName()); Source s1 = Source.builder().name("s1").build(); Source s2 = Source.builder().name("s2").build(); @@ -1557,9 +1608,13 @@ public void testMirrorSourceBuilderPrefixConversion() throws Exception { .addSources((Collection)null) .build(); - assertEquals(6, kvc.getBackingConfig().getSources().size()); + sc = kvc.getBackingConfig(); + assertNotNull(sc); + List sources = sc.getSources(); + assertNotNull(sources); + assertEquals(6, sources.size()); List names = new ArrayList<>(); - for (Source source : kvc.getBackingConfig().getSources()) { + for (Source source : sources) { names.add(source.getName()); } assertTrue(names.contains("KV_s1")); @@ -1577,8 +1632,8 @@ public void testKeyValueMirrorCrossDomains() throws Exception { KeyValueManagement leafKvm = leaf.keyValueManagement(); // Create main KV on HUB - String hubBucket = variant(); - KeyValueStatus hubStatus = hubKvm.create(KeyValueConfiguration.builder() + String hubBucket = random(); + hubKvm.create(KeyValueConfiguration.builder() .name(hubBucket) .storageType(StorageType.Memory) .build()); @@ -1589,7 +1644,7 @@ public void testKeyValueMirrorCrossDomains() throws Exception { hubKv.put("key3", "c0"); hubKv.delete("key3"); - String leafBucket = variant(); + String leafBucket = random(); String leafStream = "KV_" + leafBucket; leafKvm.create(KeyValueConfiguration.builder() .name(leafBucket) @@ -1634,6 +1689,7 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { // Make sure we can create a watcher on the mirror KV. TestKeyValueWatcher mWatcher = new TestKeyValueWatcher("mirrorWatcher" + num, false); + //noinspection unused try (NatsKeyValueWatchSubscription mWatchSub = mkv.watchAll(mWatcher)) { sleep(200); // give the messages time to propagate } @@ -1642,6 +1698,7 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { // Does the origin data match? if (okv != null) { TestKeyValueWatcher oWatcher = new TestKeyValueWatcher("originWatcher" + num, false); + //noinspection unused try (NatsKeyValueWatchSubscription oWatchSub = okv.watchAll(oWatcher)) { sleep(200); // give the messages time to propagate } @@ -1651,10 +1708,10 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { @Test public void testKeyValueTransform() throws Exception { - jsServer.run(TestBase::atLeast2_10_3, nc -> { + runInLrServer(TestBase::atLeast2_10_3, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String kvName1 = variant(); + String kvName1 = random(); String kvName2 = kvName1 + "-mir"; String mirrorSegment = "MirrorMe"; String dontMirrorSegment = "DontMirrorMe"; @@ -1709,10 +1766,10 @@ public void testKeyValueTransform() throws Exception { @Test public void testSubjectFiltersAgainst209OptOut() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); kvm.create(KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1729,9 +1786,9 @@ public void testSubjectFiltersAgainst209OptOut() throws Exception { @Test public void testTtlAndDuplicateWindowRoundTrip() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1750,7 +1807,7 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { assertNotNull(sc.getDuplicateWindow()); assertEquals(10_000, sc.getDuplicateWindow().toMillis()); - bucket = bucket(); + bucket = random(); config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1768,9 +1825,9 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { @Test public void testConsumeKeys() throws Exception { int count = 10000; - jsServer.run(TestBase::atLeast2_10, nc -> { + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1803,9 +1860,9 @@ public void testConsumeKeys() throws Exception { @Test public void testLimitMarkerCoverage() throws Exception { - jsServer.run(TestBase::atLeast2_12, nc -> { + runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); - String bucket = bucket(); + String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -1815,7 +1872,7 @@ public void testLimitMarkerCoverage() throws Exception { assertNotNull(status.getLimitMarkerTtl()); assertEquals(1000, status.getLimitMarkerTtl().toMillis()); - String key = key(); + String key = random(); KeyValue kv = nc.keyValue(bucket); kv.create(key, dataBytes(), MessageTtl.seconds(1)); @@ -1828,7 +1885,7 @@ public void testLimitMarkerCoverage() throws Exception { assertNull(kve); config = KeyValueConfiguration.builder() - .name(bucket()) + .name(random()) .storageType(StorageType.Memory) .limitMarker(Duration.ofSeconds(2)) // coverage of duration api vs ms api .build(); @@ -1852,11 +1909,11 @@ public void testLimitMarkerCoverage() throws Exception { @Test public void testLimitMarkerBehavior() throws Exception { - jsServer.run(TestBase::atLeast2_12, nc -> { - String bucket = bucket(); - String key1 = key(); - String key2 = key(); - String key3 = key(); + runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + String bucket = random(); + String key1 = random(); + String key2 = random(); + String key3 = random(); KeyValueManagement kvm = nc.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() @@ -1893,6 +1950,7 @@ public void endOfData() { } }; + //noinspection unused NatsKeyValueWatchSubscription watch = kv.watchAll(watcher); AtomicInteger rMessages = new AtomicInteger(); @@ -1925,6 +1983,7 @@ public void endOfData() { }; Dispatcher d = nc.createDispatcher(); + //noinspection unused JetStreamSubscription sub = nc.jetStream().subscribe(null, d, rawHandler, true, PushSubscribeOptions.builder() .stream("KV_" + bucket) @@ -1967,13 +2026,11 @@ public void endOfData() { @Test public void testJustLimitMarkerCreatePurge() throws Exception { - jsServer.run(TestBase::atLeast2_12, nc -> { - - String bucket = bucket(); + runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + String bucket = random(); String rawStream = "KV_" + bucket; - String key = key(); + String key = random(); - JetStreamManagement jsm = nc.jetStreamManagement(); KeyValueManagement kvm = nc.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) @@ -2023,6 +2080,7 @@ else if (mcount == 4) { } }; + //noinspection unused JetStreamSubscription sub = nc.jetStream().subscribe(null, d, rawHandler, true, PushSubscribeOptions.builder() .stream(rawStream) @@ -2077,13 +2135,11 @@ else if (mcount == 4) { @Test public void testJustTtlForDeletePurge() throws Exception { - jsServer.run(TestBase::atLeast2_12, nc -> { - - String bucket = bucket(); + runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + String bucket = random(); String rawStream = "KV_" + bucket; - String key = key(); + String key = random(); - JetStreamManagement jsm = nc.jetStreamManagement(); KeyValueManagement kvm = nc.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) @@ -2130,6 +2186,7 @@ else if (mcount == 4) { } }; + //noinspection unused JetStreamSubscription sub = nc.jetStream().subscribe(null, d, rawHandler, true, PushSubscribeOptions.builder() .stream(rawStream) diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 96e8e7eff..a4dcd6a0b 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -37,7 +37,7 @@ public class MessageManagerTests extends JetStreamTestBase { @Test public void testConstruction() throws Exception { - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { NatsJetStreamSubscription sub = genericPushSub(nc); _pushConstruction(nc, true, true, push_hb_fc(), sub); _pushConstruction(nc, true, false, push_hb_xfc(), sub); @@ -51,9 +51,9 @@ private void tf(Consumer c) { } } - private void _pushConstruction(Connection conn, boolean hb, boolean fc, SubscribeOptions so, NatsJetStreamSubscription sub) { + private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeOptions so, NatsJetStreamSubscription sub) { tf(ordered -> tf(syncMode -> tf(queueMode -> { - PushMessageManager manager = getPushManager(conn, so, sub, ordered, syncMode, queueMode); + PushMessageManager manager = getPushManager(nc, so, sub, ordered, syncMode, queueMode); assertEquals(syncMode, manager.isSyncMode()); assertEquals(queueMode, manager.isQueueMode()); if (queueMode) { @@ -136,12 +136,13 @@ public void testPullBeforeQueueProcessorAndManage() throws Exception { runInJsServer(listener, nc -> { NatsJetStreamSubscription sub = genericPullSub(nc); + String pullSubject = random(); PullMessageManager pullMgr = getPullManager(nc, sub, true); - pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).build(), true, null); + pullMgr.startPullRequest(pullSubject, PullRequestOptions.builder(1).build(), true, null); testPullBqpAndManage(sub, listener, pullMgr); pullMgr = getPullManager(nc, sub, true); - pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build(), true, null); + pullMgr.startPullRequest(pullSubject, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build(), true, null); testPullBqpAndManage(sub, listener, pullMgr); }); } @@ -246,6 +247,7 @@ public void testPushManagerHeartbeats() throws Exception { @Test public void testPullManagerHeartbeats() throws Exception { ListenerForTesting listener = new ListenerForTesting(); + Options.Builder builder = new Options.Builder().errorListener(listener); runInJsServer(listener, nc -> { PullMessageManager pullMgr = getPullManager(nc, null, true); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pullMgr); @@ -386,14 +388,10 @@ private void _push_xfc(SubscribeOptions so) { @Test public void test_received_time() throws Exception { - runInJsServer(nc -> { - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - _received_time_yes(push_hb_fc(), js, tsc.subject()); - _received_time_yes(push_hb_xfc(), js, tsc.subject()); - _received_time_no(js, jsm, tsc.stream, tsc.subject(), js.subscribe(tsc.subject(), push_xhb_xfc())); + runInLrServer((nc, jstc) -> { + _received_time_yes(push_hb_fc(), jstc.js, jstc.subject()); + _received_time_yes(push_hb_xfc(), jstc.js, jstc.subject()); + _received_time_no(jstc.js, jstc.jsm, jstc.stream, jstc.subject(), jstc.js.subscribe(jstc.subject(), push_xhb_xfc())); }); } @@ -429,7 +427,7 @@ private void _received_time_no(JetStream js, JetStreamManagement jsm, String str @Test public void test_hb_yes_settings() throws Exception { - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { NatsJetStreamSubscription sub = genericPushSub(nc); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(1000).build(); @@ -462,7 +460,7 @@ public void test_hb_yes_settings() throws Exception { @Test public void test_hb_no_settings() throws Exception { - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { NatsJetStreamSubscription sub = genericPushSub(nc); SubscribeOptions so = push_xhb_xfc(); PushMessageManager manager = getPushManager(nc, so, sub, false); @@ -576,7 +574,7 @@ static class MockPublishInternal extends NatsConnection { String fcSubject; public MockPublishInternal() { - this(new Options.Builder().errorListener(new ErrorListener() {}).build()); + this(new Options.Builder().errorListener(NO_OP_EL).build()); } public MockPublishInternal(Options options) { @@ -605,8 +603,8 @@ private static NatsJetStreamSubscription genericPullSub(Connection nc) throws IO private static String genericSub(Connection nc) throws IOException, JetStreamApiException { String id = "-" + ID.incrementAndGet() + "-" + System.currentTimeMillis(); - String stream = STREAM + id; - String subject = STREAM + id; + String stream = random() + id; + String subject = random() + id; createMemoryStream(nc, stream, subject); return subject; } diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index e12af837f..ad5bacdf5 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -15,13 +15,15 @@ import io.nats.client.NatsTestServer; import io.nats.client.Options; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.TestBase.standardOptions; +import static io.nats.client.utils.TestBase.standardOptionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,16 +33,16 @@ public class NatsConnectionImplTests { public void testConnectionClosedProperly() throws Exception { try (NatsTestServer server = new NatsTestServer()) { Options options = standardOptions(server.getNatsLocalhostUri()); - verifyInternalExecutors(options, (NatsConnection)standardConnection(options)); + verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); // using the same options to demonstrate the executors came // from the internal factory and were not reused - verifyInternalExecutors(options, (NatsConnection)standardConnection(options)); + verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); // using options copied from options to demonstrate the executors // came from the internal factory and were not reused options = new Options.Builder(options).build(); - verifyInternalExecutors(options, (NatsConnection)standardConnection(options)); + verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); ExecutorService es = Executors.newFixedThreadPool(3); ScheduledExecutorService ses = Executors.newScheduledThreadPool(3); @@ -51,10 +53,10 @@ public void testConnectionClosedProperly() throws Exception { .executor(es) .scheduledExecutor(ses) .build(); - verifyExternalExecutors(options, (NatsConnection)standardConnection(options)); + verifyExternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); // same options just because - verifyExternalExecutors(options, (NatsConnection)standardConnection(options)); + verifyExternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); es.shutdown(); ses.shutdown(); diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index fe924de3f..864fc0455 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -1,392 +1,392 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client.impl; - -import io.nats.client.*; -import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.support.IncomingHeadersProcessor; -import org.junit.jupiter.api.Test; - -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.List; - -import static io.nats.client.support.NatsConstants.OP_PING; -import static io.nats.client.support.NatsConstants.OP_PING_BYTES; -import static io.nats.client.utils.ResourceUtils.dataAsLines; -import static org.junit.jupiter.api.Assertions.*; - -public class NatsMessageTests extends JetStreamTestBase { - @Test - public void testProtocolMessage() { - NatsMessage msg = new ProtocolMessage(OP_PING_BYTES); - assertEquals(msg.getProtocolBytes().length + 2, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(OP_PING_BYTES.length + 2, msg.getSizeInBytes(), "Size is correct"); - assertTrue(msg.toString().endsWith(OP_PING)); // toString COVERAGE - assertEquals(0, msg.copyNotEmptyHeaders(0, new byte[0])); // coverage for copyNotEmptyHeaders which is a no-op - } - - @Test - public void testSizeOnPublishMessage() { - byte[] body = new byte[10]; - String subject = "subj"; - String replyTo = "reply"; - String protocol = "PUB " + subject + " " + replyTo + " " + body.length; - - NatsMessage msg = new NatsMessage(subject, replyTo, body); - - assertEquals(msg.getProtocolBytes().length + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + body.length + 4, msg.getSizeInBytes(), "Size is correct"); - - msg = new NatsMessage(subject, replyTo, body); - - assertEquals(msg.getProtocolBytes().length + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + body.length + 4, msg.getSizeInBytes(), "Size is correct"); - } - - @Test - public void testSizeOnPublishMessageWithHeaders() { - Headers headers = new Headers().add("Content-Type", "text/plain"); - byte[] body = new byte[10]; - String subject = "subj"; - String replyTo = "reply"; - String protocol = "HPUB " + subject + " " + replyTo + " " + headers.serializedLength() + " " + (headers.serializedLength() + body.length); - - NatsMessage msg = new NatsMessage(subject, replyTo, headers, body); - - assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is correct"); - - msg = new NatsMessage(subject, replyTo, headers, body); - - assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is correct"); - } - - @Test - public void testSizeOnPublishMessageOnlyHeaders() { - Headers headers = new Headers().add("Content-Type", "text/plain"); - String subject = "subj"; - String replyTo = "reply"; - String protocol = "HPUB " + subject + " " + replyTo + " " + headers.serializedLength() + " " + headers.serializedLength(); - - NatsMessage msg = new NatsMessage(subject, replyTo, headers, null); - - assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is correct"); - - msg = new NatsMessage(subject, replyTo, headers, null); - - assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is correct"); - } - - @Test - public void testSizeOnPublishMessageOnlySubject() { - String subject = "subj"; - String replyTo = "reply"; - String protocol = "PUB " + subject + " " + replyTo + " " + 0; - - NatsMessage msg = new NatsMessage(subject, replyTo, null, null); - - assertEquals(msg.getProtocolBytes().length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + 4, msg.getSizeInBytes(), "Size is correct"); - - msg = new NatsMessage(subject, replyTo, null, null); - - assertEquals(msg.getProtocolBytes().length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); - assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + 4, msg.getSizeInBytes(), "Size is correct"); - } - - @Test - public void testCustomMaxControlLine() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] body = new byte[10]; - String subject = "subject"; - int maxControlLine = 1024; - - while (subject.length() <= maxControlLine) { - subject += subject; - } - - try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - maxControlLine(maxControlLine). - build(); - Connection nc = Nats.connect(options); - standardConnectionWait(nc); - nc.request(subject, body); - } - }); - } - - @Test - public void testBigProtocolLineWithoutBody() { - assertThrows(IllegalArgumentException.class, () -> { - String subject = "subject"; - - while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { - subject += subject; - } - - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - nc.subscribe(subject); - } - }); - } - - @Test - public void testBigProtocolLineWithBody() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] body = new byte[10]; - String subject = "subject"; - String replyTo = "reply"; - - while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { - subject += subject; - } - - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - standardConnectionWait(nc); - nc.publish(subject, replyTo, body); - } - }); - } - - - @Test - public void notJetStream() throws Exception { - NatsMessage m = testMessage(); - m.ack(); - m.ackSync(Duration.ZERO); - m.nak(); - m.nakWithDelay(Duration.ZERO); - m.nakWithDelay(0); - m.inProgress(); - m.term(); - assertThrows(IllegalStateException.class, m::metaData); - } - - @Test - public void miscCoverage() { - //noinspection deprecation - NatsMessage m = NatsMessage.builder() - .subject("test").replyTo("reply").utf8mode(true) - .data("data", StandardCharsets.US_ASCII) - .build(); - assertFalse(m.hasHeaders()); - assertFalse(m.isJetStream()); - assertFalse(m.isStatusMessage()); - assertNotNull(m.toString()); - assertNotNull(m.toDetailString()); - assertFalse(m.isProtocol()); - assertFalse(m.isProtocolFilterOnStop()); - - m = NatsMessage.builder() - .subject("test").replyTo("reply") - .data("very long data to string truncates with dot dot dot", StandardCharsets.US_ASCII) - .build(); - assertNotNull(m.toString()); - assertTrue(m.toString().contains("...")); - - // no reply to, no data - m = NatsMessage.builder().subject("test").build(); - assertNotNull(m.toString()); - assertNotNull(m.toDetailString()); - - // no reply to, no empty data - m = NatsMessage.builder().subject("test").data(new byte[0]).build(); - assertNotNull(m.toString()); - assertNotNull(m.toDetailString()); - - // no reply to, no empty data - m = NatsMessage.builder().subject("test").data((byte[])null).build(); - assertNotNull(m.toString()); - assertNotNull(m.toDetailString()); - - // no reply to, no empty data - m = NatsMessage.builder().subject("test").data((String)null).build(); - assertNotNull(m.toString()); - assertNotNull(m.toDetailString()); - - List data = dataAsLines("utf8-test-strings.txt"); - for (String d : data) { - Message m1 = NatsMessage.builder().subject("test").data(d).build(); - Message m2 = NatsMessage.builder().subject("test").data(d, StandardCharsets.UTF_8).build(); - assertByteArraysEqual(m1.getData(), m2.getData()); - } - - m = testMessage(); - assertTrue(m.hasHeaders()); - assertNotNull(m.getHeaders()); - assertFalse(m.isUtf8mode()); // coverage, ALWAYS FALSE SINCE DISUSED - assertFalse(m.getHeaders().isEmpty()); - assertNull(m.getSubscription()); - assertNull(m.getNatsSubscription()); - assertNull(m.getConnection()); - assertEquals(23, m.getControlLineLength()); - assertNotNull(m.toDetailString()); // COVERAGE - - m.headers = null; // we can do this because we have package access - assertFalse(m.hasHeaders()); - assertNull(m.getHeaders()); - assertNotNull(m.toString()); // COVERAGE - - ProtocolMessage pmFilterOnStop = new ProtocolMessage(new byte[0]); - ProtocolMessage pmNotFilterOnStop = new ProtocolMessage(pmFilterOnStop.getProtocolBab(), false); - - validateProto(pmFilterOnStop, true); - validateProto(pmNotFilterOnStop, false); - - // retains filter on stop - validateProto(new ProtocolMessage(pmFilterOnStop), true); - validateProto(new ProtocolMessage(pmNotFilterOnStop), false); - - // sets filter on stop - validateProto(new ProtocolMessage(pmFilterOnStop.getProtocolBab(), true), true); - validateProto(new ProtocolMessage(pmFilterOnStop.getProtocolBab(), false), false); - validateProto(new ProtocolMessage(pmNotFilterOnStop.getProtocolBab(), true), true); - validateProto(new ProtocolMessage(pmNotFilterOnStop.getProtocolBab(), false), false); - - IncomingMessage scm = new IncomingMessage() {}; - assertEquals(0, scm.getSizeInBytes()); - assertThrows(IllegalStateException.class, scm::getProtocolBab); - assertThrows(IllegalStateException.class, scm::getProtocolBytes); - assertThrows(IllegalStateException.class, scm::getControlLineLength); - assertFalse(scm.isProtocol()); - assertFalse(scm.isProtocolFilterOnStop()); - - // coverage coverage coverage - //noinspection deprecation - NatsMessage nmCov = new NatsMessage("sub", "reply", null, true); - nmCov.calculate(); - - assertTrue(nmCov.toDetailString().contains("PUB sub reply 0")); - } - - private static void validateProto(ProtocolMessage pm, boolean isProtocolFilterOnStop) { - assertNotNull(pm.getProtocolBab()); - assertEquals(0, pm.getProtocolBab().length()); - assertEquals(2, pm.getSizeInBytes()); - assertEquals(2, pm.getControlLineLength()); - assertTrue(pm.isProtocol()); - assertEquals(isProtocolFilterOnStop, pm.isProtocolFilterOnStop()); - } - - @Test - public void constructorWithMessage() { - NatsMessage m = testMessage(); - - NatsMessage copy = new NatsMessage(m); - assertEquals(m.getSubject(), copy.getSubject()); - assertEquals(m.getReplyTo(), copy.getReplyTo()); - assertEquals(m.getData(), copy.getData()); - assertEquals(m.getSubject(), copy.getSubject()); - assertEquals(m.getSubject(), copy.getSubject()); - } - - @Test - public void testFactoryProducesStatusMessage() { - IncomingHeadersProcessor incomingHeadersProcessor = - new IncomingHeadersProcessor("NATS/1.0 503 No Responders\r\n".getBytes()); - IncomingMessageFactory factory = - new IncomingMessageFactory("sid", "subj", "replyTo", 0, false); - factory.setHeaders(incomingHeadersProcessor); - factory.setData(null); // coverage - - Message m = factory.getMessage(); - assertTrue(m.isStatusMessage()); - assertNotNull(m.getStatus()); - assertEquals(503, m.getStatus().getCode()); - assertNotNull(m.getStatus().toString()); - StatusMessage sm = (StatusMessage)m; - assertNotNull(sm.toString()); - } - - private NatsMessage testMessage() { - Headers h = new Headers(); - h.add("key", "value"); - - return NatsMessage.builder() - .subject("test").replyTo("reply").headers(h) - .data("data", StandardCharsets.US_ASCII) - .build(); - } - - @Test - public void testHeadersMutableBeforePublish() throws Exception { - jsServer.run(connection -> { - String subject = subject(); - Subscription sub = connection.subscribe(subject); - - Headers h = new Headers(); - h.put("one", "A"); - Message m = new NatsMessage(subject, null, h, null); - connection.publish(m); - Message incoming = sub.nextMessage(1000); - assertEquals(1, incoming.getHeaders().size()); - - // headers are no longer copied, just referenced - // so this will affect the message which is the same - // as the local copy - h.put("two", "B"); - connection.publish(m); - incoming = sub.nextMessage(1000); - assertEquals(2, incoming.getHeaders().size()); - - // also if you get the headers from the message - m.getHeaders().put("three", "C"); - connection.publish(m); - incoming = sub.nextMessage(1000); - assertEquals(3, incoming.getHeaders().size()); - }); - } - - @Test - public void testNatsPublishableMessageHeadersCoverage() { - byte[] data = new byte[0]; - - NatsPublishableMessage npm = new NatsPublishableMessage("subject", "replyTo", null, data, false, false); - assertFalse(npm.hasHeaders); - assertNull(npm.getHeaders()); - - Headers h = new Headers(); - assertTrue(h.isEmpty()); - assertFalse(h.isReadOnly()); - npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); - assertFalse(npm.hasHeaders); - assertNull(npm.getHeaders()); - - h.put("foo", "bar"); - assertFalse(h.isEmpty()); - assertFalse(h.isReadOnly()); - npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); - assertTrue(npm.hasHeaders); - assertFalse(npm.getHeaders().isEmpty()); - assertTrue(npm.getHeaders().isReadOnly()); - - h = new Headers(h, true); - assertFalse(h.isEmpty()); - assertTrue(h.isReadOnly()); - npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); - assertTrue(npm.hasHeaders); - assertFalse(npm.getHeaders().isEmpty()); - assertTrue(npm.getHeaders().isReadOnly()); - } +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.*; +import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.support.IncomingHeadersProcessor; +import org.junit.jupiter.api.Test; + +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.List; + +import static io.nats.client.support.NatsConstants.OP_PING; +import static io.nats.client.support.NatsConstants.OP_PING_BYTES; +import static io.nats.client.utils.ResourceUtils.dataAsLines; +import static org.junit.jupiter.api.Assertions.*; + +public class NatsMessageTests extends JetStreamTestBase { + @Test + public void testProtocolMessage() { + NatsMessage msg = new ProtocolMessage(OP_PING_BYTES); + assertEquals(msg.getProtocolBytes().length + 2, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(OP_PING_BYTES.length + 2, msg.getSizeInBytes(), "Size is correct"); + assertTrue(msg.toString().endsWith(OP_PING)); // toString COVERAGE + assertEquals(0, msg.copyNotEmptyHeaders(0, new byte[0])); // coverage for copyNotEmptyHeaders which is a no-op + } + + @Test + public void testSizeOnPublishMessage() { + byte[] body = new byte[10]; + String subject = "subj"; + String replyTo = "reply"; + String protocol = "PUB " + subject + " " + replyTo + " " + body.length; + + NatsMessage msg = new NatsMessage(subject, replyTo, body); + + assertEquals(msg.getProtocolBytes().length + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + body.length + 4, msg.getSizeInBytes(), "Size is correct"); + + msg = new NatsMessage(subject, replyTo, body); + + assertEquals(msg.getProtocolBytes().length + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + body.length + 4, msg.getSizeInBytes(), "Size is correct"); + } + + @Test + public void testSizeOnPublishMessageWithHeaders() { + Headers headers = new Headers().add("Content-Type", "text/plain"); + byte[] body = new byte[10]; + String subject = "subj"; + String replyTo = "reply"; + String protocol = "HPUB " + subject + " " + replyTo + " " + headers.serializedLength() + " " + (headers.serializedLength() + body.length); + + NatsMessage msg = new NatsMessage(subject, replyTo, headers, body); + + assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is correct"); + + msg = new NatsMessage(subject, replyTo, headers, body); + + assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + headers.serializedLength() + body.length + 4, msg.getSizeInBytes(), "Size is correct"); + } + + @Test + public void testSizeOnPublishMessageOnlyHeaders() { + Headers headers = new Headers().add("Content-Type", "text/plain"); + String subject = "subj"; + String replyTo = "reply"; + String protocol = "HPUB " + subject + " " + replyTo + " " + headers.serializedLength() + " " + headers.serializedLength(); + + NatsMessage msg = new NatsMessage(subject, replyTo, headers, null); + + assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is correct"); + + msg = new NatsMessage(subject, replyTo, headers, null); + + assertEquals(msg.getProtocolBytes().length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + headers.serializedLength() + 4, msg.getSizeInBytes(), "Size is correct"); + } + + @Test + public void testSizeOnPublishMessageOnlySubject() { + String subject = "subj"; + String replyTo = "reply"; + String protocol = "PUB " + subject + " " + replyTo + " " + 0; + + NatsMessage msg = new NatsMessage(subject, replyTo, null, null); + + assertEquals(msg.getProtocolBytes().length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.US_ASCII).length + 4, msg.getSizeInBytes(), "Size is correct"); + + msg = new NatsMessage(subject, replyTo, null, null); + + assertEquals(msg.getProtocolBytes().length + 4, msg.getSizeInBytes(), "Size is set, with CRLF"); + assertEquals(protocol.getBytes(StandardCharsets.UTF_8).length + 4, msg.getSizeInBytes(), "Size is correct"); + } + + @Test + public void testCustomMaxControlLine() { + assertThrows(IllegalArgumentException.class, () -> { + byte[] body = new byte[10]; + String subject = "subject"; + int maxControlLine = 1024; + + while (subject.length() <= maxControlLine) { + subject += subject; + } + + try (NatsTestServer ts = new NatsTestServer()) { + Options options = new Options.Builder(). + server(ts.getURI()). + maxReconnects(0). + maxControlLine(maxControlLine). + build(); + Connection nc = Nats.connect(options); + standardConnectionWait(nc); + nc.request(subject, body); + } + }); + } + + @Test + public void testBigProtocolLineWithoutBody() { + assertThrows(IllegalArgumentException.class, () -> { + String subject = "subject"; + + while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { + subject += subject; + } + + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { + standardConnectionWait(nc); + nc.subscribe(subject); + } + }); + } + + @Test + public void testBigProtocolLineWithBody() { + assertThrows(IllegalArgumentException.class, () -> { + byte[] body = new byte[10]; + String subject = "subject"; + String replyTo = "reply"; + + while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { + subject += subject; + } + + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { + standardConnectionWait(nc); + nc.publish(subject, replyTo, body); + } + }); + } + + + @Test + public void notJetStream() throws Exception { + NatsMessage m = testMessage(); + m.ack(); + m.ackSync(Duration.ZERO); + m.nak(); + m.nakWithDelay(Duration.ZERO); + m.nakWithDelay(0); + m.inProgress(); + m.term(); + assertThrows(IllegalStateException.class, m::metaData); + } + + @Test + public void miscCoverage() { + //noinspection deprecation + NatsMessage m = NatsMessage.builder() + .subject("test").replyTo("reply").utf8mode(true) + .data("data", StandardCharsets.US_ASCII) + .build(); + assertFalse(m.hasHeaders()); + assertFalse(m.isJetStream()); + assertFalse(m.isStatusMessage()); + assertNotNull(m.toString()); + assertNotNull(m.toDetailString()); + assertFalse(m.isProtocol()); + assertFalse(m.isProtocolFilterOnStop()); + + m = NatsMessage.builder() + .subject("test").replyTo("reply") + .data("very long data to string truncates with dot dot dot", StandardCharsets.US_ASCII) + .build(); + assertNotNull(m.toString()); + assertTrue(m.toString().contains("...")); + + // no reply to, no data + m = NatsMessage.builder().subject("test").build(); + assertNotNull(m.toString()); + assertNotNull(m.toDetailString()); + + // no reply to, no empty data + m = NatsMessage.builder().subject("test").data(new byte[0]).build(); + assertNotNull(m.toString()); + assertNotNull(m.toDetailString()); + + // no reply to, no empty data + m = NatsMessage.builder().subject("test").data((byte[])null).build(); + assertNotNull(m.toString()); + assertNotNull(m.toDetailString()); + + // no reply to, no empty data + m = NatsMessage.builder().subject("test").data((String)null).build(); + assertNotNull(m.toString()); + assertNotNull(m.toDetailString()); + + List data = dataAsLines("utf8-test-strings.txt"); + for (String d : data) { + Message m1 = NatsMessage.builder().subject("test").data(d).build(); + Message m2 = NatsMessage.builder().subject("test").data(d, StandardCharsets.UTF_8).build(); + assertByteArraysEqual(m1.getData(), m2.getData()); + } + + m = testMessage(); + assertTrue(m.hasHeaders()); + assertNotNull(m.getHeaders()); + assertFalse(m.isUtf8mode()); // coverage, ALWAYS FALSE SINCE DISUSED + assertFalse(m.getHeaders().isEmpty()); + assertNull(m.getSubscription()); + assertNull(m.getNatsSubscription()); + assertNull(m.getConnection()); + assertEquals(23, m.getControlLineLength()); + assertNotNull(m.toDetailString()); // COVERAGE + + m.headers = null; // we can do this because we have package access + assertFalse(m.hasHeaders()); + assertNull(m.getHeaders()); + assertNotNull(m.toString()); // COVERAGE + + ProtocolMessage pmFilterOnStop = new ProtocolMessage(new byte[0]); + ProtocolMessage pmNotFilterOnStop = new ProtocolMessage(pmFilterOnStop.getProtocolBab(), false); + + validateProto(pmFilterOnStop, true); + validateProto(pmNotFilterOnStop, false); + + // retains filter on stop + validateProto(new ProtocolMessage(pmFilterOnStop), true); + validateProto(new ProtocolMessage(pmNotFilterOnStop), false); + + // sets filter on stop + validateProto(new ProtocolMessage(pmFilterOnStop.getProtocolBab(), true), true); + validateProto(new ProtocolMessage(pmFilterOnStop.getProtocolBab(), false), false); + validateProto(new ProtocolMessage(pmNotFilterOnStop.getProtocolBab(), true), true); + validateProto(new ProtocolMessage(pmNotFilterOnStop.getProtocolBab(), false), false); + + IncomingMessage scm = new IncomingMessage() {}; + assertEquals(0, scm.getSizeInBytes()); + assertThrows(IllegalStateException.class, scm::getProtocolBab); + assertThrows(IllegalStateException.class, scm::getProtocolBytes); + assertThrows(IllegalStateException.class, scm::getControlLineLength); + assertFalse(scm.isProtocol()); + assertFalse(scm.isProtocolFilterOnStop()); + + // coverage coverage coverage + //noinspection deprecation + NatsMessage nmCov = new NatsMessage("sub", "reply", null, true); + nmCov.calculate(); + + assertTrue(nmCov.toDetailString().contains("PUB sub reply 0")); + } + + private static void validateProto(ProtocolMessage pm, boolean isProtocolFilterOnStop) { + assertNotNull(pm.getProtocolBab()); + assertEquals(0, pm.getProtocolBab().length()); + assertEquals(2, pm.getSizeInBytes()); + assertEquals(2, pm.getControlLineLength()); + assertTrue(pm.isProtocol()); + assertEquals(isProtocolFilterOnStop, pm.isProtocolFilterOnStop()); + } + + @Test + public void constructorWithMessage() { + NatsMessage m = testMessage(); + + NatsMessage copy = new NatsMessage(m); + assertEquals(m.getSubject(), copy.getSubject()); + assertEquals(m.getReplyTo(), copy.getReplyTo()); + assertEquals(m.getData(), copy.getData()); + assertEquals(m.getSubject(), copy.getSubject()); + assertEquals(m.getSubject(), copy.getSubject()); + } + + @Test + public void testFactoryProducesStatusMessage() { + IncomingHeadersProcessor incomingHeadersProcessor = + new IncomingHeadersProcessor("NATS/1.0 503 No Responders\r\n".getBytes()); + IncomingMessageFactory factory = + new IncomingMessageFactory("sid", "subj", "replyTo", 0, false); + factory.setHeaders(incomingHeadersProcessor); + factory.setData(null); // coverage + + Message m = factory.getMessage(); + assertTrue(m.isStatusMessage()); + assertNotNull(m.getStatus()); + assertEquals(503, m.getStatus().getCode()); + assertNotNull(m.getStatus().toString()); + StatusMessage sm = (StatusMessage)m; + assertNotNull(sm.toString()); + } + + private NatsMessage testMessage() { + Headers h = new Headers(); + h.add("key", "value"); + + return NatsMessage.builder() + .subject("test").replyTo("reply").headers(h) + .data("data", StandardCharsets.US_ASCII) + .build(); + } + + @Test + public void testHeadersMutableBeforePublish() throws Exception { + runInLrServer(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); + + Headers h = new Headers(); + h.put("one", "A"); + Message m = new NatsMessage(subject, null, h, null); + nc.publish(m); + Message incoming = sub.nextMessage(1000); + assertEquals(1, incoming.getHeaders().size()); + + // headers are no longer copied, just referenced + // so this will affect the message which is the same + // as the local copy + h.put("two", "B"); + nc.publish(m); + incoming = sub.nextMessage(1000); + assertEquals(2, incoming.getHeaders().size()); + + // also if you get the headers from the message + m.getHeaders().put("three", "C"); + nc.publish(m); + incoming = sub.nextMessage(1000); + assertEquals(3, incoming.getHeaders().size()); + }); + } + + @Test + public void testNatsPublishableMessageHeadersCoverage() { + byte[] data = new byte[0]; + + NatsPublishableMessage npm = new NatsPublishableMessage("subject", "replyTo", null, data, false, false); + assertFalse(npm.hasHeaders); + assertNull(npm.getHeaders()); + + Headers h = new Headers(); + assertTrue(h.isEmpty()); + assertFalse(h.isReadOnly()); + npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); + assertFalse(npm.hasHeaders); + assertNull(npm.getHeaders()); + + h.put("foo", "bar"); + assertFalse(h.isEmpty()); + assertFalse(h.isReadOnly()); + npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); + assertTrue(npm.hasHeaders); + assertFalse(npm.getHeaders().isEmpty()); + assertTrue(npm.getHeaders().isReadOnly()); + + h = new Headers(h, true); + assertFalse(h.isEmpty()); + assertTrue(h.isReadOnly()); + npm = new NatsPublishableMessage("subject", "replyTo", h, data, false, false); + assertTrue(npm.hasHeaders); + assertFalse(npm.getHeaders().isEmpty()); + assertTrue(npm.getHeaders().isReadOnly()); + } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index f98115c4a..11fd6e3b8 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -14,6 +14,7 @@ package io.nats.client.impl; import io.nats.client.*; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -21,7 +22,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.TestBase.runInServer; +import static io.nats.client.utils.TestBase.sleep; import static org.junit.jupiter.api.Assertions.*; public class NatsStatisticsTests { @@ -221,12 +223,13 @@ public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { sleep(5000); handler.onMessage(msg); }); - d1.subscribe(SUBJECT); - d2.subscribe(SUBJECT); - d3.subscribe(SUBJECT); - d4.subscribe(SUBJECT); + String subject = TestBase.random(); + d1.subscribe(subject); + d2.subscribe(subject); + d3.subscribe(subject); + d4.subscribe(subject); - Message reply = nc.request(SUBJECT, null, Duration.ofSeconds(2)); + Message reply = nc.request(subject, null, Duration.ofSeconds(2)); assertNotNull(reply); sleep(2000); assertEquals(3, requests.get()); @@ -265,12 +268,13 @@ public void testOrphanDuplicateRepliesAdvancedStatsDisabled() throws Exception { sleep(5000); handler.onMessage(msg); }); - d1.subscribe(SUBJECT); - d2.subscribe(SUBJECT); - d3.subscribe(SUBJECT); - d4.subscribe(SUBJECT); + String subject = TestBase.random(); + d1.subscribe(subject); + d2.subscribe(subject); + d3.subscribe(subject); + d4.subscribe(subject); - Message reply = nc.request(SUBJECT, null, Duration.ofSeconds(2)); + Message reply = nc.request(subject, null, Duration.ofSeconds(2)); assertNotNull(reply); sleep(2000); assertEquals(3, requests.get()); diff --git a/src/test/java/io/nats/client/impl/ObjectStoreTests.java b/src/test/java/io/nats/client/impl/ObjectStoreTests.java index 9ac3a3c57..f1a8c7103 100644 --- a/src/test/java/io/nats/client/impl/ObjectStoreTests.java +++ b/src/test/java/io/nats/client/impl/ObjectStoreTests.java @@ -36,49 +36,49 @@ public class ObjectStoreTests extends JetStreamTestBase { @Test public void testWorkflow() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { ObjectStoreManagement osm = nc.objectStoreManagement(); nc.objectStoreManagement(ObjectStoreOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage Map metadata = new HashMap<>(); metadata.put(META_KEY, META_VALUE); - String bucket = bucket(); - String desc = variant(); + String bucket = random(); + String objectDesc = random(); // create the bucket ObjectStoreConfiguration osc = ObjectStoreConfiguration.builder(bucket) - .description(desc) + .description(objectDesc) .ttl(Duration.ofHours(24)) .storageType(StorageType.Memory) .metadata(metadata) .build(); ObjectStoreStatus status = osm.create(osc); - validateStatus(status, bucket, desc); - validateStatus(osm.getStatus(bucket), bucket, desc); + validateStatus(status, bucket, objectDesc); + validateStatus(osm.getStatus(bucket), bucket, objectDesc); - JetStreamManagement jsm = nc.jetStreamManagement(); assertNotNull(jsm.getStreamInfo("OBJ_" + bucket)); List names = osm.getBucketNames(); - assertEquals(1, names.size()); assertTrue(names.contains(bucket)); // put some objects into the stores ObjectStore os = nc.objectStore(bucket); nc.objectStore(bucket, ObjectStoreOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage; - validateStatus(os.getStatus(), bucket, desc); + validateStatus(os.getStatus(), bucket, objectDesc); // object not found errors assertClientError(OsObjectNotFound, () -> os.get("notFound", new ByteArrayOutputStream())); assertClientError(OsObjectNotFound, () -> os.updateMeta("notFound", ObjectMeta.objectName("notFound"))); assertClientError(OsObjectNotFound, () -> os.delete("notFound")); - String objectName = name(); + String objectName = random(); + objectDesc = random(); + String[] keys = new String[]{random(), random()}; ObjectMeta meta = ObjectMeta.builder(objectName) - .description("object-desc") - .headers(new Headers().put(key(1), data(1)).put(key(2), data(21)).add(key(2), data(22))) + .description(objectDesc) + .headers(new Headers().put(keys[0], data(0)).put(keys[1], data(11)).add(keys[1], data(12))) .chunkSize(4096) .build(); @@ -90,14 +90,14 @@ public void testWorkflow() throws Exception { } File file = (File)input[1]; InputStream in = Files.newInputStream(file.toPath()); - ObjectInfo oi1 = validateObjectInfo(os.put(meta, in), bucket, objectName, len, expectedChunks, 4096); + ObjectInfo oi1 = validateObjectInfo(os.put(meta, in), bucket, objectName, objectDesc, len, expectedChunks, 4096, keys); - ByteArrayOutputStream baos = validateGet(os, bucket, objectName, len, expectedChunks, 4096); + ByteArrayOutputStream baos = validateGet(os, bucket, objectName, objectDesc, len, expectedChunks, 4096); byte[] bytes = baos.toByteArray(); byte[] bytes4k = Arrays.copyOf(bytes, 4096); - ObjectInfo oi2 = validateObjectInfo(os.put(meta, new ByteArrayInputStream(bytes4k)), bucket, objectName, 4096, 1, 4096); - validateGet(os, bucket, objectName, 4096, 1, 4096); + ObjectInfo oi2 = validateObjectInfo(os.put(meta, new ByteArrayInputStream(bytes4k)), bucket, objectName, objectDesc, 4096, 1, 4096, keys); + validateGet(os, bucket, objectName, objectDesc, 4096, 1, 4096); assertNotEquals(oi1.getNuid(), oi2.getNuid()); @@ -146,16 +146,16 @@ public void testWorkflow() throws Exception { os.updateMeta(oi.getObjectName(), ObjectMeta.objectName(oi3.getObjectName())); // alternate puts - String altName = name(); + String altName = random(); expectedChunks = len / DEFAULT_CHUNK_SIZE; if (expectedChunks * DEFAULT_CHUNK_SIZE < len) { expectedChunks++; } in = Files.newInputStream(file.toPath()); - validateObjectInfo(os.put(altName, in), bucket, altName, null, false, len, expectedChunks, DEFAULT_CHUNK_SIZE); + validateObjectInfo(os.put(altName, in), bucket, altName, null, len, expectedChunks, DEFAULT_CHUNK_SIZE, null); altName = file.getName(); - validateObjectInfo(os.put(file), bucket, altName, null, false, len, expectedChunks, DEFAULT_CHUNK_SIZE); + validateObjectInfo(os.put(file), bucket, altName, null, len, expectedChunks, DEFAULT_CHUNK_SIZE, null); }); } @@ -179,19 +179,15 @@ private static void validateStatus(ObjectStoreStatus status, String bucket, Stri } @SuppressWarnings("SameParameterValue") - private ByteArrayOutputStream validateGet(ObjectStore os, String bucket, String objectName, long len, long chunks, int chunkSize) throws IOException, JetStreamApiException, InterruptedException, NoSuchAlgorithmException { + private ByteArrayOutputStream validateGet(ObjectStore os, String bucket, String objectName, String objectDesc, long len, long chunks, int chunkSize) throws IOException, JetStreamApiException, InterruptedException, NoSuchAlgorithmException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectInfo oi = os.get(objectName, baos); assertEquals(len, baos.size()); - validateObjectInfo(oi, bucket, objectName, len, chunks, chunkSize); + validateObjectInfo(oi, bucket, objectName, objectDesc, len, chunks, chunkSize, null); return baos; } - private ObjectInfo validateObjectInfo(ObjectInfo oi, String bucket, String objectName, long size, long chunks, int chunkSize) { - return validateObjectInfo(oi, bucket, objectName, "object-desc", true, size, chunks, chunkSize); - } - - private ObjectInfo validateObjectInfo(ObjectInfo oi, String bucket, String objectName, String objectDesc, boolean headers, long size, long chunks, int chunkSize) { + private ObjectInfo validateObjectInfo(ObjectInfo oi, String bucket, String objectName, String objectDesc, long size, long chunks, int chunkSize, String[] keys) { assertEquals(bucket, oi.getBucket()); assertEquals(objectName, oi.getObjectName()); if (objectDesc == null) { @@ -211,18 +207,18 @@ private ObjectInfo validateObjectInfo(ObjectInfo oi, String bucket, String objec assertNotNull(oi.getObjectMeta().getObjectMetaOptions()); assertEquals(chunkSize, oi.getObjectMeta().getObjectMetaOptions().getChunkSize()); } - if (headers) { + if (keys != null) { assertNotNull(oi.getHeaders()); assertEquals(2, oi.getHeaders().size()); - List list = oi.getHeaders().get(key(1)); + List list = oi.getHeaders().get(keys[0]); assertNotNull(list); assertEquals(1, list.size()); - assertEquals(data(1), oi.getHeaders().getFirst(key(1))); - list = oi.getHeaders().get(key(2)); + assertEquals(data(0), oi.getHeaders().getFirst(keys[0])); + list = oi.getHeaders().get(keys[1]); assertNotNull(list); assertEquals(2, list.size()); - assertTrue(list.contains(data(21))); - assertTrue(list.contains(data(22))); + assertTrue(list.contains(data(11))); + assertTrue(list.contains(data(12))); } return oi; } @@ -252,18 +248,18 @@ private static Object[] getInput(int size) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { ObjectStoreManagement osm = nc.objectStoreManagement(); // create bucket 1 - String bucket1 = bucket(); + String bucket1 = random(); osm.create(ObjectStoreConfiguration.builder() .name(bucket1) // constructor variety .storageType(StorageType.Memory) .build()); // create bucket 2 - String bucket2 = bucket(); + String bucket2 = random(); osm.create(ObjectStoreConfiguration.builder(bucket2) .storageType(StorageType.Memory) .build()); @@ -314,7 +310,7 @@ private void assertOso(ObjectStoreOptions oso) { @Test public void testObjectLinks() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { ObjectStoreManagement osm = nc.objectStoreManagement(); String bucket1 = "b1"; // bucket(); @@ -399,7 +395,7 @@ public void testObjectLinks() throws Exception { assertClientError(OsObjectNotFound, () -> os2.get("targetWillBeDeleted", new ByteArrayOutputStream())); assertClientError(OsCantLinkToLink, () -> os2.addLink("willException", oiLink)); // can't link to link - String crossName = name(); + String crossName = random(); os2.addLink(crossName, info12); ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectInfo crossInfo12 = os2.get(crossName, baos); @@ -435,15 +431,15 @@ private void validateLink(ObjectInfo oiLink, String linkName, ObjectInfo targetI @Test public void testList() throws Exception { - jsServer.run(nc -> { + runInLrServer((nc, jsm, js) -> { ObjectStoreManagement osm = nc.objectStoreManagement(); - String bucket = bucket(); + String bucket = random(); osm.create(ObjectStoreConfiguration.builder(bucket).storageType(StorageType.Memory).build()); ObjectStore os = nc.objectStore(bucket); - String[] names = new String[] {name(), name(), name(), name(), name()}; + String[] names = new String[] {random(), random(), random(), random(), random()}; os.put(names[0], dataBytes()); os.put(names[1], dataBytes()); os.put(names[2], dataBytes()); @@ -470,8 +466,8 @@ public void testList() throws Exception { @Test public void testSeal() throws Exception { - jsServer.run(nc -> { - String bucket = bucket(); + runInLrServer((nc, jsm, js) -> { + String bucket = random(); ObjectStoreManagement osm = nc.objectStoreManagement(); osm.create(ObjectStoreConfiguration.builder(bucket) .storageType(StorageType.Memory) @@ -493,8 +489,8 @@ public void testSeal() throws Exception { @Test public void testCompression() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { - String bucket = bucket(); + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + String bucket = random(); ObjectStoreManagement osm = nc.objectStoreManagement(); osm.create(ObjectStoreConfiguration.builder(bucket) .storageType(StorageType.Memory) @@ -558,7 +554,7 @@ public void testWatch() throws Exception { TestObjectStoreWatcher fullAfterWatcher = new TestObjectStoreWatcher("fullAfterWatcher", false); TestObjectStoreWatcher delAfterWatcher = new TestObjectStoreWatcher("delAfterWatcher", false, IGNORE_DELETE); - runInJsServer(nc -> { + runInLrServer((nc, jsm, js) -> { _testWatch(nc, fullB4Watcher, new Object[]{"A", "B", null}, os -> os.watch(fullB4Watcher, fullB4Watcher.watchOptions)); _testWatch(nc, delB4Watcher, new Object[]{"A", "B"}, os -> os.watch(delB4Watcher, delB4Watcher.watchOptions)); _testWatch(nc, fullAfterWatcher, new Object[]{"B", null}, os -> os.watch(fullAfterWatcher, fullAfterWatcher.watchOptions)); @@ -636,7 +632,7 @@ public void testObjectStoreDomains() throws Exception { ObjectStoreManagement leafOsm = leafNc.objectStoreManagement(ObjectStoreOptions.builder().jsDomain(HUB_DOMAIN).build()); // Create main OS on HUB - String bucketName = bucket(); + String bucketName = random(); ObjectStoreStatus hubStatus = hubOsm.create(ObjectStoreConfiguration.builder() .name(bucketName) .storageType(StorageType.Memory) @@ -648,7 +644,7 @@ public void testObjectStoreDomains() throws Exception { ObjectStore hubOs = hubNc.objectStore(bucketName); ObjectStore leafOs = leafNc.objectStore(bucketName, ObjectStoreOptions.builder().jsDomain(HUB_DOMAIN).build()); - String objectName = name(); + String objectName = random(); ObjectMeta meta = ObjectMeta.builder(objectName).chunkSize(8 * 1024).build(); Object[] input = getInput(4 * 8 * 1024); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index bcd7cc96e..8cba6add4 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -1,275 +1,275 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client.impl; - -import io.nats.client.*; -import io.nats.client.ConnectionListener.Events; -import io.nats.client.NatsServerProtocolMock.ExitAt; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.time.Duration; -import java.util.concurrent.*; - -import static io.nats.client.utils.TestBase.runInJsServer; -import static org.junit.jupiter.api.Assertions.*; - -public class PingTests { - @Test - public void testHandlingPing() throws Exception,ExecutionException { - CompletableFuture gotPong = new CompletableFuture<>(); - - NatsServerProtocolMock.Customizer pingPongCustomizer = (ts, r,w) -> { - - System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); - w.write("PING\r\n"); - w.flush(); - - String pong = ""; - - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); - try { - pong = r.readLine(); - } catch(Exception e) { - gotPong.cancel(true); - return; - } - - if (pong.startsWith("PONG")) { - System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); - gotPong.complete(Boolean.TRUE); - } else { - System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); - gotPong.complete(Boolean.FALSE); - } - }; - - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(pingPongCustomizer)) { - Connection nc = Nats.connect(ts.getURI()); - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertTrue(gotPong.get(), "Got pong."); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } - } - - @Test - public void testPingTimer() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) - .pingInterval(Duration.ofMillis(5)) - .maxPingsOut(10000) // just don't want this to be what fails the test - .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings - assertTrue(stats.getPings() > 10, "got pings"); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } - } - - @Test - public void testPingFailsWhenClosed() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). - server(ts.getURI()). - pingInterval(Duration.ofMillis(10)). - maxPingsOut(5). - maxReconnects(0). - build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - } finally { - nc.close(); - } - - Future pong = nc.sendPing(); - - assertFalse(pong.get(10,TimeUnit.MILLISECONDS)); - } - } - - @Test - public void testMaxPingsOut() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). - server(ts.getURI()). - pingInterval(Duration.ofSeconds(10)). // Avoid auto pings - maxPingsOut(2). - maxReconnects(0). - build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - //noinspection TryFinallyCanBeTryWithResources - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - nc.sendPing(); - nc.sendPing(); - assertNull(nc.sendPing(), "No future returned when past max"); - } finally { - nc.close(); - } - } - } - - @Test - public void testFlushTimeout() { - assertThrows(TimeoutException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - //noinspection TryFinallyCanBeTryWithResources - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - // fake server so flush will time out - nc.flush(Duration.ofMillis(50)); - } finally { - nc.close(); - } - } - }); - } - - @Test - public void testFlushTimeoutDisconnected() { - assertThrows(TimeoutException.class, () -> { - ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().connectionListener(listener).server(ts.getURI()).build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - nc.flush(Duration.ofSeconds(2)); - listener.prepForStatusChange(Events.DISCONNECTED); - ts.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); - nc.flush(Duration.ofSeconds(2)); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } - }); - } - - @Test - public void testPingTimerThroughReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder() - .connectionListener(listener) - .server(ts.getURI()) - .server(ts2.getURI()) - .pingInterval(Duration.ofMillis(5)) - .maxPingsOut(10000) // just don't want this to be what fails the test - .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - try { - Thread.sleep(200); // should get 10+ pings - } catch (Exception exp) - { - //Ignore - } - long pings = stats.getPings(); - assertTrue(pings > 10, "got pings"); - listener.prepForStatusChange(Events.RECONNECTED); - ts.close(); - listener.waitForStatusChange(5, TimeUnit.SECONDS); - pings = stats.getPings(); - Thread.sleep(250); // should get more pings - assertTrue(stats.getPings() > pings, "more pings"); - Thread.sleep(1000); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } - } - } - - - @Test - public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()). - pingInterval(Duration.ofMillis(200)).build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - final CompletableFuture done = new CompletableFuture<>(); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } - }); - - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - - long b4 = stats.getPings(); - for (int i=0;i<10;i++) { - Thread.sleep(50); - nc.publish("subject", new byte[16]); - } - long after = stats.getPings(); - assertEquals(after, b4, "pings hidden"); - nc.publish("done", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - done.get(500, TimeUnit.MILLISECONDS); - - // no more messages, pings should start to go through - b4 = stats.getPings(); - Thread.sleep(500); - after = stats.getPings(); - assertTrue(after > b4, "pings restarted"); - } finally { - nc.close(); - } - } - } - - @Test - public void testRtt() throws Exception { - runInJsServer(nc -> { - assertTrue(nc.RTT().toMillis() < 10); - nc.close(); - assertThrows(IOException.class, nc::RTT); - }); - } -} +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.*; +import io.nats.client.ConnectionListener.Events; +import io.nats.client.NatsServerProtocolMock.ExitAt; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.time.Duration; +import java.util.concurrent.*; + +import static io.nats.client.utils.TestBase.runInServer; +import static org.junit.jupiter.api.Assertions.*; + +public class PingTests { + @Test + public void testHandlingPing() throws Exception,ExecutionException { + CompletableFuture gotPong = new CompletableFuture<>(); + + NatsServerProtocolMock.Customizer pingPongCustomizer = (ts, r,w) -> { + + System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); + w.write("PING\r\n"); + w.flush(); + + String pong = ""; + + System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + try { + pong = r.readLine(); + } catch(Exception e) { + gotPong.cancel(true); + return; + } + + if (pong.startsWith("PONG")) { + System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); + gotPong.complete(Boolean.TRUE); + } else { + System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); + gotPong.complete(Boolean.FALSE); + } + }; + + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(pingPongCustomizer)) { + Connection nc = Nats.connect(ts.getURI()); + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertTrue(gotPong.get(), "Got pong."); + } finally { + nc.close(); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + } + } + } + + @Test + public void testPingTimer() throws Exception { + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()) + .pingInterval(Duration.ofMillis(5)) + .maxPingsOut(10000) // just don't want this to be what fails the test + .build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + StatisticsCollector stats = nc.getStatisticsCollector(); + + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings + assertTrue(stats.getPings() > 10, "got pings"); + } finally { + nc.close(); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + } + } + } + + @Test + public void testPingFailsWhenClosed() throws Exception { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options options = new Options.Builder(). + server(ts.getURI()). + pingInterval(Duration.ofMillis(10)). + maxPingsOut(5). + maxReconnects(0). + build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + } finally { + nc.close(); + } + + Future pong = nc.sendPing(); + + assertFalse(pong.get(10,TimeUnit.MILLISECONDS)); + } + } + + @Test + public void testMaxPingsOut() throws Exception { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options options = new Options.Builder(). + server(ts.getURI()). + pingInterval(Duration.ofSeconds(10)). // Avoid auto pings + maxPingsOut(2). + maxReconnects(0). + build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + + //noinspection TryFinallyCanBeTryWithResources + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + nc.sendPing(); + nc.sendPing(); + assertNull(nc.sendPing(), "No future returned when past max"); + } finally { + nc.close(); + } + } + } + + @Test + public void testFlushTimeout() { + assertThrows(TimeoutException.class, () -> { + try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options options = new Options.Builder(). + server(ts.getURI()). + maxReconnects(0). + build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + + //noinspection TryFinallyCanBeTryWithResources + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + // fake server so flush will time out + nc.flush(Duration.ofMillis(50)); + } finally { + nc.close(); + } + } + }); + } + + @Test + public void testFlushTimeoutDisconnected() { + assertThrows(TimeoutException.class, () -> { + ListenerForTesting listener = new ListenerForTesting(); + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().connectionListener(listener).server(ts.getURI()).build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + nc.flush(Duration.ofSeconds(2)); + listener.prepForStatusChange(Events.DISCONNECTED); + ts.close(); + listener.waitForStatusChange(2, TimeUnit.SECONDS); + nc.flush(Duration.ofSeconds(2)); + } finally { + nc.close(); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + } + } + }); + } + + @Test + public void testPingTimerThroughReconnect() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts2 = new NatsTestServer()) { + Options options = new Options.Builder() + .connectionListener(listener) + .server(ts.getURI()) + .server(ts2.getURI()) + .pingInterval(Duration.ofMillis(5)) + .maxPingsOut(10000) // just don't want this to be what fails the test + .build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + StatisticsCollector stats = nc.getStatisticsCollector(); + + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + try { + Thread.sleep(200); // should get 10+ pings + } catch (Exception exp) + { + //Ignore + } + long pings = stats.getPings(); + assertTrue(pings > 10, "got pings"); + listener.prepForStatusChange(Events.RECONNECTED); + ts.close(); + listener.waitForStatusChange(5, TimeUnit.SECONDS); + pings = stats.getPings(); + Thread.sleep(250); // should get more pings + assertTrue(stats.getPings() > pings, "more pings"); + Thread.sleep(1000); + } finally { + nc.close(); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + } + } + } + } + + + @Test + public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { + try (NatsTestServer ts = new NatsTestServer(false)) { + Options options = new Options.Builder().server(ts.getURI()). + pingInterval(Duration.ofMillis(200)).build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + StatisticsCollector stats = nc.getStatisticsCollector(); + + try { + final CompletableFuture done = new CompletableFuture<>(); + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + + Dispatcher d = nc.createDispatcher((msg) -> { + if (msg.getSubject().equals("done")) { + done.complete(Boolean.TRUE); + } + }); + + d.subscribe("subject"); + d.subscribe("done"); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + + long b4 = stats.getPings(); + for (int i=0;i<10;i++) { + Thread.sleep(50); + nc.publish("subject", new byte[16]); + } + long after = stats.getPings(); + assertEquals(after, b4, "pings hidden"); + nc.publish("done", new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + done.get(500, TimeUnit.MILLISECONDS); + + // no more messages, pings should start to go through + b4 = stats.getPings(); + Thread.sleep(500); + after = stats.getPings(); + assertTrue(after > b4, "pings restarted"); + } finally { + nc.close(); + } + } + } + + @Test + public void testRtt() throws Exception { + runInServer(nc -> { + assertTrue(nc.RTT().toMillis() < 10); + nc.close(); + assertThrows(IOException.class, nc::RTT); + }); + } +} diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index dbcc608cd..8bcb256fb 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -13,9 +13,11 @@ package io.nats.client.impl; +import io.nats.NatsServerRunner; import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.api.ServerInfo; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -31,7 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; -import java.util.function.Function; import static io.nats.client.NatsTestServer.getNatsLocalhostUri; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; @@ -49,47 +50,35 @@ void checkReconnectingStatus(Connection nc) { @Test public void testSimpleReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - Function ntsSupplier = port -> { - try { - return new NatsTestServer(port, false); - } - catch (Exception e) { - throw new RuntimeException(e); - } - }; - _testReconnect(ntsSupplier, (ts, builder) -> builder.server(ts.getURI())); + _testReconnect(NatsServerRunner.builder(), (ts, optionsBuilder) -> optionsBuilder.server(ts.getNatsLocalhostUri())); } @Test public void testWsReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - Function ntsSupplier = port -> { - try { - return new NatsTestServer("src/test/resources/ws_operator.conf", port, false); - } - catch (Exception e) { - throw new RuntimeException(e); - } - }; - _testReconnect(ntsSupplier, (ts, builder) -> - builder.server(ts.getLocalhostUri("ws")).authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds"))); + _testReconnect(NatsServerRunner.builder().configFilePath("src/test/resources/ws_operator.conf"), + (ts, optionsBuilder) -> + optionsBuilder + .server(ts.getLocalhostUri("ws")) + .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds"))); } - private void _testReconnect(Function ntsSupplier, BiConsumer optSetter) throws Exception { + private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer optSetter) throws Exception { int port = NatsTestServer.nextPort(); ListenerForTesting listener = new ListenerForTesting(); NatsConnection nc; Subscription sub; long start; long end; - try (NatsTestServer ts = ntsSupplier.apply(port)) { + try (NatsTestServer ts = new NatsTestServer(nsrb.port(port))) { Options.Builder builder = new Options.Builder() .maxReconnects(-1) .reconnectWait(Duration.ofMillis(1000)) - .connectionListener(listener); + .connectionListener(listener) + .errorListener(NO_OP_EL); optSetter.accept(ts, builder); Options options = builder.build(); - nc = (NatsConnection)standardConnection(options); + nc = (NatsConnection) TestBase.standardConnectionWait(options); sub = nc.subscribe("subsubject"); @@ -115,7 +104,7 @@ private void _testReconnect(Function ntsSupplier, BiCon listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = ntsSupplier.apply(port)) { + try (NatsTestServer ignored = new NatsTestServer(nsrb.port(port))) { listenerConnectionWait(nc, listener, LONG_CONNECTION_WAIT_MS); end = System.nanoTime(); @@ -146,14 +135,15 @@ public void testSubscribeDuringReconnect() throws Exception { Subscription sub; try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(-1). - reconnectWait(Duration.ofMillis(20)). - connectionListener(listener). - build(); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(-1) + .reconnectWait(Duration.ofMillis(20)) + .connectionListener(listener) + .errorListener(NO_OP_EL) + .build(); port = ts.getPort(); - nc = (NatsConnection) standardConnection(options); + nc = (NatsConnection) TestBase.standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -169,7 +159,7 @@ public void testSubscribeDuringReconnect() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port, false)) { - listenerConnectionWait(nc, listener); + TestBase.listenerConnectionWait(nc, listener); // Make sure the dispatcher and subscription are still there Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); @@ -198,14 +188,13 @@ public void testReconnectBuffer() throws Exception { String[] customArgs = {"--user","stephen","--pass","password"}; try (NatsTestServer ts = new NatsTestServer(customArgs, port, false)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(-1). - userInfo("stephen".toCharArray(), "password".toCharArray()). - reconnectWait(Duration.ofMillis(1000)). - connectionListener(listener). - build(); - nc = (NatsConnection) standardConnection(options); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(-1) + .userInfo("stephen".toCharArray(), "password".toCharArray()) + .reconnectWait(Duration.ofMillis(1000)).connectionListener(listener) + .errorListener(NO_OP_EL).build(); + nc = (NatsConnection) TestBase.standardConnectionWait(options); sub = nc.subscribe("subsubject"); @@ -238,7 +227,7 @@ public void testReconnectBuffer() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port, false)) { - listenerConnectionWait(nc, listener); + TestBase.listenerConnectionWait(nc, listener); end = System.nanoTime(); @@ -268,13 +257,14 @@ public void testMaxReconnects() throws Exception { int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port, false)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(1). - connectionListener(listener). - reconnectWait(Duration.ofMillis(10)). - build(); - nc = standardConnection(options); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(1) + .connectionListener(listener) + .errorListener(NO_OP_EL) + .reconnectWait(Duration.ofMillis(10)) + .build(); + nc = TestBase.standardConnectionWait(options); listener.prepForStatusChange(Events.CLOSED); } @@ -290,14 +280,15 @@ public void testReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts2.getURI()). - server(ts.getURI()). - noRandomize(). - connectionListener(listener). - maxReconnects(-1). - build(); - nc = (NatsConnection) standardConnection(options); + Options options = new Options.Builder() + .server(ts2.getURI()) + .server(ts.getURI()) + .noRandomize() + .connectionListener(listener) + .errorListener(NO_OP_EL) + .maxReconnects(-1) + .build(); + nc = (NatsConnection) TestBase.standardConnectionWait(options); assertEquals(ts2.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -317,14 +308,15 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts2.getURI()). - server(ts.getURI()). - connectionListener(listener). - maxReconnects(-1). - noRandomize(). - build(); - nc = (NatsConnection) standardConnection(options); + Options options = new Options.Builder() + .server(ts2.getURI()) + .server(ts.getURI()) + .noRandomize() + .connectionListener(listener) + .errorListener(NO_OP_EL) + .maxReconnects(-1) + .build(); + nc = (NatsConnection) TestBase.standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), ts2.getURI()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -346,14 +338,15 @@ public void testReconnectToSecondServerFromInfo() throws Exception { String striped = ts.getURI().substring("nats://".length()); // info doesn't have protocol String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}"; try (NatsServerProtocolMock ts2 = new NatsServerProtocolMock(null, customInfo)) { - Options options = new Options.Builder(). - server(ts2.getURI()). - connectionListener(listener). - maxReconnects(-1). - connectionTimeout(Duration.ofSeconds(5)). - reconnectWait(Duration.ofSeconds(1)). - build(); - nc = (NatsConnection) standardConnection(options); + Options options = new Options.Builder() + .server(ts2.getURI()) + .connectionListener(listener) + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(5)) + .reconnectWait(Duration.ofSeconds(1)) + .errorListener(NO_OP_EL) + .build(); + nc = (NatsConnection) TestBase.standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), ts2.getURI()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -361,6 +354,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { flushAndWaitLong(nc, listener); assertConnected(nc); + assertNotNull(nc.getConnectedUrl()); assertTrue(ts.getURI().endsWith(nc.getConnectedUrl())); standardCloseConnection(nc); } @@ -373,14 +367,15 @@ public void testOverflowReconnectBuffer() { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(-1). - connectionListener(listener). - reconnectBufferSize(4*512). - reconnectWait(Duration.ofSeconds(480)). - build(); - nc = standardConnection(options); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(-1) + .connectionListener(listener) + .errorListener(NO_OP_EL) + .reconnectBufferSize(4*512) + .reconnectWait(Duration.ofSeconds(480)) + .build(); + nc = TestBase.standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -398,14 +393,15 @@ public void testInfiniteReconnectBuffer() throws Exception { Connection nc; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(5). - connectionListener(listener). - reconnectBufferSize(-1). - reconnectWait(Duration.ofSeconds(30)). - build(); - nc = standardConnection(options); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(5) + .connectionListener(listener) + .errorListener(NO_OP_EL) + .reconnectBufferSize(-1) + .reconnectWait(Duration.ofSeconds(30)) + .build(); + nc = TestBase.standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -435,7 +431,7 @@ public void testReconnectDropOnLineFeed() throws Exception { NatsServerProtocolMock.Customizer receiveMessageCustomizer = (ts, r,w) -> { String subLine; - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for SUB ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " waiting for SUB ..."); try { subLine = r.readLine(); } catch(Exception e) { @@ -458,13 +454,14 @@ public void testReconnectDropOnLineFeed() throws Exception { }; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(-1). - reconnectWait(reconnectWait). - connectionListener(listener). - build(); - port = ts.getPort(); + Options options = new Options.Builder() + .server(ts.getURI()) + .maxReconnects(-1) + .reconnectWait(reconnectWait) + .connectionListener(listener) + .errorListener(NO_OP_EL) + .build(); + port = ts.getPort(); nc = (NatsConnection) Nats.connect(options); assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); nc.subscribe("test"); @@ -482,7 +479,7 @@ public void testReconnectDropOnLineFeed() throws Exception { // connect good then bad listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(port, false)) { - listenerConnectionWait(nc, listener); + TestBase.listenerConnectionWait(nc, listener); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -496,7 +493,7 @@ public void testReconnectDropOnLineFeed() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsServerProtocolMock ignored = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - listenerConnectionWait(nc, listener); + TestBase.listenerConnectionWait(nc, listener); subRef.get().get(); listener.prepForStatusChange(Events.DISCONNECTED); sendRef.get().complete(true); @@ -543,18 +540,19 @@ public void testReconnectNoIPTLSConnection() throws Exception { NatsTestServer ts2 = new NatsTestServer("src/test/resources/tls_noip.conf", ts2Inserts, ts2Port, false) ) { SslTestingHelper.setKeystoreSystemParameters(); - Options options = new Options.Builder(). - server(ts.getURI()). - secure(). - connectionListener(listener). - maxReconnects(20). // we get multiples for some, so need enough - reconnectWait(Duration.ofMillis(100)). - connectionTimeout(Duration.ofSeconds(5)). - noRandomize(). - build(); + Options options = new Options.Builder() + .server(ts.getURI()) + .secure() + .connectionListener(listener) + .errorListener(NO_OP_EL) + .maxReconnects(20) + .reconnectWait(Duration.ofMillis(100)) + .connectionTimeout(Duration.ofSeconds(5)) + .noRandomize() + .build(); listener.prepForStatusChange(Events.DISCOVERED_SERVERS); - nc = (NatsConnection) longConnectionWait(options); + nc = (NatsConnection) TestBase.longConnectionWait(options); assertEquals(nc.getConnectedUrl(), ts.getURI()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -579,6 +577,7 @@ public void testURISchemeNoIPTLSConnection() throws Exception { Options options = new Options.Builder() .server("tls://localhost:"+ts.getPort()) .connectionTimeout(Duration.ofSeconds(5)) + .errorListener(NO_OP_EL) .maxReconnects(0) .build(); assertCanConnect(options); @@ -590,10 +589,11 @@ public void testURISchemeNoIPOpenTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); SslTestingHelper.setKeystoreSystemParameters(); try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", false)) { - Options options = new Options.Builder(). - server("opentls://localhost:"+ts.getPort()). - maxReconnects(0). - build(); + Options options = new Options.Builder() + .server("opentls://localhost:"+ts.getPort()) + .maxReconnects(0) + .errorListener(NO_OP_EL) + .build(); assertCanConnect(options); } } @@ -605,11 +605,12 @@ public void testWriterFilterTiming() throws Exception { int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port, false)) { - Options options = new Options.Builder(). - server(ts.getURI()). - noReconnect(). - connectionListener(listener). - build(); + Options options = new Options.Builder() + .server(ts.getURI()) + .noReconnect() + .connectionListener(listener) + .errorListener(NO_OP_EL) + .build(); nc = (NatsConnection) Nats.connect(options); assertConnected(nc); @@ -652,13 +653,14 @@ public void testReconnectWait() throws Exception { TestReconnectWaitHandler trwh = new TestReconnectWaitHandler(); int port = NatsTestServer.nextPort(); - Options options = new Options.Builder(). - server("nats://localhost:"+port). - maxReconnects(-1). - connectionTimeout(Duration.ofSeconds(1)). - reconnectWait(Duration.ofMillis(250)). - connectionListener(trwh). - build(); + Options options = new Options.Builder() + .server("nats://localhost:"+port) + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(1)) + .reconnectWait(Duration.ofMillis(250)) + .connectionListener(trwh) + .errorListener(NO_OP_EL) + .build(); NatsTestServer ts = new NatsTestServer(port, false); Connection c = Nats.connect(options); @@ -673,7 +675,7 @@ public void testReconnectWait() throws Exception { @Test public void testReconnectOnConnect() throws Exception { int port = NatsTestServer.nextPort(); - Options options = Options.builder().server(getNatsLocalhostUri(port)).build(); + Options options = Options.builder().server(getNatsLocalhostUri(port)).errorListener(NO_OP_EL).build(); CountDownLatch latch = new CountDownLatch(1); AtomicReference testConn = new AtomicReference<>(); @@ -717,7 +719,7 @@ private static Thread getReconnectOnConnectTestThread(AtomicReference runInServer(nc2 -> { + runInServer(nc1 -> runInServer(nc2 -> { int port1 = nc1.getServerInfo().getPort(); int port2 = nc2.getServerInfo().getPort(); @@ -962,8 +969,8 @@ public void testSocketDataPortTimeout() throws Exception { getNatsLocalhostUri(port1), getNatsLocalhostUri(port2) }; - Connection nc = standardConnection(builder.servers(servers).build()); - String subject = subject(); + Connection nc = TestBase.standardConnectionWait(builder.servers(servers).build()); + String subject = TestBase.random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); while (pubId.get() < 50000) { diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index ec030e617..c8865f842 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -48,7 +48,7 @@ public void testSimpleRequest() throws Exception { Future incoming = nc.request("subject", null); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -56,7 +56,7 @@ public void testSimpleRequest() throws Exception { incoming = nc.request("subject", new Headers().put("foo", "bar"), null); msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -76,30 +76,41 @@ public void testRequestVarieties() throws Exception { nc.publish(msg.getReplyTo(), msg.getData()); } }); - d.subscribe(SUBJECT); + String subject = random(); + d.subscribe(subject); - Future f = nc.request(SUBJECT, dataBytes(1)); + Future f = nc.request(subject, dataBytes(1)); Message msg = f.get(500, TimeUnit.MILLISECONDS); assertEquals(data(1), new String(msg.getData())); - NatsMessage outMsg = NatsMessage.builder().subject(SUBJECT).data(dataBytes(2)).build(); + NatsMessage outMsg = NatsMessage.builder().subject(subject).data(dataBytes(2)).build(); f = nc.request(outMsg); msg = f.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertNotNull(msg.getData()); assertEquals(data(2), new String(msg.getData())); - msg = nc.request(SUBJECT, dataBytes(3), Duration.ofSeconds(1)); + msg = nc.request(subject, dataBytes(3), Duration.ofSeconds(1)); + assertNotNull(msg); + assertNotNull(msg.getData()); assertEquals(data(3), new String(msg.getData())); - outMsg = NatsMessage.builder().subject(SUBJECT).data(dataBytes(4)).build(); + outMsg = NatsMessage.builder().subject(subject).data(dataBytes(4)).build(); msg = nc.request(outMsg, Duration.ofSeconds(1)); + assertNotNull(msg); + assertNotNull(msg.getData()); assertEquals(data(4), new String(msg.getData())); - msg = nc.request(SUBJECT, new Headers().put("foo", "bar"), dataBytes(5), Duration.ofSeconds(1)); + msg = nc.request(subject, new Headers().put("foo", "bar"), dataBytes(5), Duration.ofSeconds(1)); + assertNotNull(msg); + assertNotNull(msg.getData()); assertEquals(data(5), new String(msg.getData())); assertTrue(msg.hasHeaders()); assertEquals("bar", msg.getHeaders().getFirst("foo")); + //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.request(null)); + //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.request(null, Duration.ofSeconds(1))); }); } @@ -119,7 +130,7 @@ public void testSimpleResponseMessageHasConnection() throws Exception { Future incoming = nc.request("subject", null); Message msg = incoming.get(5000, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -138,7 +149,7 @@ public void testSafeRequest() throws Exception { Message msg = nc.request("subject", null, Duration.ofMillis(1000)); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -158,7 +169,7 @@ public void testMultipleRequest() throws Exception { Future incoming = nc.request("subject", new byte[11]); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(7, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -177,12 +188,14 @@ public void testMultipleReplies() throws Exception { Dispatcher d2 = nc.createDispatcher(handler); Dispatcher d3 = nc.createDispatcher(handler); Dispatcher d4 = nc.createDispatcher(msg -> { sleep(5000); handler.onMessage(msg); }); - d1.subscribe(SUBJECT); - d2.subscribe(SUBJECT); - d3.subscribe(SUBJECT); - d4.subscribe(SUBJECT); - Message reply = nc.request(SUBJECT, null, Duration.ofSeconds(2)); + String subject = random(); + d1.subscribe(subject); + d2.subscribe(subject); + d3.subscribe(subject); + d4.subscribe(subject); + + Message reply = nc.request(subject, null, Duration.ofSeconds(2)); assertNotNull(reply); sleep(2000); assertEquals(3, requests.get()); @@ -251,7 +264,7 @@ public void testRequestWithCustomInboxPrefix() throws Exception { Future incoming = nc.request("subject", null); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -272,7 +285,7 @@ public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { assertThrows(TimeoutException.class, () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); - assertEquals(1, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -293,13 +306,13 @@ public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { NatsConnection nc = (NatsConnection) Nats.connect(options); try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - NatsMessage nm = NatsMessage.builder().subject(SUBJECT).data(dataBytes(2)).build(); + NatsMessage nm = NatsMessage.builder().subject(random()).data(dataBytes(2)).build(); CompletableFuture future = nc.requestWithTimeout(nm, Duration.ofMillis(cleanupInterval)); Thread.sleep(2 * cleanupInterval + Options.DEFAULT_CONNECTION_TIMEOUT.toMillis()); assertTrue(future.isCompletedExceptionally()); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); @@ -329,23 +342,23 @@ public void testSimpleRequestWithTimeout() throws Exception { nc.publish(msg.getReplyTo(), null); } }); - d.subscribe(SUBJECT); + String subject = random(); + d.subscribe(subject); - NatsMessage outMsg = NatsMessage.builder().subject(SUBJECT).data(dataBytes(2)).build(); - CompletableFuture incoming = nc.requestWithTimeout("subject", null, Duration.ofMillis(100)); + CompletableFuture incoming = nc.requestWithTimeout(subject, null, Duration.ofMillis(100)); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); - incoming = nc.requestWithTimeout("subject", new Headers().put("foo", "bar"), null, Duration.ofMillis(100)); + incoming = nc.requestWithTimeout(subject, new Headers().put("foo", "bar"), null, Duration.ofMillis(100)); msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); @@ -380,9 +393,9 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { Thread.sleep(delay); nc.publish(msg.getReplyTo(), null); }); - d.subscribe(SUBJECT); + String subject = random(); + d.subscribe(subject); - NatsMessage nm = NatsMessage.builder().subject(SUBJECT).data(dataBytes(2)).build(); CompletableFuture incoming = nc.requestWithTimeout("subject", null, Duration.ofMillis(cleanupInterval)); assertThrows(CancellationException.class, () -> incoming.get(delay, TimeUnit.MILLISECONDS)); @@ -405,7 +418,7 @@ public void testRequireCleanupOnCancelFromNoResponders() throws Exception { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertThrows(CancellationException.class, () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); - assertEquals(0, ((NatsStatistics) nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -424,7 +437,7 @@ public void testRequireCleanupWithTimeoutNoResponders() throws Exception { try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertThrows(CancellationException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); - assertEquals(0, ((NatsStatistics) nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -446,7 +459,7 @@ public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertThrows(TimeoutException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); - assertEquals(1, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); @@ -464,7 +477,7 @@ public void testRequireCleanupOnCancel() throws Exception { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); NatsRequestCompletableFuture incoming = (NatsRequestCompletableFuture)nc.request("subject", null); incoming.cancel(true); - NatsStatistics stats = ((NatsStatistics)nc.getStatistics()); + NatsStatistics stats = (NatsStatistics)nc.getStatistics(); // sometimes if the machine is very fast, the request gets a reply (even if it's no responders) // so there is either an outstanding or a received assertEquals(1, stats.getOutstandingRequests() + stats.getRepliesReceived()); @@ -496,7 +509,7 @@ public void testCleanupTimerWorks() throws Exception { long timeout = 10 * cleanupInterval; sleep(sleep); - assertTrueByTimeout(timeout, () -> ((NatsStatistics)nc.getStatistics()).getOutstandingRequests() == 0); + assertTrueByTimeout(timeout, () -> nc.getStatistics().getOutstandingRequests() == 0); // Make sure it is still running incoming = nc.request("subject", null); @@ -507,7 +520,7 @@ public void testCleanupTimerWorks() throws Exception { incoming.cancel(true); sleep(sleep); - assertTrueByTimeout(timeout, () -> ((NatsStatistics)nc.getStatistics()).getOutstandingRequests() == 0); + assertTrueByTimeout(timeout, () -> nc.getStatistics().getOutstandingRequests() == 0); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -542,7 +555,7 @@ public void testRequestsVsCleanup() throws Exception { } assertTrue((end-start) > 2 * cleanupInterval * 1_000_000); - assertTrue(0 >= ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertTrue(0 >= nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -574,7 +587,7 @@ public void testDelayInPickingUpFuture() throws Exception { assertEquals(1, msg.getData().length); } - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); @@ -584,27 +597,19 @@ public void testDelayInPickingUpFuture() throws Exception { @Test public void testOldStyleRequest() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).oldRequestStyle().build(); - Connection nc = Nats.connect(options); - try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); - d.subscribe("subject"); + runInLrServer(Options.builder().oldRequestStyle(), nc -> { + String subject = random(); + Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); + d.subscribe(subject); - Future incoming = nc.request("subject", null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); - assertNotNull(msg); - assertEquals(0, msg.getData().length); - assertEquals(msg.getSubject().indexOf('.'), msg.getSubject().lastIndexOf('.')); - } finally { - nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } + assertEquals(0, nc.getStatistics().getOutstandingRequests()); + assertNotNull(msg); + assertEquals(0, msg.getData().length); + assertEquals(msg.getSubject().indexOf('.'), msg.getSubject().lastIndexOf('.')); + }); } @Test @@ -634,7 +639,7 @@ public void testBuffersResize() throws Exception { exp.printStackTrace(); } - assertEquals(0, ((NatsStatistics)nc.getStatistics()).getOutstandingRequests()); + assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(messageSize, msg.getData().length); } finally { @@ -660,7 +665,8 @@ public void throwsIfClosed() { public void testThrowsWithoutSubject() { assertThrows(IllegalArgumentException.class, () -> { try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getURI())) { + //noinspection DataFlowIssue nc.request((String)null, null); fail(); } @@ -726,7 +732,7 @@ public void testNatsRequestCompletableFuture() throws Exception { assertTrue(ftot.useTimeoutException()); ftot.cancelTimedOut(); ExecutionException ee = assertThrows(ExecutionException.class, ftot::get); - assertTrue(ee.getCause() instanceof TimeoutException); + assertInstanceOf(TimeoutException.class, ee.getCause()); } @Test @@ -754,9 +760,7 @@ public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception { future.cancelClosing(); // Future is already cancelled, collecting it shouldn't result in an exception being thrown. - assertDoesNotThrow(() -> { - nc.cleanResponses(false); - }); + assertDoesNotThrow(() -> nc.cleanResponses(false)); } } } diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 546028f1e..fcc1eba6d 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -41,41 +41,46 @@ public class SimplificationTests extends JetStreamTestBase { @Test - public void testStreamContext() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(stream())); - assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(stream(), JetStreamOptions.DEFAULT_JS_OPTIONS)); - assertThrows(JetStreamApiException.class, () -> js.getStreamContext(stream())); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext streamContext = nc.getStreamContext(tsc.stream); - assertEquals(tsc.stream, streamContext.getStreamName()); - _testStreamContext(jsm, js, tsc, streamContext); - - tsc = new TestingStreamContainer(jsm); - streamContext = js.getStreamContext(tsc.stream); - assertEquals(tsc.stream, streamContext.getStreamName()); - _testStreamContext(jsm, js, tsc, streamContext); + public void testStreamContextErrors() throws Exception { + runInLrServer(TestBase::atLeast2_9_1, (nc, jsm, js) -> { + assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random())); + assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random(), JetStreamOptions.DEFAULT_JS_OPTIONS)); + assertThrows(JetStreamApiException.class, () -> js.getStreamContext(random())); }); } - private void _testStreamContext(JetStreamManagement jsm, JetStream js, TestingStreamContainer tsc, StreamContext streamContext) throws IOException, JetStreamApiException { - String durable = durable(); + @Test + public void testStreamContextFromConnection() throws Exception { + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + StreamContext streamContext = nc.getStreamContext(jstc.stream); + assertEquals(jstc.stream, streamContext.getStreamName()); + _testStreamContext(jstc, streamContext); + }); + } + + @Test + public void testStreamContextFromContext() throws Exception { + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + StreamContext streamContext = jstc.js.getStreamContext(jstc.stream); + assertEquals(jstc.stream, streamContext.getStreamName()); + _testStreamContext(jstc, streamContext); + }); + } + + private void _testStreamContext(JetStreamTestingContext jstc, StreamContext streamContext) throws IOException, JetStreamApiException { + String durable = random(); assertThrows(JetStreamApiException.class, () -> streamContext.getConsumerContext(durable)); assertThrows(JetStreamApiException.class, () -> streamContext.deleteConsumer(durable)); ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(durable).build(); ConsumerContext consumerContext = streamContext.createOrUpdateConsumer(cc); ConsumerInfo ci = consumerContext.getConsumerInfo(); - assertEquals(tsc.stream, ci.getStreamName()); + assertEquals(jstc.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); ci = streamContext.getConsumerInfo(durable); assertNotNull(ci); - assertEquals(tsc.stream, ci.getStreamName()); + assertEquals(jstc.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); assertEquals(1, streamContext.getConsumerNames().size()); @@ -87,12 +92,12 @@ private void _testStreamContext(JetStreamManagement jsm, JetStream js, TestingSt ci = consumerContext.getConsumerInfo(); assertNotNull(ci); - assertEquals(tsc.stream, ci.getStreamName()); + assertEquals(jstc.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); ci = consumerContext.getCachedConsumerInfo(); assertNotNull(ci); - assertEquals(tsc.stream, ci.getStreamName()); + assertEquals(jstc.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); streamContext.deleteConsumer(durable); @@ -101,12 +106,12 @@ private void _testStreamContext(JetStreamManagement jsm, JetStream js, TestingSt assertThrows(JetStreamApiException.class, () -> streamContext.deleteConsumer(durable)); // coverage - js.publish(tsc.subject(), "one".getBytes()); - js.publish(tsc.subject(), "two".getBytes()); - js.publish(tsc.subject(), "three".getBytes()); - js.publish(tsc.subject(), "four".getBytes()); - js.publish(tsc.subject(), "five".getBytes()); - js.publish(tsc.subject(), "six".getBytes()); + jstc.js.publish(jstc.subject(), "one".getBytes()); + jstc.js.publish(jstc.subject(), "two".getBytes()); + jstc.js.publish(jstc.subject(), "three".getBytes()); + jstc.js.publish(jstc.subject(), "four".getBytes()); + jstc.js.publish(jstc.subject(), "five".getBytes()); + jstc.js.publish(jstc.subject(), "six".getBytes()); assertTrue(streamContext.deleteMessage(3)); assertTrue(streamContext.deleteMessage(4, true)); @@ -114,13 +119,13 @@ private void _testStreamContext(JetStreamManagement jsm, JetStream js, TestingSt MessageInfo mi = streamContext.getMessage(1); assertEquals(1, mi.getSeq()); - mi = streamContext.getFirstMessage(tsc.subject()); + mi = streamContext.getFirstMessage(jstc.subject()); assertEquals(1, mi.getSeq()); - mi = streamContext.getLastMessage(tsc.subject()); + mi = streamContext.getLastMessage(jstc.subject()); assertEquals(6, mi.getSeq()); - mi = streamContext.getNextMessage(3, tsc.subject()); + mi = streamContext.getNextMessage(3, jstc.subject()); assertEquals(5, mi.getSeq()); assertNotNull(streamContext.getStreamInfo()); @@ -129,25 +134,25 @@ private void _testStreamContext(JetStreamManagement jsm, JetStream js, TestingSt streamContext.purge(PurgeOptions.builder().sequence(5).build()); assertThrows(JetStreamApiException.class, () -> streamContext.getMessage(1)); - StreamInfo si = jsm.getStreamInfo(tsc.stream); + StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(2, si.getStreamState().getMsgCount()); assertEquals(5, si.getStreamState().getFirstSequence()); assertEquals(6, si.getStreamState().getLastSequence()); - js.publish(tsc.subject(), "aone".getBytes()); - js.publish(tsc.subject(), "btwo".getBytes()); - js.publish(tsc.subject(), "cthree".getBytes()); - js.publish(tsc.subject(), "dfour".getBytes()); - js.publish(tsc.subject(), "efive".getBytes()); - js.publish(tsc.subject(), "fsix".getBytes()); + jstc.js.publish(jstc.subject(), "aone".getBytes()); + jstc.js.publish(jstc.subject(), "btwo".getBytes()); + jstc.js.publish(jstc.subject(), "cthree".getBytes()); + jstc.js.publish(jstc.subject(), "dfour".getBytes()); + jstc.js.publish(jstc.subject(), "efive".getBytes()); + jstc.js.publish(jstc.subject(), "fsix".getBytes()); - si = jsm.getStreamInfo(tsc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(8, si.getStreamState().getMsgCount()); assertEquals(12, si.getStreamState().getLastSequence()); streamContext.purge(); - si = jsm.getStreamInfo(tsc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(0, si.getStreamState().getMsgCount()); assertEquals(12, si.getStreamState().getLastSequence()); } @@ -186,57 +191,52 @@ private String validateConsumerNameForOrdered(BaseConsumerContext bcc, MessageCo static int FETCH_ORDERED = 3; @Test public void testFetch() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - TestingStreamContainer tsc = new TestingStreamContainer(nc); - JetStream js = nc.jetStream(); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { for (int x = 1; x <= 20; x++) { - js.publish(tsc.subject(), ("test-fetch-msg-" + x).getBytes()); + jstc.js.publish(jstc.subject(), ("test-fetch-msg-" + x).getBytes()); } for (int f = FETCH_EPHEMERAL; f <= FETCH_ORDERED; f++) { // 1. Different fetch sizes demonstrate expiration behavior // 1A. equal number of messages to the fetch size - _testFetch("1A", nc, tsc, 20, 0, 20, f, false); + _testFetch("1A", jstc, 20, 0, 20, f, false); // 1B. more messages than the fetch size - _testFetch("1B", nc, tsc, 10, 0, 10, f, false); + _testFetch("1B", jstc, 10, 0, 10, f, false); // 1C. fewer messages than the fetch size - _testFetch("1C", nc, tsc, 40, 0, 40, f, false); + _testFetch("1C", jstc, 40, 0, 40, f, false); // 1D. simple-consumer-40msgs was created in 1C and has no messages available - _testFetch("1D", nc, tsc, 40, 0, 40, f, false); + _testFetch("1D", jstc, 40, 0, 40, f, false); // 2. Different max bytes sizes demonstrate expiration behavior // - each test message is approximately 100 bytes // 2A. max bytes are reached before message count - _testFetch("2A", nc, tsc, 0, 750, 20, f, false); + _testFetch("2A", jstc, 0, 750, 20, f, false); // 2B. fetch size is reached before byte count - _testFetch("2B", nc, tsc, 10, 1500, 10, f, false); + _testFetch("2B", jstc, 10, 1500, 10, f, false); if (f == FETCH_DURABLE) { // this is long-running, so don't want to test every time // 2C. fewer bytes than the byte count - _testFetch("2C", nc, tsc, 0, 3000, 40, f, false); + _testFetch("2C", jstc, 0, 3000, 40, f, false); } else if (f == FETCH_ORDERED) { // just to get coverage of testing with a consumer name prefix - _testFetch("1A", nc, tsc, 20, 0, 20, f, true); - _testFetch("2A", nc, tsc, 0, 750, 20, f, true); + _testFetch("1A", jstc, 20, 0, 20, f, true); + _testFetch("2A", jstc, 0, 750, 20, f, true); } } }); } - private void _testFetch(String label, Connection nc, TestingStreamContainer tsc, int maxMessages, int maxBytes, int testAmount, int fetchType, boolean useConsumerPrefix) throws Exception { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - StreamContext ctx = js.getStreamContext(tsc.stream); + private void _testFetch(String label, JetStreamTestingContext jstc, int maxMessages, int maxBytes, int testAmount, int fetchType, boolean useConsumerPrefix) throws Exception { + StreamContext ctx = jstc.js.getStreamContext(jstc.stream); String consumerName = null; String consumerNamePrefix = null; @@ -244,7 +244,7 @@ private void _testFetch(String label, Connection nc, TestingStreamContainer tsc, if (fetchType == FETCH_ORDERED) { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration(); if (useConsumerPrefix) { - consumerNamePrefix = prefix(); + consumerNamePrefix = random(); occ.consumerNamePrefix(consumerNamePrefix); } consumerContext = ctx.createOrderedConsumer(occ); @@ -263,7 +263,7 @@ private void _testFetch(String label, Connection nc, TestingStreamContainer tsc, consumerName = consumerName + "E"; cc = builder.name(consumerName).inactiveThreshold(10_000).build(); } - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); consumerContext = ctx.getConsumerContext(consumerName); assertEquals(consumerName, consumerContext.getConsumerName()); } @@ -324,25 +324,20 @@ else if (maxBytes == 0) { private String generateConsumerName(int maxMessages, int maxBytes) { return maxBytes == 0 - ? variant() + "-" + maxMessages + "msgs" - : variant() + "-" + maxBytes + "bytes-" + maxMessages + "msgs"; + ? random() + "-" + maxMessages + "msgs" + : random() + "-" + maxBytes + "bytes-" + maxMessages + "msgs"; } @Test public void testFetchNoWaitPlusExpires() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder() - .name(tsc.consumerName()) + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() + .name(jstc.consumerName()) .inactiveThreshold(100000) // I could have used a durable, but this is long enough for the test - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .build()); - ConsumerContext cc = nc.getConsumerContext(tsc.stream, tsc.consumerName()); + ConsumerContext cc = nc.getConsumerContext(jstc.stream, jstc.consumerName()); FetchConsumeOptions fco = FetchConsumeOptions.builder().maxMessages(10).noWait().build(); // No Wait, No Messages @@ -351,14 +346,14 @@ public void testFetchNoWaitPlusExpires() throws Exception { assertEquals(0, count); // no messages // No Wait, One Message - js.publish(tsc.subject(), "DATA-A".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-A".getBytes()); fc = cc.fetch(fco); count = readMessages(fc); assertEquals(1, count); // 1 message // No Wait, Two Messages - js.publish(tsc.subject(), "DATA-B".getBytes()); - js.publish(tsc.subject(), "DATA-C".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-B".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-C".getBytes()); fc = cc.fetch(fco); count = readMessages(fc); assertEquals(2, count); // 2 messages @@ -372,9 +367,9 @@ public void testFetchNoWaitPlusExpires() throws Exception { // With Expires, One to Three Message fco = FetchConsumeOptions.builder().maxMessages(10).noWaitExpiresIn(1000).build(); fc = cc.fetch(fco); - js.publish(tsc.subject(), "DATA-D".getBytes()); - js.publish(tsc.subject(), "DATA-E".getBytes()); - js.publish(tsc.subject(), "DATA-F".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-D".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-E".getBytes()); + jstc.js.publish(jstc.subject(), "DATA-F".getBytes()); count = readMessages(fc); // With Long (Default) Expires, Leftovers @@ -399,52 +394,42 @@ private int readMessages(FetchConsumer fc) throws InterruptedException, JetStrea @Test public void testIterableConsumer() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(tsc.consumerName()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = js.getConsumerContext(tsc.stream, tsc.consumerName()); - validateConsumerName(consumerContext, null, tsc.consumerName()); + ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName()); + validateConsumerName(consumerContext, null, jstc.consumerName()); int stopCount = 500; // create the consumer then use it try (IterableConsumer consumer = consumerContext.iterate()) { - validateConsumerName(consumerContext, consumer, tsc.consumerName()); - _testIterableBasic(js, stopCount, consumer, tsc.subject()); + validateConsumerName(consumerContext, consumer, jstc.consumerName()); + _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); } // coverage IterableConsumer consumer = consumerContext.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS); - validateConsumerName(consumerContext, consumer, tsc.consumerName()); + validateConsumerName(consumerContext, consumer, jstc.consumerName()); consumer.close(); + //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> consumerContext.iterate(null)); }); } @Test public void testOrderedConsumerDeliverPolices() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - jsPublish(js, tsc.subject(), 101, 3, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(js, tsc); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 101, 3, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(jstc); - StreamContext sctx = nc.getStreamContext(tsc.stream); + StreamContext sctx = nc.getStreamContext(jstc.stream); // test a start time OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartTime) .startTime(startTime); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); @@ -455,7 +440,7 @@ public void testOrderedConsumerDeliverPolices() throws Exception { // test a start sequence occ = new OrderedConsumerConfiguration() - .filterSubject(tsc.subject()) + .filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence) .startSequence(2); occtx = sctx.createOrderedConsumer(occ); @@ -491,29 +476,25 @@ public void testOrderedConsumerCoverage() { @Test public void testOrderedIterableConsumerBasic() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext sctx = nc.getStreamContext(tsc.stream); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + StreamContext sctx = nc.getStreamContext(jstc.stream); int stopCount = 500; - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(tsc.subject()); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); assertNull(occtx.getConsumerName()); try (IterableConsumer consumer = occtx.iterate()) { validateConsumerNameForOrdered(occtx, consumer, null); - _testIterableBasic(js, stopCount, consumer, tsc.subject()); + _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); } - String consumerNamePrefix = prefix(); - occ = new OrderedConsumerConfiguration().filterSubject(tsc.subject()).consumerNamePrefix(consumerNamePrefix); + String consumerNamePrefix = random(); + occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()).consumerNamePrefix(consumerNamePrefix); occtx = sctx.createOrderedConsumer(occ); assertNull(occtx.getConsumerName()); try (IterableConsumer consumer = occtx.iterate()) { validateConsumerNameForOrdered(occtx, consumer, consumerNamePrefix); - _testIterableBasic(js, stopCount, consumer, tsc.subject()); + _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); } }); } @@ -559,21 +540,16 @@ private void _testIterableBasic(JetStream js, int stopCount, IterableConsumer co @Test public void testConsumeWithHandler() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - JetStream js = nc.jetStream(); - jsPublish(js, tsc.subject(), 2500); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 2500); // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(tsc.consumerName()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = js.getConsumerContext(tsc.stream, tsc.consumerName()); - validateConsumerName(consumerContext, null, tsc.consumerName()); + ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName()); + validateConsumerName(consumerContext, null, jstc.consumerName()); int stopCount = 500; @@ -587,16 +563,16 @@ public void testConsumeWithHandler() throws Exception { }; try (MessageConsumer mcon = consumerContext.consume(handler)) { - validateConsumerName(consumerContext, mcon, tsc.consumerName()); + validateConsumerName(consumerContext, mcon, jstc.consumerName()); latch.await(); stopAndWaitForFinished(mcon); assertTrue(atomicCount.get() > 500); } - StreamContext sctx = nc.getStreamContext(tsc.stream); + StreamContext sctx = nc.getStreamContext(jstc.stream); OrderedConsumerContext orderedConsumerContext = - sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(tsc.subject())); + sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(jstc.subject())); assertNull(orderedConsumerContext.getConsumerName()); CountDownLatch orderedLatch = new CountDownLatch(1); @@ -615,9 +591,9 @@ public void testConsumeWithHandler() throws Exception { assertTrue(atomicCount.get() > 500); } - String prefix = prefix(); + String prefix = random(); OrderedConsumerContext orderedConsumerContextPrefixed = - sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(tsc.subject()).consumerNamePrefix(prefix)); + sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(jstc.subject()).consumerNamePrefix(prefix)); assertNull(orderedConsumerContextPrefixed.getConsumerName()); CountDownLatch orderedLatchPrefixed = new CountDownLatch(1); @@ -652,21 +628,17 @@ private static void stopAndWaitForFinished(MessageConsumer mcon) throws Interrup @Test public void testNext() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - jsPublish(js, tsc.subject(), 4); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 4); - String name = name(); + String name = random(); // Pre define a consumer ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(name).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = js.getConsumerContext(tsc.stream, name); + ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, name); validateConsumerName(consumerContext, null, name); assertThrows(IllegalArgumentException.class, () -> consumerContext.next(1)); // max wait too small @@ -676,7 +648,7 @@ public void testNext() throws Exception { assertNotNull(consumerContext.next()); assertNull(consumerContext.next(1000)); - StreamContext sctx = js.getStreamContext(tsc.stream); + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); OrderedConsumerContext occtx = sctx.createOrderedConsumer(new OrderedConsumerConfiguration()); assertNull(occtx.getConsumerName()); assertThrows(IllegalArgumentException.class, () -> occtx.next(1)); // max wait too small @@ -700,7 +672,7 @@ public void testNext() throws Exception { cname1 = validateConsumerNameForOrdered(occtx, null, null); assertNotEquals(cname1, cname2); - String prefix = prefix(); + String prefix = random(); OrderedConsumerContext occtxPrefixed = sctx.createOrderedConsumer(new OrderedConsumerConfiguration().consumerNamePrefix(prefix)); assertNull(occtxPrefixed.getConsumerName()); assertThrows(IllegalArgumentException.class, () -> occtxPrefixed.next(1)); // max wait too small @@ -728,37 +700,32 @@ public void testNext() throws Exception { @Test public void testCoverage() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder().durable(tsc.consumerName(1)).build()); - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder().durable(tsc.consumerName(2)).build()); - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder().durable(tsc.consumerName(3)).build()); - jsm.addOrUpdateConsumer(tsc.stream, ConsumerConfiguration.builder().durable(tsc.consumerName(4)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(1)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(2)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(3)).build()); + jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(4)).build()); // Stream[Context] - StreamContext sctx1 = nc.getStreamContext(tsc.stream); - nc.getStreamContext(tsc.stream, JetStreamOptions.DEFAULT_JS_OPTIONS); - js.getStreamContext(tsc.stream); + StreamContext sctx1 = nc.getStreamContext(jstc.stream); + nc.getStreamContext(jstc.stream, JetStreamOptions.DEFAULT_JS_OPTIONS); + jstc.js.getStreamContext(jstc.stream); // Consumer[Context] - ConsumerContext cctx1 = nc.getConsumerContext(tsc.stream, tsc.consumerName(1)); - ConsumerContext cctx2 = nc.getConsumerContext(tsc.stream, tsc.consumerName(2), JetStreamOptions.DEFAULT_JS_OPTIONS); - ConsumerContext cctx3 = js.getConsumerContext(tsc.stream, tsc.consumerName(3)); - ConsumerContext cctx4 = sctx1.getConsumerContext(tsc.consumerName(4)); - ConsumerContext cctx5 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(tsc.consumerName(5)).build()); - ConsumerContext cctx6 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(tsc.consumerName(6)).build()); - - after(cctx1.iterate(), tsc.consumerName(1), true); - after(cctx2.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS), tsc.consumerName(2), true); - after(cctx3.consume(m -> {}), tsc.consumerName(3), true); - after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {}), tsc.consumerName(4), true); - after(cctx5.fetchMessages(1), tsc.consumerName(5), false); - after(cctx6.fetchBytes(1000), tsc.consumerName(6), false); + ConsumerContext cctx1 = nc.getConsumerContext(jstc.stream, jstc.consumerName(1)); + ConsumerContext cctx2 = nc.getConsumerContext(jstc.stream, jstc.consumerName(2), JetStreamOptions.DEFAULT_JS_OPTIONS); + ConsumerContext cctx3 = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName(3)); + ConsumerContext cctx4 = sctx1.getConsumerContext(jstc.consumerName(4)); + ConsumerContext cctx5 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(jstc.consumerName(5)).build()); + ConsumerContext cctx6 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(jstc.consumerName(6)).build()); + + after(cctx1.iterate(), jstc.consumerName(1), true); + after(cctx2.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS), jstc.consumerName(2), true); + after(cctx3.consume(m -> {}), jstc.consumerName(3), true); + after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {}), jstc.consumerName(4), true); + after(cctx5.fetchMessages(1), jstc.consumerName(5), false); + after(cctx6.fetchBytes(1000), jstc.consumerName(6), false); }); } @@ -955,46 +922,42 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorNext() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext sctx = js.getStreamContext(tsc.stream); + runInJsServer(TestBase::atLeast2_9_1, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); - jsPublish(js, tsc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(js, tsc); + jsPublish(jstc.js, jstc.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(jstc); // New pomm factory in place before each subscription is made // test with and without a consumer name prefix - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; _testOrderedNext(sctx, 1, new OrderedConsumerConfiguration() - .filterSubject(tsc.subject())); + .filterSubject(jstc.subject())); _testOrderedNext(sctx, 1, new OrderedConsumerConfiguration() - .consumerNamePrefix(prefix()) - .filterSubject(tsc.subject())); + .consumerNamePrefix(random()) + .filterSubject(jstc.subject())); - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); } - private ZonedDateTime getStartTimeFirstMessage(JetStream js, TestingStreamContainer tsc) throws IOException, JetStreamApiException, InterruptedException { + private ZonedDateTime getStartTimeFirstMessage(JetStreamTestingContext jstc) throws IOException, JetStreamApiException, InterruptedException { ZonedDateTime startTime; - JetStreamSubscription sub = js.subscribe(tsc.subject()); + JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); Message mt = sub.nextMessage(1000); startTime = mt.metaData().timestamp().plus(30, ChronoUnit.MILLIS); sub.unsubscribe(); @@ -1041,39 +1004,35 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorFetch() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); + runInJsServer(TestBase::atLeast2_9_1, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext sctx = js.getStreamContext(tsc.stream); - - jsPublish(js, tsc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(js, tsc); + jsPublish(jstc.js, jstc.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(jstc); // New pomm factory in place before subscriptions are made - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; // Set the Consumer Sequence For Stream Sequence 3 statically for ease CS_FOR_SS_3 = 3; - _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration().filterSubject(tsc.subject())); + _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration().filterSubject(jstc.subject())); _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration() - .consumerNamePrefix(prefix()) - .filterSubject(tsc.subject())); + .consumerNamePrefix(random()) + .filterSubject(jstc.subject())); CS_FOR_SS_3 = 2; - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); CS_FOR_SS_3 = 2; - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); } @@ -1115,43 +1074,36 @@ private void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq, Ordere @Test public void testOrderedBehaviorIterable() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - jsServer.setExitOnDisconnect(); - jsServer.setExitOnHeartbeatError(); - - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); + runInJsServer(TestBase::atLeast2_9_1, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - StreamContext sctx = js.getStreamContext(tsc.stream); - - jsPublish(js, tsc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(js, tsc); + jsPublish(jstc.js, jstc.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(jstc); // New pomm factory in place before each subscription is made // Set the Consumer Sequence For Stream Sequence 3 statically for ease CS_FOR_SS_3 = 3; - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration().filterSubject(tsc.subject())); + jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration().filterSubject(jstc.subject())); _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration() - .consumerNamePrefix(prefix()) - .filterSubject(tsc.subject())); + .consumerNamePrefix(random()) + .filterSubject(jstc.subject())); CS_FOR_SS_3 = 2; - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); CS_FOR_SS_3 = 2; - ((NatsJetStream)js)._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) + jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(tsc.subject()) - .consumerNamePrefix(prefix()) + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); } @@ -1172,7 +1124,7 @@ private void _testOrderedIterate(StreamContext sctx, int expectedStreamSeq, Orde } @Test - public void testOrderedConsumeConstruction() throws Exception { + public void testOrderedConsumeConstruction() { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(null); assertNotNull(occ.getFilterSubjects()); assertEquals(GREATER_THAN, occ.getFilterSubject()); @@ -1206,28 +1158,28 @@ public void testOrderedConsumeConstruction() throws Exception { @Test public void testOrderedConsume() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(tsc.subject()); - _testOrderedConsume(js, tsc, occ); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() + .filterSubject(jstc.subject()); + _testOrderedConsume(jstc, occ); + }); + } - tsc = new TestingStreamContainer(jsm); - occ = new OrderedConsumerConfiguration() - .consumerNamePrefix(prefix()) - .filterSubject(tsc.subject()); - _testOrderedConsume(js, tsc, occ); + @Test + public void testOrderedConsumeWithPrefix() throws Exception { + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() + .consumerNamePrefix(random()) + .filterSubject(jstc.subject()); + _testOrderedConsume(jstc, occ); }); } - private void _testOrderedConsume(JetStream js, TestingStreamContainer tsc, OrderedConsumerConfiguration occ) throws Exception { - StreamContext sctx = js.getStreamContext(tsc.stream); + private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerConfiguration occ) throws Exception { + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); // Get this in place before subscriptions are made - ((NatsJetStream) js)._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; CountDownLatch msgLatch = new CountDownLatch(6); AtomicInteger received = new AtomicInteger(); @@ -1241,7 +1193,7 @@ private void _testOrderedConsume(JetStream js, TestingStreamContainer tsc, Order assertNull(occtx.getConsumerName()); try (MessageConsumer mcon = occtx.consume(handler)) { validateConsumerNameForOrdered(occtx, mcon, occ.getConsumerNamePrefix()); - jsPublish(js, tsc.subject(), 201, 6); + jsPublish(jstc.js, jstc.subject(), 201, 6); // wait for the messages awaitAndAssert(msgLatch); @@ -1257,18 +1209,14 @@ private void _testOrderedConsume(JetStream js, TestingStreamContainer tsc, Order @Test public void testOrderedConsumeMultipleSubjects() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); - - TestingStreamContainer tsc = new TestingStreamContainer(jsm, 2); - jsPublish(js, tsc.subject(0), 10); - jsPublish(js, tsc.subject(1), 5); + runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + jsPublish(jstc.js, jstc.subject(0), 10); + jsPublish(jstc.js, jstc.subject(1), 5); - StreamContext sctx = js.getStreamContext(tsc.stream); + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubjects(tsc.subject(0), tsc.subject(1)); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubjects(jstc.subject(0), jstc.subject(1)); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); int count0 = 0; @@ -1276,7 +1224,7 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { try (FetchConsumer fc = occtx.fetch(FetchConsumeOptions.builder().maxMessages(20).expiresIn(2000).build())) { Message m = fc.nextMessage(); while (m != null) { - if (m.getSubject().equals(tsc.subject(0))) { + if (m.getSubject().equals(jstc.subject(0))) { count0++; } else { @@ -1294,17 +1242,10 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { @Test public void testOrderedMultipleWays() throws Exception { - jsServer.run(TestBase::atLeast2_9_1, nc -> { - // Setup - JetStream js = nc.jetStream(); - JetStreamManagement jsm = nc.jetStreamManagement(); + runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + StreamContext sctx = jstc.js.getStreamContext(jstc.stream); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - createMemoryStream(jsm, tsc.stream, tsc.subject()); - - StreamContext sctx = js.getStreamContext(tsc.stream); - - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(tsc.subject()); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); // can't do others while doing next @@ -1328,8 +1269,8 @@ public void testOrderedMultipleWays() throws Exception { //noinspection ResultOfMethodCallIgnored latch.await(3000, TimeUnit.MILLISECONDS); - for (int x = 0 ; x < 10_000; x++) { - js.publish(tsc.subject(), ("multiple" + x).getBytes()); + for (int x = 0; x < 10_000; x++) { + jstc.js.publish(jstc.subject(), ("multiple" + x).getBytes()); } // can do others now @@ -1398,6 +1339,7 @@ public void testOrderedMultipleWays() throws Exception { private void validateCantCallOtherMethods(OrderedConsumerContext ctx) { assertThrows(IOException.class, () -> ctx.next(1000)); assertThrows(IOException.class, () -> ctx.fetchMessages(1)); + //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> ctx.consume(null)); } @@ -1516,28 +1458,25 @@ private Object roundTripSerialize(Serializable s) throws IOException, ClassNotFo @Test public void testOverflowFetch() throws Exception { - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - jsServer.run(b, TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - jsPublish(js, tsc.subject(), 100); + ListenerForTesting listener = new ListenerForTesting(); + runInJsServer(listener, TestBase::atLeast2_9_1, nc -> { + JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending - String group = variant(); - String cname = variant(); + String group = random(); + String cname = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(cname) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(10_000) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(tsc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(tsc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); FetchConsumeOptions fcoNoMin = FetchConsumeOptions.builder() .maxMessages(5).expiresIn(1000).group(group) @@ -1582,28 +1521,24 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - runInJsServer(b, TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - jsPublish(js, tsc.subject(), 100); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending - String group = variant(); - String cname = variant(); + String group = random(); + String cname = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(cname) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(30_000) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(tsc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(tsc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); validateConsumerName(ctxPrime, null, cname); validateConsumerName(ctxOver, null, cname); @@ -1672,28 +1607,24 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - runInJsServer(b, TestBase::atLeast2_11, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - JetStream js = nc.jetStream(); - jsPublish(js, tsc.subject(), 1000); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + jsPublish(jstc.js, jstc.subject(), 1000); // Testing min ack pending - String group = variant(); - String cname = variant(); + String group = random(); + String cname = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(cname) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(30_000) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(tsc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(tsc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); validateConsumerName(ctxPrime, null, cname); validateConsumerName(ctxOver, null, cname); @@ -1742,20 +1673,15 @@ public void testOverflowConsume() throws Exception { @Test public void testFinishEmptyStream() throws Exception { - ListenerForTesting l = new ListenerForTesting(); - Options.Builder b = Options.builder().errorListener(l); - runInJsServer(b, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - TestingStreamContainer tsc = new TestingStreamContainer(jsm); - - String name = variant(); - + ListenerForTesting listener = new ListenerForTesting(); + runInLrServer(listener, (nc, jstc) -> { + String name = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(name) - .filterSubjects(tsc.subject()).build(); - jsm.addOrUpdateConsumer(tsc.stream, cc); + .filterSubjects(jstc.subject()).build(); + jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - ConsumerContext cctx = nc.getConsumerContext(tsc.stream, name); + ConsumerContext cctx = nc.getConsumerContext(jstc.stream, name); MessageHandler handler = Message::ack; @@ -1788,8 +1714,8 @@ public void testReconnectOverOrdered() throws Exception { .server(NatsTestServer.getNatsLocalhostUri(port)).build(); NatsConnection nc; - String stream = stream(); - String subject = subject(); + String stream = random(); + String subject = random(); AtomicBoolean allInOrder = new AtomicBoolean(true); AtomicInteger atomicCount = new AtomicInteger(); @@ -1812,7 +1738,7 @@ public void testReconnectOverOrdered() throws Exception { //noinspection unused try (NatsTestServer ts = new NatsTestServer(port, false, true)) { - nc = (NatsConnection) standardConnection(options); + nc = (NatsConnection) standardConnectionWait(options); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.File) // file since we are killing the server and bringing it back up. diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 4dddd0e66..b39d7f18f 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -99,7 +99,7 @@ public void testSimpleTlsFirstConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsTestServer.builder() .configFilePath("src/test/resources/tls_first.conf") - .connectValidateTlsFirstMode()) + .skipConnectValidate()) ) { String servers = ts.getURI(); Options options = new Options.Builder() @@ -254,7 +254,7 @@ public void testTLSMessageFlow() throws Exception { .maxReconnects(0) .sslContext(ctx) .build(); - Connection nc = standardConnection(options); + Connection nc = TestBase.standardConnectionWait(options); Dispatcher d = nc.createDispatcher((msg) -> { nc.publish(msg.getReplyTo(), new byte[16]); }); @@ -289,7 +289,7 @@ public void testTLSOnReconnect() throws InterruptedException, Exception { connectionListener(listener). reconnectWait(Duration.ofMillis(10)). build(); - nc = standardConnection(options); + nc = TestBase.standardConnectionWait(options); assertInstanceOf(SocketDataPort.class, ((NatsConnection) nc).getDataPort(), "Correct data port class"); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -298,7 +298,7 @@ public void testTLSOnReconnect() throws InterruptedException, Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer("src/test/resources/tlsverify.conf", newPort, false)) { - listenerConnectionWait(nc, listener, 10000); + listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); } standardCloseConnection(nc); @@ -455,7 +455,7 @@ public void testProxyTlsFirst() throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsTestServer.builder() .configFilePath("src/test/resources/tls_first.conf") - .connectValidateTlsFirstMode()) + .skipConnectValidate()) ) { // 1. client tls first | secure proxy | server insecure -> connects ProxyConnection connTI = new ProxyConnection(ts.getURI(), true, null, SERVER_INSECURE); diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index c1641a421..de220e3ea 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -52,7 +52,7 @@ public void testRequestReply() throws Exception { } private static void standardRequestReply(Options options) throws InterruptedException, IOException { - try (Connection connection = standardConnection(options)) { + try (Connection connection = standardConnectionWait(options)) { Dispatcher dispatcher = connection.createDispatcher(msg -> { connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes()); }); @@ -222,7 +222,7 @@ public void testTLSMessageFlow() throws Exception { .maxReconnects(0) .sslContext(ctx) .build(); - Connection nc = standardConnection(options); + Connection nc = standardConnectionWait(options); Dispatcher d = nc.createDispatcher((msg) -> { nc.publish(msg.getReplyTo(), new byte[16]); }); diff --git a/src/test/java/io/nats/client/support/JsonParsingTests.java b/src/test/java/io/nats/client/support/JsonParsingTests.java index e2ca4d8fa..105cbfded 100644 --- a/src/test/java/io/nats/client/support/JsonParsingTests.java +++ b/src/test/java/io/nats/client/support/JsonParsingTests.java @@ -13,6 +13,7 @@ package io.nats.client.support; +import io.nats.client.utils.TestBase; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; import org.jspecify.annotations.NonNull; @@ -43,39 +44,39 @@ public void testStringParsing() { List list = new ArrayList<>(); int x = 0; - addField(key(x++), "b4\\after", oMap, list, encodeds, decodeds); - addField(key(x++), "b4/after", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\"after", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\tafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\\bafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\\fafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\\nafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\\rafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4\\tafter", oMap, list, encodeds, decodeds); - addField(key(x++), "b4" + (char) 0 + "after", oMap, list, encodeds, decodeds); - addField(key(x++), "b4" + (char) 1 + "after", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\after", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4/after", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\"after", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\tafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\bafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\fafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\nafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\rafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4\\tafter", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4" + (char) 0 + "after", oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), "b4" + (char) 1 + "after", oMap, list, encodeds, decodeds); List utfs = dataAsLines("utf8-only-no-ws-test-strings.txt"); for (String u : utfs) { String uu = "b4\b\f\n\r\t" + u + "after"; - addField(key(x++), uu, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), uu, oMap, list, encodeds, decodeds); } - addField(key(x++), PLAIN, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_SPACE, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_PRINTABLE, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_DOT, oMap, list, encodeds, decodeds); - addField(key(x++), STAR_NOT_SEGMENT, oMap, list, encodeds, decodeds); - addField(key(x++), GT_NOT_SEGMENT, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_DASH, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_UNDER, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_DOLLAR, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_LOW, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_127, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_FWD_SLASH, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_BACK_SLASH, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_EQUALS, oMap, list, encodeds, decodeds); - addField(key(x++), HAS_TIC, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), PLAIN, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_SPACE, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_PRINTABLE, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_DOT, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), STAR_NOT_SEGMENT, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), GT_NOT_SEGMENT, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_DASH, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_UNDER, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_DOLLAR, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_LOW, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_127, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_FWD_SLASH, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_BACK_SLASH, oMap, list, encodeds, decodeds); + addField(TestBase.data(x++), HAS_EQUALS, oMap, list, encodeds, decodeds); + addField(TestBase.data(x), HAS_TIC, oMap, list, encodeds, decodeds); for (int i = 0; i < list.size(); i++) { JsonValue v = list.get(i); diff --git a/src/test/java/io/nats/client/support/ScheduledTaskTests.java b/src/test/java/io/nats/client/support/ScheduledTaskTests.java index 093619df8..cb77d0509 100644 --- a/src/test/java/io/nats/client/support/ScheduledTaskTests.java +++ b/src/test/java/io/nats/client/support/ScheduledTaskTests.java @@ -1,12 +1,12 @@ package io.nats.client.support; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static io.nats.client.utils.TestBase.variant; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,7 +30,7 @@ public void testScheduledTask() throws InterruptedException { AtomicInteger counter100 = new AtomicInteger(); SttRunnable sttr100 = new SttRunnable(400, counter100); - String id = "100-" + variant(); + String id = "100-" + TestBase.random(); ScheduledTask task100 = new ScheduledTask(id, stpe, 0, 100, TimeUnit.MILLISECONDS, sttr100); validateTaskPeriods(task100, 0, 100); assertEquals(id, task100.getId()); diff --git a/src/test/java/io/nats/client/utils/LongRunningServer.java b/src/test/java/io/nats/client/utils/LongRunningServer.java new file mode 100644 index 000000000..e9dd97b79 --- /dev/null +++ b/src/test/java/io/nats/client/utils/LongRunningServer.java @@ -0,0 +1,123 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import io.nats.client.*; + +import java.io.IOException; +import java.util.concurrent.locks.ReentrantLock; + +import static io.nats.client.utils.TestBase.VERY_LONG_CONNECTION_WAIT_MS; +import static io.nats.client.utils.TestBase.initRunServerInfo; + +public abstract class LongRunningServer { + + private static final ErrorListener NO_OP_EL = new ErrorListener() {}; + + private static final ReentrantLock lock = new ReentrantLock(); + private static final int MAX_TRIES = 3; + + private static NatsTestServer natsTestServer; + private static String uri; + private static Connection[] ncs; + + public static Options.Builder optionsBuilder() throws IOException { + return new Options.Builder().server(uri()).errorListener(NO_OP_EL); + } + + public static Options options() throws IOException { + return optionsBuilder().build(); + } + + public static String uri() throws IOException { + if (uri == null) { + ensureInitialized(); + } + return uri; + } + + // do not use LrConns in try-resources + public static Connection getLrConn() throws IOException, InterruptedException { + return _getLrConnection(0, 0); + } + + public static Connection getLrConn2() throws IOException, InterruptedException { + return _getLrConnection(1, 0); + } + + private static Connection _getLrConnection(int ix, int tries) throws IOException, InterruptedException { + lock.lock(); + try { + if (ncs == null) { + ncs = new Connection[2]; + } + if (ncs[ix] == null) { + ncs[ix] = TestBase.connectionWait(Nats.connect(optionsBuilder().build()), VERY_LONG_CONNECTION_WAIT_MS); + initRunServerInfo(ncs[ix]); + } + else if (ncs[ix].getStatus() != Connection.Status.CONNECTED) { + if (++tries < MAX_TRIES) { + Connection c = ncs[ix]; + c.getOptions().getExecutor().execute(() -> { + try { + c.close(); + } + catch (InterruptedException ignore) { + } + }); + ncs[ix] = null; + return _getLrConnection(ix, tries); + } + } + return ncs[ix]; + } + finally { + lock.unlock(); + } + } + + private static void ensureInitialized() throws IOException { + lock.lock(); + try { + if (natsTestServer == null) { + natsTestServer = new NatsTestServer( + NatsTestServer.builder() + .jetstream(true) + .customName("LongRunningServer") + ); + uri = natsTestServer.getURI(); +// System.out.println("LongRunningServer create " + uri); + + final Thread shutdownHookThread = new Thread("LongRunningServer-Shutdown-Hook") { + @Override + public void run() { + try { +// System.out.println("LongRunningServer shutting down"); + natsTestServer.shutdown(false); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + }; + + Runtime.getRuntime().addShutdownHook(shutdownHookThread); + } +// System.out.println("LongRunningServer return " + natsTestServer.getNatsLocalhostUri()); + } + finally { + lock.unlock(); + } + } +} diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index a4d29b48e..320e46327 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -15,8 +15,10 @@ import io.nats.client.*; import io.nats.client.api.ServerInfo; -import io.nats.client.impl.ListenerForTesting; -import io.nats.client.impl.NatsMessage; +import io.nats.client.api.StorageType; +import io.nats.client.api.StreamConfiguration; +import io.nats.client.api.StreamInfo; +import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; import org.junit.jupiter.api.function.Executable; import org.opentest4j.AssertionFailedError; @@ -76,6 +78,7 @@ public class TestBase { public static final long STANDARD_CONNECTION_WAIT_MS = 5000; public static final long LONG_CONNECTION_WAIT_MS = 7500; + public static final long VERY_LONG_CONNECTION_WAIT_MS = 10000; public static final long STANDARD_FLUSH_TIMEOUT_MS = 2000; public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000; public static final long LONG_TIMEOUT_MS = 15000; @@ -84,28 +87,26 @@ public class TestBase { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; + public static ErrorListener NO_OP_EL = new ErrorListener() {}; + // ---------------------------------------------------------------------------------------------------- - // runners + // VersionCheck // ---------------------------------------------------------------------------------------------------- - public interface InServerTest { - void test(Connection nc) throws Exception; - } - - public interface TwoServerTest { - void test(Connection nc1, Connection nc2) throws Exception; - } + public static ServerInfo RUN_SERVER_INFO; - public interface ThreeServerTest { - void test(Connection nc1, Connection nc2, Connection nc3) throws Exception; + public static ServerInfo ensureRunServerInfo() throws Exception { + if (RUN_SERVER_INFO == null) { + _runInServer(false, null, null, nc -> {}); + } + return RUN_SERVER_INFO; } - public interface ThreeServerTestOptions { - default void append(int index, Options.Builder builder) {} - default boolean configureAccount() { return false; } - default boolean includeAllServers() { return false; } + public static void initRunServerInfo(Connection nc) { + if (RUN_SERVER_INFO == null) { + RUN_SERVER_INFO = nc.getServerInfo(); + } } - @SuppressWarnings("BooleanMethodIsAlwaysInverted") public interface VersionCheck { boolean runTest(ServerInfo si); } @@ -166,185 +167,226 @@ public static boolean atLeast2_12(ServerInfo si) { return si.isSameOrNewerThanVersion("2.11.99"); } + // ---------------------------------------------------------------------------------------------------- + // runners / test interfaces + // ---------------------------------------------------------------------------------------------------- + public interface InServerTest { + void test(Connection nc) throws Exception; + } + + public interface TwoServerTest { + void test(Connection nc1, Connection nc2) throws Exception; + } + + public interface ThreeServerTest { + void test(Connection nc1, Connection nc2, Connection nc3) throws Exception; + } + + public interface ThreeServerTestOptions { + default void append(int index, Options.Builder builder) {} + default boolean configureAccount() { return false; } + default boolean includeAllServers() { return false; } + } + + public interface InJetStreamTest { + void test(Connection nc, JetStreamManagement jsm, JetStream js) throws Exception; + } + + public interface InJetStreamTestingContextTest { + void test(Connection nc, JetStreamTestingContext jstc) throws Exception; + } + + // ---------------------------------------------------------------------------------------------------- + // runners / js cleanup + // ---------------------------------------------------------------------------------------------------- + public static void cleanupJs(Connection c) + { + try { + cleanupJs(c.jetStreamManagement()); + } catch (Exception ignore) {} + } + + public static void cleanupJs(JetStreamManagement jsm) + { + try { + List streams = jsm.getStreamNames(); + for (String s : streams) { + jsm.deleteStream(s); + } + } catch (Exception ignore) {} + } + + // ---------------------------------------------------------------------------------------------------- + // runners -> new server + // ---------------------------------------------------------------------------------------------------- public static void runInServer(InServerTest inServerTest) throws Exception { - runInServer(false, false, null, null, inServerTest); + _runInServer(false, null, null, inServerTest); } public static void runInServer(Options.Builder builder, InServerTest inServerTest) throws Exception { - runInServer(false, false, builder, null, inServerTest); + _runInServer(false, builder, null, inServerTest); } - public static void runInServer(boolean debug, InServerTest inServerTest) throws Exception { - runInServer(debug, false, null, null, inServerTest); + public static void runInJsServer(InServerTest inServerTest) throws Exception { + _runInServer(true, null, null, inServerTest); } - public static void runInJsServer(InServerTest inServerTest) throws Exception { - runInServer(false, true, null, null, inServerTest); + public static void runInJsServer(VersionCheck vc, InServerTest inServerTest) throws Exception { + _runInServer(true, null, vc, inServerTest); } public static void runInJsServer(ErrorListener el, InServerTest inServerTest) throws Exception { - runInServer(false, true, new Options.Builder().errorListener(el), null, inServerTest); + _runInServer(true, Options.builder().errorListener(el), null, inServerTest); } - public static void runInJsServer(VersionCheck vc, ErrorListener el, InServerTest inServerTest) throws Exception { - runInServer(false, true, new Options.Builder().errorListener(el), vc, inServerTest); + public static void runInJsServer(ErrorListener el, VersionCheck vc, InServerTest inServerTest) throws Exception { + _runInServer(true, Options.builder().errorListener(el), vc, inServerTest); } - public static void runInJsServer(Options.Builder builder, InServerTest inServerTest) throws Exception { - runInServer(false, true, builder, null, inServerTest); + private static Options.Builder builder(ErrorListener el) { + return Options.builder().errorListener(el); } - public static void runInJsServer(Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { - runInServer(false, true, builder, vc, inServerTest); + // ---------------------------------------------------------------------------------------------------- + // runners -> long running server + // ---------------------------------------------------------------------------------------------------- + public static void runInLrServer(InServerTest test) throws Exception { + _runInLrServer(null, null, test, null, null); } - public static void runInJsServer(VersionCheck vc, InServerTest inServerTest) throws Exception { - runInServer(false, true, null, vc, inServerTest); + public static void runInLrServerCloseableConnection(InServerTest test) throws Exception { + _runInLrServer(LongRunningServer.optionsBuilder(), null, test, null, null); } - public static void runInJsServer(boolean debug, InServerTest inServerTest) throws Exception { - runInServer(debug, true, null, null, inServerTest); + public static void runInLrServer(Options.Builder builder, InServerTest test) throws Exception { + _runInLrServer(builder, null, test, null, null); } - public static void runInServer(boolean debug, boolean jetstream, InServerTest inServerTest) throws Exception { - runInServer(debug, jetstream, null, null, inServerTest); + public static void runInLrServer(InJetStreamTest jsTest) throws Exception { + _runInLrServer(null, null, null, jsTest, null); } - public static void runInServer(boolean debug, boolean jetstream, Options.Builder builder, InServerTest inServerTest) throws Exception { - runInServer(debug, jetstream, builder, null, inServerTest); + public static void runInLrServer(VersionCheck vc, InJetStreamTest jsTest) throws Exception { + _runInLrServer(null, vc, null, jsTest, null); } - public static ServerInfo RUN_SERVER_INFO; + public static void runInLrServer(ErrorListener el, InJetStreamTest jsTest) throws Exception { + _runInLrServer(builder(el), null, null, jsTest, null); + } - public static ServerInfo ensureRunServerInfo() throws Exception { - if (RUN_SERVER_INFO == null) { - runInServer(false, false, null, null, nc -> {}); - } - return RUN_SERVER_INFO; + public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTest jsTest) throws Exception { + _runInLrServer(builder, vc, null, jsTest, null); } - public static void initRunServerInfo(Connection nc) { - if (RUN_SERVER_INFO == null) { - RUN_SERVER_INFO = nc.getServerInfo(); - } + public static void runInLrServer(InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(null, null, null, null, oneSubjectJstcTest); } - public static void runInServer(boolean debug, boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { - if (vc != null && RUN_SERVER_INFO != null) { - if (!vc.runTest(RUN_SERVER_INFO)) { - return; - } - vc = null; // since we've already determined it should run, null this out so we don't check below - } + public static void runInLrServer(VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(null, vc, null, null, oneSubjectJstcTest); + } - if (builder == null) { - builder = new Options.Builder(); - } + public static void runInLrServer(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(builder(el), vc, null, null, oneSubjectJstcTest); + } - try (NatsTestServer ts = new NatsTestServer(debug, jetstream); - Connection nc = standardConnection(builder.server(ts.getURI()).build())) - { - initRunServerInfo(nc); + public static void runInLrServer(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(builder(el), null, null, null, oneSubjectJstcTest); + } - if (vc != null && !vc.runTest(RUN_SERVER_INFO)) { - return; - } + public static void runInLrServer(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(builder, null, null, null, oneSubjectJstcTest); + } - try { - inServerTest.test(nc); - } - finally { - if (jetstream) { - cleanupJs(nc); - } - } - } + public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInLrServer(builder, vc, null, null, oneSubjectJstcTest); } - public static class LongRunningNatsTestServer extends NatsTestServer { - public final boolean jetstream; - public final Options.Builder builder; - public final ListenerForTesting listenerForTesting; - - public LongRunningNatsTestServer(boolean debug, boolean jetstream, Options.Builder builder) throws IOException { - super(builder() - .debug(debug) - .jetstream(jetstream) - .connectValidateInitialDelay(100L) - .connectValidateSubsequentDelay(25L) - .connectValidateTries(15) - ); - this.jetstream = jetstream; - if (builder == null) { - this.builder = new Options.Builder(); - listenerForTesting = new ListenerForTesting(); - } - else { - this.builder = builder; - listenerForTesting = null; - } + // ---------------------------------------------------------------------------------------------------- + // runners impl -> new server + // runners impl -> long running server + // ---------------------------------------------------------------------------------------------------- + private static void _runInServer(boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { + if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { + return; // had vc, already had run server info and fails check } - public void setExitOnDisconnect() { - if (listenerForTesting != null) { - listenerForTesting.setExitOnDisconnect(); + try (NatsTestServer ts = new NatsTestServer(NatsTestServer.builder().jetstream(jetstream))) { + if (builder == null) { + builder = new Options.Builder().errorListener(NO_OP_EL); } - } - public void setExitOnHeartbeatError() { - if (listenerForTesting != null) { - listenerForTesting.setExitOnHeartbeatError(); + try (Connection nc = standardConnectionWait(builder.server(ts.getURI()).build())) { + initRunServerInfo(nc); + if (vc == null || vc.runTest(RUN_SERVER_INFO)) { + try { + inServerTest.test(nc); + } + finally { + if (jetstream) { + cleanupJs(nc); + } + } + } } } + } - public Connection connect() throws IOException, InterruptedException { - return standardConnection(builder.server(getURI()).build()); - } - - public void run(InServerTest inServerTest) throws Exception { - run(null, null, inServerTest); + private static void _runInLrServer(Options.Builder builder, VersionCheck vc, + InServerTest test, + InJetStreamTest jsTest, + InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { + return; // had vc, already had run server info and fails check } - public void run(VersionCheck vc, InServerTest inServerTest) throws Exception { - run(null, vc, inServerTest); + // no builder, we can use the long-running connection since it's totally generic + // with a builder, just make a fresh connection and close it at the end. + boolean closeWhenDone; + Connection nc; + if (builder == null) { + closeWhenDone = false; + nc = LongRunningServer.getLrConn(); } - - public void run(Options.Builder builder, InServerTest inServerTest) throws Exception { - run(builder, null, inServerTest); + else { + closeWhenDone = true; + nc = longConnectionWait(builder.server(LongRunningServer.uri()).build()); } - public void run(Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { - if (vc != null && RUN_SERVER_INFO != null) { - if (!vc.runTest(RUN_SERVER_INFO)) { - return; + initRunServerInfo(nc); + if (vc == null || vc.runTest(RUN_SERVER_INFO)) { + try { + if (oneSubjectJstcTest != null) { + try (JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 1)) { + oneSubjectJstcTest.test(nc, jstc); + } } - vc = null; // since we've already determined it should run, null this out so we don't check below - } - - if (builder == null) { - builder = new Options.Builder(); - } - - try (Connection nc = standardConnection(builder.server(getURI()).build())) - { - initRunServerInfo(nc); - - if (vc != null && !vc.runTest(RUN_SERVER_INFO)) { - return; + else if (jsTest != null) { + NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); + NatsJetStream js = (NatsJetStream) nc.jetStream(); + jsTest.test(nc, jsm, js); } - - try { - inServerTest.test(nc); + else { + test.test(nc); } - finally { - if (jetstream) { - cleanupJs(nc); + } + finally { + if (test == null) { + cleanupJs(nc); + } + if (closeWhenDone) { + try { + nc.close(); } + catch (Exception ignore) {} } } } } + // ---------------------------------------------------------------------------------------------------- + // runners / external + // ---------------------------------------------------------------------------------------------------- public static void runInExternalServer(InServerTest inServerTest) throws Exception { runInExternalServer(Options.DEFAULT_URL, inServerTest); } @@ -355,6 +397,10 @@ public static void runInExternalServer(String url, InServerTest inServerTest) th } } + + // ---------------------------------------------------------------------------------------------------- + // runners / special + // ---------------------------------------------------------------------------------------------------- public static String HUB_DOMAIN = "HUB"; public static String LEAF_DOMAIN = "LEAF"; @@ -386,9 +432,9 @@ public static void runInJsHubLeaf(TwoServerTest twoServerTest) throws Exception }; try (NatsTestServer hub = new NatsTestServer(hubPort, false, true, null, hubInserts, null); - Connection nchub = standardConnection(hub.getURI()); + Connection nchub = standardConnectionWait(hub.getURI()); NatsTestServer leaf = new NatsTestServer(leafPort, false, true, null, leafInserts, null); - Connection ncleaf = standardConnection(leaf.getURI()) + Connection ncleaf = standardConnectionWait(leaf.getURI()) ) { try { twoServerTest.test(nchub, ncleaf); @@ -414,8 +460,8 @@ public static void runInJsCluster(ThreeServerTestOptions tstOpts, ThreeServerTes String dir1 = tempJsStoreDir(); String dir2 = tempJsStoreDir(); String dir3 = tempJsStoreDir(); - String cluster = "cluster_" + variant(); - String serverPrefix = "server_" + variant() + "_"; + String cluster = "cluster_" + random(); + String serverPrefix = "server_" + random() + "_"; if (tstOpts == null) { tstOpts = new ThreeServerTestOptions() {}; @@ -429,9 +475,9 @@ public static void runInJsCluster(ThreeServerTestOptions tstOpts, ThreeServerTes try (NatsTestServer srv1 = new NatsTestServer(port1, false, true, null, server1Inserts, null); NatsTestServer srv2 = new NatsTestServer(port2, false, true, null, server2Inserts, null); NatsTestServer srv3 = new NatsTestServer(port3, false, true, null, server3Inserts, null); - Connection nc1 = standardConnection(makeOptions(0, tstOpts, srv1, srv2, srv3)); - Connection nc2 = standardConnection(makeOptions(1, tstOpts, srv2, srv1, srv3)); - Connection nc3 = standardConnection(makeOptions(2, tstOpts, srv3, srv1, srv2)) + Connection nc1 = standardConnectionWait(makeOptions(0, tstOpts, srv1, srv2, srv3)); + Connection nc2 = standardConnectionWait(makeOptions(1, tstOpts, srv2, srv1, srv3)); + Connection nc3 = standardConnectionWait(makeOptions(2, tstOpts, srv3, srv1, srv2)) ) { try { threeServerTest.test(nc1, nc2, nc3); @@ -495,160 +541,55 @@ private static Options makeOptions(int id, ThreeServerTestOptions tstOpts, NatsT } private static String tempJsStoreDir() throws IOException { - return Files.createTempDirectory(variant()).toString().replace("\\", "\\\\"); // when on windows this is necessary. unix doesn't have backslash - } - - public static void cleanupJs(Connection c) - { - try { - JetStreamManagement jsm = c.jetStreamManagement(); - List streams = jsm.getStreamNames(); - for (String s : streams) - { - jsm.deleteStream(s); - } - } catch (Exception ignore) {} + return Files.createTempDirectory(random()).toString().replace("\\", "\\\\"); // when on windows this is necessary. unix doesn't have backslash } // ---------------------------------------------------------------------------------------------------- // data makers // ---------------------------------------------------------------------------------------------------- - public static final String STREAM = "stream"; - public static final String MIRROR = "mirror"; - public static final String SOURCE = "source"; - public static final String SUBJECT = "subject"; - public static final String SUBJECT_STAR = SUBJECT + ".*"; - public static final String SUBJECT_GT = SUBJECT + ".>"; - public static final String QUEUE = "queue"; - public static final String DURABLE = "durable"; - public static final String NAME = "name"; - public static final String DELIVER = "deliver"; - public static final String MESSAGE_ID = "mid"; - public static final String BUCKET = "bucket"; - public static final String KEY = "key"; public static final String DATA = "data"; - public static final String PREFIX = "prefix"; - - public static String variant(Object variant) { - return variant == null ? NUID.nextGlobalSequence() : "" + variant; - } - public static String variant() { + public static String random() { return NUID.nextGlobalSequence(); } - private static int pi0 = -1; - private static int pi1 = 0; - public static String prefix() { - if (++pi0 == 26) { - pi0 = 0; - if (++pi1 == 26) { - pi1 = 0; - } + public static String randomWide(int width) { + StringBuilder sb = new StringBuilder(); + while (sb.length() < width) { + sb.append(random()); } - return PREFIX + (char)('A' + pi1) + (char)('A' + pi0); - } - - public static String stream() { - return STREAM + "-" + variant(); - } - - public static String stream(Object variant) { - return STREAM + "-" + variant(variant); + return sb.substring(0, width); } - public static String mirror() { - return MIRROR + "-" + variant(); + public static String subject(int variant) { + return "subject-" + variant; } - public static String mirror(Object variant) { - return MIRROR + "-" + variant(variant); + public static String subjectGt(String subject) { + return subject + ".>"; } - public static String source() { - return SOURCE + "-" + variant(); + public static String subjectStar(String subject) { + return subject + ".*"; } - public static String source(Object variant) { - return SOURCE + "-" + variant(variant); - } - - public static String subject() { - return SUBJECT + "-" + variant(); - } - public static String subject(Object variant) { - return SUBJECT + "-" + variant(variant); - } - - public static String subjectDot(String field) { - return SUBJECT + DOT + field; - } - - public static String queue(Object variant) { - return QUEUE + "-" + variant(variant); - } - - public static String durable() { - return DURABLE + "-" + variant(); - } - - public static String durable(Object variant) { - return DURABLE + "-" + variant(variant); - } - - public static String durable(String vary, Object variant) { - return DURABLE + "-" + vary + "-" + variant(variant); - } - - public static String name() { - return NAME + "-" + variant(); - } - - public static String name(Object variant) { - return NAME + "-" + variant(variant); - } - - public static String deliver() { - return DELIVER + "-" + variant(); - } - - public static String deliver(Object variant) { - return DELIVER + "-" + variant(variant); - } - - public static String bucket(Object variant) { - return BUCKET + "-" + variant(variant); - } - - public static String bucket() { - return bucket(null); - } - - public static String key(Object variant) { - return KEY + "-" + variant(variant); - } - - public static String key() { - return KEY + "-" + variant(); - } - - public static String messageId(Object variant) { - return MESSAGE_ID + "-" + variant(variant); + public static String subjectDot(String subject, String field) { + return subject + DOT + field; } public static String data(Object variant) { - return DATA + "-" + variant(variant); + return DATA + "-" + variant; } public static byte[] dataBytes() { - return data(variant()).getBytes(StandardCharsets.US_ASCII); + return data(random()).getBytes(StandardCharsets.US_ASCII); } public static byte[] dataBytes(Object variant) { return data(variant).getBytes(StandardCharsets.US_ASCII); } public static NatsMessage getDataMessage(String data) { - return new NatsMessage(SUBJECT, null, data.getBytes(StandardCharsets.US_ASCII)); + return new NatsMessage(random(), null, data.getBytes(StandardCharsets.US_ASCII)); } // ---------------------------------------------------------------------------------------------------- @@ -670,31 +611,31 @@ public static void assertClosed(Connection conn) { } public static void assertCanConnect() throws IOException, InterruptedException { - standardCloseConnection( standardConnection() ); + standardCloseConnection( standardConnectionWait() ); } public static void assertCanConnect(String serverURL) throws IOException, InterruptedException { - standardCloseConnection( standardConnection(serverURL) ); + standardCloseConnection( standardConnectionWait(serverURL) ); } public static void assertCanConnect(Options options) throws IOException, InterruptedException { - standardCloseConnection( standardConnection(options) ); + standardCloseConnection( standardConnectionWait(options) ); } public static void assertCanConnectAndPubSub() throws IOException, InterruptedException { - Connection conn = standardConnection(); + Connection conn = standardConnectionWait(); assertPubSub(conn); standardCloseConnection(conn); } public static void assertCanConnectAndPubSub(String serverURL) throws IOException, InterruptedException { - Connection conn = standardConnection(serverURL); + Connection conn = standardConnectionWait(serverURL); assertPubSub(conn); standardCloseConnection(conn); } public static void assertCanConnectAndPubSub(Options options) throws IOException, InterruptedException { - Connection conn = standardConnection(options); + Connection conn = standardConnectionWait(options); assertPubSub(conn); standardCloseConnection(conn); } @@ -712,7 +653,7 @@ public static void assertByteArraysEqual(byte[] data1, byte[] data2) { } public static void assertPubSub(Connection conn) throws InterruptedException { - String subject = subject(); + String subject = random(); String data = data(null); Subscription sub = conn.subscribe(subject); conn.publish(subject, data.getBytes()); @@ -796,42 +737,47 @@ public static Options standardOptions(String serverURL) { return standardOptionsBuilder(serverURL).build(); } - public static Connection standardConnection() throws IOException, InterruptedException { - return standardConnectionWait( Nats.connect(standardOptions()) ); - } - - public static Connection standardConnection(String serverURL) throws IOException, InterruptedException { - return standardConnectionWait( Nats.connect(standardOptions(serverURL)) ); + public static Connection connectionWait(Connection conn, long millis) { + return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); } - public static Connection standardConnection(Options options) throws IOException, InterruptedException { - return standardConnectionWait( Nats.connect(options) ); + public static Connection standardConnectionWait() throws IOException, InterruptedException { + return standardConnectionWait( Nats.connect(standardOptions()) ); } - public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { - return listenerConnectionWait( Nats.connect(options), listener ); + public static Connection standardConnectionWait(String serverURL) throws IOException, InterruptedException { + return connectionWait(Nats.connect(standardOptions(serverURL)), STANDARD_CONNECTION_WAIT_MS); } - public static Connection listenerConnectionWait(Connection conn, ListenerForTesting listener) { - return listenerConnectionWait(conn, listener, STANDARD_CONNECTION_WAIT_MS); + public static Connection standardConnectionWait(Options options) throws IOException, InterruptedException { + return connectionWait(Nats.connect(options), STANDARD_CONNECTION_WAIT_MS); } public static Connection standardConnectionWait(Connection conn) { return connectionWait(conn, STANDARD_CONNECTION_WAIT_MS); } + public static Connection longConnectionWait(String serverURL) throws IOException, InterruptedException { + return connectionWait(Nats.connect(standardOptions(serverURL)), LONG_CONNECTION_WAIT_MS); + } + public static Connection longConnectionWait(Options options) throws IOException, InterruptedException { - return connectionWait( Nats.connect(options), LONG_CONNECTION_WAIT_MS ); + return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); } - public static Connection connectionWait(Connection conn, long millis) { - return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); + public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { + Connection conn = Nats.connect(options); + listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); + return conn; + } + + public static void listenerConnectionWait(Connection conn, ListenerForTesting listener) { + listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); } - public static Connection listenerConnectionWait(Connection conn, ListenerForTesting listener, long millis) { + public static void listenerConnectionWait(Connection conn, ListenerForTesting listener, long millis) { listener.waitForStatusChange(millis, TimeUnit.MILLISECONDS); assertConnected(conn); - return conn; } // ---------------------------------------------------------------------------------------------------- @@ -912,4 +858,29 @@ else if (atLeast2_9_0() ){ assertEquals(0, metadata.size()); } } + + // ---------------------------------------------------------------------------------------------------- + // JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream + // ---------------------------------------------------------------------------------------------------- + public static StreamInfo createMemoryStream(JetStreamManagement jsm, String streamName, String... subjects) throws IOException, JetStreamApiException { + if (streamName == null) { + streamName = random(); + } + + if (subjects == null || subjects.length == 0) { + subjects = new String[]{random()}; + } + + StreamConfiguration sc = StreamConfiguration.builder() + .name(streamName) + .storageType(StorageType.Memory) + .subjects(subjects).build(); + + return jsm.addStream(sc); + } + + public static StreamInfo createMemoryStream(Connection nc, String streamName, String... subjects) + throws IOException, JetStreamApiException { + return createMemoryStream(nc.jetStreamManagement(), streamName, subjects); + } } diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index cbcdf8fad..80926c2c7 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -68,9 +68,9 @@ public class ServiceTests extends JetStreamTestBase { @Test public void testServiceWorkflow() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnection(ts.getURI()); - Connection serviceNc2 = standardConnection(ts.getURI()); - Connection clientNc = standardConnection(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); + Connection serviceNc2 = standardConnectionWait(ts.getURI()); + Connection clientNc = standardConnectionWait(ts.getURI())) { Endpoint endEcho = Endpoint.builder() .name(ECHO_ENDPOINT_NAME) @@ -469,9 +469,9 @@ private static String reverse(byte[] data) { @Test public void testQueueGroup() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnection(ts.getURI()); - Connection serviceNc2 = standardConnection(ts.getURI()); - Connection clientNc = standardConnection(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); + Connection serviceNc2 = standardConnectionWait(ts.getURI()); + Connection clientNc = standardConnectionWait(ts.getURI())) { String yesQueueSubject = "subjyes"; String noQueueSubject = "subjno"; @@ -563,9 +563,9 @@ public void testQueueGroup() throws Exception { @Test public void testResponsesFromAllInstances() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnection(ts.getURI()); - Connection serviceNc2 = standardConnection(ts.getURI()); - Connection clientNc = standardConnection(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); + Connection serviceNc2 = standardConnectionWait(ts.getURI()); + Connection clientNc = standardConnectionWait(ts.getURI())) { Endpoint ep = Endpoint.builder() .name("ep") @@ -655,7 +655,7 @@ else if (response.getName().equals(SERVICE_NAME_2)) { @Test public void testDispatchers() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection nc = standardConnection(ts.getURI())) { + try (Connection nc = standardConnectionWait(ts.getURI())) { Map dispatchers = getDispatchers(nc); assertEquals(0, dispatchers.size()); @@ -759,16 +759,17 @@ public void testServiceBuilderConstruction() { Options options = new Options.Builder().build(); Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() - .endpoint(new Endpoint(name(0))) + .endpoint(new Endpoint(random())) .handler(m -> { }) .build(); // minimum valid service - Service service = Service.builder().connection(conn).name(NAME).version("1.0.0").addServiceEndpoint(se).build(); + String name = random(); + Service service = Service.builder().connection(conn).name(name).version("1.0.0").addServiceEndpoint(se).build(); assertNotNull(service.toString()); // coverage assertNotNull(service.getId()); - assertEquals(NAME, service.getName()); + assertEquals(name, service.getName()); assertEquals(ServiceBuilder.DEFAULT_DRAIN_TIMEOUT, service.getDrainTimeout()); assertEquals("1.0.0", service.getVersion()); assertNull(service.getDescription()); @@ -777,7 +778,7 @@ public void testServiceBuilderConstruction() { // additional fields Map meta = new HashMap<>(); meta.put("foo", "bar"); - service = Service.builder().connection(conn).name(NAME).version("1.0.0").addServiceEndpoint(se) + service = Service.builder().connection(conn).name(name).version("1.0.0").addServiceEndpoint(se) .description("desc") .drainTimeout(Duration.ofSeconds(1)) .metadata(meta) @@ -788,14 +789,14 @@ public void testServiceBuilderConstruction() { assertNotNull(service.getPingResponse().getMetadata()); // more coverage - service = Service.builder().connection(conn).name(NAME).version("1.0.0").addServiceEndpoint(se) + service = Service.builder().connection(conn).name(name).version("1.0.0").addServiceEndpoint(se) .drainTimeout(null) .metadata(new HashMap<>()) .build(); assertEquals(ServiceBuilder.DEFAULT_DRAIN_TIMEOUT, service.getDrainTimeout()); //noinspection deprecation - service = Service.builder().connection(conn).name(NAME).version("1.0.0").addServiceEndpoint(se) + service = Service.builder().connection(conn).name(name).version("1.0.0").addServiceEndpoint(se) .drainTimeout(1000) .schemaDispatcher(null) // COVERAGE for deprecated .build(); @@ -821,7 +822,7 @@ public void testServiceBuilderConstruction() { assertThrows(IllegalArgumentException.class, () -> Service.builder().version("not-semver")); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> Service.builder().name(NAME).version("1.0.0").addServiceEndpoint(se).build()); + () -> Service.builder().name(name).version("1.0.0").addServiceEndpoint(se).build()); assertTrue(iae.getMessage().contains("Connection cannot be null")); iae = assertThrows(IllegalArgumentException.class, @@ -829,11 +830,11 @@ public void testServiceBuilderConstruction() { assertTrue(iae.getMessage().contains("Name cannot be null or empty")); iae = assertThrows(IllegalArgumentException.class, - () -> Service.builder().connection(conn).name(NAME).addServiceEndpoint(se).build()); + () -> Service.builder().connection(conn).name(name).addServiceEndpoint(se).build()); assertTrue(iae.getMessage().contains("Version cannot be null or empty")); assertDoesNotThrow( - () -> Service.builder().connection(conn).name(NAME).version("1.0.0").build()); + () -> Service.builder().connection(conn).name(name).version("1.0.0").build()); } @Test @@ -841,21 +842,22 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { Options options = new Options.Builder().build(); Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() - .endpoint(new Endpoint(name(0))) + .endpoint(new Endpoint(random())) .handler(m -> { }) .build(); // minimum valid service - Service service = Service.builder().connection(conn).name(NAME).version("1.0.0").addServiceEndpoint(se).build(); + String name = random(); + Service service = Service.builder().connection(conn).name(name).version("1.0.0").addServiceEndpoint(se).build(); assertNotNull(service.toString()); // coverage assertNotNull(service.getId()); - assertEquals(NAME, service.getName()); + assertEquals(name, service.getName()); assertEquals(ServiceBuilder.DEFAULT_DRAIN_TIMEOUT, service.getDrainTimeout()); assertEquals("1.0.0", service.getVersion()); assertNull(service.getDescription()); - service = Service.builder().connection(conn).name(NAME).version("1.0.0") + service = Service.builder().connection(conn).name(name).version("1.0.0") .description("desc") .drainTimeout(Duration.ofSeconds(1)) .build(); @@ -884,7 +886,7 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { assertThrows(IllegalArgumentException.class, () -> Service.builder().version("not-semver")); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> Service.builder().name(NAME).version("1.0.0").addServiceEndpoint(se).build()); + () -> Service.builder().name(name).version("1.0.0").addServiceEndpoint(se).build()); assertTrue(iae.getMessage().contains("Connection cannot be null")); iae = assertThrows(IllegalArgumentException.class, @@ -892,10 +894,10 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { assertTrue(iae.getMessage().contains("Name cannot be null or empty")); iae = assertThrows(IllegalArgumentException.class, - () -> Service.builder().connection(conn).name(NAME).addServiceEndpoint(se).build()); + () -> Service.builder().connection(conn).name(name).addServiceEndpoint(se).build()); assertTrue(iae.getMessage().contains("Version cannot be null or empty")); - assertDoesNotThrow(() -> Service.builder().connection(conn).name(NAME).version("1.0.0").build()); + assertDoesNotThrow(() -> Service.builder().connection(conn).name(name).version("1.0.0").build()); } @Test @@ -1027,41 +1029,44 @@ public void testEndpointConstruction() { EqualsVerifier.simple().forClass(Endpoint.class).verify(); Map metadata = new HashMap<>(); - Endpoint e = new Endpoint(NAME); - assertEpNameSubQ(e, NAME); + String name = random(); + String subject = random(); + + Endpoint e = new Endpoint(name); + assertEpNameSubQ(e, name, name); assertEquals(e, Endpoint.builder().endpoint(e).build()); assertNull(e.getMetadata()); String jep = e.toJson(); String sep = e.toString(); assertTrue(sep.contains(jep)); - e = new Endpoint(NAME, metadata); - assertEpNameSubQ(e, NAME); + e = new Endpoint(name, metadata); + assertEpNameSubQ(e, name, name); assertEquals(e, Endpoint.builder().endpoint(e).build()); assertNull(e.getMetadata()); - e = new Endpoint(NAME, SUBJECT); - assertEpNameSubQ(e); + e = new Endpoint(name, subject); + assertEpNameSubQ(e, name, subject); assertEquals(e, Endpoint.builder().endpoint(e).build()); assertEquals(Endpoint.DEFAULT_QGROUP, e.getQueueGroup()); e = Endpoint.builder() - .name(NAME).subject(SUBJECT) + .name(name).subject(subject) .build(); - assertEpNameSubQ(e); + assertEpNameSubQ(e, name, subject); assertEquals(e, Endpoint.builder().endpoint(e).build()); e = Endpoint.builder() - .name(NAME).subject(SUBJECT) + .name(name).subject(subject) .metadata(metadata) .queueGroup(null) // coverage .build(); - assertEpNameSubQ(e); + assertEpNameSubQ(e, name, subject); assertNull(e.getMetadata()); assertEquals(Endpoint.DEFAULT_QGROUP, e.getQueueGroup()); e = Endpoint.builder() - .name(NAME).subject(SUBJECT) + .name(name).subject(subject) .metadata(metadata) .queueGroup("qg") // coverage .build(); @@ -1070,30 +1075,30 @@ public void testEndpointConstruction() { metadata.put("k", "v"); - e = new Endpoint(NAME, SUBJECT, metadata); - assertEpNameSubQ(e); + e = new Endpoint(name, subject, metadata); + assertEpNameSubQ(e, name, subject); assertTrue(JsonUtils.mapEquals(metadata, e.getMetadata())); e = Endpoint.builder() - .name(NAME).subject(SUBJECT) + .name(name).subject(subject) .metadata(metadata) .build(); - assertEpNameSubQ(e); + assertEpNameSubQ(e, name, subject); assertTrue(JsonUtils.mapEquals(metadata, e.getMetadata())); // internal allows null queue group - e = new Endpoint(NAME, SUBJECT, null, metadata, false); + e = new Endpoint(name, subject, null, metadata, false); assertNull(e.getQueueGroup()); // some subject testing - e = new Endpoint(NAME, "foo.>"); + e = new Endpoint(name, "foo.>"); assertEquals("foo.>", e.getSubject()); - e = new Endpoint(NAME, "foo.*"); + e = new Endpoint(name, "foo.*"); assertEquals("foo.*", e.getSubject()); // coverage - e = new Endpoint(NAME, SUBJECT, metadata); - assertEpNameSubQ(e); + e = new Endpoint(name, subject, metadata); + assertEpNameSubQ(e, name, subject); assertTrue(JsonUtils.mapEquals(metadata, e.getMetadata())); assertThrows(IllegalArgumentException.class, () -> Endpoint.builder().build()); @@ -1114,20 +1119,16 @@ public void testEndpointConstruction() { assertThrows(IllegalArgumentException.class, () -> new Endpoint(HAS_TIC)); // typical subjects are bad - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, HAS_SPACE)); - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, HAS_CR)); - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, HAS_LF)); - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, STAR_NOT_SEGMENT)); - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, GT_NOT_SEGMENT)); - assertThrows(IllegalArgumentException.class, () -> new Endpoint(NAME, STARTS_WITH_DOT)); - } - - private static void assertEpNameSubQ(Endpoint ep) { - assertEpNameSubQ(ep, SUBJECT); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, HAS_SPACE)); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, HAS_CR)); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, HAS_LF)); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, STAR_NOT_SEGMENT)); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, GT_NOT_SEGMENT)); + assertThrows(IllegalArgumentException.class, () -> new Endpoint(name, STARTS_WITH_DOT)); } - private static void assertEpNameSubQ(Endpoint ep, String exSubject) { - assertEquals(NAME, ep.getName()); + private static void assertEpNameSubQ(Endpoint ep, String name, String exSubject) { + assertEquals(name, ep.getName()); assertEquals(exSubject, ep.getSubject()); assertEquals(Endpoint.DEFAULT_QGROUP, ep.getQueueGroup()); } @@ -1180,37 +1181,40 @@ public void testEndpointResponseConstruction() { @Test public void testGroupConstruction() { - Group g1 = new Group(subject(1)); - Group g2 = new Group(subject(2)); - Group g3 = new Group(subject(3)); - assertEquals(subject(1), g1.getName()); - assertEquals(subject(1), g1.getSubject()); - assertEquals(subject(2), g2.getName()); - assertEquals(subject(2), g2.getSubject()); - assertEquals(subject(3), g3.getName()); - assertEquals(subject(3), g3.getSubject()); + String subject1 = random(); + String subject2 = random(); + String subject3 = random(); + Group g1 = new Group(subject1); + Group g2 = new Group(subject2); + Group g3 = new Group(subject3); + assertEquals(subject1, g1.getName()); + assertEquals(subject1, g1.getSubject()); + assertEquals(subject2, g2.getName()); + assertEquals(subject2, g2.getSubject()); + assertEquals(subject3, g3.getName()); + assertEquals(subject3, g3.getSubject()); assertNull(g1.getNext()); assertNull(g2.getNext()); assertNull(g3.getNext()); - assertTrue(g1.toString().contains(subject(1))); // coverage - assertTrue(g2.toString().contains(subject(2))); // coverage - assertTrue(g3.toString().contains(subject(3))); // coverage + assertTrue(g1.toString().contains(subject1)); // coverage + assertTrue(g2.toString().contains(subject2)); // coverage + assertTrue(g3.toString().contains(subject3)); // coverage assertEquals(g1, g1.appendGroup(g2)); - assertEquals(subject(2), g1.getNext().getName()); + assertEquals(subject2, g1.getNext().getName()); assertNull(g2.getNext()); - assertEquals(subject(1), g1.getName()); - assertEquals(subject(1) + DOT + subject(2), g1.getSubject()); - assertEquals(subject(2), g2.getName()); - assertEquals(subject(2), g2.getSubject()); - assertTrue(g1.toString().contains(subject(2))); // coverage + assertEquals(subject1, g1.getName()); + assertEquals(subject1 + DOT + subject2, g1.getSubject()); + assertEquals(subject2, g2.getName()); + assertEquals(subject2, g2.getSubject()); + assertTrue(g1.toString().contains(subject2)); // coverage assertEquals(g1, g1.appendGroup(g3)); - assertEquals(subject(2), g1.getNext().getName()); - assertEquals(subject(3), g1.getNext().getNext().getName()); - assertEquals(subject(1), g1.getName()); - assertEquals(subject(1) + DOT + subject(2) + DOT + subject(3), g1.getSubject()); - assertTrue(g1.toString().contains(subject(3))); // coverage + assertEquals(subject2, g1.getNext().getName()); + assertEquals(subject3, g1.getNext().getNext().getName()); + assertEquals(subject1, g1.getName()); + assertEquals(subject1 + DOT + subject2 + DOT + subject3, g1.getSubject()); + assertTrue(g1.toString().contains(subject3)); // coverage g1 = new Group("foo.*"); assertEquals("foo.*", g1.getName()); @@ -1227,10 +1231,12 @@ public void testGroupConstruction() { @Test public void testServiceEndpointConstruction() { - Group g1 = new Group(subject(1)); - Group g2 = new Group(subject(2)).appendGroup(g1); - Endpoint e1 = new Endpoint(name(100), subject(100)); - Endpoint e2 = new Endpoint(name(200), subject(200)); + String subject1 = random(); + String subject2 = random(); + Group g1 = new Group(subject1); + Group g2 = new Group(subject2).appendGroup(g1); + Endpoint e1 = new Endpoint(random(), random()); + Endpoint e2 = new Endpoint(random(), random()); ServiceMessageHandler smh = m -> {}; Supplier sds = () -> null; From 8c97c4f06b2527b837d167b11bffb0580f54b294 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 20 Nov 2025 07:21:05 -0500 Subject: [PATCH 04/51] Work in progress --- src/test/java/io/nats/client/AuthTests.java | 5 +- src/test/java/io/nats/client/EchoTests.java | 5 +- .../java/io/nats/client/NatsTestServer.java | 1 - .../client/impl/JetStreamManagementTests.java | 4 +- .../nats/client/impl/ListenerForTesting.java | 4 + .../nats/client/impl/MessageManagerTests.java | 3 +- .../io/nats/client/impl/ReconnectTests.java | 37 ++++--- .../nats/client/utils/LongRunningServer.java | 22 ++-- .../java/io/nats/client/utils/TestBase.java | 83 +++++++------- .../io/nats/client/utils/TestOptions.java | 103 ++++++++++++++++++ 10 files changed, 185 insertions(+), 82 deletions(-) create mode 100644 src/test/java/io/nats/client/utils/TestOptions.java diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 98dc7f199..72cdd94fb 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -39,6 +39,7 @@ import static io.nats.client.NatsTestServer.configuredServer; import static io.nats.client.NatsTestServer.skipValidateServer; +import static io.nats.client.utils.TestOptions.NOOP_EL; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @@ -385,7 +386,7 @@ public void testBadToken() { Options options = new Options.Builder() .server(ts.getURI()) .maxReconnects(0) - .errorListener(NO_OP_EL) + .errorListener(NOOP_EL) .token("notthetoken".toCharArray()) .build(); Nats.connect(options); // expected to fail @@ -688,7 +689,7 @@ private static void _testReconnectAfter(String errText) throws Exception { .maxReconnects(-1) .noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) - .errorListener(NO_OP_EL) + .errorListener(NOOP_EL) .build(); Connection nc = standardConnectionWait(options); diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 2a6f849d4..8d7f8dc8c 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.time.Duration; +import static io.nats.client.utils.TestOptions.NOOP_EL; import static org.junit.jupiter.api.Assertions.*; public class EchoTests { @@ -29,7 +30,7 @@ public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().errorListener(TestBase.NO_OP_EL).build(); + Options opt = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().errorListener(NOOP_EL).build(); try { nc = Nats.connect(opt); // Should fail } @@ -47,7 +48,7 @@ public void testFailWithBadServerProtocol() { public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noReconnect().errorListener(TestBase.NO_OP_EL).build(); + Options opt = new Options.Builder().server(ts.getURI()).noReconnect().errorListener(NOOP_EL).build(); try { nc = Nats.connect(opt); } finally { diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index bc31c37b8..c8340655d 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -29,7 +29,6 @@ public class NatsTestServer extends NatsServerRunner { NatsRunnerUtils.setDefaultConnectValidateTries(10); NatsRunnerUtils.setDefaultConnectValidateTimeout(200); NatsRunnerUtils.setDefaultOutputSupplier(ConsoleOutput::new); - NatsRunnerUtils.setDefaultLocalhostHost(NatsRunnerUtils.LocalHost.ip); } public static void quiet() { diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index 3d406b8cc..5b40180ae 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -1425,7 +1425,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(new Options.Builder().errorListener(listener), TestBase::atLeast2_10_26, (nc, jsm, js) -> { + runInLrServer(listener, TestBase::atLeast2_10_26, (nc, jsm, js) -> { String stream = random(); String subject = random(); @@ -1486,7 +1486,7 @@ public void testNoRespondersWhenConsumerDeleted() throws Exception { private static void validate1026(Message m, ListenerForTesting listener, boolean empty) { assertNull(m); - sleep(100); // give time for the message to get there + sleep(250); // give time for the message to get there assertEquals(empty, listener.getPullStatusWarnings().isEmpty()); } diff --git a/src/test/java/io/nats/client/impl/ListenerForTesting.java b/src/test/java/io/nats/client/impl/ListenerForTesting.java index e29a26af0..325fbf5a6 100644 --- a/src/test/java/io/nats/client/impl/ListenerForTesting.java +++ b/src/test/java/io/nats/client/impl/ListenerForTesting.java @@ -69,6 +69,10 @@ public ListenerForTesting() { this(false, false); } + public ListenerForTesting(boolean verbose) { + this(false, verbose); + } + public ListenerForTesting(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index a4dcd6a0b..62ce1042e 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -30,6 +30,7 @@ import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; import static io.nats.client.support.NatsJetStreamConstants.CONSUMER_STALLED_HDR; import static io.nats.client.support.Status.*; +import static io.nats.client.utils.TestOptions.NOOP_EL; import static org.junit.jupiter.api.Assertions.*; @SuppressWarnings("SameParameterValue") @@ -574,7 +575,7 @@ static class MockPublishInternal extends NatsConnection { String fcSubject; public MockPublishInternal() { - this(new Options.Builder().errorListener(NO_OP_EL).build()); + this(new Options.Builder().errorListener(NOOP_EL).build()); } public MockPublishInternal(Options options) { diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 8bcb256fb..375c23cc2 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -37,6 +37,7 @@ import static io.nats.client.NatsTestServer.getNatsLocalhostUri; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.TestOptions.NOOP_EL; import static org.junit.jupiter.api.Assertions.*; @Isolated @@ -74,7 +75,7 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer testConn = new AtomicReference<>(); @@ -792,7 +793,7 @@ public void append(int index, Options.Builder builder) { if (index == 0) { builder .connectionListener(listener) - .errorListener(NO_OP_EL) + .errorListener(NOOP_EL) .ignoreDiscoveredServers() .noRandomize(); } @@ -858,7 +859,7 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount, Options options = Options.builder() .server(getNatsLocalhostUri(port)) .connectionListener(listener) - .errorListener(NO_OP_EL) + .errorListener(NOOP_EL) .dataPortType(ForceReconnectQueueCheckDataPort.class.getCanonicalName()) .build(); diff --git a/src/test/java/io/nats/client/utils/LongRunningServer.java b/src/test/java/io/nats/client/utils/LongRunningServer.java index e9dd97b79..795fdae56 100644 --- a/src/test/java/io/nats/client/utils/LongRunningServer.java +++ b/src/test/java/io/nats/client/utils/LongRunningServer.java @@ -13,7 +13,10 @@ package io.nats.client.utils; -import io.nats.client.*; +import io.nats.client.Connection; +import io.nats.client.Nats; +import io.nats.client.NatsTestServer; +import io.nats.client.Options; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; @@ -23,28 +26,26 @@ public abstract class LongRunningServer { - private static final ErrorListener NO_OP_EL = new ErrorListener() {}; - private static final ReentrantLock lock = new ReentrantLock(); private static final int MAX_TRIES = 3; private static NatsTestServer natsTestServer; - private static String uri; + private static String server; private static Connection[] ncs; public static Options.Builder optionsBuilder() throws IOException { - return new Options.Builder().server(uri()).errorListener(NO_OP_EL); + return TestOptions.optionsBuilder(server()); } public static Options options() throws IOException { return optionsBuilder().build(); } - public static String uri() throws IOException { - if (uri == null) { + public static String server() throws IOException { + if (server == null) { ensureInitialized(); } - return uri; + return server; } // do not use LrConns in try-resources @@ -96,14 +97,12 @@ private static void ensureInitialized() throws IOException { .jetstream(true) .customName("LongRunningServer") ); - uri = natsTestServer.getURI(); -// System.out.println("LongRunningServer create " + uri); + server = natsTestServer.getURI(); final Thread shutdownHookThread = new Thread("LongRunningServer-Shutdown-Hook") { @Override public void run() { try { -// System.out.println("LongRunningServer shutting down"); natsTestServer.shutdown(false); } catch (InterruptedException e) { @@ -114,7 +113,6 @@ public void run() { Runtime.getRuntime().addShutdownHook(shutdownHookThread); } -// System.out.println("LongRunningServer return " + natsTestServer.getNatsLocalhostUri()); } finally { lock.unlock(); diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 320e46327..03b5e70df 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -37,6 +37,7 @@ import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_ARGUMENT; import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_STATE; +import static io.nats.client.utils.TestOptions.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class TestBase { @@ -87,8 +88,6 @@ public class TestBase { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; - public static ErrorListener NO_OP_EL = new ErrorListener() {}; - // ---------------------------------------------------------------------------------------------------- // VersionCheck // ---------------------------------------------------------------------------------------------------- @@ -219,6 +218,32 @@ public static void cleanupJs(JetStreamManagement jsm) // ---------------------------------------------------------------------------------------------------- // runners -> new server // ---------------------------------------------------------------------------------------------------- + private static void _runInServer(boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { + if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { + return; // had vc, already had run server info and fails check + } + + try (NatsTestServer ts = new NatsTestServer(NatsTestServer.builder().jetstream(jetstream))) { + if (builder == null) { + builder = optionsBuilder(); + } + + try (Connection nc = standardConnectionWait(builder.server(ts.getURI()).build())) { + initRunServerInfo(nc); + if (vc == null || vc.runTest(RUN_SERVER_INFO)) { + try { + inServerTest.test(nc); + } + finally { + if (jetstream) { + cleanupJs(nc); + } + } + } + } + } + } + public static void runInServer(InServerTest inServerTest) throws Exception { _runInServer(false, null, null, inServerTest); } @@ -236,15 +261,11 @@ public static void runInJsServer(VersionCheck vc, InServerTest inServerTest) thr } public static void runInJsServer(ErrorListener el, InServerTest inServerTest) throws Exception { - _runInServer(true, Options.builder().errorListener(el), null, inServerTest); + _runInServer(true, optionsBuilder(el), null, inServerTest); } public static void runInJsServer(ErrorListener el, VersionCheck vc, InServerTest inServerTest) throws Exception { - _runInServer(true, Options.builder().errorListener(el), vc, inServerTest); - } - - private static Options.Builder builder(ErrorListener el) { - return Options.builder().errorListener(el); + _runInServer(true, optionsBuilder(el), vc, inServerTest); } // ---------------------------------------------------------------------------------------------------- @@ -270,12 +291,16 @@ public static void runInLrServer(VersionCheck vc, InJetStreamTest jsTest) throws _runInLrServer(null, vc, null, jsTest, null); } + public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTest jsTest) throws Exception { + _runInLrServer(builder, vc, null, jsTest, null); + } + public static void runInLrServer(ErrorListener el, InJetStreamTest jsTest) throws Exception { - _runInLrServer(builder(el), null, null, jsTest, null); + _runInLrServer(optionsBuilder(el), null, null, jsTest, null); } - public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTest jsTest) throws Exception { - _runInLrServer(builder, vc, null, jsTest, null); + public static void runInLrServer(ErrorListener el, VersionCheck vc, InJetStreamTest jsTest) throws Exception { + _runInLrServer(optionsBuilder(el), vc, null, jsTest, null); } public static void runInLrServer(InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { @@ -287,11 +312,11 @@ public static void runInLrServer(VersionCheck vc, InJetStreamTestingContextTest } public static void runInLrServer(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(builder(el), vc, null, null, oneSubjectJstcTest); + _runInLrServer(optionsBuilder(el), vc, null, null, oneSubjectJstcTest); } public static void runInLrServer(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(builder(el), null, null, null, oneSubjectJstcTest); + _runInLrServer(optionsBuilder(el), null, null, null, oneSubjectJstcTest); } public static void runInLrServer(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { @@ -302,36 +327,6 @@ public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJet _runInLrServer(builder, vc, null, null, oneSubjectJstcTest); } - // ---------------------------------------------------------------------------------------------------- - // runners impl -> new server - // runners impl -> long running server - // ---------------------------------------------------------------------------------------------------- - private static void _runInServer(boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { - if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { - return; // had vc, already had run server info and fails check - } - - try (NatsTestServer ts = new NatsTestServer(NatsTestServer.builder().jetstream(jetstream))) { - if (builder == null) { - builder = new Options.Builder().errorListener(NO_OP_EL); - } - - try (Connection nc = standardConnectionWait(builder.server(ts.getURI()).build())) { - initRunServerInfo(nc); - if (vc == null || vc.runTest(RUN_SERVER_INFO)) { - try { - inServerTest.test(nc); - } - finally { - if (jetstream) { - cleanupJs(nc); - } - } - } - } - } - } - private static void _runInLrServer(Options.Builder builder, VersionCheck vc, InServerTest test, InJetStreamTest jsTest, @@ -350,7 +345,7 @@ private static void _runInLrServer(Options.Builder builder, VersionCheck vc, } else { closeWhenDone = true; - nc = longConnectionWait(builder.server(LongRunningServer.uri()).build()); + nc = longConnectionWait(builder.server(LongRunningServer.server()).build()); } initRunServerInfo(nc); diff --git a/src/test/java/io/nats/client/utils/TestOptions.java b/src/test/java/io/nats/client/utils/TestOptions.java new file mode 100644 index 000000000..e68162fcb --- /dev/null +++ b/src/test/java/io/nats/client/utils/TestOptions.java @@ -0,0 +1,103 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import io.nats.client.ErrorListener; +import io.nats.client.Options; +import org.jspecify.annotations.NonNull; + +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * ---------------------------------------------------------------------------------------------------- + * THIS IS THE PREFERRED WAY TO BUILD ANY OPTIONS FOR TESTING + * ---------------------------------------------------------------------------------------------------- + * Use optionsBuilder(uri) if you need to customize some stuff, for instance custom listeners + * Use options(uri) if you need the default options + * ---------------------------------------------------------------------------------------------------- + */ +public abstract class TestOptions { + + public static ErrorListener NOOP_EL = new ErrorListener() {}; + + public static Options.Builder optionsBuilder(ErrorListener el) { + return optionsBuilder().errorListener(el); + } + + public static Options.Builder optionsBuilder(String server) { + return optionsBuilder().server(server); + } + + public static Options options(String server) { + return optionsBuilder().server(server).build(); + } + + public static Options.Builder optionsBuilder() { + if (ES == null) { + ES = new ThreadPoolExecutor(0, Integer.MAX_VALUE, + 500L, TimeUnit.MILLISECONDS, + new SynchronousQueue<>(), + new TestThreadFactory("ES")); + } + + if (SCHD == null) { + SCHD = new ScheduledThreadPoolExecutor(3, new TestThreadFactory("SCHD")); + SCHD.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); + SCHD.setRemoveOnCancelPolicy(true); + } + + if (CB == null) { + CB = new TestThreadFactory("CB"); + } + + if (CN == null) { + CN = new TestThreadFactory("CN"); + } + + return Options.builder() + .executor(ES) + .scheduledExecutor(SCHD) + .callbackThreadFactory(CB) + .connectThreadFactory(CN) + .errorListener(NOOP_EL); + } + + static class TestThreadFactory implements ThreadFactory { + final String name; + final AtomicInteger threadNo; + + public TestThreadFactory(String name) { + this.name = name; + this.threadNo = new AtomicInteger(0); + } + + public Thread newThread(@NonNull Runnable r) { + String threadName = "test." + name + "." + threadNo.incrementAndGet(); + Thread t = new Thread(r, threadName); + if (t.isDaemon()) { + t.setDaemon(false); + } + if (t.getPriority() != Thread.NORM_PRIORITY) { + t.setPriority(Thread.NORM_PRIORITY); + } + return t; + } + } + + static ExecutorService ES; + static ScheduledThreadPoolExecutor SCHD; + static ThreadFactory CB; + static ThreadFactory CN; +} From fa32af0cc77422fa08f04ba92a00f5c96361ad51 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 20 Nov 2025 08:57:38 -0500 Subject: [PATCH 05/51] Fix removed Automatic-Module-Name --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 5974bef76..df7bd6d3c 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,9 @@ tasks.register('bundle', Bundle) { } jar { + manifest { + attributes('Automatic-Module-Name': 'io.nats.jnats') + } bundle { bnd("Bundle-Name": "io.nats.jnats", "Bundle-Vendor": "nats.io", From 976f044187fcef07eb4325255e4360f76b9b9520 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 20 Nov 2025 17:24:10 -0500 Subject: [PATCH 06/51] Resuing options builder to share executors making as few threads / pools as possible --- src/test/java/io/nats/client/AuthTests.java | 74 +++-- .../java/io/nats/client/ConnectTests.java | 107 +++---- src/test/java/io/nats/client/EchoTests.java | 13 +- .../nats/client/NatsServerProtocolMock.java | 10 +- .../java/io/nats/client/OptionsTests.java | 124 ++++---- .../java/io/nats/client/PublishTests.java | 16 +- .../java/io/nats/client/SubscriberTests.java | 10 +- .../client/api/StreamConfigurationTests.java | 3 +- .../nats/client/impl/AuthAndConnectTests.java | 16 +- ...tionDuringReconnectOnFlushTimeoutTest.java | 22 +- .../client/impl/ConnectionListenerTests.java | 49 ++-- .../io/nats/client/impl/DispatcherTests.java | 31 +- .../java/io/nats/client/impl/DrainTests.java | 163 +++++------ .../nats/client/impl/ErrorListenerTests.java | 88 +++--- .../io/nats/client/impl/InfoHandlerTests.java | 40 ++- .../client/impl/JetStreamConsumerTests.java | 5 +- .../client/impl/JetStreamGeneralTests.java | 12 +- .../client/impl/JetStreamManagementTests.java | 19 +- .../JetStreamManagementWithConfTests.java | 4 +- .../impl/JetStreamMirrorAndSourcesTests.java | 6 +- .../nats/client/impl/JetStreamPubTests.java | 4 + .../nats/client/impl/JetStreamPullTests.java | 25 +- .../client/impl/JetStreamPushAsyncTests.java | 1 + .../nats/client/impl/JetStreamPushTests.java | 1 + .../nats/client/impl/JetStreamTestBase.java | 1 + .../io/nats/client/impl/KeyValueTests.java | 29 +- .../nats/client/impl/MessageContentTests.java | 11 +- .../nats/client/impl/MessageManagerTests.java | 7 +- .../nats/client/impl/MessageQueueTests.java | 2 +- .../client/impl/NatsConnectionImplTests.java | 14 +- .../io/nats/client/impl/NatsMessageTests.java | 8 +- .../nats/client/impl/NatsStatisticsTests.java | 253 +++++++--------- .../io/nats/client/impl/ObjectStoreTests.java | 5 +- .../java/io/nats/client/impl/ParseTests.java | 34 ++- .../java/io/nats/client/impl/PingTests.java | 24 +- .../io/nats/client/impl/ReconnectTests.java | 123 ++++---- .../io/nats/client/impl/RequestTests.java | 95 +++--- .../io/nats/client/impl/ServerPoolTests.java | 23 +- .../nats/client/impl/SimplificationTests.java | 49 ++-- .../nats/client/impl/SlowConsumerTests.java | 16 +- .../io/nats/client/impl/TLSConnectTests.java | 93 +++--- .../client/impl/ValidateIssue1426Test.java | 5 +- .../client/impl/WebsocketConnectTests.java | 1 + .../io/nats/client/support/JwtUtilsTests.java | 2 +- .../io/nats/client/utils/ConnectionUtils.java | 167 +++++++++++ .../nats/client/utils/LongRunningServer.java | 19 +- .../{TestOptions.java => OptionsUtils.java} | 34 ++- .../java/io/nats/client/utils/TestBase.java | 271 ++---------------- .../io/nats/client/utils/ThreadUtils.java | 27 ++ .../io/nats/client/utils/VersionUtils.java | 91 ++++++ .../java/io/nats/service/ServiceTests.java | 7 +- 51 files changed, 1107 insertions(+), 1147 deletions(-) create mode 100644 src/test/java/io/nats/client/utils/ConnectionUtils.java rename src/test/java/io/nats/client/utils/{TestOptions.java => OptionsUtils.java} (78%) create mode 100644 src/test/java/io/nats/client/utils/ThreadUtils.java create mode 100644 src/test/java/io/nats/client/utils/VersionUtils.java diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 72cdd94fb..156d6c7a3 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -39,7 +39,8 @@ import static io.nats.client.NatsTestServer.configuredServer; import static io.nats.client.NatsTestServer.skipValidateServer; -import static io.nats.client.utils.TestOptions.NOOP_EL; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @@ -51,7 +52,7 @@ public void testUserPass() throws Exception { String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .userInfo("stephen".toCharArray(), "password".toCharArray()).build(); assertCanConnect(options); } @@ -91,7 +92,7 @@ public void testEncodedPassword() throws Exception { private void assertEncoded(String encoded, int port) throws IOException, InterruptedException { String url = "nats://u" + encoded + ":p" + encoded + "@localhost:" + port; - Options options = new Options.Builder().server(url).build(); + Options options = optionsBuilder(url).build(); Connection c = Nats.connect(options); c.getServerInfo(); c.close(); @@ -117,7 +118,7 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsServerRunner.builder().customArgs(customArgs))) { // See config file for user/pass - Options options = new Options.Builder().server("nats://localhost:" + ts.getPort()) + Options options = optionsBuilder("nats://localhost:" + ts.getPort()) .userInfo(user, pass) .maxReconnects(0).build(); assertCanConnect(options); @@ -135,7 +136,7 @@ public void testUserPassOnReconnect() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { port = ts.getPort(); // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(-1) + Options options = optionsBuilder(ts.getURI()).maxReconnects(-1) .userInfo("stephen".toCharArray(), "password".toCharArray()).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -176,7 +177,7 @@ public void testUserBCryptPass() throws Exception { "$2a$11$1oJy/wZYNTxr9jNwMNwS3eUGhBpHT3On8CL9o7ey89mpgo88VG6ba" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .userInfo("ginger".toCharArray(), "password".toCharArray()).build(); assertCanConnect(options); } @@ -187,7 +188,7 @@ public void testUserPassInURL() throws Exception { String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts.getPort()) + Options options = optionsBuilder("nats://stephen:password@localhost:" + ts.getPort()) .maxReconnects(0).build(); assertCanConnect(options); } @@ -197,14 +198,14 @@ public void testUserPassInURL() throws Exception { public void testUserPassInURLOnReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); int port; - Connection nc = null; - Subscription sub = null; + Connection nc; + Subscription sub; String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { port = ts.getPort(); // See config file for user/pass - Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts.getPort()) + Options options = optionsBuilder("nats://stephen:password@localhost:" + ts.getPort()) .maxReconnects(-1).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -243,7 +244,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts1.getPort()) + Options options = optionsBuilder("nats://stephen:password@localhost:" + ts1.getPort()) .server("nats://alberto:casadecampo@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); Connection nc = standardConnectionWait(options); @@ -265,7 +266,7 @@ public void testUserPassInURLWithFallback() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://stephen:password@localhost:" + ts1.getPort()) + Options options = optionsBuilder("nats://stephen:password@localhost:" + ts1.getPort()) .server("nats://localhost:" + ts2.getPort()).noRandomize() .userInfo("alberto".toCharArray(), "casadecampo".toCharArray()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); @@ -289,7 +290,7 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://token_one@localhost:" + ts1.getPort()) + Options options = optionsBuilder("nats://token_one@localhost:" + ts1.getPort()) .server("nats://token_two@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); Connection nc = standardConnectionWait(options); @@ -310,11 +311,11 @@ public void testTokenInURLWithFallback() throws Exception { String[] customArgs1 = { "--auth", "token_one" }; String[] customArgs2 = { "--auth", "token_two" }; ListenerForTesting listener = new ListenerForTesting(); - Connection nc = null; + Connection nc; try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://token_one@localhost:" + ts1.getPort()) + Options options = optionsBuilder("nats://token_one@localhost:" + ts1.getPort()) .server("nats://localhost:" + ts2.getPort()).token("token_two".toCharArray()).maxReconnects(4) .noRandomize().connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); nc = standardConnectionWait(options); @@ -335,7 +336,7 @@ public void testToken() throws Exception { String[] customArgs = { "--auth", "derek" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0).token("derek".toCharArray()) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0).token("derek".toCharArray()) .build(); assertCanConnect(options); } @@ -346,7 +347,7 @@ public void testTokenInURL() throws Exception { String[] customArgs = { "--auth", "alberto" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server("nats://alberto@localhost:" + ts.getPort()).maxReconnects(0) + Options options = optionsBuilder("nats://alberto@localhost:" + ts.getPort()).maxReconnects(0) .build(); assertCanConnect(options); } @@ -358,7 +359,7 @@ public void testBadUserBadPass() { String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .userInfo("sam".toCharArray(), "notthepassword".toCharArray()).build(); Nats.connect(options); // expected to fail } @@ -371,7 +372,7 @@ public void testMissingUserPass() { String[] customArgs = { "--user", "wally", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0).build(); + Options options = optionsBuilder(ts.getURI()).maxReconnects(0).build(); Nats.connect(options); // expected to fail } }); @@ -383,10 +384,8 @@ public void testBadToken() { String[] customArgs = { "--auth", "colin" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts.getURI()) .maxReconnects(0) - .errorListener(NOOP_EL) .token("notthetoken".toCharArray()) .build(); Nats.connect(options); // expected to fail @@ -400,7 +399,7 @@ public void testMissingToken() { String[] customArgs = { "--auth", "ivan" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0).build(); + Options options = optionsBuilder(ts.getURI()).maxReconnects(0).build(); Nats.connect(options); // expected to fail } }); @@ -437,7 +436,7 @@ public void testNKeyAuth() throws Exception { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .authHandler(new AuthHandlerForTesting(theKey)).build(); assertCanConnect(options); } @@ -451,7 +450,7 @@ public void testStaticNKeyAuth() throws Exception { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); assertCanConnect(options); } @@ -468,12 +467,12 @@ public void testStaticNKeyAuth() throws Exception { public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf")) { - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) .build(); assertCanConnect(options); - options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + options = optionsBuilder(ts.getURI()).maxReconnects(0) .credentialPath("src/test/resources/jwt_nkey/user.creds") .build(); assertCanConnect(options); @@ -498,7 +497,7 @@ public void testJWTAuthWithCredsFile() throws Exception { public void testWsJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); - Options options = new Options.Builder().server(uri).maxReconnects(0) + Options options = optionsBuilder(uri).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); assertCanConnect(options); } @@ -518,7 +517,7 @@ public void testWssJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipValidateServer("wss_operator.conf")) { String uri = ts.getLocalhostUri("wss"); - Options options = new Options.Builder().server(uri).maxReconnects(0).sslContext(ctx) + Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); assertCanConnect(options); } @@ -531,7 +530,7 @@ public void testStaticJWTAuth() throws Exception { String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false)) { - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); } @@ -546,7 +545,7 @@ public void testBadAuthHandler() { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = new Options.Builder().server(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts.getURI()).maxReconnects(0) .authHandler(new AuthHandlerForTesting(null)). // No nkey build(); Connection nc = Nats.connect(options); @@ -560,7 +559,7 @@ public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { - Options options = new Options.Builder().servers(new String[]{ts.getURI(), ts2.getURI()}) + Options options = optionsBuilder(ts.getURI(), ts2.getURI()) .noRandomize().maxReconnects(-1).authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); Connection nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); @@ -583,7 +582,7 @@ public void testCloseOnReconnectWithSameError() throws Exception { // Connect should fail on ts1 try (NatsTestServer ts = NatsTestServer.configuredServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { - Options options = new Options.Builder().servers(new String[]{ts.getURI(), ts2.getURI()}) + Options options = optionsBuilder(ts.getURI(), ts2.getURI()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); Connection nc = standardConnectionWait(options); @@ -605,8 +604,8 @@ public void testThatAuthErrorIsCleared() throws Exception { try (NatsTestServer ts1 = NatsTestServer.configuredServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { - Options options = new Options.Builder() - .servers(new String[]{ts1.getURI(), ts2.getURI()}).noRandomize() + Options options = optionsBuilder(ts1.getURI(), ts2.getURI()) + .noRandomize() .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) // wait a tad to allow restarts @@ -671,7 +670,7 @@ public void testReconnectAfterAccountAuthenticationExpired() throws Exception { private static void _testReconnectAfter(String errText) throws Exception { ListenerForTesting listener = new ListenerForTesting(); - CompletableFuture f = new CompletableFuture(); + CompletableFuture f = new CompletableFuture<>(); NatsServerProtocolMock.Customizer timeoutCustomizer = (ts, r, w) -> { f.join(); // wait until we are ready @@ -684,12 +683,11 @@ private static void _testReconnectAfter(String errText) throws Exception { // Connect should fail on ts1 try (NatsServerProtocolMock ts = new NatsServerProtocolMock(timeoutCustomizer, port, true); NatsTestServer ts2 = skipValidateServer("operator.conf")) { - Options options = new Options.Builder() + Options options = optionsBuilder() .servers(new String[]{ts.getURI(), ts2.getURI()}) .maxReconnects(-1) .noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) - .errorListener(NOOP_EL) .build(); Connection nc = standardConnectionWait(options); diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 05b40985f..03242df46 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -20,6 +20,7 @@ import io.nats.client.impl.SimulateSocketDataPortException; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.net.InetAddress; @@ -32,14 +33,19 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; +@Isolated public class ConnectTests { @Test public void testDefaultConnection() throws Exception { try (NatsTestServer ignored = new NatsTestServer(Options.DEFAULT_PORT, false)) { - Connection nc = TestBase.standardConnectionWait(); + Connection nc = standardConnectionWait(); assertEquals(Options.DEFAULT_PORT, nc.getServerInfo().getPort()); standardCloseConnection(nc); } @@ -47,8 +53,8 @@ public void testDefaultConnection() throws Exception { @Test public void testConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = TestBase.standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = new NatsTestServer()) { + Connection nc = standardConnectionWait(ts.getURI()); assertEquals(ts.getPort(), nc.getServerInfo().getPort()); // coverage for getClientAddress InetAddress inetAddress = nc.getClientInetAddress(); @@ -61,8 +67,8 @@ public void testConnection() throws Exception { @Test public void testConnectionWithOptions() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).build(); assertCanConnect(options); } } @@ -86,7 +92,7 @@ public void testFullFakeConnectWithTabs() throws Exception { public void testConnectExitBeforeInfo() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + Options options = optionsBuilder(ts.getURI()).noReconnect().build(); assertCanConnect(options); } }); @@ -96,7 +102,7 @@ public void testConnectExitBeforeInfo() { public void testConnectExitAfterInfo() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + Options options = optionsBuilder(ts.getURI()).noReconnect().build(); assertCanConnect(options); } }); @@ -106,7 +112,7 @@ public void testConnectExitAfterInfo() { public void testConnectExitAfterConnect() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + Options options = optionsBuilder(ts.getURI()).noReconnect().build(); assertCanConnect(options); } }); @@ -116,7 +122,7 @@ public void testConnectExitAfterConnect() { public void testConnectExitAfterPing() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect().build(); + Options options = optionsBuilder(ts.getURI()).noReconnect().build(); assertCanConnect(options); } }); @@ -124,11 +130,11 @@ public void testConnectExitAfterPing() { @Test public void testConnectionFailureWithFallback() throws Exception { - - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { try (NatsServerProtocolMock fake = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = new Options.Builder().connectionTimeout(Duration.ofSeconds(5)).server(fake.getURI()) - .server(ts.getURI()).build(); + Options options = optionsBuilder(fake.getURI(), ts.getNatsLocalhostUri()) + .connectionTimeout(Duration.ofSeconds(5)) + .build(); assertCanConnect(options); } } @@ -143,8 +149,8 @@ public void testConnectWithConfig() throws Exception { @Test public void testConnectWithCommas() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { + try (NatsTestServer ts1 = new NatsTestServer()) { + try (NatsTestServer ts2 = new NatsTestServer()) { assertCanConnect(ts1.getURI() + "," + ts2.getURI()); } } @@ -152,14 +158,14 @@ public void testConnectWithCommas() throws Exception { @Test public void testConnectRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { + try (NatsTestServer ts1 = new NatsTestServer()) { + try (NatsTestServer ts2 = new NatsTestServer()) { boolean needOne = true; boolean needTwo = true; int count = 0; int maxTries = 100; while (count++ < maxTries && (needOne || needTwo)) { - Connection nc = TestBase.standardConnectionWait(ts1.getURI() + "," + ts2.getURI()); + Connection nc = standardConnectionWait(ts1.getURI() + "," + ts2.getURI()); if (ts1.getURI().equals(nc.getConnectedUrl())) { needOne = false; } else { @@ -178,16 +184,15 @@ public void testConnectRandomize() throws Exception { @Test public void testConnectNoRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer(false)) { - try (NatsTestServer ts2 = new NatsTestServer(false)) { + try (NatsTestServer ts1 = new NatsTestServer()) { + try (NatsTestServer ts2 = new NatsTestServer()) { int one = 0; int two = 0; // should get at least 1 for each for (int i = 0; i < 10; i++) { - String[] servers = { ts1.getURI(), ts2.getURI() }; - Options options = new Options.Builder().noRandomize().servers(servers).build(); - Connection nc = TestBase.standardConnectionWait(options); + Options options = optionsBuilder(ts1.getURI(), ts2.getURI()).noRandomize().build(); + Connection nc = standardConnectionWait(options); if (ts1.getURI().equals(nc.getConnectedUrl())) { one++; } else { @@ -207,7 +212,7 @@ public void testFailWithMissingLineFeedAfterInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -218,7 +223,7 @@ public void testFailWithStuffAfterInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -230,7 +235,7 @@ public void testFailWrongInitialInfoOP() { String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { ts.useCustomInfoAsFullInfo(); - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -241,7 +246,7 @@ public void testIncompleteInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\"\r\n"; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = new Options.Builder().server(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -250,8 +255,8 @@ public void testIncompleteInitialInfo() { @Test public void testAsyncConnection() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).connectionListener(listener).build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).connectionListener(listener).build(); listener.prepForStatusChange(Events.CONNECTED); Nats.connectAsynchronously(options, false); @@ -269,7 +274,7 @@ public void testAsyncConnection() throws Exception { public void testAsyncConnectionWithReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); int port = NatsTestServer.nextPort(); - Options options = new Options.Builder().server("nats://localhost:" + port).maxReconnects(-1) + Options options = optionsBuilder(port).maxReconnects(-1) .reconnectWait(Duration.ofMillis(100)).connectionListener(listener).build(); Nats.connectAsynchronously(options, true); @@ -281,7 +286,7 @@ public void testAsyncConnectionWithReconnect() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port, false)) { - TestBase.listenerConnectionWait(nc, listener); + listenerConnectionWait(nc, listener); standardCloseConnection(nc); } } @@ -289,8 +294,8 @@ public void testAsyncConnectionWithReconnect() throws Exception { @Test public void testThrowOnAsyncWithoutListener() { assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).build(); Nats.connectAsynchronously(options, false); } }); @@ -299,7 +304,7 @@ public void testThrowOnAsyncWithoutListener() { @Test public void testErrorOnAsync() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - Options options = new Options.Builder().server("nats://localhost:" + NatsTestServer.nextPort()) + Options options = optionsBuilder(NatsTestServer.nextPort()) .connectionListener(listener).errorListener(listener).noReconnect().build(); listener.prepForStatusChange(Events.CLOSED); Nats.connectAsynchronously(options, false); @@ -313,7 +318,7 @@ public void testErrorOnAsync() throws Exception { public void testConnectionTimeout() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 - Options options = new Options.Builder().server(ts.getURI()).noReconnect().traceConnection() + Options options = optionsBuilder(ts.getURI()).noReconnect().traceConnection() .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test build(); Connection nc = Nats.connect(options); @@ -325,7 +330,7 @@ public void testConnectionTimeout() { @Test public void testSlowConnectionNoTimeout() throws Exception { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { - Options options = new Options.Builder().server(ts.getURI()).noReconnect() + Options options = optionsBuilder(ts.getURI()).noReconnect() .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep build(); assertCanConnect(options); @@ -337,11 +342,11 @@ public void testTimeCheckCoverage() throws Exception { List traces = new ArrayList<>(); TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).traceConnection().build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).traceConnection().build(); assertCanConnect(options); - options = new Options.Builder().server(ts.getURI()).timeTraceLogger(l).build(); + options = optionsBuilder(ts).timeTraceLogger(l).build(); assertCanConnect(options); } @@ -375,9 +380,8 @@ public void testReconnectLogging() throws Exception { List traces = new ArrayList<>(); TimeTraceLogger l = (f, a) -> traces.add(String.format(f, a)); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder() - .server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .traceConnection() .timeTraceLogger(l) .reconnectWait(Duration.ofSeconds(1)) @@ -399,7 +403,7 @@ public void testReconnectLogging() throws Exception { @Test public void testConnectExceptionHasURLS() { try { - Nats.connect("nats://testserver.notnats:4222, nats://testserver.alsonotnats:4223"); + Nats.connect(options("nats://testserver.notnats:4222, nats://testserver.alsonotnats:4223")); } catch (Exception e) { assertTrue(e.getMessage().contains("testserver.notnats:4222")); assertTrue(e.getMessage().contains("testserver.alsonotnats:4223")); @@ -408,8 +412,8 @@ public void testConnectExceptionHasURLS() { @Test public void testFlushBuffer() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = TestBase.standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = new NatsTestServer()) { + Connection nc = standardConnectionWait(ts.getURI()); // test connected nc.flushBuffer(); @@ -430,8 +434,8 @@ public void testFlushBuffer() throws Exception { @Test public void testFlushBufferThreadSafety() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = TestBase.standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = new NatsTestServer()) { + Connection nc = standardConnectionWait(ts.getURI()); // use two latches to sync the threads as close as // possible. @@ -508,8 +512,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { } }; - Options options = new Options.Builder() - .server(NatsTestServer.getNatsLocalhostUri(port)) + Options options = optionsBuilder(port) .dataPortType("io.nats.client.impl.SimulateSocketDataPortException") .connectionListener(listener) .errorListener(el) @@ -635,9 +638,9 @@ void testLowConnectionTimeoutResultsInIOException() { @Test void testConnectWithFastFallback() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).enableFastFallback().build(); - Connection nc = TestBase.standardConnectionWait(options); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).enableFastFallback().build(); + Connection nc = standardConnectionWait(options); standardCloseConnection(nc); } } diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 8d7f8dc8c..60f3676a1 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -21,16 +21,16 @@ import java.io.IOException; import java.time.Duration; -import static io.nats.client.utils.TestOptions.NOOP_EL; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; -public class EchoTests { +public class EchoTests extends TestBase { @Test public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noEcho().noReconnect().errorListener(NOOP_EL).build(); + Options opt = optionsBuilder(ts.getURI()).noEcho().noReconnect().build(); try { nc = Nats.connect(opt); // Should fail } @@ -48,7 +48,7 @@ public void testFailWithBadServerProtocol() { public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = new Options.Builder().server(ts.getURI()).noReconnect().errorListener(NOOP_EL).build(); + Options opt = optionsBuilder(ts.getURI()).noReconnect().build(); try { nc = Nats.connect(opt); } finally { @@ -91,8 +91,7 @@ public void testWithEcho() throws Exception { @Test public void testWithNoEcho() throws Exception { - Options options = LongRunningServer.optionsBuilder().noEcho().noReconnect().build(); - try (Connection nc1 = Nats.connect(options);) { + runInLrServer(optionsBuilder().noEcho().noReconnect(), nc1 -> { String subject = TestBase.random(); // Echo is off so sub should get messages from pub from other connections Subscription sub1 = nc1.subscribe(subject); @@ -103,6 +102,6 @@ public void testWithNoEcho() throws Exception { nc1.flush(Duration.ofSeconds(1)); Message msg = sub1.nextMessage(Duration.ofSeconds(1)); assertNull(msg); // no message for sub1 from pub 1 - } + }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/NatsServerProtocolMock.java b/src/test/java/io/nats/client/NatsServerProtocolMock.java index 6b1ce0981..6fd0583ea 100644 --- a/src/test/java/io/nats/client/NatsServerProtocolMock.java +++ b/src/test/java/io/nats/client/NatsServerProtocolMock.java @@ -24,7 +24,7 @@ * Handles the begining of the connect sequence, all hard coded, but * is configurable to fail at specific points to allow client testing. */ -public class NatsServerProtocolMock implements Closeable{ +public class NatsServerProtocolMock implements Closeable { // Default is to exit after pong public enum ExitAt { @@ -49,11 +49,11 @@ public enum Progress { } public interface Customizer { - public void customizeTest(NatsServerProtocolMock ts, BufferedReader reader, PrintWriter writer); + void customizeTest(NatsServerProtocolMock ts, BufferedReader reader, PrintWriter writer); } - private int port; - private ExitAt exitAt; + private final int port; + private final ExitAt exitAt; private Progress progress; private boolean protocolFailure; private CompletableFuture waitForIt; @@ -105,7 +105,7 @@ public NatsServerProtocolMock(Customizer custom, String customInfo) throws IOExc private void start() { this.progress = Progress.NO_CLIENT; this.waitForIt = new CompletableFuture<>(); - Thread t = new Thread(() -> {accept();}); + Thread t = new Thread(this::accept); t.start(); try { Thread.sleep(100); diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index 6ca01a87f..36db53161 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -39,6 +39,8 @@ import static io.nats.client.Options.*; import static io.nats.client.support.Encoding.base64UrlEncodeToString; import static io.nats.client.support.NatsConstants.DEFAULT_PORT; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class OptionsTests { @@ -54,7 +56,7 @@ public void testClientVersion() { @Test public void testDefaultOptions() { - Options o = new Options.Builder().build(); + Options o = optionsBuilder().errorListener(null).build(); _testDefaultOptions(o); _testDefaultOptions(new Options.Builder(o).build()); } @@ -105,7 +107,7 @@ private static void _testDefaultOptions(Options o) { @Test public void testOldStyle() { - Options o = new Options.Builder().build(); + Options o = options(); assertFalse(o.isOldRequestStyle(), "default oldstyle"); //noinspection deprecation o.setOldRequestStyle(true); @@ -117,7 +119,7 @@ public void testOldStyle() { @Test public void testChainedBooleanOptions() { - Options o = new Options.Builder().verbose().pedantic().noRandomize() + Options o = optionsBuilder().verbose().pedantic().noRandomize() .noEcho().oldRequestStyle().noHeaders().noNoResponders() .discardMessagesWhenOutgoingQueueFull() .build(); @@ -139,7 +141,7 @@ private static void _testChainedBooleanOptions(Options o) { @Test public void testChainedStringOptions() { - Options o = new Options.Builder().userInfo("hello".toCharArray(), "world".toCharArray()).connectionName("name").build(); + Options o = optionsBuilder().userInfo("hello".toCharArray(), "world".toCharArray()).connectionName("name").build(); _testChainedStringOptions(o); _testChainedStringOptions(new Options.Builder(o).build()); } @@ -155,7 +157,7 @@ private static void _testChainedStringOptions(Options o) { public void testChainedSecure() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); SSLContext.setDefault(ctx); - Options o = new Options.Builder().secure().build(); + Options o = optionsBuilder().secure().build(); _testChainedSecure(ctx, o); _testChainedSecure(ctx, new Options.Builder(o).build()); } @@ -167,7 +169,7 @@ private static void _testChainedSecure(SSLContext ctx, Options o) { @Test public void testChainedSSLOptions() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options o = new Options.Builder().sslContext(ctx).build(); + Options o = optionsBuilder().sslContext(ctx).build(); _testChainedSSLOptions(ctx, o); _testChainedSSLOptions(ctx, new Options.Builder(o).build()); } @@ -179,7 +181,7 @@ private static void _testChainedSSLOptions(SSLContext ctx, Options o) { @Test public void testChainedIntOptions() { - Options o = new Options.Builder().maxReconnects(100).maxPingsOut(200).reconnectBufferSize(300) + Options o = optionsBuilder().maxReconnects(100).maxPingsOut(200).reconnectBufferSize(300) .maxControlLine(400) .maxMessagesInOutgoingQueue(500) .build(); @@ -198,7 +200,7 @@ private static void _testChainedIntOptions(Options o) { @Test public void testChainedDurationOptions() { - Options o = new Options.Builder().reconnectWait(Duration.ofMillis(101)) + Options o = optionsBuilder().reconnectWait(Duration.ofMillis(101)) .connectionTimeout(Duration.ofMillis(202)).pingInterval(Duration.ofMillis(303)) .requestCleanupInterval(Duration.ofMillis(404)) .reconnectJitter(Duration.ofMillis(505)) @@ -226,13 +228,13 @@ public void testHttpRequestInterceptors() { java.util.function.Consumer interceptor2 = req -> { req.getHeaders().add("Test2", "Header"); }; - Options o = new Options.Builder() + Options o = optionsBuilder() .httpRequestInterceptor(interceptor1) .httpRequestInterceptor(interceptor2) .build(); assertEquals(o.getHttpRequestInterceptors(), Arrays.asList(interceptor1, interceptor2)); - o = new Options.Builder() + o = optionsBuilder() .httpRequestInterceptors(Arrays.asList(interceptor2, interceptor1)) .build(); assertEquals(o.getHttpRequestInterceptors(), Arrays.asList(interceptor2, interceptor1)); @@ -360,10 +362,10 @@ private static void _testPropertiesSSLOptions(Options o) { @Test public void testSupportUTF8Subjects() { - Options o = new Options.Builder().build(); + Options o = options(); assertFalse(o.supportUTF8Subjects()); - o = new Options.Builder().supportUTF8Subjects().build(); + o = optionsBuilder().supportUTF8Subjects().build(); assertTrue(o.supportUTF8Subjects()); Properties props = new Properties(); @@ -374,13 +376,13 @@ public void testSupportUTF8Subjects() { @Test public void testBuilderCoverageOptions() { - Options o = new Options.Builder().build(); + Options o = options(); assertTrue(o.clientSideLimitChecks()); assertNull(o.getServerPool()); // there is a default provider - o = new Options.Builder().clientSideLimitChecks(true).build(); + o = optionsBuilder().clientSideLimitChecks(true).build(); assertTrue(o.clientSideLimitChecks()); - o = new Options.Builder() + o = optionsBuilder() .clientSideLimitChecks(false) .serverPool(new NatsServerPool()) .build(); @@ -456,7 +458,7 @@ public void testProperties() throws Exception { .build(); assertEquals(1000, o.getMaxMessagesInOutgoingQueue()); - o = new Options.Builder() + o = optionsBuilder() .maxMessagesInOutgoingQueue(1000) .properties(props) .build(); @@ -702,7 +704,7 @@ public void testChainOverridesProperties() { @Test public void testDefaultConnectOptions() { - Options o = new Options.Builder().build(); + Options o = options(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "default connect options"); @@ -710,7 +712,7 @@ public void testDefaultConnectOptions() { @Test public void testNonDefaultConnectOptions() { - Options o = new Options.Builder().noNoResponders().noHeaders().noEcho().pedantic().verbose().build(); + Options o = optionsBuilder().noNoResponders().noHeaders().noEcho().pedantic().verbose().build(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":true,\"pedantic\":true,\"tls_required\":false,\"echo\":false,\"headers\":false,\"no_responders\":false}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "non default connect options"); @@ -719,7 +721,7 @@ public void testNonDefaultConnectOptions() { @Test public void testConnectOptionsWithNameAndContext() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options o = new Options.Builder().sslContext(ctx).connectionName("c1").build(); + Options o = optionsBuilder().sslContext(ctx).connectionName("c1").build(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\",\"name\":\"c1\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":true,\"echo\":true,\"headers\":true,\"no_responders\":true}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "default connect options"); @@ -727,7 +729,7 @@ public void testConnectOptionsWithNameAndContext() throws Exception { @Test public void testAuthConnectOptions() { - Options o = new Options.Builder().userInfo("hello".toCharArray(), "world".toCharArray()).build(); + Options o = optionsBuilder().userInfo("hello".toCharArray(), "world".toCharArray()).build(); String expectedNoAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; String expectedWithAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" @@ -747,7 +749,7 @@ public void testNKeyConnectOptions() throws Exception { byte[] nonce = "abcdefg".getBytes(StandardCharsets.UTF_8); String sig = base64UrlEncodeToString(th.sign(nonce)); - Options o = new Options.Builder().authHandler(th).build(); + Options o = optionsBuilder().authHandler(th).build(); String expectedNoAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; String expectedWithAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" @@ -775,7 +777,7 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { String sig = Base64.getUrlEncoder().withoutPadding().encodeToString(th.sign(nonce)); // Assert that no auth and user info is given - Options options = new Options.Builder().authHandler(th) + Options options = optionsBuilder().authHandler(th) .userInfo(username.toCharArray(), password.toCharArray()).build(); String expectedWithoutAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true," @@ -794,7 +796,7 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { assertEquals(expectedWithAuth, actualWithAuthInOptions); // Assert that auth is given via options and user info is given via server URI - Options optionsWithoutUserInfo = new Options.Builder().authHandler(th).build(); + Options optionsWithoutUserInfo = optionsBuilder().authHandler(th).build(); String serverUriWithAuth = "nats://" + username + ":" + password + "@localhost:4222"; String actualWithAuthInServerUri = optionsWithoutUserInfo .buildProtocolConnectOptionsString(serverUriWithAuth, true, nonce).toString(); @@ -804,12 +806,12 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { @Test public void testDefaultDataPort() { - Options o = new Options.Builder().socketWriteTimeout(null).build(); + Options o = optionsBuilder().socketWriteTimeout(null).build(); DataPort dataPort = o.buildDataPort(); assertNotNull(dataPort); assertEquals(Options.DEFAULT_DATA_PORT_TYPE, dataPort.getClass().getCanonicalName(), "old default dataPort"); - o = new Options.Builder().build(); + o = options(); dataPort = o.buildDataPort(); assertNotNull(dataPort); assertEquals(SocketDataPortWithWriteTimeout.class.getCanonicalName(), dataPort.getClass().getCanonicalName(), "new default dataPort"); @@ -842,7 +844,7 @@ public void testJetStreamProperties() { @Test public void testUserPassInURL() { String serverURI = "nats://derek:password@localhost:2222"; - Options o = new Options.Builder().server(serverURI).build(); + Options o = optionsBuilder(serverURI).build(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"user\":\"derek\"")); @@ -853,7 +855,7 @@ public void testUserPassInURL() { @Test public void testTokenInURL() { String serverURI = "nats://alberto@localhost:2222"; - Options o = new Options.Builder().server(serverURI).build(); + Options o = optionsBuilder(serverURI).build(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"alberto\"")); @@ -864,31 +866,31 @@ public void testTokenInURL() { @Test public void testTokenSupplier() { String serverURI = "nats://localhost:2222"; - Options o = new Options.Builder().build(); + Options o = options(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); //noinspection deprecation - o = new Options.Builder().token((String)null).build(); + o = optionsBuilder().token((String)null).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); //noinspection deprecation - o = new Options.Builder().token(" ").build(); + o = optionsBuilder().token(" ").build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); - o = new Options.Builder().token((char[])null).build(); + o = optionsBuilder().token((char[])null).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); - o = new Options.Builder().token(new char[0]).build(); + o = optionsBuilder().token(new char[0]).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); AtomicInteger counter = new AtomicInteger(0); Supplier tokenSupplier = () -> ("short-lived-token-" + counter.incrementAndGet()).toCharArray(); - o = new Options.Builder().tokenSupplier(tokenSupplier).build(); + o = optionsBuilder().tokenSupplier(tokenSupplier).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"short-lived-token-1\"")); @@ -898,7 +900,7 @@ public void testTokenSupplier() { Properties properties = new Properties(); properties.setProperty(PROP_TOKEN_SUPPLIER, TestingDynamicTokenSupplier.class.getCanonicalName()); - o = new Options.Builder().properties(properties).build(); + o = optionsBuilder().properties(properties).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"dynamic-token-1\"")); @@ -935,20 +937,20 @@ public void testServersInProperties() { @Test public void testServers() { String[] serverUrls = {URL_PROTO_HOST_PORT_8080, URL_HOST_PORT_8081}; - Options options = new Options.Builder().servers(serverUrls).build(); + Options options = optionsBuilder(serverUrls).build(); assertServersAndUnprocessed(true, options); } @Test public void testServersWithCommas() { - String serverURLs = URL_PROTO_HOST_PORT_8080 + "," + URL_HOST_PORT_8081; - assertServersAndUnprocessed(true, new Options.Builder().server(serverURLs).build()); + String commaDelimited = URL_PROTO_HOST_PORT_8080 + "," + URL_HOST_PORT_8081; + assertServersAndUnprocessed(true, optionsBuilder().server(commaDelimited).build()); } @Test public void testEmptyAndNullStringsInServers() { String[] serverUrls = {"", null, URL_PROTO_HOST_PORT_8080, URL_HOST_PORT_8081}; - assertServersAndUnprocessed(true, new Options.Builder().servers(serverUrls).build()); + assertServersAndUnprocessed(true, optionsBuilder(serverUrls).build()); } private void assertServersAndUnprocessed(boolean two, Options o) { @@ -991,27 +993,27 @@ public void testBadClassInPropertyStatisticsCollector() { @Test public void testTokenAndUserThrows() { assertThrows(IllegalStateException.class, - () -> new Options.Builder().token("foo".toCharArray()).userInfo("foo".toCharArray(), "bar".toCharArray()).build()); + () -> optionsBuilder().token("foo".toCharArray()).userInfo("foo".toCharArray(), "bar".toCharArray()).build()); } @Test public void testThrowOnBadServerURI() { assertThrows(IllegalArgumentException.class, - () -> new Options.Builder().server("foo:/bar\\:blammer").build()); + () -> optionsBuilder("foo:/bar\\:blammer").build()); } @Test public void testThrowOnBadServersURI() { assertThrows(IllegalArgumentException.class, () -> { String[] serverUrls = {URL_PROTO_HOST_PORT_8080, "foo:/bar\\:blammer"}; - new Options.Builder().servers(serverUrls).build(); + optionsBuilder(serverUrls).build(); }); } @Test public void testSetExecutor() { ExecutorService exec = Executors.newCachedThreadPool(); - Options options = new Options.Builder().executor(exec).build(); + Options options = optionsBuilder().executor(exec).build(); assertEquals(exec, options.getExecutor()); } @@ -1031,7 +1033,7 @@ public void testDefaultExecutor() throws Exception { @Test public void testCallbackExecutor() throws ExecutionException, InterruptedException, TimeoutException { ThreadFactory threadFactory = r -> new Thread(r, "test"); - Options options = new Options.Builder() + Options options = optionsBuilder() .callbackThreadFactory(threadFactory) .build(); Future callbackFuture = options.getCallbackExecutor().submit(() -> { @@ -1043,7 +1045,7 @@ public void testCallbackExecutor() throws ExecutionException, InterruptedExcepti @Test public void testConnectExecutor() throws ExecutionException, InterruptedException, TimeoutException { ThreadFactory threadFactory = r -> new Thread(r, "test"); - Options options = new Options.Builder() + Options options = optionsBuilder() .connectThreadFactory(threadFactory) .build(); Future connectFuture = options.getConnectExecutor().submit(() -> { @@ -1147,7 +1149,7 @@ private static void checkCreate(NatsUri uri, boolean secure, boolean ws, boolean public void testReconnectDelayHandler() { ReconnectDelayHandler rdh = l -> Duration.ofSeconds(l * 2); - Options o = new Options.Builder().reconnectDelayHandler(rdh).build(); + Options o = optionsBuilder().reconnectDelayHandler(rdh).build(); ReconnectDelayHandler rdhO = o.getReconnectDelayHandler(); assertNotNull(rdhO); @@ -1156,43 +1158,39 @@ public void testReconnectDelayHandler() { @Test public void testInboxPrefixCoverage() { - Options o = new Options.Builder().inboxPrefix("foo").build(); + Options o = optionsBuilder().inboxPrefix("foo").build(); assertEquals("foo.", o.getInboxPrefix()); - o = new Options.Builder().inboxPrefix("foo.").build(); + o = optionsBuilder().inboxPrefix("foo.").build(); assertEquals("foo.", o.getInboxPrefix()); } @Test public void testSslContextIsProvided() { - Options o = new Options.Builder().server("localhost").build(); + Options o = options("localhost"); assertNull(o.getSslContext()); - o = new Options.Builder().server("ws://localhost").build(); + o = options("ws://localhost"); assertNull(o.getSslContext()); - o = new Options.Builder().server("localhost").build(); + o = options("localhost"); assertNull(o.getSslContext()); - o = new Options.Builder().server("tls://localhost").build(); + o = options("tls://localhost"); assertNotNull(o.getSslContext()); - o = new Options.Builder().server("wss://localhost").build(); + o = options("wss://localhost"); assertNotNull(o.getSslContext()); - o = new Options.Builder().server("opentls://localhost").build(); + o = options("opentls://localhost"); assertNotNull(o.getSslContext()); - o = new Options.Builder().server("nats://localhost,tls://localhost").build(); + o = optionsBuilder().server("nats://localhost,tls://localhost").build(); assertNotNull(o.getSslContext()); } @SuppressWarnings("deprecation") @Test public void coverageForDeprecated() { - Options o = new Options.Builder() - .token("deprecated") - .build(); + Options o = optionsBuilder().token("deprecated").build(); assertEquals("deprecated", o.getToken()); assertNull(o.getUsername()); assertNull(o.getPassword()); - o = new Options.Builder() - .userInfo("user", "pass") - .build(); + o = optionsBuilder().userInfo("user", "pass").build(); assertEquals("user", o.getUsername()); assertEquals("pass", o.getPassword()); assertNull(o.getToken()); @@ -1200,7 +1198,7 @@ public void coverageForDeprecated() { @Test public void testFastFallback() { - Options options = new Options.Builder().enableFastFallback().build(); + Options options = optionsBuilder().enableFastFallback().build(); assertTrue(options.isEnableFastFallback()); } @@ -1213,7 +1211,7 @@ public void testThrowOnBadContextForSecure() throws Exception { try { System.setProperty("javax.net.ssl.keyStore", "foo"); System.setProperty("javax.net.ssl.trustStore", "bar"); - new Options.Builder().secure().build(); + optionsBuilder().secure().build(); assertFalse(true); } finally { @@ -1227,7 +1225,7 @@ public void testThrowOnBadContextForTLSUrl() throws Exception { try { System.setProperty("javax.net.ssl.keyStore", "foo"); System.setProperty("javax.net.ssl.trustStore", "bar"); - new Options.Builder().server("tls://localhost:4242").build(); + optionsBuilder("tls://localhost:4242").build(); assertFalse(true); } finally { diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 9e35ff987..a0e1a1071 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -28,6 +28,8 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.support.NatsConstants.*; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; @@ -80,8 +82,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { } } }; - Options options = Options.builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .clientSideLimitChecks(false) .errorListener(el) .build(); @@ -98,12 +99,13 @@ public void exceptionOccurred(Connection conn, Exception exp) { } @Test - public void testThrowsIfheadersNotSupported() { + public void testThrowsIfHeadersNotSupported() { assertThrows(IllegalArgumentException.class, () -> { String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getURI())) + { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); nc.publish(NatsMessage.builder() @@ -181,7 +183,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header }; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { byte[] bodyBytes; if (bodyString == null || bodyString.isEmpty()) { @@ -269,8 +271,8 @@ public void testUtf8Subjects() throws Exception { CountDownLatch jsReceivedLatchWhenSupported = new CountDownLatch(1); try (NatsTestServer ts = new NatsTestServer(false, true); - Connection ncNotSupported = TestBase.standardConnectionWait(standardOptionsBuilder(ts.getURI()).build()); - Connection ncSupported = TestBase.standardConnectionWait(standardOptionsBuilder(ts.getURI()).supportUTF8Subjects().build())) + Connection ncNotSupported = standardConnectionWait(standardOptionsBuilder(ts.getURI()).build()); + Connection ncSupported = standardConnectionWait(standardOptionsBuilder(ts.getURI()).supportUTF8Subjects().build())) { try { ncNotSupported.jetStreamManagement().addStream( diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index 9768f2e6d..bdb4c98b0 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -13,14 +13,16 @@ package io.nats.client; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.HashSet; import java.util.concurrent.CompletableFuture; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.TestBase.random; +import static io.nats.client.utils.TestBase.runInLrServer; import static org.junit.jupiter.api.Assertions.*; public class SubscriberTests { @@ -107,7 +109,7 @@ public void testTabInProtocolLine() throws Exception { }; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { String subject = random(); Subscription sub = nc.subscribe(subject); @@ -353,7 +355,7 @@ public void testThrowOnEmptySubjectWithQueue() throws Exception { @Test public void throwsSubscriptionExceptions() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { String subject = random(); Subscription sub = nc.subscribe(subject); diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java index 0ba28e21a..39aabe826 100644 --- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java +++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java @@ -30,6 +30,7 @@ import static io.nats.client.api.CompressionOption.S2; import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.ApiConstants.*; +import static io.nats.client.utils.VersionUtils.atLeast2_10; import static org.junit.jupiter.api.Assertions.*; public class StreamConfigurationTests extends JetStreamTestBase { @@ -54,7 +55,7 @@ private StreamConfiguration getTestConfiguration() { @Test public void testRoundTrip() throws Exception { runInLrServer((nc, jsm, js) -> { - CompressionOption compressionOption = atLeast2_10(ensureRunServerInfo()) ? S2 : None; + CompressionOption compressionOption = atLeast2_10() ? S2 : None; String stream = random(); StreamConfiguration sc = StreamConfiguration.builder(getTestConfiguration()) .name(stream) diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 52ac05ff6..2035e6a98 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -17,21 +17,21 @@ import io.nats.client.ErrorListener; import io.nats.client.NatsTestServer; import io.nats.client.Options; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.concurrent.atomic.AtomicBoolean; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class AuthAndConnectTests { @Test public void testIsAuthError() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Connection nc = TestBase.standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = new NatsTestServer()) { + Connection nc = standardConnectionWait(ts.getURI()); NatsConnection nats = (NatsConnection)nc; assertTrue(nats.isAuthenticationError("user authentication expired")); @@ -47,8 +47,8 @@ public void testIsAuthError() throws Exception { @Test() public void testConnectWhenClosed() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - NatsConnection nc = (NatsConnection) TestBase.standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = new NatsTestServer()) { + NatsConnection nc = (NatsConnection) standardConnectionWait(ts.getURI()); standardCloseConnection(nc); nc.connect(false); // should do nothing assertClosed(nc); @@ -71,7 +71,7 @@ public void errorOccurred(Connection conn, String error) { } }; - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() .server(ts.getURI()) .maxReconnects(-1) @@ -79,7 +79,7 @@ public void errorOccurred(Connection conn, String error) { .errorListener(noopErrorListener) .build(); - NatsConnection nc = (NatsConnection) TestBase.standardConnectionWait(options); + NatsConnection nc = (NatsConnection) standardConnectionWait(options); // After we've connected, shut down, so we can attempt reconnecting. ts.shutdown(true); diff --git a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java index dd3cb2fb8..52ca34a0d 100644 --- a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java +++ b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java @@ -1,18 +1,15 @@ package io.nats.client.impl; import io.nats.client.*; -import io.nats.client.support.NatsUri; -import org.jspecify.annotations.NonNull; -import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -44,8 +41,7 @@ public void testAuthViolationDuringReconnect() throws Exception { ctx.port = NatsTestServer.nextPort(); startServer(ctx); - Options options = new Options.Builder() - .servers(new String[]{"nats://" + "127.0.0.1:" + ctx.port}) + Options options = optionsBuilder("nats://" + "127.0.0.1:" + ctx.port) .noRandomize() .token(new char[]{'1', '2', '3', '4'}) @@ -54,8 +50,7 @@ public void testAuthViolationDuringReconnect() throws Exception { .connectionTimeout(Duration.ofMillis(10)) .reconnectWait(Duration.ofMillis(2000)) .connectionListener((conn, e) -> - System.out.println(String.format("Tid: %d, NATS: connection event - %s, connected url: %s. servers: %s ", Thread.currentThread().getId(), e, conn.getConnectedUrl(), conn.getServers()) - )) + System.out.printf("Tid: %d, NATS: connection event - %s, connected url: %s. servers: %s %n", Thread.currentThread().getId(), e, conn.getConnectedUrl(), conn.getServers())) .errorListener(ctx.errorListener) .build(); @@ -76,8 +71,8 @@ public void testAuthViolationDuringReconnect() throws Exception { TimeUnit.SECONDS.sleep(20); // give time to restore all subscriptions synchronized(ctx.nc.getStatus()) { - while (ctx.nc.getStatus() != Connection.Status.CONNECTED && ctx.nc.getStatus() != Connection.Status.CLOSED) { - } + //noinspection StatementWithEmptyBody + while (ctx.nc.getStatus() != Connection.Status.CONNECTED && ctx.nc.getStatus() != Connection.Status.CLOSED) {} } assertFalse(ctx.violated.get()); @@ -100,19 +95,18 @@ static class Context implements AutoCloseable { ErrorListener errorListener = new ErrorListener() { @Override public void slowConsumerDetected(Connection conn, Consumer consumer) { - System.out.println(String.format("Tid: %d, %s: Slow Consumer", Thread.currentThread().getId(), conn.getConnectedUrl())); + System.out.printf("Tid: %d, %s: Slow Consumer%n", Thread.currentThread().getId(), conn.getConnectedUrl()); } @Override public void exceptionOccurred(Connection conn, Exception exp) { exp.printStackTrace(); - System.out.println(String.format("Tid: %d, Nats '%s' exception: %s", Thread.currentThread().getId(), conn.getConnectedUrl(), exp.toString())); + System.out.printf("Tid: %d, Nats '%s' exception: %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), exp); } @Override public void errorOccurred(Connection conn, String error) { - System.out.println(String.format("Tid: %d, Nats '%s': Error %s", Thread.currentThread().getId(), conn.getConnectedUrl(), error.toString())); - + System.out.printf("Tid: %d, Nats '%s': Error %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), error); if (error.contains("Authorization Violation")) { violated.set(true); } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index aef6f272a..9417012a4 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -25,8 +24,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import static io.nats.client.utils.TestBase.standardCloseConnection; -import static io.nats.client.utils.TestBase.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class ConnectionListenerTests { @@ -38,13 +37,12 @@ public void testToString() { @Test public void testCloseCount() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { ListenerForTesting listener = new ListenerForTesting(); - Options options = new Options.Builder(). - server(ts.getURI()). + Options options = optionsBuilder(ts). connectionListener(listener). build(); - Connection nc = TestBase.standardConnectionWait(options); + Connection nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); @@ -59,14 +57,14 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception { String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getURI()+"\"]}"; try (NatsServerProtocolMock ts2 = new NatsServerProtocolMock(null, customInfo)) { ListenerForTesting listener = new ListenerForTesting(); - Options options = new Options.Builder(). - server(ts2.getURI()). - maxReconnects(0). - connectionListener(listener). - build(); + Options options = optionsBuilder() + .server(ts2.getURI()) + .maxReconnects(0) + .connectionListener(listener) + .build(); listener.prepForStatusChange(Events.CONNECTED); - standardCloseConnection( TestBase.listenerConnectionWait(options, listener) ); + standardCloseConnection( listenerConnectionWait(options, listener) ); assertEquals(1, listener.getEventCount(Events.DISCOVERED_SERVERS)); } } @@ -77,15 +75,14 @@ public void testDisconnectReconnectCount() throws Exception { int port; Connection nc; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder(). - server(ts.getURI()). + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts). reconnectWait(Duration.ofMillis(100)). maxReconnects(-1). connectionListener(listener). build(); port = ts.getPort(); - nc = TestBase.standardConnectionWait(options); + nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -106,13 +103,10 @@ public void testDisconnectReconnectCount() throws Exception { @Test public void testExceptionInConnectionListener() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { BadHandler listener = new BadHandler(); - Options options = new Options.Builder(). - server(ts.getURI()). - connectionListener(listener). - build(); - Connection nc = TestBase.standardConnectionWait(options); + Options options = optionsBuilder(ts).connectionListener(listener).build(); + Connection nc = standardConnectionWait(options); standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); } @@ -122,13 +116,10 @@ public void testExceptionInConnectionListener() throws Exception { public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { ListenerForTesting listener = new ListenerForTesting(); - Options options = new Options.Builder(). - server(ts.getURI()). - connectionListener(listener). - build(); - Connection nc = TestBase.standardConnectionWait(options); + Options options = optionsBuilder(ts).connectionListener(listener).build(); + Connection nc = standardConnectionWait(options); assertEquals(ts.getURI(), nc.getConnectedUrl()); //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull diff --git a/src/test/java/io/nats/client/impl/DispatcherTests.java b/src/test/java/io/nats/client/impl/DispatcherTests.java index c7d84e5d7..f48663673 100644 --- a/src/test/java/io/nats/client/impl/DispatcherTests.java +++ b/src/test/java/io/nats/client/impl/DispatcherTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.utils.LongRunningServer; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,7 +28,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ConnectionUtils.longConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.TestBase.BAD_SUBJECTS_OR_QUEUES; +import static io.nats.client.utils.TestBase.random; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -43,7 +48,7 @@ public class DispatcherTests { @BeforeAll public static void beforeAll() { try { - nc = TestBase.longConnectionWait(LongRunningServer.options()); + nc = longConnectionWait(options(LongRunningServer.server())); } catch (IOException e) { throw new RuntimeException(e); @@ -65,20 +70,16 @@ public static void afterAll() { @Test public void testDispatcherSubscribingExceptions() throws Exception { // InvalidSubjectsAndQueueNames - Dispatcher dx = nc.createDispatcher(m -> { - }); + Dispatcher dx = nc.createDispatcher(m -> {}); for (String bad : BAD_SUBJECTS_OR_QUEUES) { assertThrows(IllegalArgumentException.class, () -> nc.subscribe(bad)); assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, m -> { - })); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, m -> {})); assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q")); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q", m -> { - })); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q", m -> {})); assertThrows(IllegalArgumentException.class, () -> nc.subscribe("s", bad)); assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad, m -> { - })); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad, m -> {})); } String subject = random(); @@ -223,7 +224,7 @@ public void testSingleMessage() throws Exception { @Test public void testDispatcherMessageContainsConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { final CompletableFuture msgFuture = new CompletableFuture<>(); final CompletableFuture connFuture = new CompletableFuture<>(); @@ -253,7 +254,7 @@ public void testDispatcherMessageContainsConnection() throws Exception { @Test public void testMultiSubject() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { final CompletableFuture one = new CompletableFuture<>(); final CompletableFuture two = new CompletableFuture<>(); @@ -362,7 +363,7 @@ else if (msg.getSubject().equals(phase2)) { @Test public void testQueueSubscribers() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = TestBase.standardConnectionWait(ts.getURI())) { + Connection nc = standardConnectionWait(ts.getURI())) { int msgs = 100; AtomicInteger received = new AtomicInteger(); AtomicInteger sub1Count = new AtomicInteger(); @@ -850,7 +851,7 @@ public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Ex @Test public void testDispatcherFactoryCoverage() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = longConnectionWait(Options.builder().server(ts.getURI()).useDispatcherWithExecutor().build())) + Connection nc = longConnectionWait(optionsBuilder(ts).useDispatcherWithExecutor().build())) { CountDownLatch latch = new CountDownLatch(1); Dispatcher d = nc.createDispatcher(msg -> latch.countDown()); diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 0587fff4b..07e675e21 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -26,7 +25,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.TestBase.flushConnection; +import static io.nats.client.utils.ThreadUtils.park; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class DrainTests { @@ -34,8 +37,8 @@ public class DrainTests { @SuppressWarnings("resource") @Test public void testCloseOnDrainFailure() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - final Connection nc = TestBase.standardConnectionWait(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); + try (NatsTestServer ts = new NatsTestServer()) { + final Connection nc = standardConnectionWait(optionsBuilder(ts).maxReconnects(0).build()); nc.subscribe("draintest"); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do @@ -48,9 +51,9 @@ public void testCloseOnDrainFailure() throws Exception { @Test public void testSimpleSubDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -72,15 +75,15 @@ public void testSimpleSubDrain() throws Exception { assertTrue(tracker.get(1, TimeUnit.SECONDS)); assertFalse(sub.isActive()); - assertEquals(((NatsConnection) subCon).getConsumerCount(), 0); + assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); } } @Test public void testSimpleDispatchDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -90,7 +93,7 @@ public void testSimpleDispatchDrain() throws Exception { sleep(2000); // go slow so the main app can drain us }); d.subscribe("draintest"); - d.subscribe("draintest", (msg) -> { count.incrementAndGet(); }); + d.subscribe("draintest", (msg) -> count.incrementAndGet()); subCon.flush(Duration.ofSeconds(5)); // Get the sub to the server pubCon.publish("draintest", null); @@ -103,17 +106,17 @@ public void testSimpleDispatchDrain() throws Exception { CompletableFuture tracker = d.drain(Duration.ofSeconds(8)); assertTrue(tracker.get(10, TimeUnit.SECONDS)); // wait for the drain to complete - assertEquals(count.get(), 4); // Should get both, two times. + assertEquals(4, count.get()); // Should get both, two times. assertFalse(d.isActive()); - assertEquals(((NatsConnection) subCon).getConsumerCount(), 0); + assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); } } @Test public void testSimpleConnectionDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -143,16 +146,16 @@ public void testSimpleConnectionDrain() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertSame(Connection.Status.CLOSED, subCon.getStatus()); } } @Test public void testConnectionDrainWithZeroTimeout() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -189,9 +192,9 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { @Test public void testDrainWithZeroTimeout() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -219,9 +222,9 @@ public void testDrainWithZeroTimeout() throws Exception { @Test public void testSubDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -246,9 +249,9 @@ public void testSubDuringDrainThrows() { @Test public void testCreateDispatcherDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -272,9 +275,9 @@ public void testCreateDispatcherDuringDrainThrows() { @Test public void testUnsubDuringDrainIsNoop() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -308,16 +311,16 @@ public void testUnsubDuringDrainIsNoop() throws Exception { assertNotNull(msg); assertTrue(tracker.get(2, TimeUnit.SECONDS)); - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertSame(Connection.Status.CLOSED, subCon.getStatus()); } } @Test public void testDrainInMessageHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -340,17 +343,17 @@ public void testDrainInMessageHandler() throws Exception { sleep(500); // give the msgs time to get to subCon assertTrue(tracker.get().get(5, TimeUnit.SECONDS)); // wait for the drain to complete - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertFalse(d.isActive()); - assertEquals(((NatsConnection) subCon).getConsumerCount(), 0); + assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); } } @Test public void testDrainFutureMatches() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -386,7 +389,7 @@ public void testDrainFutureMatches() throws Exception { assertNotNull(msg); assertTrue(tracker.get(2, TimeUnit.SECONDS)); - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertSame(Connection.Status.CLOSED, subCon.getStatus()); } } @@ -394,18 +397,16 @@ public void testDrainFutureMatches() throws Exception { @Test public void testFirstTimeRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - Dispatcher d = pubCon.createDispatcher((msg) -> { - pubCon.publish(msg.getReplyTo(), null); - }); + Dispatcher d = pubCon.createDispatcher((msg) -> pubCon.publish(msg.getReplyTo(), null)); d.subscribe("reply"); pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -434,18 +435,16 @@ public void testFirstTimeRequestReplyDuringDrain() { @Test public void testRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - Dispatcher d = pubCon.createDispatcher((msg) -> { - pubCon.publish(msg.getReplyTo(), null); - }); + Dispatcher d = pubCon.createDispatcher((msg) -> pubCon.publish(msg.getReplyTo(), null)); d.subscribe("reply"); pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -477,8 +476,8 @@ public void testRequestReplyDuringDrain() { @Test public void testQueueHandoffWithDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); final int total = 5_000; @@ -489,16 +488,14 @@ public void testQueueHandoffWithDrain() throws Exception { AtomicInteger count = new AtomicInteger(); Instant start = Instant.now(); Instant now = start; - Connection working = null; - NatsDispatcher workingD = null; - NatsDispatcher drainingD = null; + Connection working; + NatsDispatcher workingD; + NatsDispatcher drainingD; - Connection draining = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); + Connection draining = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertSame(Connection.Status.CONNECTED, draining.getStatus(), "Connected Status"); - drainingD = (NatsDispatcher) draining.createDispatcher((msg) -> { - count.incrementAndGet(); - }).subscribe("draintest", "queue"); + drainingD = (NatsDispatcher) draining.createDispatcher((msg) -> count.incrementAndGet()).subscribe("draintest", "queue"); draining.flush(Duration.ofSeconds(5)); Thread pubThread = new Thread(() -> { @@ -513,11 +510,9 @@ public void testQueueHandoffWithDrain() throws Exception { while (count.get() < total && Duration.between(start, now).compareTo(testTimeout) < 0) { - working = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); + working = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertSame(Connection.Status.CONNECTED, working.getStatus(), "Connected Status"); - workingD = (NatsDispatcher) working.createDispatcher((msg) -> { - count.incrementAndGet(); - }).subscribe("draintest", "queue"); + workingD = (NatsDispatcher) working.createDispatcher((msg) -> count.incrementAndGet()).subscribe("draintest", "queue"); working.flush(Duration.ofSeconds(5)); park(sleepBetweenDrains); @@ -543,9 +538,9 @@ public void testQueueHandoffWithDrain() throws Exception { @Test public void testDrainWithLotsOfMessages() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -577,15 +572,15 @@ public void testDrainWithLotsOfMessages() throws Exception { assertTrue(tracker.get(5, TimeUnit.SECONDS)); assertFalse(sub.isActive()); - assertEquals(((NatsConnection) subCon).getConsumerCount(), 0); + assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); } } @Test public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -615,7 +610,7 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { assertTrue(tracker.get(10, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertSame(Connection.Status.CLOSED, subCon.getStatus()); } } @@ -623,9 +618,9 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { @Test public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).errorListener(listener).maxReconnects(0).build()); - Connection pubCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); @@ -665,9 +660,9 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { public void testThrowIfCantFlush() { assertThrows(TimeoutException.class, () -> { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().connectionListener(listener).server(ts.getURI()).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) + { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server listener.prepForStatusChange(Events.DISCONNECTED); @@ -681,8 +676,8 @@ public void testThrowIfCantFlush() { @Test public void testThrowIfClosing() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); subCon.close(); diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 2cd91d733..ee2ec5434 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Status; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -28,8 +27,10 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import static io.nats.client.utils.TestBase.sleep; -import static io.nats.client.utils.TestBase.standardCloseConnection; +import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @Isolated @@ -44,7 +45,7 @@ public void testLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = new Options.Builder() + Options options = optionsBuilder() .server(ts.getURI()) .server(ts2.getURI()) .server(ts3.getURI()) @@ -90,7 +91,7 @@ public void testClearLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = new Options.Builder() + Options options = optionsBuilder() .server(ts.getURI()) .server(ts2.getURI()) .server(ts3.getURI()) @@ -139,11 +140,10 @@ public void testErrorOnNoAuth() throws Exception { sleep(1000); // give the server time to get ready, otherwise sometimes this test flaps // See config file for user/pass // no or wrong u/p in the options is an error - Options options = new Options.Builder(). - server(ts.getURI()) - .maxReconnects(0) - .errorListener(listener) - .build(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .errorListener(listener) + .build(); try { Nats.connect(options); fail(); @@ -162,11 +162,10 @@ public void testErrorOnNoAuth() throws Exception { public void testExceptionOnBadDispatcher() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - errorListener(listener). - build(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .errorListener(listener) + .build(); Connection nc = Nats.connect(options); try { Dispatcher d = nc.createDispatcher((msg) -> { @@ -197,12 +196,11 @@ public void testExceptionInErrorHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = new Options.Builder() - .server(ts.getURI()) - .maxReconnects(0) - .errorListener(listener) - // skip this so we get an error userInfo("stephen", "password"). - .build(); + // don't put u/p in options + Options options = optionsBuilder(ts) + .maxReconnects(0) + .errorListener(listener) + .build(); assertThrows(IOException.class, () -> Nats.connect(options)); } } @@ -210,11 +208,8 @@ public void testExceptionInErrorHandler() throws Exception { @Test public void testExceptionInSlowConsumerHandler() throws Exception { BadHandler listener = new BadHandler(); - try (NatsTestServer ts = new NatsTestServer(false); - NatsConnection nc = (NatsConnection) Nats.connect(new Options.Builder(). - server(ts.getURI()). - errorListener(listener). - build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { Subscription sub = nc.subscribe("subject"); sub.setPendingLimits(1, -1); @@ -230,7 +225,7 @@ public void testExceptionInSlowConsumerHandler() throws Exception { nc.close(); // should force the exception listener through - assertTrue(nc.getStatisticsCollector().getExceptions() > 0); + assertTrue(nc.getStatistics().getExceptions() > 0); } } @@ -238,11 +233,7 @@ public void testExceptionInSlowConsumerHandler() throws Exception { public void testExceptionInExceptionHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - errorListener(listener). - build(); + Options options = optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); Connection nc = Nats.connect(options); try { Dispatcher d = nc.createDispatcher((msg) -> { @@ -260,7 +251,7 @@ public void testExceptionInExceptionHandler() throws Exception { } assertNull(msg); - assertEquals(((NatsConnection) nc).getStatisticsCollector().getExceptions(), 2); // 1 for the dispatcher, 1 for the handlers + assertEquals(2, nc.getStatistics().getExceptions()); // 1 for the dispatcher, 1 for the handlers } finally { standardCloseConnection(nc); } @@ -272,13 +263,12 @@ public void testDiscardedMessageFastProducer() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxMessagesInOutgoingQueue(maxMessages). - discardMessagesWhenOutgoingQueueFull(). - errorListener(listener). - pingInterval(Duration.ofSeconds(100)). // make this long so we don't ping during test - build(); + Options options = optionsBuilder(ts) + .maxMessagesInOutgoingQueue(maxMessages) + .discardMessagesWhenOutgoingQueueFull() + .errorListener(listener) + .pingInterval(Duration.ofSeconds(100)) // make this long so we don't ping during test + .build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { @@ -307,16 +297,14 @@ public void testDiscardedMessageFastProducer() throws Exception { public void testDiscardedMessageServerClosed() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxMessagesInOutgoingQueue(maxMessages). - discardMessagesWhenOutgoingQueueFull(). - pingInterval(Duration.ofSeconds(100)). // make this long so we don't ping during test - connectionListener(listener). - errorListener(listener). - build(); - Connection nc = TestBase.standardConnectionWait(options); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) + .maxMessagesInOutgoingQueue(maxMessages) + .discardMessagesWhenOutgoingQueueFull() + .errorListener(listener) + .pingInterval(Duration.ofSeconds(100)) // make this long so we don't ping during test + .build(); + Connection nc = standardConnectionWait(options); try { nc.flush(Duration.ofSeconds(1)); // Get the sub to the server diff --git a/src/test/java/io/nats/client/impl/InfoHandlerTests.java b/src/test/java/io/nats/client/impl/InfoHandlerTests.java index 3890d8709..6efead94b 100644 --- a/src/test/java/io/nats/client/impl/InfoHandlerTests.java +++ b/src/test/java/io/nats/client/impl/InfoHandlerTests.java @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static org.junit.jupiter.api.Assertions.*; public class InfoHandlerTests { @Test @@ -33,17 +33,15 @@ public void testInitialInfo() throws IOException, InterruptedException { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo)) { Connection nc = Nats.connect(ts.getURI()); try { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); } finally { nc.close(); - assertTrue(Connection.Status.CLOSED == nc.getStatus(), "Closed Status"); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } } - - @Test public void testUnsolicitedInfo() throws IOException, InterruptedException, ExecutionException { String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\"}"; @@ -69,9 +67,8 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec w.write("PING\r\n"); w.flush(); - String pong = ""; - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + String pong; try { pong = r.readLine(); } catch (Exception e) { @@ -91,15 +88,15 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec try (NatsServerProtocolMock ts = new NatsServerProtocolMock(infoCustomizer, customInfo)) { Connection nc = Nats.connect(ts.getURI()); try { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); sendInfo.complete(Boolean.TRUE); - assertTrue(gotPong.get().booleanValue(), "Got pong."); // Server round tripped so we should have new info + assertTrue(gotPong.get(), "Got pong."); // Server round tripped so we should have new info assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info"); } finally { nc.close(); - assertTrue(Connection.Status.CLOSED == nc.getStatus(), "Closed Status"); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } } @@ -114,7 +111,6 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti CompletableFuture connectLDM = new CompletableFuture<>(); NatsServerProtocolMock.Customizer infoCustomizer = (ts, r, w) -> { - // Wait for client to be ready. try { sendInfo.get(); @@ -132,9 +128,8 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti w.write("PING\r\n"); w.flush(); - String pong = ""; - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + String pong; try { pong = r.readLine(); } catch (Exception e) { @@ -153,16 +148,15 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti try (NatsServerProtocolMock ts = new NatsServerProtocolMock(infoCustomizer, customInfo)) { - Options options = new Options.Builder().server(ts.getURI()).connectionListener(new ConnectionListener() { - @Override - public void connectionEvent(Connection conn, Events type) { - if (type.equals(Events.LAME_DUCK)) connectLDM.complete(type); - } - }).build(); + ConnectionListener cl = (conn, type) -> { + if (type.equals(ConnectionListener.Events.LAME_DUCK)) connectLDM.complete(type); + }; + + Options options = optionsBuilder().server(ts.getURI()).connectionListener(cl).build(); Connection nc = Nats.connect(options); try { - assertTrue(Connection.Status.CONNECTED == nc.getStatus(), "Connected Status"); + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); sendInfo.complete(Boolean.TRUE); @@ -170,12 +164,12 @@ public void connectionEvent(Connection conn, Events type) { assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info"); } finally { nc.close(); - assertTrue(Connection.Status.CLOSED == nc.getStatus(), "Closed Status"); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } ConnectionListener.Events event = connectLDM.get(5, TimeUnit.SECONDS); - assertEquals(event, ConnectionListener.Events.LAME_DUCK); + assertEquals(ConnectionListener.Events.LAME_DUCK, event); System.out.println(event); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index f85b49e09..318dadbe9 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -15,7 +15,7 @@ import io.nats.client.*; import io.nats.client.api.ConsumerConfiguration; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicLong; import static io.nats.client.support.NatsJetStreamClientError.JsSubOrderedNotAllowOnQueues; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamConsumerTests extends JetStreamTestBase { @@ -335,7 +336,7 @@ private static SimulatorState setupPullFactory(JetStream js) { @Test public void testMultipleSubjectFilters() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); jsPublish(jstc.js, jstc.subject(0), 10); jsPublish(jstc.js, jstc.subject(1), 5); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 3520374a5..ae6e50631 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -32,6 +32,10 @@ import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.*; +import static io.nats.client.utils.ConnectionUtils.longConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; public class JetStreamGeneralTests extends JetStreamTestBase { @@ -60,7 +64,7 @@ public void testJetNotEnabled() throws Exception { @Test public void testJetEnabledGoodAccount() throws Exception { try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_authorization.conf")) { - Options options = new Options.Builder().server(ts.getURI()) + Options options = optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = longConnectionWait(options)) { nc.jetStreamManagement(); @@ -398,10 +402,10 @@ public void testPrefix() throws Exception { String subjectMadeByTar = "sub-made-by.tar"; try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_prefix.conf")) { - Options optionsSrc = new Options.Builder().server(ts.getURI()) + Options optionsSrc = optionsBuilder(ts) .userInfo("src".toCharArray(), "spass".toCharArray()).build(); - Options optionsTar = new Options.Builder().server(ts.getURI()) + Options optionsTar = optionsBuilder(ts) .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); try (Connection ncSrc = standardConnectionWait(optionsSrc); @@ -1104,7 +1108,7 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { runInLrServer((ncCancel, jsm, js) -> { - Options optReport = LongRunningServer.optionsBuilder().reportNoResponders().build(); + Options optReport = optionsBuilder(LongRunningServer.server()).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index 5b40180ae..dae5375fd 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -16,7 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.DateTimeUtils; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; @@ -34,6 +34,7 @@ import static io.nats.client.support.DateTimeUtils.ZONE_ID_GMT; import static io.nats.client.support.NatsJetStreamConstants.*; import static io.nats.client.utils.ResourceUtils.dataAsString; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamManagementTests extends JetStreamTestBase { @@ -109,7 +110,7 @@ public void testStreamCreate() throws Exception { @Test public void testStreamMetadata() throws Exception { - runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); StreamConfiguration sc = StreamConfiguration.builder() .name(random()) @@ -248,7 +249,7 @@ public void testUpdateStream() throws Exception { @Test public void testAddStreamInvalids() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { assertThrows(IllegalArgumentException.class, () -> jsm.addStream(null)); String stream = random(); @@ -717,7 +718,7 @@ public void testAddDeleteConsumer() throws Exception { @Test public void testAddPausedConsumer() throws Exception { - runInLrServer(TestBase::atLeast2_11, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_11, (nc, jstc) -> { List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); @@ -738,7 +739,7 @@ public void testAddPausedConsumer() throws Exception { @Test public void testPauseResumeConsumer() throws Exception { - runInLrServer(TestBase::atLeast2_11, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_11, (nc, jstc) -> { List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); @@ -1256,7 +1257,7 @@ public void testMessageGetRequestObjectDeprecatedMethods() { @Test public void testDirectMessageRepublishedSubject() throws Exception { - runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { String streamBucketName = "sb-" + random(); String subject = random(); String streamSubject = subject + ".>"; @@ -1300,7 +1301,7 @@ public void testDirectMessageRepublishedSubject() throws Exception { @Test public void testCreateConsumerUpdateConsumer() throws Exception { - runInLrServer(TestBase::atLeast2_9_0, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { String streamPrefix = random(); JetStreamManagement jsmNew = nc.jetStreamManagement(); JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build()); @@ -1425,7 +1426,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_10_26, (nc, jsm, js) -> { + runInLrServer(listener, VersionUtils::atLeast2_10_26, (nc, jsm, js) -> { String stream = random(); String subject = random(); @@ -1554,7 +1555,7 @@ public void testMessageDeleteRequest() { @Test public void testStreamPersistMode() throws Exception { - runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() .name(random()) .storageType(StorageType.File) diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 3844d97f4..4614dfc89 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -20,6 +20,8 @@ import java.util.List; import static io.nats.client.NatsTestServer.configuredJsServer; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; public class JetStreamManagementWithConfTests extends JetStreamTestBase { @@ -119,7 +121,7 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long @Test public void testAuthCreateUpdateStream() throws Exception { try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options optionsSrc = new Options.Builder().server(ts.getURI()) + Options optionsSrc = optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = standardConnectionWait(optionsSrc)) { diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index ca6f79c67..0380edb0e 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -19,7 +19,7 @@ import io.nats.client.PushSubscribeOptions; import io.nats.client.api.*; import io.nats.client.support.DateTimeUtils; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -294,7 +294,7 @@ public void testSourceBasics() throws Exception { @Test @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); @@ -336,7 +336,7 @@ public void testSourceAndTransformsRoundTrips() throws Exception { @Test public void testMirror() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scMirror = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationMirrorSubjectTransform.json"); diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index dc6aeea7b..a5085aee1 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -28,6 +28,10 @@ import static io.nats.client.support.NatsJetStreamConstants.MSG_TTL_HDR; import static io.nats.client.support.NatsJetStreamConstants.NATS_MARKER_REASON_HDR; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardOptionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; +import static io.nats.client.utils.VersionUtils.atLeast2_12; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPubTests extends JetStreamTestBase { diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 4d9512109..93af7f8a7 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -19,7 +19,7 @@ import io.nats.client.api.PriorityPolicy; import io.nats.client.support.JsonUtils; import io.nats.client.support.Status; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -41,6 +41,8 @@ import static io.nats.client.support.ApiConstants.*; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPullTests extends JetStreamTestBase { @@ -51,7 +53,7 @@ public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status } private Options.Builder noPullWarnings() { - return Options.builder().errorListener(new ErrorListenerPullImpl()); + return optionsBuilder().errorListener(new ErrorListenerPullImpl()); } @Test @@ -571,9 +573,6 @@ public void testDurable() throws Exception { runInLrServer(noPullWarnings(), (nc, jstc) -> { String durable = random(); - // Create our JetStream context. - JetStream js = nc.jetStream(); - // Build our subscription options normally PullSubscribeOptions options1 = PullSubscribeOptions.builder().durable(durable).build(); _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(jstc.subject(), options1)); @@ -606,7 +605,7 @@ public void testDurable() throws Exception { @Test public void testNamed() throws Exception { - runInLrServer(noPullWarnings(), TestBase::atLeast2_9_0, (nc, jstc) -> { + runInLrServer(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { String name = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() @@ -1006,7 +1005,7 @@ public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String dur = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(jstc.subject()).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); @@ -1031,13 +1030,11 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesExactBytes() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes createMemoryStream(nc, stream, subject); - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); jstc.jsm.addOrUpdateConsumer(stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(stream, durable); JetStreamSubscription sub = jstc.js.subscribe(subject, so); @@ -1120,7 +1117,7 @@ private static Thread getReaderThread(AtomicInteger count, int stopCount, JetStr @Test public void testOverflow() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Setting PriorityPolicy requires at least one PriorityGroup to be set @@ -1225,7 +1222,7 @@ public void testOverflow() throws Exception { }); } - private static void _overflowCheck(JetStreamSubscription sub, PullRequestOptions pro, boolean ack, int expected) throws InterruptedException, JetStreamApiException, IOException { + private static void _overflowCheck(JetStreamSubscription sub, PullRequestOptions pro, boolean ack, int expected) throws InterruptedException { sub.pull(pro); int count = 0; Message m = sub.nextMessage(1000); @@ -1246,7 +1243,7 @@ public void testPrioritized() throws Exception { // close the #1, #2 should get messages // start another priority 1 (#3), #2 should stop getting messages #3 should get messages ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_12, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); @@ -1343,7 +1340,7 @@ public void testPinnedClient() throws Exception { // start consuming, tracking pin ids and counts // unpin 10 times and make sure that new pins are made ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_12, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index 8588b4e74..93c9eaeb9 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -25,6 +25,7 @@ import static io.nats.client.support.NatsJetStreamConstants.*; import static io.nats.client.support.NatsKeyValueUtil.KV_OPERATION_HEADER_KEY; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPushAsyncTests extends JetStreamTestBase { diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index 9201edeaa..5b9785b07 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.support.NatsJetStreamClientError.JsSubPushAsyncCantSetPending; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPushTests extends JetStreamTestBase { diff --git a/src/test/java/io/nats/client/impl/JetStreamTestBase.java b/src/test/java/io/nats/client/impl/JetStreamTestBase.java index d1ddee064..77d9b9385 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestBase.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestBase.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamTestBase extends TestBase { diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 0e909f036..7947d7c97 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -15,7 +15,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsKeyValueUtil; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -34,6 +34,9 @@ import static io.nats.client.api.KeyValueWatchOption.*; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsJetStreamConstants.SERVER_DEFAULT_DUPLICATE_WINDOW_MS; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; +import static io.nats.client.utils.VersionUtils.atLeast2_10; import static org.junit.jupiter.api.Assertions.*; public class KeyValueTests extends JetStreamTestBase { @@ -51,7 +54,7 @@ public void testWorkflow() throws Exception { String stringValue1 = "String Value 1"; String stringValue2 = "String Value 2"; - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { // get the kv management context KeyValueManagement kvm = nc.keyValueManagement(); nc.keyValueManagement(KeyValueOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage @@ -565,7 +568,7 @@ public void testCreateUpdate() throws Exception { assertEquals(1, history.size()); assertEquals(2, history.get(0).getValueAsLong()); - boolean compression = atLeast2_10(ensureRunServerInfo()); + boolean compression = atLeast2_10(); String desc = random(); KeyValueConfiguration kvc = KeyValueConfiguration.builder(kvs.getConfiguration()) .description(desc) @@ -1166,8 +1169,8 @@ else if (expected instanceof String) { @Test public void testWithAccount() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/kv_account.conf", false)) { - Options acctA = new Options.Builder().server(ts.getURI()).userInfo("a", "a").build(); - Options acctI = new Options.Builder().server(ts.getURI()).userInfo("i", "i").inboxPrefix("ForI").build(); + Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); + Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); try (Connection connUserA = Nats.connect(acctA); Connection connUserI = Nats.connect(acctI)) { @@ -1708,7 +1711,7 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { @Test public void testKeyValueTransform() throws Exception { - runInLrServer(TestBase::atLeast2_10_3, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10_3, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); String kvName1 = random(); @@ -1766,7 +1769,7 @@ public void testKeyValueTransform() throws Exception { @Test public void testSubjectFiltersAgainst209OptOut() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); String bucket = random(); @@ -1786,7 +1789,7 @@ public void testSubjectFiltersAgainst209OptOut() throws Exception { @Test public void testTtlAndDuplicateWindowRoundTrip() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() @@ -1825,7 +1828,7 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { @Test public void testConsumeKeys() throws Exception { int count = 10000; - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() @@ -1860,7 +1863,7 @@ public void testConsumeKeys() throws Exception { @Test public void testLimitMarkerCoverage() throws Exception { - runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { KeyValueManagement kvm = nc.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() @@ -1909,7 +1912,7 @@ public void testLimitMarkerCoverage() throws Exception { @Test public void testLimitMarkerBehavior() throws Exception { - runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String key1 = random(); String key2 = random(); @@ -2026,7 +2029,7 @@ public void endOfData() { @Test public void testJustLimitMarkerCreatePurge() throws Exception { - runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); @@ -2135,7 +2138,7 @@ else if (mcount == 4) { @Test public void testJustTtlForDeletePurge() throws Exception { - runInLrServer(TestBase::atLeast2_12, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 9da663992..4aad6146e 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -23,13 +23,14 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class MessageContentTests { @Test public void testSimpleString() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -51,7 +52,7 @@ public void testSimpleString() throws Exception { @Test public void testUTF8String() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -73,7 +74,7 @@ public void testUTF8String() throws Exception { @Test public void testDifferentSizes() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -100,7 +101,7 @@ public void testDifferentSizes() throws Exception { @Test public void testZeros() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -202,7 +203,7 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF ListenerForTesting listener = new ListenerForTesting(); try (NatsServerProtocolMock ts = new NatsServerProtocolMock(badServer, null)) { - Options options = new Options.Builder(). + Options options = optionsBuilder(). server(ts.getURI()). maxReconnects(0). errorListener(listener). diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 62ce1042e..d450d6cf0 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -30,7 +30,8 @@ import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; import static io.nats.client.support.NatsJetStreamConstants.CONSUMER_STALLED_HDR; import static io.nats.client.support.Status.*; -import static io.nats.client.utils.TestOptions.NOOP_EL; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @SuppressWarnings("SameParameterValue") @@ -248,7 +249,6 @@ public void testPushManagerHeartbeats() throws Exception { @Test public void testPullManagerHeartbeats() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - Options.Builder builder = new Options.Builder().errorListener(listener); runInJsServer(listener, nc -> { PullMessageManager pullMgr = getPullManager(nc, null, true); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pullMgr); @@ -575,7 +575,7 @@ static class MockPublishInternal extends NatsConnection { String fcSubject; public MockPublishInternal() { - this(new Options.Builder().errorListener(NOOP_EL).build()); + this(optionsBuilder().build()); } public MockPublishInternal(Options options) { @@ -636,6 +636,7 @@ protected void shutdown() {} @Test public void testMessageManagerInterfaceDefaultImplCoverage() { // make a dummy connection so we can make a subscription + // notice we don't nc.connect Options options = Options.builder().build(); NatsConnection nc = new NatsConnection(options); diff --git a/src/test/java/io/nats/client/impl/MessageQueueTests.java b/src/test/java/io/nats/client/impl/MessageQueueTests.java index 6585a6cd2..de0789b52 100644 --- a/src/test/java/io/nats/client/impl/MessageQueueTests.java +++ b/src/test/java/io/nats/client/impl/MessageQueueTests.java @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; -import static io.nats.client.utils.TestBase.sleep; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class MessageQueueTests { diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index ad5bacdf5..56ee3b61e 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -15,15 +15,13 @@ import io.nats.client.NatsTestServer; import io.nats.client.Options; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import static io.nats.client.utils.TestBase.standardOptions; -import static io.nats.client.utils.TestBase.standardOptionsBuilder; +import static io.nats.client.utils.ConnectionUtils.*; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -33,16 +31,16 @@ public class NatsConnectionImplTests { public void testConnectionClosedProperly() throws Exception { try (NatsTestServer server = new NatsTestServer()) { Options options = standardOptions(server.getNatsLocalhostUri()); - verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); + verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); // using the same options to demonstrate the executors came // from the internal factory and were not reused - verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); + verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); // using options copied from options to demonstrate the executors // came from the internal factory and were not reused options = new Options.Builder(options).build(); - verifyInternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); + verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); ExecutorService es = Executors.newFixedThreadPool(3); ScheduledExecutorService ses = Executors.newScheduledThreadPool(3); @@ -53,10 +51,10 @@ public void testConnectionClosedProperly() throws Exception { .executor(es) .scheduledExecutor(ses) .build(); - verifyExternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); + verifyExternalExecutors(options, (NatsConnection) standardConnectionWait(options)); // same options just because - verifyExternalExecutors(options, (NatsConnection) TestBase.standardConnectionWait(options)); + verifyExternalExecutors(options, (NatsConnection) standardConnectionWait(options)); es.shutdown(); ses.shutdown(); diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index 864fc0455..0d0ecac52 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -24,6 +24,8 @@ import static io.nats.client.support.NatsConstants.OP_PING; import static io.nats.client.support.NatsConstants.OP_PING_BYTES; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static org.junit.jupiter.api.Assertions.*; @@ -121,11 +123,7 @@ public void testCustomMaxControlLine() { } try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - maxControlLine(maxControlLine). - build(); + Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); Connection nc = Nats.connect(options); standardConnectionWait(nc); nc.request(subject, body); diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index 11fd6e3b8..58dd82d6c 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -13,7 +13,10 @@ package io.nats.client.impl; -import io.nats.client.*; +import io.nats.client.Dispatcher; +import io.nats.client.Message; +import io.nats.client.MessageHandler; +import io.nats.client.Statistics; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -22,21 +25,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static io.nats.client.utils.TestBase.runInServer; -import static io.nats.client.utils.TestBase.sleep; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; -public class NatsStatisticsTests { +public class NatsStatisticsTests extends TestBase { @Test public void testHumanReadableString() throws Exception { - // This test is purely for coverage, any test without a human is likely pedantic - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(new Options.Builder() - .server(ts.getURI()) - .turnOnAdvancedStats() - .build())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - + runInLrServer(optionsBuilder().turnOnAdvancedStats(), nc -> { Dispatcher d = nc.createDispatcher((msg) -> { nc.publish(msg.getReplyTo(), new byte[16]); }); @@ -53,164 +49,135 @@ public void testHumanReadableString() throws Exception { assertTrue(str.length() > 0); assertTrue(str.contains("### Connection ###")); assertTrue(str.contains("Socket Writes")); - } + }); } @Test public void testInOutOKRequestStats() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).verbose().build(); - Connection nc = Nats.connect(options); - StatisticsCollector stats = ((NatsConnection) nc).getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - Message m = NatsMessage.builder() - .subject(msg.getReplyTo()) - .data(new byte[16]) - .headers(new Headers().put("header", "reply")) - .build(); - nc.publish(m); - }); - d.subscribe("subject"); - + runInLrServer(optionsBuilder().verbose(), nc -> { + Dispatcher d = nc.createDispatcher((msg) -> { Message m = NatsMessage.builder() - .subject("subject") - .data(new byte[8]) - .headers(new Headers().put("header", "request")) + .subject(msg.getReplyTo()) + .data(new byte[16]) + .headers(new Headers().put("header", "reply")) .build(); - Future incoming = nc.request(m); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - - assertNotNull(msg); - assertEquals(0, stats.getOutstandingRequests(), "outstanding"); - assertTrue(stats.getInBytes() > 200, "bytes in"); - assertTrue(stats.getOutBytes() > 400, "bytes out"); - assertEquals(2, stats.getInMsgs(), "messages in"); // reply & request - assertEquals(6, stats.getOutMsgs(), "messages out"); // ping, sub, pub, msg, pub, msg - assertEquals(5, stats.getOKs(), "oks"); //sub, pub, msg, pub, msg - } finally { - nc.close(); - } - } + nc.publish(m); + }); + d.subscribe("subject"); + + Message m = NatsMessage.builder() + .subject("subject") + .data(new byte[8]) + .headers(new Headers().put("header", "request")) + .build(); + Future incoming = nc.request(m); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + + assertNotNull(msg); + Statistics stats = nc.getStatistics(); + assertEquals(0, stats.getOutstandingRequests(), "outstanding"); + assertTrue(stats.getInBytes() > 200, "bytes in"); + assertTrue(stats.getOutBytes() > 400, "bytes out"); + assertEquals(2, stats.getInMsgs(), "messages in"); // reply & request + assertEquals(6, stats.getOutMsgs(), "messages out"); // ping, sub, pub, msg, pub, msg + assertEquals(5, stats.getOKs(), "oks"); //sub, pub, msg, pub, msg + }); } @Test public void testReadWriteAdvancedStatsEnabled() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).verbose().turnOnAdvancedStats().build(); - Connection nc = Nats.connect(options); - StatisticsCollector stats = ((NatsConnection) nc).getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - Message m = NatsMessage.builder() - .subject(msg.getReplyTo()) - .data(new byte[16]) - .headers(new Headers().put("header", "reply")) - .build(); - nc.publish(m); - }); - d.subscribe("subject"); - + runInLrServer(optionsBuilder().verbose().turnOnAdvancedStats(), nc -> { + Dispatcher d = nc.createDispatcher((msg) -> { Message m = NatsMessage.builder() - .subject("subject") - .data(new byte[8]) - .headers(new Headers().put("header", "request")) - .build(); - Future incoming = nc.request(m); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - - assertNotNull(msg); - - // The read/write advanced stats are only exposed via toString, so assert on that - String stringStats = stats.toString(); - assertTrue(stringStats.contains("Socket Reads"), "readStats count"); - assertTrue(stringStats.contains("Average Bytes Per Read"), "readStats average bytes"); - assertTrue(stringStats.contains("Min Bytes Per Read"), "readStats min bytes"); - assertTrue(stringStats.contains("Max Bytes Per Read"), "readStats max bytes"); - - assertTrue(stringStats.contains("Socket Writes"), "writeStats count"); - assertTrue(stringStats.contains("Average Bytes Per Write"), "writeStats average bytes"); - assertTrue(stringStats.contains("Min Bytes Per Write"), "writeStats min bytes"); - assertTrue(stringStats.contains("Max Bytes Per Write"), "writeStats max bytes"); - } finally { - nc.close(); - } - } + .subject(msg.getReplyTo()) + .data(new byte[16]) + .headers(new Headers().put("header", "reply")) + .build(); + nc.publish(m); + }); + d.subscribe("subject"); + + Message m = NatsMessage.builder() + .subject("subject") + .data(new byte[8]) + .headers(new Headers().put("header", "request")) + .build(); + Future incoming = nc.request(m); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + + assertNotNull(msg); + + // The read/write advanced stats are only exposed via toString, so assert on that + Statistics stats = nc.getStatistics(); + String stringStats = stats.toString(); + assertTrue(stringStats.contains("Socket Reads"), "readStats count"); + assertTrue(stringStats.contains("Average Bytes Per Read"), "readStats average bytes"); + assertTrue(stringStats.contains("Min Bytes Per Read"), "readStats min bytes"); + assertTrue(stringStats.contains("Max Bytes Per Read"), "readStats max bytes"); + + assertTrue(stringStats.contains("Socket Writes"), "writeStats count"); + assertTrue(stringStats.contains("Average Bytes Per Write"), "writeStats average bytes"); + assertTrue(stringStats.contains("Min Bytes Per Write"), "writeStats min bytes"); + assertTrue(stringStats.contains("Max Bytes Per Write"), "writeStats max bytes"); + }); } @Test public void testReadWriteAdvancedStatsDisabled() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).verbose().build(); - Connection nc = Nats.connect(options); - StatisticsCollector stats = ((NatsConnection) nc).getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - Message m = NatsMessage.builder() - .subject(msg.getReplyTo()) - .data(new byte[16]) - .headers(new Headers().put("header", "reply")) - .build(); - nc.publish(m); - }); - d.subscribe("subject"); - + runInLrServer(optionsBuilder().verbose(), nc -> { + Dispatcher d = nc.createDispatcher((msg) -> { Message m = NatsMessage.builder() - .subject("subject") - .data(new byte[8]) - .headers(new Headers().put("header", "request")) - .build(); - Future incoming = nc.request(m); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + .subject(msg.getReplyTo()) + .data(new byte[16]) + .headers(new Headers().put("header", "reply")) + .build(); + nc.publish(m); + }); + d.subscribe("subject"); - assertNotNull(msg); + Message m = NatsMessage.builder() + .subject("subject") + .data(new byte[8]) + .headers(new Headers().put("header", "request")) + .build(); + Future incoming = nc.request(m); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - incoming = nc.request(m); - incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); - assertNotNull(msg); + incoming = nc.request(m); + incoming.get(500, TimeUnit.MILLISECONDS); - incoming = nc.request(m); - incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); - assertNotNull(msg); + incoming = nc.request(m); + incoming.get(500, TimeUnit.MILLISECONDS); - incoming = nc.request(m); - incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); - assertNotNull(msg); + incoming = nc.request(m); + incoming.get(500, TimeUnit.MILLISECONDS); - // The read/write advanced stats are only exposed via toString, so assert on that - String stringStats = stats.toString(); - assertFalse(stringStats.contains("Socket Reads"), "readStats count"); - assertFalse(stringStats.contains("Average Bytes Per Read"), "readStats average bytes"); - assertFalse(stringStats.contains("Min Bytes Per Read"), "readStats min bytes"); - assertFalse(stringStats.contains("Max Bytes Per Read"), "readStats max bytes"); + assertNotNull(msg); - assertFalse(stringStats.contains("Socket Writes"), "writeStats count"); - assertFalse(stringStats.contains("Average Bytes Per Write"), "writeStats average bytes"); - assertFalse(stringStats.contains("Min Bytes Per Write"), "writeStats min bytes"); - assertFalse(stringStats.contains("Max Bytes Per Write"), "writeStats max bytes"); - } finally { - nc.close(); - } - } + // The read/write advanced stats are only exposed via toString, so assert on that + Statistics stats = nc.getStatistics(); + String stringStats = stats.toString(); + assertFalse(stringStats.contains("Socket Reads"), "readStats count"); + assertFalse(stringStats.contains("Average Bytes Per Read"), "readStats average bytes"); + assertFalse(stringStats.contains("Min Bytes Per Read"), "readStats min bytes"); + assertFalse(stringStats.contains("Max Bytes Per Read"), "readStats max bytes"); + + assertFalse(stringStats.contains("Socket Writes"), "writeStats count"); + assertFalse(stringStats.contains("Average Bytes Per Write"), "writeStats average bytes"); + assertFalse(stringStats.contains("Min Bytes Per Write"), "writeStats min bytes"); + assertFalse(stringStats.contains("Max Bytes Per Write"), "writeStats max bytes"); + }); } @Test public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { - Options.Builder builder = new Options.Builder().turnOnAdvancedStats(); - - runInServer(builder, nc -> { + runInLrServer(optionsBuilder().turnOnAdvancedStats(), nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = (msg) -> { requests.incrementAndGet(); @@ -253,9 +220,7 @@ public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { @Test public void testOrphanDuplicateRepliesAdvancedStatsDisabled() throws Exception { - Options.Builder builder = new Options.Builder(); - - runInServer(builder, nc -> { + runInServer(optionsBuilder(), nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = (msg) -> { requests.incrementAndGet(); diff --git a/src/test/java/io/nats/client/impl/ObjectStoreTests.java b/src/test/java/io/nats/client/impl/ObjectStoreTests.java index f1a8c7103..9d0f674fa 100644 --- a/src/test/java/io/nats/client/impl/ObjectStoreTests.java +++ b/src/test/java/io/nats/client/impl/ObjectStoreTests.java @@ -14,7 +14,7 @@ import io.nats.client.*; import io.nats.client.api.*; -import io.nats.client.utils.TestBase; +import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; import java.io.*; @@ -30,6 +30,7 @@ import static io.nats.client.api.ObjectStoreWatchOption.IGNORE_DELETE; import static io.nats.client.support.NatsJetStreamClientError.*; import static io.nats.client.support.NatsObjectStoreUtil.DEFAULT_CHUNK_SIZE; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class ObjectStoreTests extends JetStreamTestBase { @@ -489,7 +490,7 @@ public void testSeal() throws Exception { @Test public void testCompression() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { String bucket = random(); ObjectStoreManagement osm = nc.objectStoreManagement(); osm.create(ObjectStoreConfiguration.builder(bucket) diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index 5e1008f03..2c4630fda 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -15,13 +15,13 @@ import io.nats.client.Nats; import io.nats.client.NatsTestServer; -import io.nats.client.Options; import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.charset.StandardCharsets; import static io.nats.client.support.NatsConstants.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -55,7 +55,7 @@ public void testTooBig() { @Test public void testLongProtocolOpThrows() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("thisistoolong\r\n").getBytes(StandardCharsets.US_ASCII); @@ -68,7 +68,7 @@ public void testLongProtocolOpThrows() { @Test public void testMissingLineFeed() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("PING\rPONG").getBytes(StandardCharsets.US_ASCII); @@ -81,7 +81,7 @@ public void testMissingLineFeed() { @Test public void testMissingSubject() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("MSG 1 1\r\n").getBytes(StandardCharsets.US_ASCII); @@ -96,7 +96,7 @@ public void testMissingSubject() { @Test public void testMissingSID() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("MSG subject 1\r\n").getBytes(StandardCharsets.US_ASCII); @@ -111,7 +111,7 @@ public void testMissingSID() { @Test public void testMissingLength() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("MSG subject 2 \r\n").getBytes(StandardCharsets.US_ASCII); @@ -126,7 +126,7 @@ public void testMissingLength() { @Test public void testBadLength() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("MSG subject 2 x\r\n").getBytes(StandardCharsets.US_ASCII); @@ -141,11 +141,10 @@ public void testBadLength() { @Test public void testMessageLineTooLong() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - NatsConnection nc = (NatsConnection) Nats.connect(new Options.Builder(). - server(ts.getURI()). - maxControlLine(16). - build())) { + try (NatsTestServer ts = new NatsTestServer(); + NatsConnection nc = (NatsConnection) Nats.connect( + optionsBuilder(ts.getURI()).maxControlLine(16).build()) + ) { NatsConnectionReader reader = nc.getReader(); byte[] bytes = ("MSG reallylongsubjectobreakthelength 1 1\r\n").getBytes(StandardCharsets.US_ASCII); reader.fakeReadForTest(bytes); @@ -159,11 +158,10 @@ public void testMessageLineTooLong() { @Test public void testProtocolLineTooLong() { assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); - NatsConnection nc = (NatsConnection) Nats.connect(new Options.Builder(). - server(ts.getURI()). - maxControlLine(1024). - build())) { + try (NatsTestServer ts = new NatsTestServer(); + NatsConnection nc = (NatsConnection) Nats.connect( + optionsBuilder(ts.getURI()).maxControlLine(1024).build()) + ) { NatsConnectionReader reader = nc.getReader(); StringBuilder longString = new StringBuilder(); @@ -203,7 +201,7 @@ public void testProtocolStrings() throws Exception { OP_OK, OP_PONG, OP_PONG, OP_MSG }; - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { NatsConnectionReader reader = nc.getReader(); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 8cba6add4..fb3cb9373 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -22,6 +22,7 @@ import java.time.Duration; import java.util.concurrent.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.TestBase.runInServer; import static org.junit.jupiter.api.Assertions.*; @@ -69,8 +70,8 @@ public void testHandlingPing() throws Exception,ExecutionException { @Test public void testPingTimer() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test .build(); @@ -91,8 +92,7 @@ public void testPingTimer() throws Exception { @Test public void testPingFailsWhenClosed() throws Exception { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). - server(ts.getURI()). + Options options = optionsBuilder().server(ts.getURI()). pingInterval(Duration.ofMillis(10)). maxPingsOut(5). maxReconnects(0). @@ -114,7 +114,7 @@ public void testPingFailsWhenClosed() throws Exception { @Test public void testMaxPingsOut() throws Exception { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). + Options options = optionsBuilder(). server(ts.getURI()). pingInterval(Duration.ofSeconds(10)). // Avoid auto pings maxPingsOut(2). @@ -138,7 +138,7 @@ public void testMaxPingsOut() throws Exception { public void testFlushTimeout() { assertThrows(TimeoutException.class, () -> { try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = new Options.Builder(). + Options options = optionsBuilder(). server(ts.getURI()). maxReconnects(0). build(); @@ -160,8 +160,8 @@ public void testFlushTimeout() { public void testFlushTimeoutDisconnected() { assertThrows(TimeoutException.class, () -> { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().connectionListener(listener).server(ts.getURI()).build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).connectionListener(listener).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { @@ -182,9 +182,9 @@ public void testFlushTimeoutDisconnected() { @Test public void testPingTimerThroughReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder() + Options options = optionsBuilder() .connectionListener(listener) .server(ts.getURI()) .server(ts2.getURI()) @@ -222,8 +222,8 @@ public void testPingTimerThroughReconnect() throws Exception { @Test public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()). + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts). pingInterval(Duration.ofMillis(200)).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); StatisticsCollector stats = nc.getStatisticsCollector(); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 375c23cc2..152c5b842 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -36,8 +36,11 @@ import static io.nats.client.NatsTestServer.getNatsLocalhostUri; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.TestBase.*; -import static io.nats.client.utils.TestOptions.NOOP_EL; +import static io.nats.client.utils.ThreadUtils.sleep; +import static io.nats.client.utils.VersionUtils.atLeast2_9_0; import static org.junit.jupiter.api.Assertions.*; @Isolated @@ -65,21 +68,21 @@ public void testWsReconnect() throws Exception { //Includes test for subscriptio private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer optSetter) throws Exception { int port = NatsTestServer.nextPort(); + nsrb.port(port); // set the port into the builder ListenerForTesting listener = new ListenerForTesting(); NatsConnection nc; Subscription sub; long start; long end; - try (NatsTestServer ts = new NatsTestServer(nsrb.port(port))) { - Options.Builder builder = new Options.Builder() + try (NatsTestServer ts = new NatsTestServer(nsrb)) { + Options.Builder builder = optionsBuilder() .maxReconnects(-1) .reconnectWait(Duration.ofMillis(1000)) - .connectionListener(listener) - .errorListener(NOOP_EL); + .connectionListener(listener); optSetter.accept(ts, builder); Options options = builder.build(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); + nc = (NatsConnection) standardConnectionWait(options); sub = nc.subscribe("subsubject"); @@ -136,15 +139,13 @@ public void testSubscribeDuringReconnect() throws Exception { Subscription sub; try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(-1) .reconnectWait(Duration.ofMillis(20)) .connectionListener(listener) - .errorListener(NOOP_EL) .build(); - port = ts.getPort(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); + port = ts.getPort(); + nc = (NatsConnection) standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -160,7 +161,7 @@ public void testSubscribeDuringReconnect() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port, false)) { - TestBase.listenerConnectionWait(nc, listener); + listenerConnectionWait(nc, listener); // Make sure the dispatcher and subscription are still there Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); @@ -189,13 +190,13 @@ public void testReconnectBuffer() throws Exception { String[] customArgs = {"--user","stephen","--pass","password"}; try (NatsTestServer ts = new NatsTestServer(customArgs, port, false)) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(-1) .userInfo("stephen".toCharArray(), "password".toCharArray()) - .reconnectWait(Duration.ofMillis(1000)).connectionListener(listener) - .errorListener(NOOP_EL).build(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); + .reconnectWait(Duration.ofMillis(1000)) + .connectionListener(listener) + .build(); + nc = (NatsConnection) standardConnectionWait(options); sub = nc.subscribe("subsubject"); @@ -228,7 +229,7 @@ public void testReconnectBuffer() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port, false)) { - TestBase.listenerConnectionWait(nc, listener); + listenerConnectionWait(nc, listener); end = System.nanoTime(); @@ -258,14 +259,12 @@ public void testMaxReconnects() throws Exception { int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port, false)) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(1) .connectionListener(listener) - .errorListener(NOOP_EL) .reconnectWait(Duration.ofMillis(10)) .build(); - nc = TestBase.standardConnectionWait(options); + nc = standardConnectionWait(options); listener.prepForStatusChange(Events.CLOSED); } @@ -281,15 +280,14 @@ public void testReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder() - .server(ts2.getURI()) - .server(ts.getURI()) + Options options = optionsBuilder() + .server(ts2.getNatsLocalhostUri()) + .server(ts.getNatsLocalhostUri()) .noRandomize() .connectionListener(listener) - .errorListener(NOOP_EL) .maxReconnects(-1) .build(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); + nc = (NatsConnection) standardConnectionWait(options); assertEquals(ts2.getURI(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -309,23 +307,22 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = new Options.Builder() - .server(ts2.getURI()) - .server(ts.getURI()) + Options options = optionsBuilder() + .server(ts2.getNatsLocalhostUri()) + .server(ts.getNatsLocalhostUri()) .noRandomize() .connectionListener(listener) - .errorListener(NOOP_EL) .maxReconnects(-1) .build(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts2.getURI()); + nc = (NatsConnection) standardConnectionWait(options); + assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getNatsLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -339,15 +336,14 @@ public void testReconnectToSecondServerFromInfo() throws Exception { String striped = ts.getURI().substring("nats://".length()); // info doesn't have protocol String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}"; try (NatsServerProtocolMock ts2 = new NatsServerProtocolMock(null, customInfo)) { - Options options = new Options.Builder() + Options options = optionsBuilder() .server(ts2.getURI()) .connectionListener(listener) .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) - .errorListener(NOOP_EL) .build(); - nc = (NatsConnection) TestBase.standardConnectionWait(options); + nc = (NatsConnection) standardConnectionWait(options); assertEquals(nc.getConnectedUrl(), ts2.getURI()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -368,15 +364,13 @@ public void testOverflowReconnectBuffer() { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(-1) .connectionListener(listener) - .errorListener(NOOP_EL) .reconnectBufferSize(4*512) .reconnectWait(Duration.ofSeconds(480)) .build(); - nc = TestBase.standardConnectionWait(options); + nc = standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -394,15 +388,13 @@ public void testInfiniteReconnectBuffer() throws Exception { Connection nc; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(5) .connectionListener(listener) - .errorListener(NOOP_EL) .reconnectBufferSize(-1) .reconnectWait(Duration.ofSeconds(30)) .build(); - nc = TestBase.standardConnectionWait(options); + nc = standardConnectionWait(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -455,12 +447,11 @@ public void testReconnectDropOnLineFeed() throws Exception { }; try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - Options options = new Options.Builder() + Options options = optionsBuilder() .server(ts.getURI()) .maxReconnects(-1) .reconnectWait(reconnectWait) .connectionListener(listener) - .errorListener(NOOP_EL) .build(); port = ts.getPort(); nc = (NatsConnection) Nats.connect(options); @@ -480,7 +471,7 @@ public void testReconnectDropOnLineFeed() throws Exception { // connect good then bad listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(port, false)) { - TestBase.listenerConnectionWait(nc, listener); + listenerConnectionWait(nc, listener); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -494,7 +485,7 @@ public void testReconnectDropOnLineFeed() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsServerProtocolMock ignored = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - TestBase.listenerConnectionWait(nc, listener); + listenerConnectionWait(nc, listener); subRef.get().get(); listener.prepForStatusChange(Events.DISCONNECTED); sendRef.get().complete(true); @@ -541,11 +532,9 @@ public void testReconnectNoIPTLSConnection() throws Exception { NatsTestServer ts2 = new NatsTestServer("src/test/resources/tls_noip.conf", ts2Inserts, ts2Port, false) ) { SslTestingHelper.setKeystoreSystemParameters(); - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .secure() .connectionListener(listener) - .errorListener(NOOP_EL) .maxReconnects(20) .reconnectWait(Duration.ofMillis(100)) .connectionTimeout(Duration.ofSeconds(5)) @@ -553,7 +542,7 @@ public void testReconnectNoIPTLSConnection() throws Exception { .build(); listener.prepForStatusChange(Events.DISCOVERED_SERVERS); - nc = (NatsConnection) TestBase.longConnectionWait(options); + nc = (NatsConnection) longConnectionWait(options); assertEquals(nc.getConnectedUrl(), ts.getURI()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -575,10 +564,8 @@ public void testURISchemeNoIPTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); SslTestingHelper.setKeystoreSystemParameters(); try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", false)) { - Options options = new Options.Builder() - .server("tls://localhost:"+ts.getPort()) + Options options = optionsBuilder("tls://localhost:"+ts.getPort()) .connectionTimeout(Duration.ofSeconds(5)) - .errorListener(NOOP_EL) .maxReconnects(0) .build(); assertCanConnect(options); @@ -590,10 +577,8 @@ public void testURISchemeNoIPOpenTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); SslTestingHelper.setKeystoreSystemParameters(); try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", false)) { - Options options = new Options.Builder() - .server("opentls://localhost:"+ts.getPort()) + Options options = optionsBuilder("opentls://localhost:"+ts.getPort()) .maxReconnects(0) - .errorListener(NOOP_EL) .build(); assertCanConnect(options); } @@ -606,11 +591,9 @@ public void testWriterFilterTiming() throws Exception { int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port, false)) { - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .noReconnect() .connectionListener(listener) - .errorListener(NOOP_EL) .build(); nc = (NatsConnection) Nats.connect(options); @@ -654,13 +637,11 @@ public void testReconnectWait() throws Exception { TestReconnectWaitHandler trwh = new TestReconnectWaitHandler(); int port = NatsTestServer.nextPort(); - Options options = new Options.Builder() - .server("nats://localhost:"+port) + Options options = optionsBuilder("nats://localhost:"+port) .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(1)) .reconnectWait(Duration.ofMillis(250)) .connectionListener(trwh) - .errorListener(NOOP_EL) .build(); NatsTestServer ts = new NatsTestServer(port, false); @@ -676,7 +657,7 @@ public void testReconnectWait() throws Exception { @Test public void testReconnectOnConnect() throws Exception { int port = NatsTestServer.nextPort(); - Options options = Options.builder().server(getNatsLocalhostUri(port)).errorListener(NOOP_EL).build(); + Options options = options(getNatsLocalhostUri(port)); CountDownLatch latch = new CountDownLatch(1); AtomicReference testConn = new AtomicReference<>(); @@ -856,10 +837,8 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount, ReconnectQueueCheckConnectionListener listener = new ReconnectQueueCheckConnectionListener(); - Options options = Options.builder() - .server(getNatsLocalhostUri(port)) + Options options = optionsBuilder(getNatsLocalhostUri(port)) .connectionListener(listener) - .errorListener(NOOP_EL) .dataPortType(ForceReconnectQueueCheckDataPort.class.getCanonicalName()) .build(); @@ -923,7 +902,7 @@ public ReconnectQueueCheckSubscriber(String subject, int pubCount, int port) { @Override public void run() { - Options options = Options.builder().server(getNatsLocalhostUri(port)).build(); + Options options = optionsBuilder().server(getNatsLocalhostUri(port)).build(); try (Connection nc = Nats.connect(options)) { Subscription sub = nc.subscribe(subject); while (!subscriberDone.get()) { @@ -953,7 +932,7 @@ public void run() { @Test public void testSocketDataPortTimeout() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - Options.Builder builder = Options.builder() + Options.Builder builder = optionsBuilder() .socketWriteTimeout(5000) .pingInterval(Duration.ofSeconds(1)) .maxMessagesInOutgoingQueue(100) @@ -970,7 +949,7 @@ public void testSocketDataPortTimeout() throws Exception { getNatsLocalhostUri(port1), getNatsLocalhostUri(port2) }; - Connection nc = TestBase.standardConnectionWait(builder.servers(servers).build()); + Connection nc = standardConnectionWait(builder.servers(servers).build()); String subject = TestBase.random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index c8865f842..24782dfd1 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -25,13 +25,16 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class RequestTests extends TestBase { @Test public void testSimpleRequest() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher((msg) -> { @@ -117,8 +120,8 @@ public void testRequestVarieties() throws Exception { @Test public void testSimpleResponseMessageHasConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher((msg) -> { @@ -140,8 +143,8 @@ public void testSimpleResponseMessageHasConnection() throws Exception { @Test public void testSafeRequest() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); @@ -158,8 +161,8 @@ public void testSafeRequest() throws Exception { @Test public void testMultipleRequest() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), new byte[7])); @@ -179,8 +182,7 @@ public void testMultipleRequest() throws Exception { @Test public void testMultipleReplies() throws Exception { - Options.Builder builder = new Options.Builder().turnOnAdvancedStats(); - + Options.Builder builder = optionsBuilder().turnOnAdvancedStats(); runInServer(builder, nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = (msg) -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; @@ -215,7 +217,7 @@ public void testMultipleReplies() throws Exception { @Test public void testManualRequestReplyAndPublishSignatures() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -251,8 +253,8 @@ public void testManualRequestReplyAndPublishSignatures() throws Exception { @Test public void testRequestWithCustomInboxPrefix() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); - Connection nc = Nats.connect(new Options.Builder().inboxPrefix("myinbox").server(ts.getURI()).maxReconnects(0).build())) { + try (NatsTestServer ts = new NatsTestServer(); + Connection nc = Nats.connect(optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher((msg) -> { @@ -273,8 +275,8 @@ public void testRequestWithCustomInboxPrefix() throws Exception { @Test public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); @@ -295,11 +297,11 @@ public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { @Test public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 100; - Options options = new Options.Builder().server(ts.getURI()) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofMillis(cleanupInterval)) .noNoResponders().build(); @@ -324,9 +326,9 @@ public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { @Test public void testSimpleRequestWithTimeout() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) + try (NatsTestServer ts = new NatsTestServer()) { - Options options = new Options.Builder().server(ts.getURI()).requestCleanupInterval(Duration.ofHours(1)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { @@ -375,10 +377,10 @@ public void testSimpleRequestWithTimeout() throws Exception { @Test public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) + try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 10; - Options options = new Options.Builder().server(ts.getURI()).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { @@ -409,8 +411,8 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { @Test public void testRequireCleanupOnCancelFromNoResponders() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); @@ -429,8 +431,8 @@ public void testRequireCleanupOnCancelFromNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoResponders() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); @@ -448,8 +450,8 @@ public void testRequireCleanupWithTimeoutNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()) + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); @@ -470,8 +472,8 @@ public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { @Test public void testRequireCleanupOnCancel() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { - Options options = new Options.Builder().server(ts.getURI()).requestCleanupInterval(Duration.ofHours(1)).build(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -491,9 +493,9 @@ public void testRequireCleanupOnCancel() throws Exception { @Test public void testCleanupTimerWorks() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; - Options options = new Options.Builder().server(ts.getURI()).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -530,10 +532,10 @@ public void testCleanupTimerWorks() throws Exception { @Test public void testRequestsVsCleanup() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; int msgCount = 100; - Options options = new Options.Builder().server(ts.getURI()).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -565,7 +567,7 @@ public void testRequestsVsCleanup() throws Exception { @Test public void testDelayInPickingUpFuture() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { int msgCount = 100; ArrayList> messages = new ArrayList<>(); Connection nc = Nats.connect(ts.getURI()); @@ -614,19 +616,11 @@ public void testOldStyleRequest() throws Exception { @Test public void testBuffersResize() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { int initialSize = 128; int messageSize = 1024; - Options options = new Options.Builder(). - server(ts.getURI()). - bufferSize(initialSize). - connectionTimeout(Duration.ofSeconds(10)). - build(); - - Connection nc = Nats.connect(options); - try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - + Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); + try (Connection nc = standardConnectionWait(options)) { Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); @@ -642,9 +636,6 @@ public void testBuffersResize() throws Exception { assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(messageSize, msg.getData().length); - } finally { - nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); } } } @@ -652,7 +643,7 @@ public void testBuffersResize() throws Exception { @Test public void throwsIfClosed() { assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { nc.close(); nc.request("subject", null); @@ -664,7 +655,7 @@ public void throwsIfClosed() { @Test public void testThrowsWithoutSubject() { assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { //noinspection DataFlowIssue nc.request((String)null, null); @@ -676,7 +667,7 @@ public void testThrowsWithoutSubject() { @Test public void testThrowsEmptySubject() { assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(ts.getURI())) { nc.request("", null); fail(); @@ -748,7 +739,7 @@ public void testNatsImplAndEmptyStatsCoverage() { @Test public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false)) { + try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() .server(ts.getURI()) .noNoResponders() diff --git a/src/test/java/io/nats/client/impl/ServerPoolTests.java b/src/test/java/io/nats/client/impl/ServerPoolTests.java index 776aae337..a9c1fd912 100644 --- a/src/test/java/io/nats/client/impl/ServerPoolTests.java +++ b/src/test/java/io/nats/client/impl/ServerPoolTests.java @@ -21,6 +21,7 @@ import java.net.URISyntaxException; import java.util.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class ServerPoolTests extends TestBase { @@ -41,7 +42,7 @@ public void testPoolOptions() throws URISyntaxException { NatsUri lastConnectedServer = new NatsUri(BOOT_ONE); // testing that the expected show up in the pool - Options o = new Options.Builder().servers(bootstrap).build(); + Options o = optionsBuilder(bootstrap).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); @@ -50,7 +51,7 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, false, combined); // testing that noRandomize maintains order - o = new Options.Builder().noRandomize().servers(bootstrap).build(); + o = optionsBuilder(bootstrap).noRandomize().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, true, combined); @@ -59,19 +60,19 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, true, combined); // testing that ignoreDiscoveredServers ignores discovered servers - o = new Options.Builder().ignoreDiscoveredServers().servers(bootstrap).build(); + o = optionsBuilder(bootstrap).ignoreDiscoveredServers().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, BOOT_ONE, BOOT_TWO); // testing that duplicates don't get added String[] secureAndNotSecure = new String[]{BOOT_ONE, BOOT_ONE_SECURE}; String[] secureBootstrap = new String[]{BOOT_ONE_SECURE}; - o = new Options.Builder().servers(secureAndNotSecure).build(); + o = optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); secureAndNotSecure = new String[]{BOOT_ONE_SECURE, BOOT_ONE}; - o = new Options.Builder().servers(secureAndNotSecure).build(); + o = optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); } @@ -81,7 +82,7 @@ public void testMaxReconnects() throws URISyntaxException { NatsUri failed = new NatsUri(BOOT_ONE); // testing that servers that fail max times and is removed - Options o = new Options.Builder().server(BOOT_ONE).maxReconnects(3).build(); + Options o = optionsBuilder(BOOT_ONE).maxReconnects(3).build(); NatsServerPool nsp = newNatsServerPool(o, null, null); for (int x = 0; x < 4; x++) { nsp.nextServer(); @@ -95,7 +96,7 @@ public void testMaxReconnects() throws URISyntaxException { validateNslp(nsp, null, false, BOOT_ONE); // testing that servers that fail max times and is removed - o = new Options.Builder().server(BOOT_ONE).maxReconnects(0).build(); + o = optionsBuilder(BOOT_ONE).maxReconnects(0).build(); nsp = newNatsServerPool(o, null, null); nsp.nextServer(); validateNslp(nsp, null, false, BOOT_ONE); @@ -110,7 +111,7 @@ public void testMaxReconnects() throws URISyntaxException { @Test public void testPruning() throws URISyntaxException { // making sure that pruning happens. get baseline - Options o = new Options.Builder().servers(bootstrap).maxReconnects(0).build(); + Options o = optionsBuilder(bootstrap).maxReconnects(0).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); @@ -128,13 +129,13 @@ public void testPruning() throws URISyntaxException { public void testResolvingHostname() throws URISyntaxException { // resolving host name is false NatsUri ngs = new NatsUri(HOST_THAT_CAN_BE_RESOLVED); - Options o = new Options.Builder().noResolveHostnames().build(); + Options o = optionsBuilder().noResolveHostnames().build(); NatsServerPool nsp = newNatsServerPool(o, null, null); List resolved = nsp.resolveHostToIps(HOST_THAT_CAN_BE_RESOLVED); assertNull(resolved); // resolving host name is true - o = new Options.Builder().build(); + o = optionsBuilder().build(); nsp = newNatsServerPool(o, null, null); resolved = nsp.resolveHostToIps(HOST_THAT_CAN_BE_RESOLVED); assertNotNull(resolved); @@ -150,7 +151,7 @@ private static NatsServerPool newNatsServerPool(Options o, NatsUri last, List { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jsm, js) -> { assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random())); assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random(), JetStreamOptions.DEFAULT_JS_OPTIONS)); assertThrows(JetStreamApiException.class, () -> js.getStreamContext(random())); @@ -51,7 +54,7 @@ public void testStreamContextErrors() throws Exception { @Test public void testStreamContextFromConnection() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext streamContext = nc.getStreamContext(jstc.stream); assertEquals(jstc.stream, streamContext.getStreamName()); _testStreamContext(jstc, streamContext); @@ -60,7 +63,7 @@ public void testStreamContextFromConnection() throws Exception { @Test public void testStreamContextFromContext() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext streamContext = jstc.js.getStreamContext(jstc.stream); assertEquals(jstc.stream, streamContext.getStreamName()); _testStreamContext(jstc, streamContext); @@ -191,7 +194,7 @@ private String validateConsumerNameForOrdered(BaseConsumerContext bcc, MessageCo static int FETCH_ORDERED = 3; @Test public void testFetch() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { for (int x = 1; x <= 20; x++) { jstc.js.publish(jstc.subject(), ("test-fetch-msg-" + x).getBytes()); } @@ -330,7 +333,7 @@ private String generateConsumerName(int maxMessages, int maxBytes) { @Test public void testFetchNoWaitPlusExpires() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() .name(jstc.consumerName()) .inactiveThreshold(100000) // I could have used a durable, but this is long enough for the test @@ -394,7 +397,7 @@ private int readMessages(FetchConsumer fc) throws InterruptedException, JetStrea @Test public void testIterableConsumer() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); @@ -421,7 +424,7 @@ public void testIterableConsumer() throws Exception { @Test public void testOrderedConsumerDeliverPolices() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 101, 3, 100); ZonedDateTime startTime = getStartTimeFirstMessage(jstc); @@ -476,7 +479,7 @@ public void testOrderedConsumerCoverage() { @Test public void testOrderedIterableConsumerBasic() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = nc.getStreamContext(jstc.stream); int stopCount = 500; @@ -540,7 +543,7 @@ private void _testIterableBasic(JetStream js, int stopCount, IterableConsumer co @Test public void testConsumeWithHandler() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 2500); // Pre define a consumer @@ -628,7 +631,7 @@ private static void stopAndWaitForFinished(MessageConsumer mcon) throws Interrup @Test public void testNext() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 4); String name = random(); @@ -700,7 +703,7 @@ public void testNext() throws Exception { @Test public void testCoverage() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(1)).build()); jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(2)).build()); @@ -922,7 +925,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorNext() throws Exception { - runInJsServer(TestBase::atLeast2_9_1, nc -> { + runInJsServer(VersionUtils::atLeast2_9_1, nc -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc); StreamContext sctx = jstc.js.getStreamContext(jstc.stream); @@ -1004,7 +1007,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorFetch() throws Exception { - runInJsServer(TestBase::atLeast2_9_1, nc -> { + runInJsServer(VersionUtils::atLeast2_9_1, nc -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc); StreamContext sctx = jstc.js.getStreamContext(jstc.stream); @@ -1074,7 +1077,7 @@ private void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq, Ordere @Test public void testOrderedBehaviorIterable() throws Exception { - runInJsServer(TestBase::atLeast2_9_1, nc -> { + runInJsServer(VersionUtils::atLeast2_9_1, nc -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc); StreamContext sctx = jstc.js.getStreamContext(jstc.stream); @@ -1158,7 +1161,7 @@ public void testOrderedConsumeConstruction() { @Test public void testOrderedConsume() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() .filterSubject(jstc.subject()); _testOrderedConsume(jstc, occ); @@ -1167,7 +1170,7 @@ public void testOrderedConsume() throws Exception { @Test public void testOrderedConsumeWithPrefix() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() .consumerNamePrefix(random()) .filterSubject(jstc.subject()); @@ -1209,7 +1212,7 @@ private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerCo @Test public void testOrderedConsumeMultipleSubjects() throws Exception { - runInLrServer(TestBase::atLeast2_10, (nc, jsm, js) -> { + runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); jsPublish(jstc.js, jstc.subject(0), 10); jsPublish(jstc.js, jstc.subject(1), 5); @@ -1242,7 +1245,7 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { @Test public void testOrderedMultipleWays() throws Exception { - runInLrServer(TestBase::atLeast2_9_1, (nc, jstc) -> { + runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = jstc.js.getStreamContext(jstc.stream); OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); @@ -1459,7 +1462,7 @@ private Object roundTripSerialize(Serializable s) throws IOException, ClassNotFo @Test public void testOverflowFetch() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, TestBase::atLeast2_9_1, nc -> { + runInJsServer(listener, VersionUtils::atLeast2_9_1, nc -> { JetStreamTestingContext jstc = new JetStreamTestingContext(nc); jsPublish(jstc.js, jstc.subject(), 100); @@ -1522,7 +1525,7 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending @@ -1608,7 +1611,7 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, TestBase::atLeast2_11, (nc, jstc) -> { + runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 1000); // Testing min ack pending @@ -1708,7 +1711,7 @@ public void testReconnectOverOrdered() throws Exception { // ------------------------------------------------------------ int port = NatsTestServer.nextPort(); ListenerForTesting lft = new ListenerForTesting(); - Options options = new Options.Builder() + Options options = optionsBuilder() .connectionListener(lft) .errorListener(lft) .server(NatsTestServer.getNatsLocalhostUri(port)).build(); diff --git a/src/test/java/io/nats/client/impl/SlowConsumerTests.java b/src/test/java/io/nats/client/impl/SlowConsumerTests.java index 262bb9720..f76ced752 100644 --- a/src/test/java/io/nats/client/impl/SlowConsumerTests.java +++ b/src/test/java/io/nats/client/impl/SlowConsumerTests.java @@ -22,13 +22,14 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; public class SlowConsumerTests { @Test public void testDefaultPendingLimits() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { Subscription sub = nc.subscribe("subject"); @@ -45,7 +46,7 @@ public void testDefaultPendingLimits() throws Exception { @Test public void testSlowSubscriberByMessages() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { Subscription sub = nc.subscribe("subject"); @@ -78,7 +79,7 @@ public void testSlowSubscriberByMessages() throws Exception { @Test public void testSlowSubscriberByBytes() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { Subscription sub = nc.subscribe("subject"); @@ -109,7 +110,7 @@ public void testSlowSubscriberByBytes() throws Exception { @Test public void testSlowSDispatcherByMessages() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { final CompletableFuture ok = new CompletableFuture<>(); @@ -150,7 +151,7 @@ public void testSlowSDispatcherByMessages() throws Exception { @Test public void testSlowSDispatcherByBytes() throws Exception { - try (NatsTestServer ts = new NatsTestServer(false); + try (NatsTestServer ts = new NatsTestServer(); NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { final CompletableFuture ok = new CompletableFuture<>(); @@ -191,9 +192,8 @@ public void testSlowSDispatcherByBytes() throws Exception { @Test public void testSlowSubscriberNotification() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(false); - NatsConnection nc = (NatsConnection) Nats.connect(new Options.Builder(). - server(ts.getURI()).errorListener(listener).build())) { + try (NatsTestServer ts = new NatsTestServer(); + NatsConnection nc = (NatsConnection) Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { Subscription sub = nc.subscribe("subject"); sub.setPendingLimits(1, -1); diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index b39d7f18f..619802bf3 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.utils.CloseOnUpgradeAttempt; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; @@ -30,7 +29,12 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; -import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.TestBase.assertCanConnectAndPubSub; +import static io.nats.client.utils.TestBase.flushAndWaitLong; +import static io.nats.client.utils.VersionUtils.atLeast2_10_3; +import static io.nats.client.utils.VersionUtils.ensureRunServerInfo; import static org.junit.jupiter.api.Assertions.*; public class TLSConnectTests { @@ -47,8 +51,7 @@ private String convertToProtocol(String proto, NatsTestServer... servers) { } private static Options createTestOptionsManually(String servers) throws Exception { - return new Options.Builder() - .server(servers) + return optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .build(); @@ -64,8 +67,7 @@ private static Options createTestOptionsViaProperties(String servers) { } private static Options createTestOptionsViaFactoryInstance(String servers) { - return new Options.Builder() - .server(servers) + return optionsBuilder(servers) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) .build(); @@ -74,8 +76,8 @@ private static Options createTestOptionsViaFactoryInstance(String servers) { private static Options createTestOptionsViaFactoryClassName(String servers) { Properties properties = new Properties(); properties.setProperty(PROP_SSL_CONTEXT_FACTORY_CLASS, SSLContextFactoryForTesting.class.getCanonicalName()); - return new Options.Builder(properties) - .server(servers) + return optionsBuilder(servers) + .properties(properties) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) .build(); @@ -95,15 +97,13 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testSimpleTlsFirstConnection() throws Exception { - if (TestBase.atLeast2_10_3(ensureRunServerInfo())) { + if (atLeast2_10_3(ensureRunServerInfo())) { try (NatsTestServer ts = new NatsTestServer( NatsTestServer.builder() .configFilePath("src/test/resources/tls_first.conf") .skipConnectValidate()) ) { - String servers = ts.getURI(); - Options options = new Options.Builder() - .server(servers) + Options options = optionsBuilder(ts) .maxReconnects(0) .tlsFirst() .sslContext(SslTestingHelper.createTestSSLContext()) @@ -166,7 +166,7 @@ public void testVerifiedTLSConnection() throws Exception { public void testOpenTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { String servers = ts.getURI(); - Options options = new Options.Builder() + Options options = optionsBuilder() .server(servers) .maxReconnects(0) .opentls() @@ -207,7 +207,7 @@ public void testURISchemeIPTLSConnection() throws Exception { public void testURISchemeOpenTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { String servers = convertToProtocol("opentls", ts); - Options options = new Options.Builder() + Options options = optionsBuilder() .server(servers) .maxReconnects(0) .opentls() @@ -229,7 +229,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { NatsTestServer server2 = new NatsTestServer("src/test/resources/tls.conf", false); ) { String servers = convertToProtocol("opentls", server1, server2); - Options options = new Options.Builder() + Options options = optionsBuilder() .server(servers) .maxReconnects(0) .opentls() @@ -249,12 +249,11 @@ public void testTLSMessageFlow() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; - Options options = new Options.Builder() - .server(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .build(); - Connection nc = TestBase.standardConnectionWait(options); + Connection nc = standardConnectionWait(options); Dispatcher d = nc.createDispatcher((msg) -> { nc.publish(msg.getReplyTo(), new byte[16]); }); @@ -281,15 +280,15 @@ public void testTLSOnReconnect() throws InterruptedException, Exception { // Use two server ports to avoid port release timing issues try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", port, false)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = new Options.Builder(). - server(ts.getURI()). - server(NatsTestServer.getNatsLocalhostUri(newPort)). - maxReconnects(-1). - sslContext(ctx). - connectionListener(listener). - reconnectWait(Duration.ofMillis(10)). - build(); - nc = TestBase.standardConnectionWait(options); + Options options = optionsBuilder() + .server(ts.getURI()) + .server(NatsTestServer.getNatsLocalhostUri(newPort)) + .maxReconnects(-1) + .sslContext(ctx) + .connectionListener(listener) + .reconnectWait(Duration.ofMillis(10)) + .build(); + nc = standardConnectionWait(options); assertInstanceOf(SocketDataPort.class, ((NatsConnection) nc).getDataPort(), "Correct data port class"); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -309,12 +308,11 @@ public void testDisconnectOnUpgrade() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()). - sslContext(ctx). - build(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) + .sslContext(ctx) + .build(); Nats.connect(options); } }); @@ -324,10 +322,7 @@ public void testDisconnectOnUpgrade() { public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - build(); + Options options = optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); } }); @@ -338,11 +333,7 @@ public void testClientSecureServerNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer()) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = new Options.Builder(). - server(ts.getURI()). - maxReconnects(0). - sslContext(ctx). - build(); + Options options = optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); Nats.connect(options); } }); @@ -361,12 +352,11 @@ public void exceptionOccurred(Connection conn, Exception exp) { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = new Options.Builder() - .server(ts.getURI()) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(el) - .build(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(el) + .build(); Nats.connect(options); } }); @@ -379,7 +369,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { @Test public void testSSLContextFactoryPropertiesPassOnCorrectly() throws NoSuchAlgorithmException { SSLContextFactoryForTesting factory = new SSLContextFactoryForTesting(); - new Options.Builder() + optionsBuilder() .sslContextFactory(factory) .keystorePath("keystorePath") .keystorePassword("ksp".toCharArray()) @@ -414,8 +404,7 @@ public ProxyConnection(String servers, boolean tlsFirst, ErrorListener listener, } private static Options makeMiddleman(String servers, boolean tlsFirst, ErrorListener listener) throws Exception { - Options.Builder builder = new Options.Builder() - .server(servers) + Options.Builder builder = optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .errorListener(listener); @@ -450,7 +439,7 @@ void handleInfo(String infoJson) { */ @Test public void testProxyTlsFirst() throws Exception { - if (TestBase.atLeast2_10_3(ensureRunServerInfo())) { + if (atLeast2_10_3(ensureRunServerInfo())) { // cannot check connect b/c tls first try (NatsTestServer ts = new NatsTestServer( NatsTestServer.builder() diff --git a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java index a8116d28f..93e59b83f 100644 --- a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java +++ b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java @@ -13,6 +13,7 @@ package io.nats.client.impl; +import io.nats.NatsRunnerUtils; import io.nats.client.*; import org.junit.jupiter.api.Test; @@ -25,6 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -50,8 +52,7 @@ public void errorOccurred(Connection conn, String error) { } }; - Options options = new Options.Builder() - .servers(new String[]{"nats://" + "127.0.0.1:" + port}) + Options options = optionsBuilder("nats://" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port) .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) .reconnectBufferSize(NUMBER_OF_SUBS * 100) diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index de220e3ea..861be9e10 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -33,6 +33,7 @@ import static io.nats.client.ConnectionListener.Events.CONNECTED; import static io.nats.client.NatsTestServer.*; +import static io.nats.client.utils.ConnectionUtils.*; import static org.junit.jupiter.api.Assertions.*; public class WebsocketConnectTests extends TestBase { diff --git a/src/test/java/io/nats/client/support/JwtUtilsTests.java b/src/test/java/io/nats/client/support/JwtUtilsTests.java index 32ca9114d..8c0e6651e 100644 --- a/src/test/java/io/nats/client/support/JwtUtilsTests.java +++ b/src/test/java/io/nats/client/support/JwtUtilsTests.java @@ -21,7 +21,7 @@ import java.util.List; import static io.nats.client.support.JwtUtils.*; -import static io.nats.client.utils.TestBase.sleep; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JwtUtilsTests { diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java new file mode 100644 index 000000000..00aa0d4ae --- /dev/null +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -0,0 +1,167 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import io.nats.client.Connection; +import io.nats.client.Nats; +import io.nats.client.Options; +import io.nats.client.impl.ListenerForTesting; +import org.opentest4j.AssertionFailedError; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import static io.nats.client.utils.ThreadUtils.sleep; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; + +public abstract class ConnectionUtils { + + public static final long STANDARD_CONNECTION_WAIT_MS = 5000; + public static final long LONG_CONNECTION_WAIT_MS = 7500; + public static final long VERY_LONG_CONNECTION_WAIT_MS = 10000; + public static final long STANDARD_FLUSH_TIMEOUT_MS = 2000; + public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000; + public static final long LONG_TIMEOUT_MS = 15000; + + // ---------------------------------------------------------------------------------------------------- + // connect or wait for a connection + // ---------------------------------------------------------------------------------------------------- + public static Options.Builder standardOptionsBuilder() { + return Options.builder().reportNoResponders().errorListener(new ListenerForTesting()); + } + + public static Options.Builder standardOptionsBuilder(String serverURL) { + return standardOptionsBuilder().server(serverURL); + } + + public static Options standardOptions() { + return standardOptionsBuilder().build(); + } + + public static Options standardOptions(String serverURL) { + return standardOptionsBuilder(serverURL).build(); + } + + public static Connection connectionWait(Connection conn, long millis) { + return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); + } + + public static Connection standardConnectionWait() throws IOException, InterruptedException { + return standardConnectionWait( Nats.connect(standardOptions()) ); + } + + public static Connection standardConnectionWait(String serverURL) throws IOException, InterruptedException { + return connectionWait(Nats.connect(standardOptions(serverURL)), STANDARD_CONNECTION_WAIT_MS); + } + + public static Connection standardConnectionWait(Options options) throws IOException, InterruptedException { + return connectionWait(Nats.connect(options), STANDARD_CONNECTION_WAIT_MS); + } + + public static Connection standardConnectionWait(Connection conn) { + return connectionWait(conn, STANDARD_CONNECTION_WAIT_MS); + } + + public static Connection longConnectionWait(String serverURL) throws IOException, InterruptedException { + return connectionWait(Nats.connect(standardOptions(serverURL)), LONG_CONNECTION_WAIT_MS); + } + + public static Connection longConnectionWait(Options options) throws IOException, InterruptedException { + return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); + } + + public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { + Connection conn = Nats.connect(options); + listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); + return conn; + } + + public static void listenerConnectionWait(Connection conn, ListenerForTesting listener) { + listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); + } + + public static void listenerConnectionWait(Connection conn, ListenerForTesting listener, long millis) { + listener.waitForStatusChange(millis, TimeUnit.MILLISECONDS); + assertConnected(conn); + } + + // ---------------------------------------------------------------------------------------------------- + // close + // ---------------------------------------------------------------------------------------------------- + public static void standardCloseConnection(Connection conn) { + closeConnection(conn, STANDARD_CONNECTION_WAIT_MS); + } + + public static void closeConnection(Connection conn, long millis) { + if (conn != null) { + close(conn); + waitUntilStatus(conn, millis, Connection.Status.CLOSED); + assertClosed(conn); + } + } + + public static void close(Connection conn) { + try { conn.close(); } catch (InterruptedException e) { /* ignored */ } + } + + // ---------------------------------------------------------------------------------------------------- + // connection waiting + // ---------------------------------------------------------------------------------------------------- + public static Connection waitUntilStatus(Connection conn, long millis, Connection.Status waitUntilStatus) { + long times = (millis + 99) / 100; + for (long x = 0; x < times; x++) { + sleep(100); + if (conn.getStatus() == waitUntilStatus) { + return conn; + } + } + + throw new AssertionFailedError(expectingMessage(conn, waitUntilStatus)); + } + + // ---------------------------------------------------------------------------------------------------- + // assertions + // ---------------------------------------------------------------------------------------------------- + public static void assertConnected(Connection conn) { + assertSame(Connection.Status.CONNECTED, conn.getStatus(), + () -> expectingMessage(conn, Connection.Status.CONNECTED)); + } + + public static void assertNotConnected(Connection conn) { + assertNotSame(Connection.Status.CONNECTED, conn.getStatus(), + () -> "Failed not expecting Connection Status " + Connection.Status.CONNECTED.name()); + } + + public static void assertClosed(Connection conn) { + assertSame(Connection.Status.CLOSED, conn.getStatus(), + () -> expectingMessage(conn, Connection.Status.CLOSED)); + } + + public static void assertCanConnect() throws IOException, InterruptedException { + standardCloseConnection( standardConnectionWait() ); + } + + public static void assertCanConnect(String serverURL) throws IOException, InterruptedException { + standardCloseConnection( standardConnectionWait(serverURL) ); + } + + public static void assertCanConnect(Options options) throws IOException, InterruptedException { + standardCloseConnection( standardConnectionWait(options) ); + } + + private static String expectingMessage(Connection conn, Connection.Status expecting) { + return "Failed expecting Connection Status " + expecting.name() + " but was " + conn.getStatus(); + } +} diff --git a/src/test/java/io/nats/client/utils/LongRunningServer.java b/src/test/java/io/nats/client/utils/LongRunningServer.java index 795fdae56..370113095 100644 --- a/src/test/java/io/nats/client/utils/LongRunningServer.java +++ b/src/test/java/io/nats/client/utils/LongRunningServer.java @@ -16,13 +16,14 @@ import io.nats.client.Connection; import io.nats.client.Nats; import io.nats.client.NatsTestServer; -import io.nats.client.Options; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; -import static io.nats.client.utils.TestBase.VERY_LONG_CONNECTION_WAIT_MS; -import static io.nats.client.utils.TestBase.initRunServerInfo; +import static io.nats.client.utils.ConnectionUtils.VERY_LONG_CONNECTION_WAIT_MS; +import static io.nats.client.utils.ConnectionUtils.connectionWait; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.VersionUtils.initVersionServerInfo; public abstract class LongRunningServer { @@ -33,14 +34,6 @@ public abstract class LongRunningServer { private static String server; private static Connection[] ncs; - public static Options.Builder optionsBuilder() throws IOException { - return TestOptions.optionsBuilder(server()); - } - - public static Options options() throws IOException { - return optionsBuilder().build(); - } - public static String server() throws IOException { if (server == null) { ensureInitialized(); @@ -64,8 +57,8 @@ private static Connection _getLrConnection(int ix, int tries) throws IOException ncs = new Connection[2]; } if (ncs[ix] == null) { - ncs[ix] = TestBase.connectionWait(Nats.connect(optionsBuilder().build()), VERY_LONG_CONNECTION_WAIT_MS); - initRunServerInfo(ncs[ix]); + ncs[ix] = connectionWait(Nats.connect(options(server())), VERY_LONG_CONNECTION_WAIT_MS); + initVersionServerInfo(ncs[ix]); } else if (ncs[ix].getStatus() != Connection.Status.CONNECTED) { if (++tries < MAX_TRIES) { diff --git a/src/test/java/io/nats/client/utils/TestOptions.java b/src/test/java/io/nats/client/utils/OptionsUtils.java similarity index 78% rename from src/test/java/io/nats/client/utils/TestOptions.java rename to src/test/java/io/nats/client/utils/OptionsUtils.java index e68162fcb..3f24cfa2e 100644 --- a/src/test/java/io/nats/client/utils/TestOptions.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -14,21 +14,26 @@ package io.nats.client.utils; import io.nats.client.ErrorListener; +import io.nats.client.NatsTestServer; import io.nats.client.Options; import org.jspecify.annotations.NonNull; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; +import static io.nats.NatsRunnerUtils.getNatsLocalhostUri; + /** * ---------------------------------------------------------------------------------------------------- * THIS IS THE PREFERRED WAY TO BUILD ANY OPTIONS FOR TESTING * ---------------------------------------------------------------------------------------------------- - * Use optionsBuilder(uri) if you need to customize some stuff, for instance custom listeners - * Use options(uri) if you need the default options - * ---------------------------------------------------------------------------------------------------- */ -public abstract class TestOptions { +public abstract class OptionsUtils { + + private static ExecutorService ES; + private static ScheduledThreadPoolExecutor SCHD; + private static ThreadFactory CB; + private static ThreadFactory CN; public static ErrorListener NOOP_EL = new ErrorListener() {}; @@ -36,12 +41,20 @@ public static Options.Builder optionsBuilder(ErrorListener el) { return optionsBuilder().errorListener(el); } - public static Options.Builder optionsBuilder(String server) { - return optionsBuilder().server(server); + public static Options.Builder optionsBuilder(NatsTestServer ts) { + return optionsBuilder().server(ts.getNatsLocalhostUri()); + } + + public static Options.Builder optionsBuilder(int port) { + return optionsBuilder().server(getNatsLocalhostUri(port)); + } + + public static Options.Builder optionsBuilder(String... servers) { + return optionsBuilder().servers(servers); } - public static Options options(String server) { - return optionsBuilder().server(server).build(); + public static Options options(String... servers) { + return optionsBuilder().servers(servers).build(); } public static Options.Builder optionsBuilder() { @@ -95,9 +108,4 @@ public Thread newThread(@NonNull Runnable r) { return t; } } - - static ExecutorService ES; - static ScheduledThreadPoolExecutor SCHD; - static ThreadFactory CB; - static ThreadFactory CN; } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 03b5e70df..2603b3934 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -14,14 +14,14 @@ package io.nats.client.utils; import io.nats.client.*; -import io.nats.client.api.ServerInfo; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; import io.nats.client.api.StreamInfo; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.function.Executable; -import org.opentest4j.AssertionFailedError; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -30,17 +30,23 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.LockSupport; import java.util.function.Supplier; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_ARGUMENT; import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_STATE; -import static io.nats.client.utils.TestOptions.optionsBuilder; +import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; +import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; public class TestBase { + @BeforeAll + public static void setup(TestInfo info) { + TestDebugger.clazz(info.getDisplayName()); + } public static final String STAR_SEGMENT = "*.star.*.segment.*"; public static final String GT_NOT_LAST_SEGMENT = "gt.>.notlast"; @@ -77,95 +83,10 @@ public class TestBase { public static final String META_KEY = "meta-test-key"; public static final String META_VALUE = "meta-test-value"; - public static final long STANDARD_CONNECTION_WAIT_MS = 5000; - public static final long LONG_CONNECTION_WAIT_MS = 7500; - public static final long VERY_LONG_CONNECTION_WAIT_MS = 10000; - public static final long STANDARD_FLUSH_TIMEOUT_MS = 2000; - public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000; - public static final long LONG_TIMEOUT_MS = 15000; - public static String[] BAD_SUBJECTS_OR_QUEUES = new String[] { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; - // ---------------------------------------------------------------------------------------------------- - // VersionCheck - // ---------------------------------------------------------------------------------------------------- - public static ServerInfo RUN_SERVER_INFO; - - public static ServerInfo ensureRunServerInfo() throws Exception { - if (RUN_SERVER_INFO == null) { - _runInServer(false, null, null, nc -> {}); - } - return RUN_SERVER_INFO; - } - - public static void initRunServerInfo(Connection nc) { - if (RUN_SERVER_INFO == null) { - RUN_SERVER_INFO = nc.getServerInfo(); - } - } - - public interface VersionCheck { - boolean runTest(ServerInfo si); - } - - public static boolean atLeast2_9_0() { - return atLeast2_9_0(RUN_SERVER_INFO); - } - - public static boolean atLeast2_9_0(Connection nc) { - return atLeast2_9_0(nc.getServerInfo()); - } - - public static boolean atLeast2_9_0(ServerInfo si) { - return si.isSameOrNewerThanVersion("2.9.0"); - } - - public static boolean atLeast2_10_26(ServerInfo si) { - return si.isSameOrNewerThanVersion("2.10.26"); - } - - public static boolean atLeast2_9_1(ServerInfo si) { - return si.isSameOrNewerThanVersion("2.9.1"); - } - - public static boolean atLeast2_10() { - return atLeast2_10(RUN_SERVER_INFO); - } - - public static boolean atLeast2_10(ServerInfo si) { - return si.isNewerVersionThan("2.9.99"); - } - - public static boolean atLeast2_10_3(ServerInfo si) { - return si.isSameOrNewerThanVersion("2.10.3"); - } - - public static boolean atLeast2_11() { - return atLeast2_11(RUN_SERVER_INFO); - } - - public static boolean atLeast2_11(ServerInfo si) { - return si.isNewerVersionThan("2.10.99"); - } - - public static boolean before2_11() { - return before2_11(RUN_SERVER_INFO); - } - - public static boolean before2_11(ServerInfo si) { - return si.isOlderThanVersion("2.11"); - } - - public static boolean atLeast2_12() { - return atLeast2_12(RUN_SERVER_INFO); - } - - public static boolean atLeast2_12(ServerInfo si) { - return si.isSameOrNewerThanVersion("2.11.99"); - } - // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- @@ -219,7 +140,7 @@ public static void cleanupJs(JetStreamManagement jsm) // runners -> new server // ---------------------------------------------------------------------------------------------------- private static void _runInServer(boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { - if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { + if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } @@ -229,8 +150,8 @@ private static void _runInServer(boolean jetstream, Options.Builder builder, Ver } try (Connection nc = standardConnectionWait(builder.server(ts.getURI()).build())) { - initRunServerInfo(nc); - if (vc == null || vc.runTest(RUN_SERVER_INFO)) { + initVersionServerInfo(nc); + if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { try { inServerTest.test(nc); } @@ -276,7 +197,7 @@ public static void runInLrServer(InServerTest test) throws Exception { } public static void runInLrServerCloseableConnection(InServerTest test) throws Exception { - _runInLrServer(LongRunningServer.optionsBuilder(), null, test, null, null); + _runInLrServer(optionsBuilder(LongRunningServer.server()), null, test, null, null); } public static void runInLrServer(Options.Builder builder, InServerTest test) throws Exception { @@ -331,7 +252,7 @@ private static void _runInLrServer(Options.Builder builder, VersionCheck vc, InServerTest test, InJetStreamTest jsTest, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - if (vc != null && RUN_SERVER_INFO != null && !vc.runTest(RUN_SERVER_INFO)) { + if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } @@ -348,8 +269,8 @@ private static void _runInLrServer(Options.Builder builder, VersionCheck vc, nc = longConnectionWait(builder.server(LongRunningServer.server()).build()); } - initRunServerInfo(nc); - if (vc == null || vc.runTest(RUN_SERVER_INFO)) { + initVersionServerInfo(nc); + if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { try { if (oneSubjectJstcTest != null) { try (JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 1)) { @@ -590,32 +511,6 @@ public static NatsMessage getDataMessage(String data) { // ---------------------------------------------------------------------------------------------------- // assertions // ---------------------------------------------------------------------------------------------------- - public static void assertConnected(Connection conn) { - assertSame(Connection.Status.CONNECTED, conn.getStatus(), - () -> expectingMessage(conn, Connection.Status.CONNECTED)); - } - - public static void assertNotConnected(Connection conn) { - assertNotSame(Connection.Status.CONNECTED, conn.getStatus(), - () -> "Failed not expecting Connection Status " + Connection.Status.CONNECTED.name()); - } - - public static void assertClosed(Connection conn) { - assertSame(Connection.Status.CLOSED, conn.getStatus(), - () -> expectingMessage(conn, Connection.Status.CLOSED)); - } - - public static void assertCanConnect() throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait() ); - } - - public static void assertCanConnect(String serverURL) throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait(serverURL) ); - } - - public static void assertCanConnect(Options options) throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait(options) ); - } public static void assertCanConnectAndPubSub() throws IOException, InterruptedException { Connection conn = standardConnectionWait(); @@ -657,38 +552,6 @@ public static void assertPubSub(Connection conn) throws InterruptedException { assertEquals(data, new String(m.getData())); } - // ---------------------------------------------------------------------------------------------------- - // utils / macro utils - // ---------------------------------------------------------------------------------------------------- - public static void sleep(long ms) { - try { Thread.sleep(ms); } catch (InterruptedException ignored) { /* ignored */ } - } - - public static void park(Duration d) { - try { LockSupport.parkNanos(d.toNanos()); } catch (Exception ignored) { /* ignored */ } - } - - public static void debugPrintln(Object... debug) { - StringBuilder sb = new StringBuilder(); - sb.append(System.currentTimeMillis()); - sb.append(" ["); - sb.append(Thread.currentThread().getName()); - sb.append(","); - sb.append(Thread.currentThread().getPriority()); - sb.append("] "); - boolean flag = true; - for (Object o : debug) { - if (flag) { - flag = false; - } - else { - sb.append(" | "); - } - sb.append(o); - } - System.out.println(sb.toString()); - } - // ---------------------------------------------------------------------------------------------------- // flush // ---------------------------------------------------------------------------------------------------- @@ -713,106 +576,6 @@ public static void flushAndWaitLong(Connection conn, ListenerForTesting listener flushAndWait(conn, listener, STANDARD_FLUSH_TIMEOUT_MS, LONG_TIMEOUT_MS); } - // ---------------------------------------------------------------------------------------------------- - // connect or wait for a connection - // ---------------------------------------------------------------------------------------------------- - public static Options.Builder standardOptionsBuilder() { - return Options.builder().reportNoResponders().errorListener(new ListenerForTesting()); - } - - public static Options.Builder standardOptionsBuilder(String serverURL) { - return standardOptionsBuilder().server(serverURL); - } - - public static Options standardOptions() { - return standardOptionsBuilder().build(); - } - - public static Options standardOptions(String serverURL) { - return standardOptionsBuilder(serverURL).build(); - } - - public static Connection connectionWait(Connection conn, long millis) { - return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); - } - - public static Connection standardConnectionWait() throws IOException, InterruptedException { - return standardConnectionWait( Nats.connect(standardOptions()) ); - } - - public static Connection standardConnectionWait(String serverURL) throws IOException, InterruptedException { - return connectionWait(Nats.connect(standardOptions(serverURL)), STANDARD_CONNECTION_WAIT_MS); - } - - public static Connection standardConnectionWait(Options options) throws IOException, InterruptedException { - return connectionWait(Nats.connect(options), STANDARD_CONNECTION_WAIT_MS); - } - - public static Connection standardConnectionWait(Connection conn) { - return connectionWait(conn, STANDARD_CONNECTION_WAIT_MS); - } - - public static Connection longConnectionWait(String serverURL) throws IOException, InterruptedException { - return connectionWait(Nats.connect(standardOptions(serverURL)), LONG_CONNECTION_WAIT_MS); - } - - public static Connection longConnectionWait(Options options) throws IOException, InterruptedException { - return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); - } - - public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { - Connection conn = Nats.connect(options); - listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); - return conn; - } - - public static void listenerConnectionWait(Connection conn, ListenerForTesting listener) { - listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); - } - - public static void listenerConnectionWait(Connection conn, ListenerForTesting listener, long millis) { - listener.waitForStatusChange(millis, TimeUnit.MILLISECONDS); - assertConnected(conn); - } - - // ---------------------------------------------------------------------------------------------------- - // close - // ---------------------------------------------------------------------------------------------------- - public static void standardCloseConnection(Connection conn) { - closeConnection(conn, STANDARD_CONNECTION_WAIT_MS); - } - - public static void closeConnection(Connection conn, long millis) { - if (conn != null) { - close(conn); - waitUntilStatus(conn, millis, Connection.Status.CLOSED); - assertClosed(conn); - } - } - - public static void close(Connection conn) { - try { conn.close(); } catch (InterruptedException e) { /* ignored */ } - } - - // ---------------------------------------------------------------------------------------------------- - // connection waiting - // ---------------------------------------------------------------------------------------------------- - public static Connection waitUntilStatus(Connection conn, long millis, Connection.Status waitUntilStatus) { - long times = (millis + 99) / 100; - for (long x = 0; x < times; x++) { - sleep(100); - if (conn.getStatus() == waitUntilStatus) { - return conn; - } - } - - throw new AssertionFailedError(expectingMessage(conn, waitUntilStatus)); - } - - private static String expectingMessage(Connection conn, Connection.Status expecting) { - return "Failed expecting Connection Status " + expecting.name() + " but was " + conn.getStatus(); - } - public static void assertTrueByTimeout(long millis, Supplier test) { long times = (millis + 99) / 100; for (long x = 0; x < times; x++) { diff --git a/src/test/java/io/nats/client/utils/ThreadUtils.java b/src/test/java/io/nats/client/utils/ThreadUtils.java new file mode 100644 index 000000000..820748d6c --- /dev/null +++ b/src/test/java/io/nats/client/utils/ThreadUtils.java @@ -0,0 +1,27 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import java.time.Duration; +import java.util.concurrent.locks.LockSupport; + +public abstract class ThreadUtils { + public static void sleep(long ms) { + try { Thread.sleep(ms); } catch (InterruptedException ignored) { /* ignored */ } + } + + public static void park(Duration d) { + try { LockSupport.parkNanos(d.toNanos()); } catch (Exception ignored) { /* ignored */ } + } +} diff --git a/src/test/java/io/nats/client/utils/VersionUtils.java b/src/test/java/io/nats/client/utils/VersionUtils.java new file mode 100644 index 000000000..da5a4bcd1 --- /dev/null +++ b/src/test/java/io/nats/client/utils/VersionUtils.java @@ -0,0 +1,91 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import io.nats.client.Connection; +import io.nats.client.api.ServerInfo; + +public abstract class VersionUtils { + public static ServerInfo VERSION_SERVER_INFO; + + public interface VersionCheck { + boolean runTest(ServerInfo si); + } + + public static ServerInfo ensureRunServerInfo() throws Exception { +// if (VERSION_SERVER_INFO == null) { +// _runInServer(false, null, null, nc -> {}); +// } +// return VERSION_SERVER_INFO; + return null; + } + + public static void initVersionServerInfo(Connection nc) { + if (VERSION_SERVER_INFO == null) { + VERSION_SERVER_INFO = nc.getServerInfo(); + } + } + + public static boolean atLeast2_9_0() { + return atLeast2_9_0(VERSION_SERVER_INFO); + } + + public static boolean atLeast2_9_0(Connection nc) { + return atLeast2_9_0(nc.getServerInfo()); + } + + public static boolean atLeast2_9_0(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.9.0"); + } + + public static boolean atLeast2_10_26(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.10.26"); + } + + public static boolean atLeast2_9_1(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.9.1"); + } + + public static boolean atLeast2_10() { + return atLeast2_10(VERSION_SERVER_INFO); + } + + public static boolean atLeast2_10(ServerInfo si) { + return si.isNewerVersionThan("2.9.99"); + } + + public static boolean atLeast2_10_3(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.10.3"); + } + + public static boolean atLeast2_11(ServerInfo si) { + return si.isNewerVersionThan("2.10.99"); + } + + public static boolean before2_11() { + return before2_11(VERSION_SERVER_INFO); + } + + public static boolean before2_11(ServerInfo si) { + return si.isOlderThanVersion("2.11"); + } + + public static boolean atLeast2_12() { + return atLeast2_12(VERSION_SERVER_INFO); + } + + public static boolean atLeast2_12(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.11.99"); + } +} diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 80926c2c7..50900a594 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -45,6 +45,9 @@ import static io.nats.client.support.JsonValueUtils.readString; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsConstants.EMPTY; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.service.Service.SRV_PING; import static io.nats.service.ServiceMessage.NATS_SERVICE_ERROR; import static io.nats.service.ServiceMessage.NATS_SERVICE_ERROR_CODE; @@ -756,7 +759,7 @@ public void testDispatchers() throws Exception { @Test public void testServiceBuilderConstruction() { - Options options = new Options.Builder().build(); + Options options = options(); Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() .endpoint(new Endpoint(random())) @@ -839,7 +842,7 @@ public void testServiceBuilderConstruction() { @Test public void testAddingEndpointAfterServiceBuilderConstruction() { - Options options = new Options.Builder().build(); + Options options = options(); Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() .endpoint(new Endpoint(random())) From a8dc40c2c33006fdef0b40ef92131e30e7ac62f0 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 21 Nov 2025 16:49:59 -0500 Subject: [PATCH 07/51] Resuing long running server as much as possible --- ThreadOptions.md | 3 + build.gradle | 18 +- .../client/impl/NatsConnectionReader.java | 3 + src/test/java/io/nats/client/AuthTests.java | 105 +++++----- .../java/io/nats/client/ConnectTests.java | 85 ++++---- src/test/java/io/nats/client/EchoTests.java | 10 +- .../nats/client/NatsServerProtocolMock.java | 6 +- .../java/io/nats/client/NatsTestServer.java | 43 +++-- .../java/io/nats/client/PublishTests.java | 35 ++-- .../client/RequestBenchmarkWithStats.java | 2 +- .../java/io/nats/client/SubscriberTests.java | 12 +- .../nats/client/impl/AuthAndConnectTests.java | 39 ++-- .../client/impl/ConnectionListenerTests.java | 53 ++--- .../io/nats/client/impl/DispatcherTests.java | 182 +++++++++--------- .../java/io/nats/client/impl/DrainTests.java | 28 +-- .../nats/client/impl/ErrorListenerTests.java | 24 +-- .../io/nats/client/impl/InfoHandlerTests.java | 12 +- .../client/impl/JetStreamConsumerTests.java | 2 +- .../client/impl/JetStreamManagementTests.java | 2 +- .../JetStreamManagementWithConfTests.java | 2 +- .../nats/client/impl/JetStreamPubTests.java | 84 ++++---- .../nats/client/impl/JetStreamPullTests.java | 20 +- .../client/impl/JetStreamPushAsyncTests.java | 2 +- .../nats/client/impl/MessageContentTests.java | 61 ++---- .../nats/client/impl/MessageQueueTests.java | 8 +- .../client/impl/NatsConnectionImplTests.java | 4 +- .../io/nats/client/impl/NatsMessageTests.java | 8 +- .../nats/client/impl/NatsStatisticsTests.java | 22 +-- .../java/io/nats/client/impl/ParseTests.java | 164 +++++----------- .../java/io/nats/client/impl/PingTests.java | 174 +++++++---------- .../io/nats/client/impl/ReconnectTests.java | 101 +++++----- .../io/nats/client/impl/RequestTests.java | 40 ++-- .../nats/client/impl/SimplificationTests.java | 8 +- .../nats/client/impl/SlowConsumerTests.java | 149 +++++++------- .../io/nats/client/impl/TLSConnectTests.java | 111 +++++------ .../client/impl/ValidateIssue1426Test.java | 3 +- .../client/impl/WebsocketConnectTests.java | 31 +-- .../nats/client/utils/LongRunningServer.java | 2 +- .../io/nats/client/utils/OptionsUtils.java | 18 +- .../java/io/nats/client/utils/TestBase.java | 49 +++-- .../io/nats/client/utils/VersionUtils.java | 8 - .../java/io/nats/service/ServiceTests.java | 20 +- 42 files changed, 800 insertions(+), 953 deletions(-) create mode 100644 ThreadOptions.md diff --git a/ThreadOptions.md b/ThreadOptions.md new file mode 100644 index 000000000..83df4b322 --- /dev/null +++ b/ThreadOptions.md @@ -0,0 +1,3 @@ +## Threading Options + +The client can, in an optional manner, per \ No newline at end of file diff --git a/build.gradle b/build.gradle index df7bd6d3c..dc3151281 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { id("java-library") id("maven-publish") id("jacoco") - id("biz.aQute.bnd.builder") version "5.1.2" -// id("biz.aQute.bnd.builder") version "7.1.0" +// id("biz.aQute.bnd.builder") version "5.1.2" + id("biz.aQute.bnd.builder") version "7.1.0" id("org.gradle.test-retry") version "1.6.4" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("signing") @@ -26,10 +26,15 @@ def jarAndArtifactName = "jnats" + jarEnd version = isRelease ? jarVersion : jarVersion + snap // version is the variable the build actually uses. +def os = System.getProperty("os.name") +def isNotWindows = !os.contains("Windows") def javaVersion = System.getProperty("java.version"); +def compilerIsJava8 = javaVersion.startsWith("1.8") + +System.out.println("OS: " + os) System.out.println("Java: " + javaVersion) System.out.println("Target Compatibility: " + targetCompat) -System.out.println(group + ":" + jarAndArtifactName + ":" + version) +System.out.println("Output: " + group + ":" + jarAndArtifactName + ":" + version) java { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -49,7 +54,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' testImplementation 'io.nats:jnats-server-runner:3.0.2-SNAPSHOT' - if (javaVersion.startsWith("1.8")) { + if (compilerIsJava8) { testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3' } else { @@ -88,6 +93,7 @@ jar { "Bundle-DocURL": "https://github.com/nats-io/nats.java" ) } + archiveBaseName = jarAndArtifactName } test { @@ -103,7 +109,9 @@ test { maxFailures = 4 maxRetries = 4 } - maxParallelForks = Runtime.runtime.availableProcessors() + if (compilerIsJava8 || isNotWindows) { + maxParallelForks = Runtime.runtime.availableProcessors() + } systemProperty 'junit.jupiter.execution.timeout.default', '3m' } diff --git a/src/main/java/io/nats/client/impl/NatsConnectionReader.java b/src/main/java/io/nats/client/impl/NatsConnectionReader.java index 91a63fcbe..e78d5cd39 100644 --- a/src/main/java/io/nats/client/impl/NatsConnectionReader.java +++ b/src/main/java/io/nats/client/impl/NatsConnectionReader.java @@ -606,6 +606,9 @@ void encounteredProtocolError(Exception ex) throws IOException { //For testing void fakeReadForTest(byte[] bytes) { + for (int x = 0; x < this.buffer.length; x++) { + this.buffer[x] = 0; + } System.arraycopy(bytes, 0, this.buffer, 0, bytes.length); this.bufferPosition = 0; this.op = UNKNOWN_OP; diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 156d6c7a3..3f9cffec4 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -23,8 +23,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.parallel.Execution; -import org.junit.jupiter.api.parallel.ExecutionMode; +import org.junit.jupiter.api.parallel.Isolated; import javax.net.ssl.SSLContext; import java.io.BufferedWriter; @@ -37,14 +36,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static io.nats.client.NatsTestServer.configuredServer; -import static io.nats.client.NatsTestServer.skipValidateServer; +import static io.nats.client.NatsTestServer.configFileServer; +import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; -@Execution(ExecutionMode.SAME_THREAD) +@Isolated public class AuthTests extends TestBase { @Test @@ -52,7 +51,7 @@ public void testUserPass() throws Exception { String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .userInfo("stephen".toCharArray(), "password".toCharArray()).build(); assertCanConnect(options); } @@ -136,7 +135,7 @@ public void testUserPassOnReconnect() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { port = ts.getPort(); // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(-1) + Options options = optionsBuilder(ts).maxReconnects(-1) .userInfo("stephen".toCharArray(), "password".toCharArray()).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -177,7 +176,7 @@ public void testUserBCryptPass() throws Exception { "$2a$11$1oJy/wZYNTxr9jNwMNwS3eUGhBpHT3On8CL9o7ey89mpgo88VG6ba" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .userInfo("ginger".toCharArray(), "password".toCharArray()).build(); assertCanConnect(options); } @@ -336,7 +335,7 @@ public void testToken() throws Exception { String[] customArgs = { "--auth", "derek" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0).token("derek".toCharArray()) + Options options = optionsBuilder(ts).maxReconnects(0).token("derek".toCharArray()) .build(); assertCanConnect(options); } @@ -359,7 +358,7 @@ public void testBadUserBadPass() { String[] customArgs = { "--user", "stephen", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .userInfo("sam".toCharArray(), "notthepassword".toCharArray()).build(); Nats.connect(options); // expected to fail } @@ -372,7 +371,7 @@ public void testMissingUserPass() { String[] customArgs = { "--user", "wally", "--pass", "password" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0).build(); + Options options = optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); // expected to fail } }); @@ -384,7 +383,7 @@ public void testBadToken() { String[] customArgs = { "--auth", "colin" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()) + Options options = optionsBuilder(ts) .maxReconnects(0) .token("notthetoken".toCharArray()) .build(); @@ -399,7 +398,7 @@ public void testMissingToken() { String[] customArgs = { "--auth", "ivan" }; try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { // See config file for user/pass - Options options = optionsBuilder(ts.getURI()).maxReconnects(0).build(); + Options options = optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); // expected to fail } }); @@ -436,7 +435,7 @@ public void testNKeyAuth() throws Exception { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(theKey)).build(); assertCanConnect(options); } @@ -450,14 +449,14 @@ public void testStaticNKeyAuth() throws Exception { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); assertCanConnect(options); } //test Nats.connect method try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Connection nc = Nats.connect(ts.getURI(), Nats.staticCredentials(null, theKey.getSeed())); + Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.staticCredentials(null, theKey.getSeed())); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -466,28 +465,28 @@ public void testStaticNKeyAuth() throws Exception { @Test public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path - try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf")) { - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) .build(); assertCanConnect(options); - options = optionsBuilder(ts.getURI()).maxReconnects(0) + options = optionsBuilder(ts).maxReconnects(0) .credentialPath("src/test/resources/jwt_nkey/user.creds") .build(); assertCanConnect(options); } //test Nats.connect method - try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf")) { - Connection nc = Nats.connect(ts.getURI(), Nats.credentials("src/test/resources/jwt_nkey/user.creds")); + try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { + Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials("src/test/resources/jwt_nkey/user.creds")); standardConnectionWait(nc); standardCloseConnection(nc); } //test Nats.connect method - try (NatsTestServer ts = NatsTestServer.configuredServer("operatorJnatsTest.conf")) { - Connection nc = Nats.connect(ts.getURI(), Nats.credentials("src/test/resources/jwt_nkey/userJnatsTest.creds")); + try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { + Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials("src/test/resources/jwt_nkey/userJnatsTest.creds")); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -495,7 +494,7 @@ public void testJWTAuthWithCredsFile() throws Exception { @Test public void testWsJWTAuthWithCredsFile() throws Exception { - try (NatsTestServer ts = skipValidateServer("ws_operator.conf")) { + try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); Options options = optionsBuilder(uri).maxReconnects(0) .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); @@ -503,7 +502,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { } //test Nats.connect method - try (NatsTestServer ts = skipValidateServer("ws_operator.conf")) { + try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); Connection nc = Nats.connect(uri, Nats.credentials("src/test/resources/jwt_nkey/user.creds")); standardConnectionWait(nc); @@ -514,7 +513,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { @Test public void testWssJWTAuthWithCredsFile() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - try (NatsTestServer ts = skipValidateServer("wss_operator.conf")) + try (NatsTestServer ts = skipConnectValidateServer("wss_operator.conf")) { String uri = ts.getLocalhostUri("wss"); Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) @@ -530,7 +529,7 @@ public void testStaticJWTAuth() throws Exception { String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false)) { - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); } @@ -545,7 +544,7 @@ public void testBadAuthHandler() { String configFile = createNKeyConfigFile(theKey.getPublicKey()); try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts.getURI()).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(null)). // No nkey build(); Connection nc = Nats.connect(options); @@ -558,11 +557,11 @@ public void testBadAuthHandler() { public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 - try (NatsTestServer ts = NatsTestServer.configuredServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { - Options options = optionsBuilder(ts.getURI(), ts2.getURI()) + try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { + Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) .noRandomize().maxReconnects(-1).authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); Connection nc = standardConnectionWait(options); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); @@ -571,7 +570,7 @@ public void testReconnectWithAuth() throws Exception { // Reconnect will fail because ts has the same auth error listener.waitForStatusChange(5, TimeUnit.SECONDS); assertConnected(nc); - assertEquals(ts2.getURI(), nc.getConnectedUrl()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -581,12 +580,12 @@ public void testCloseOnReconnectWithSameError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts1 - try (NatsTestServer ts = NatsTestServer.configuredServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { - Options options = optionsBuilder(ts.getURI(), ts2.getURI()) + try (NatsTestServer ts = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { + Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); Connection nc = standardConnectionWait(options); - assertEquals(ts2.getURI(), nc.getConnectedUrl()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.CLOSED); @@ -601,10 +600,10 @@ public void testCloseOnReconnectWithSameError() throws Exception { @Test public void testThatAuthErrorIsCleared() throws Exception { // Connect should fail on ts1 - try (NatsTestServer ts1 = NatsTestServer.configuredServer("operator_noacct.conf"); - NatsTestServer ts2 = NatsTestServer.configuredServer("operator.conf")) { + try (NatsTestServer ts1 = NatsTestServer.configFileServer("operator_noacct.conf"); + NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts1.getURI(), ts2.getURI()) + Options options = optionsBuilder(ts1.getLocalhostUri(), ts2.getLocalhostUri()) .noRandomize() .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) @@ -613,15 +612,15 @@ public void testThatAuthErrorIsCleared() throws Exception { .errorListener(new ListenerForTesting()) .build(); Connection nc = standardConnectionWait(options); - assertEquals(ts2.getURI(), nc.getConnectedUrl()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); - String tsURI = ts1.getURI(); + String tsURI = ts1.getLocalhostUri(); int port1 = ts1.getPort(); int port2 = ts2.getPort(); ts1.close(); // ts3 will be at the same port that ts was - try (NatsTestServer ts3 = configuredServer("operator.conf", port1)) { + try (NatsTestServer ts3 = configFileServer("operator.conf", port1)) { ListenerForTesting listener = new ListenerForTesting(); listener.prepForStatusChange(Events.RECONNECTED); @@ -630,17 +629,17 @@ public void testThatAuthErrorIsCleared() throws Exception { // reconnect should work because we are now running with the good config listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - assertEquals(ts3.getURI(), nc.getConnectedUrl()); - assertEquals(tsURI, ts3.getURI()); + assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(tsURI, ts3.getLocalhostUri()); // Close this and go back to the bad config on that port, should be ok 1x listener.prepForStatusChange(Events.RECONNECTED); ts3.close(); - try (NatsTestServer ignored = configuredServer("operator_noacct.conf", port1); - NatsTestServer ts5 = configuredServer("operator.conf", port2)) { + try (NatsTestServer ignored = configFileServer("operator_noacct.conf", port1); + NatsTestServer ts5 = configFileServer("operator.conf", port2)) { listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - assertEquals(ts5.getURI(), nc.getConnectedUrl()); + assertEquals(ts5.getLocalhostUri(), nc.getConnectedUrl()); } } standardCloseConnection(nc); @@ -681,24 +680,24 @@ private static void _testReconnectAfter(String errText) throws Exception { int port = NatsTestServer.nextPort(); // Connect should fail on ts1 - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(timeoutCustomizer, port, true); - NatsTestServer ts2 = skipValidateServer("operator.conf")) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true); + NatsTestServer ts2 = skipConnectValidateServer("operator.conf")) { Options options = optionsBuilder() - .servers(new String[]{ts.getURI(), ts2.getURI()}) + .servers(new String[]{mockTs.getMockUri(), ts2.getLocalhostUri()}) .maxReconnects(-1) .noRandomize() .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) .build(); Connection nc = standardConnectionWait(options); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(mockTs.getMockUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); f.complete(true); listenerConnectionWait(nc, listener); - assertEquals(ts2.getURI(), nc.getConnectedUrl()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); String err = nc.getLastError(); assertNotNull(err); @@ -753,10 +752,10 @@ else if (error.equalsIgnoreCase("authorization violation")) { String creds = String.format(JwtUtils.NATS_USER_JWT_FORMAT, jwt, new String(nKeyUser.getSeed())); String credsFile = ResourceUtils.createTempFile("nats_java_test", ".creds", creds.split("\\Q\\n\\E")); - try (NatsTestServer ts = NatsTestServer.configuredServer("operatorJnatsTest.conf")) { + try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { Options options = Options.builder() - .server(ts.getURI()) + .server(ts.getLocalhostUri()) .credentialPath(credsFile) .connectionListener(cl) .errorListener(el) diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 03242df46..01a3defda 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -42,19 +42,10 @@ @Isolated public class ConnectTests { - @Test - public void testDefaultConnection() throws Exception { - try (NatsTestServer ignored = new NatsTestServer(Options.DEFAULT_PORT, false)) { - Connection nc = standardConnectionWait(); - assertEquals(Options.DEFAULT_PORT, nc.getServerInfo().getPort()); - standardCloseConnection(nc); - } - } - @Test public void testConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getURI()); + Connection nc = standardConnectionWait(ts.getLocalhostUri()); assertEquals(ts.getPort(), nc.getServerInfo().getPort()); // coverage for getClientAddress InetAddress inetAddress = nc.getClientInetAddress(); @@ -75,24 +66,24 @@ public void testConnectionWithOptions() throws Exception { @Test public void testFullFakeConnect() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - assertCanConnect(ts.getURI()); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + assertCanConnect(mockTs.getMockUri()); } } @Test public void testFullFakeConnectWithTabs() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - ts.useTabs(); - assertCanConnect(ts.getURI()); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + mockTs.useTabs(); + assertCanConnect(mockTs.getMockUri()); } } @Test public void testConnectExitBeforeInfo() { assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { - Options options = optionsBuilder(ts.getURI()).noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); assertCanConnect(options); } }); @@ -101,8 +92,8 @@ public void testConnectExitBeforeInfo() { @Test public void testConnectExitAfterInfo() { assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { - Options options = optionsBuilder(ts.getURI()).noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); assertCanConnect(options); } }); @@ -111,8 +102,8 @@ public void testConnectExitAfterInfo() { @Test public void testConnectExitAfterConnect() { assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { - Options options = optionsBuilder(ts.getURI()).noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); assertCanConnect(options); } }); @@ -121,8 +112,8 @@ public void testConnectExitAfterConnect() { @Test public void testConnectExitAfterPing() { assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = optionsBuilder(ts.getURI()).noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); assertCanConnect(options); } }); @@ -132,7 +123,7 @@ public void testConnectExitAfterPing() { public void testConnectionFailureWithFallback() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsServerProtocolMock fake = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = optionsBuilder(fake.getURI(), ts.getNatsLocalhostUri()) + Options options = optionsBuilder(fake.getMockUri(), ts.getLocalhostUri()) .connectionTimeout(Duration.ofSeconds(5)) .build(); assertCanConnect(options); @@ -143,7 +134,7 @@ public void testConnectionFailureWithFallback() throws Exception { @Test public void testConnectWithConfig() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/simple.conf", false)) { - assertCanConnect(ts.getURI()); + assertCanConnect(ts.getLocalhostUri()); } } @@ -151,7 +142,7 @@ public void testConnectWithConfig() throws Exception { public void testConnectWithCommas() throws Exception { try (NatsTestServer ts1 = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - assertCanConnect(ts1.getURI() + "," + ts2.getURI()); + assertCanConnect(ts1.getLocalhostUri() + "," + ts2.getLocalhostUri()); } } } @@ -165,15 +156,15 @@ public void testConnectRandomize() throws Exception { int count = 0; int maxTries = 100; while (count++ < maxTries && (needOne || needTwo)) { - Connection nc = standardConnectionWait(ts1.getURI() + "," + ts2.getURI()); - if (ts1.getURI().equals(nc.getConnectedUrl())) { + Connection nc = standardConnectionWait(ts1.getLocalhostUri() + "," + ts2.getLocalhostUri()); + if (ts1.getLocalhostUri().equals(nc.getConnectedUrl())) { needOne = false; } else { needTwo = false; } Collection servers = nc.getServers(); - assertTrue(servers.contains(ts1.getURI())); - assertTrue(servers.contains(ts2.getURI())); + assertTrue(servers.contains(ts1.getLocalhostUri())); + assertTrue(servers.contains(ts2.getLocalhostUri())); standardCloseConnection(nc); } assertFalse(needOne); @@ -191,9 +182,9 @@ public void testConnectNoRandomize() throws Exception { // should get at least 1 for each for (int i = 0; i < 10; i++) { - Options options = optionsBuilder(ts1.getURI(), ts2.getURI()).noRandomize().build(); + Options options = optionsBuilder(ts1.getLocalhostUri(), ts2.getLocalhostUri()).noRandomize().build(); Connection nc = standardConnectionWait(options); - if (ts1.getURI().equals(nc.getConnectedUrl())) { + if (ts1.getLocalhostUri().equals(nc.getConnectedUrl())) { one++; } else { two++; @@ -211,8 +202,8 @@ public void testConnectNoRandomize() throws Exception { public void testFailWithMissingLineFeedAfterInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -222,8 +213,8 @@ public void testFailWithMissingLineFeedAfterInfo() { public void testFailWithStuffAfterInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -233,9 +224,9 @@ public void testFailWithStuffAfterInitialInfo() { public void testFailWrongInitialInfoOP() { assertThrows(IOException.class, () -> { String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - ts.useCustomInfoAsFullInfo(); - Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + mockTs.useCustomInfoAsFullInfo(); + Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -245,8 +236,8 @@ public void testFailWrongInitialInfoOP() { public void testIncompleteInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\"\r\n"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(ts.getURI()).reconnectWait(Duration.ofDays(1)).build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -317,8 +308,8 @@ public void testErrorOnAsync() throws Exception { @Test public void testConnectionTimeout() { assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 - Options options = optionsBuilder(ts.getURI()).noReconnect().traceConnection() + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().traceConnection() .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test build(); Connection nc = Nats.connect(options); @@ -329,8 +320,8 @@ public void testConnectionTimeout() { @Test public void testSlowConnectionNoTimeout() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { - Options options = optionsBuilder(ts.getURI()).noReconnect() + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { + Options options = optionsBuilder(mockTs.getMockUri()).noReconnect() .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep build(); assertCanConnect(options); @@ -413,7 +404,7 @@ public void testConnectExceptionHasURLS() { @Test public void testFlushBuffer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getURI()); + Connection nc = standardConnectionWait(ts.getLocalhostUri()); // test connected nc.flushBuffer(); @@ -435,7 +426,7 @@ public void testFlushBuffer() throws Exception { @Test public void testFlushBufferThreadSafety() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getURI()); + Connection nc = standardConnectionWait(ts.getLocalhostUri()); // use two latches to sync the threads as close as // possible. diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 60f3676a1..0f396a432 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -29,8 +29,8 @@ public class EchoTests extends TestBase { public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = optionsBuilder(ts.getURI()).noEcho().noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options opt = optionsBuilder(mockTs.getMockUri()).noEcho().noReconnect().build(); try { nc = Nats.connect(opt); // Should fail } @@ -47,8 +47,8 @@ public void testFailWithBadServerProtocol() { @Test public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = optionsBuilder(ts.getURI()).noReconnect().build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options opt = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); try { nc = Nats.connect(opt); } finally { @@ -91,7 +91,7 @@ public void testWithEcho() throws Exception { @Test public void testWithNoEcho() throws Exception { - runInLrServer(optionsBuilder().noEcho().noReconnect(), nc1 -> { + runInLrServerOwnNc(optionsBuilder().noEcho().noReconnect(), nc1 -> { String subject = TestBase.random(); // Echo is off so sub should get messages from pub from other connections Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/NatsServerProtocolMock.java b/src/test/java/io/nats/client/NatsServerProtocolMock.java index 6fd0583ea..9b489667d 100644 --- a/src/test/java/io/nats/client/NatsServerProtocolMock.java +++ b/src/test/java/io/nats/client/NatsServerProtocolMock.java @@ -49,7 +49,7 @@ public enum Progress { } public interface Customizer { - void customizeTest(NatsServerProtocolMock ts, BufferedReader reader, PrintWriter writer); + void customizeTest(NatsServerProtocolMock mockTs, BufferedReader reader, PrintWriter writer); } private final int port; @@ -126,8 +126,8 @@ public int getPort() { return port; } - public String getURI() { - return "nats://0.0.0.0:" + this.getPort(); + public String getMockUri() { + return "nats://0.0.0.0:" + port; } public Progress getProgress() { diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index c8340655d..c5b25ee9e 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -43,31 +43,24 @@ public static String configFilePath(String configFilePath) { return configFilePath.startsWith(CONFIG_FILE_BASE) ? configFilePath : CONFIG_FILE_BASE + configFilePath; } - public static NatsTestServer configuredServer(String configFilePath) throws IOException { - return new NatsTestServer( - NatsServerRunner.builder() - .configFilePath(configFilePath(configFilePath))); + public static Builder configFileBuilder(String configFilePath) { + return NatsServerRunner.builder().configFilePath(configFilePath(configFilePath)); } - public static NatsTestServer configuredJsServer(String configFilePath) throws IOException { - return new NatsTestServer( - NatsServerRunner.builder() - .jetstream(true) - .configFilePath(configFilePath(configFilePath))); + public static NatsTestServer configFileServer(String configFilePath) throws IOException { + return new NatsTestServer(configFileBuilder(configFilePath)); + } + + public static NatsTestServer configFileServer(String configFilePath, int port) throws IOException { + return new NatsTestServer(configFileBuilder(configFilePath).port(port)); } - public static NatsTestServer configuredServer(String configFilePath, int port) throws IOException { - return new NatsTestServer( - NatsServerRunner.builder() - .port(port) - .configFilePath(configFilePath(configFilePath))); + public static NatsTestServer configuredJsServer(String configFilePath) throws IOException { + return new NatsTestServer(configFileBuilder(configFilePath).jetstream()); } - public static NatsTestServer skipValidateServer(String configFilePath) throws IOException { - return new NatsTestServer( - NatsServerRunner.builder() - .configFilePath(configFilePath(configFilePath)) - .skipConnectValidate()); + public static NatsTestServer skipConnectValidateServer(String configFilePath) throws IOException { + return new NatsTestServer(configFileBuilder(configFilePath).skipConnectValidate()); } public NatsTestServer() throws IOException { @@ -130,15 +123,23 @@ public String getLocalhostUri(String schema) { return NatsRunnerUtils.getLocalhostUri(schema, getPort()); } - public String getNatsLocalhostUri() { + public String getLocalhostUri() { return NatsRunnerUtils.getNatsLocalhostUri(getPort()); } - public static String getNatsLocalhostUri(int port) { + public static String getLocalhostUri(int port) { return NatsRunnerUtils.getNatsLocalhostUri(port); } public static String getLocalhostUri(String schema, int port) { return NatsRunnerUtils.getLocalhostUri(schema, port); } + + public static String[] getLocalhostUris(String schema, NatsTestServer... servers) { + String[] results = new String[servers.length]; + for (int x = 0; x < servers.length; x++) { + results[x] = NatsRunnerUtils.getLocalhostUri(schema, servers[x].getPort()); + } + return results; + } } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index a0e1a1071..b7dd59981 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -37,7 +37,7 @@ public class PublishTests { @Test public void throwsIfClosed() throws Exception { - runInLrServerCloseableConnection(nc -> { + runInLrServerOwnNc(nc -> { nc.close(); // can't publish after close assertThrows(IllegalStateException.class, () -> nc.publish("subject", "replyto", null)); @@ -57,8 +57,8 @@ public void testThrowsWithoutSubject() throws Exception { @Test public void testThrowsIfTooBig() throws Exception { - try (NatsTestServer ts = NatsTestServer.configuredServer("max_payload.conf")) { - Connection nc = standardConnectionWait(ts.getURI()); + try (NatsTestServer ts = NatsTestServer.configFileServer("max_payload.conf")) { + Connection nc = standardConnectionWait(ts.getLocalhostUri()); byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); @@ -103,8 +103,8 @@ public void testThrowsIfHeadersNotSupported() { assertThrows(IllegalArgumentException.class, () -> { String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo); - Connection nc = Nats.connect(ts.getURI())) + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo); + Connection nc = Nats.connect(mockTs.getMockUri())) { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); @@ -182,8 +182,8 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header } }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(ts.getURI())) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); + Connection nc = standardConnectionWait(mockTs.getMockUri())) { byte[] bodyBytes; if (bodyString == null || bodyString.isEmpty()) { @@ -227,14 +227,14 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header @Test public void testMaxPayload() throws Exception { - runInServer(standardOptionsBuilder().noReconnect(), nc -> { + TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect(), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); nc.publish("mptest", new byte[maxPayload-1]); nc.publish("mptest", new byte[maxPayload]); }); try { - runInServer(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { + TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); for (int x = 1; x < 1000; x++) { nc.publish("mptest", new byte[maxPayload + x]); @@ -245,7 +245,7 @@ public void testMaxPayload() throws Exception { catch (IllegalStateException ignore) {} try { - runInServer(standardOptionsBuilder().noReconnect(), nc -> { + TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect(), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); for (int x = 1; x < 1000; x++) { nc.publish("mptest", new byte[maxPayload + x]); @@ -270,11 +270,10 @@ public void testUtf8Subjects() throws Exception { CountDownLatch jsReceivedLatchNotSupported = new CountDownLatch(1); CountDownLatch jsReceivedLatchWhenSupported = new CountDownLatch(1); - try (NatsTestServer ts = new NatsTestServer(false, true); - Connection ncNotSupported = standardConnectionWait(standardOptionsBuilder(ts.getURI()).build()); - Connection ncSupported = standardConnectionWait(standardOptionsBuilder(ts.getURI()).supportUTF8Subjects().build())) - { - try { + Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); + TestBase.runInLrServerOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { + Options ncSupportedOptions = optionsBuilder(ncNotSupported.getConnectedUrl()).supportUTF8Subjects().build(); + try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { ncNotSupported.jetStreamManagement().addStream( StreamConfiguration.builder() .name(TestBase.random()) @@ -318,11 +317,7 @@ public void testUtf8Subjects() throws Exception { assertEquals(subject, coreReceivedSubjectWhenSupported.get()); assertNotEquals(jsSubject, jsReceivedSubjectNotSupported.get()); assertEquals(jsSubject, jsReceivedSubjectWhenSupported.get()); - - } - finally { - cleanupJs(ncSupported); } - } + }); } } diff --git a/src/test/java/io/nats/client/RequestBenchmarkWithStats.java b/src/test/java/io/nats/client/RequestBenchmarkWithStats.java index 9b382f753..eb9dd84d6 100644 --- a/src/test/java/io/nats/client/RequestBenchmarkWithStats.java +++ b/src/test/java/io/nats/client/RequestBenchmarkWithStats.java @@ -52,7 +52,7 @@ public static void main(String args[]) throws InterruptedException { build(); Connection handlerC = Nats.connect(o); - Dispatcher d = handlerC.createDispatcher((msg) -> { + Dispatcher d = handlerC.createDispatcher(msg -> { try { handlerC.publish(msg.getReplyTo(), msg.getData()); msgsHandled.incrementAndGet(); diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index bdb4c98b0..c4c0de7fd 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -21,8 +21,7 @@ import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.TestBase.random; -import static io.nats.client.utils.TestBase.runInLrServer; +import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; public class SubscriberTests { @@ -108,8 +107,8 @@ public void testTabInProtocolLine() throws Exception { w.flush(); }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(ts.getURI())) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); + Connection nc = standardConnectionWait(mockTs.getMockUri())) { String subject = random(); Subscription sub = nc.subscribe(subject); @@ -354,8 +353,7 @@ public void testThrowOnEmptySubjectWithQueue() throws Exception { @Test public void throwsSubscriptionExceptions() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getURI())) { + runInLrServerOwnNc(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); @@ -369,7 +367,7 @@ public void throwsSubscriptionExceptions() throws Exception { /// can't auto unsubscribe when closed assertThrows(IllegalStateException.class, () -> sub.unsubscribe(1)); - } + }); } @Test diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 2035e6a98..078b5443e 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -31,7 +31,7 @@ public class AuthAndConnectTests { @Test public void testIsAuthError() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getURI()); + Connection nc = standardConnectionWait(ts.getLocalhostUri()); NatsConnection nats = (NatsConnection)nc; assertTrue(nats.isAuthenticationError("user authentication expired")); @@ -48,7 +48,7 @@ public void testIsAuthError() throws Exception { @Test() public void testConnectWhenClosed() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - NatsConnection nc = (NatsConnection) standardConnectionWait(ts.getURI()); + NatsConnection nc = (NatsConnection) standardConnectionWait(ts.getLocalhostUri()); standardCloseConnection(nc); nc.connect(false); // should do nothing assertClosed(nc); @@ -73,33 +73,34 @@ public void errorOccurred(Connection conn, String error) { try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() - .server(ts.getURI()) + .server(ts.getLocalhostUri()) .maxReconnects(-1) .reconnectWait(Duration.ZERO) .errorListener(noopErrorListener) .build(); - NatsConnection nc = (NatsConnection) standardConnectionWait(options); + try (NatsConnection nc = (NatsConnection) standardConnectionWait(options)) { - // After we've connected, shut down, so we can attempt reconnecting. - ts.shutdown(true); + // After we've connected, shut down, so we can attempt reconnecting. + ts.shutdown(true); - final AtomicBoolean running = new AtomicBoolean(true); - Thread parallelCommunicationIssues = new Thread(() -> { - while (running.get()) { - nc.handleCommunicationIssue(new Exception()); + final AtomicBoolean running = new AtomicBoolean(true); + Thread parallelCommunicationIssues = new Thread(() -> { + while (running.get()) { + nc.handleCommunicationIssue(new Exception()); - // Shortly sleep, to not spam at full speed. - sleep(1); - } - }); - parallelCommunicationIssues.start(); + // Shortly sleep, to not spam at full speed. + sleep(1); + } + }); + parallelCommunicationIssues.start(); - // Wait for some time to allow for reconnection logic to run. - Thread.sleep(2000); - running.set(false); + // Wait for some time to allow for reconnection logic to run. + Thread.sleep(2000); + running.set(false); - assertNotEquals(Connection.Status.CLOSED, nc.getStatus()); + assertNotEquals(Connection.Status.CLOSED, nc.getStatus()); + } } } } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 9417012a4..db51446a4 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -28,7 +29,7 @@ import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; -public class ConnectionListenerTests { +public class ConnectionListenerTests extends TestBase { @Test public void testToString() { @@ -37,28 +38,23 @@ public void testToString() { @Test public void testCloseCount() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - ListenerForTesting listener = new ListenerForTesting(); - Options options = optionsBuilder(ts). - connectionListener(listener). - build(); - Connection nc = standardConnectionWait(options); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + ListenerForTesting listener = new ListenerForTesting(); + runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); assertEquals(1, listener.getEventCount(Events.CLOSED)); - } + }); } @Test public void testDiscoveredServersCountAndListenerInOptions() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getURI()+"\"]}"; - try (NatsServerProtocolMock ts2 = new NatsServerProtocolMock(null, customInfo)) { + String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getLocalhostUri()+"\"]}"; + try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) { ListenerForTesting listener = new ListenerForTesting(); Options options = optionsBuilder() - .server(ts2.getURI()) + .server(mockTs2.getMockUri()) .maxReconnects(0) .connectionListener(listener) .build(); @@ -76,14 +72,14 @@ public void testDisconnectReconnectCount() throws Exception { Connection nc; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts). - reconnectWait(Duration.ofMillis(100)). - maxReconnects(-1). - connectionListener(listener). - build(); + Options options = optionsBuilder(ts) + .reconnectWait(Duration.ofMillis(100)) + .maxReconnects(-1) + .connectionListener(listener) + .build(); port = ts.getPort(); nc = standardConnectionWait(options); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -96,31 +92,25 @@ public void testDisconnectReconnectCount() throws Exception { try (NatsTestServer ts = new NatsTestServer(port, false)) { standardConnectionWait(nc); assertEquals(1, listener.getEventCount(Events.RECONNECTED)); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @Test public void testExceptionInConnectionListener() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - BadHandler listener = new BadHandler(); - Options options = optionsBuilder(ts).connectionListener(listener).build(); - Connection nc = standardConnectionWait(options); + BadHandler listener = new BadHandler(); + runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); - } + }); } @Test public void testMultipleConnectionListeners() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); Set capturedEvents = ConcurrentHashMap.newKeySet(); - - try (NatsTestServer ts = new NatsTestServer()) { - ListenerForTesting listener = new ListenerForTesting(); - Options options = optionsBuilder(ts).connectionListener(listener).build(); - Connection nc = standardConnectionWait(options); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull assertThrows(NullPointerException.class, () -> nc.addConnectionListener(null)); @@ -140,14 +130,13 @@ public void testMultipleConnectionListeners() throws Exception { assertNull(nc.getConnectedUrl()); assertEquals(1, listener.getEventCount(Events.CLOSED)); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); - } + }); Set expectedEvents = new HashSet<>(Arrays.asList( "CL1-CLOSED", "CL2-CLOSED", "CL3-CLOSED", "CL4-CLOSED")); - assertEquals(expectedEvents, capturedEvents); } diff --git a/src/test/java/io/nats/client/impl/DispatcherTests.java b/src/test/java/io/nats/client/impl/DispatcherTests.java index f48663673..ddf670ea7 100644 --- a/src/test/java/io/nats/client/impl/DispatcherTests.java +++ b/src/test/java/io/nats/client/impl/DispatcherTests.java @@ -136,7 +136,7 @@ public void testDispatcherSubscribingExceptions() throws Exception { public void throwsOnCreateIfConnectionClosed() throws Exception { // custom connection since we must close it. try (NatsTestServer ts = new NatsTestServer(); - Connection nc = longConnectionWait(ts.getURI())) + Connection nc = longConnectionWait(ts.getLocalhostUri())) { Dispatcher d = nc.createDispatcher(msg -> {}); // close connection @@ -223,65 +223,60 @@ public void testSingleMessage() throws Exception { @Test public void testDispatcherMessageContainsConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getURI())) { + final CompletableFuture msgFuture = new CompletableFuture<>(); + final CompletableFuture connFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msg -> { + msgFuture.complete(msg); + connFuture.complete(msg.getConnection()); + }); - final CompletableFuture msgFuture = new CompletableFuture<>(); - final CompletableFuture connFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msg -> { - msgFuture.complete(msg); - connFuture.complete(msg.getConnection()); - }); + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(5000));// Get them all to the server - String subject = random(); - d.subscribe(subject); - nc.flush(Duration.ofMillis(5000));// Get them all to the server + nc.publish(subject, new byte[16]); - nc.publish(subject, new byte[16]); + Message msg = msgFuture.get(5000, TimeUnit.MILLISECONDS); + Connection conn = connFuture.get(5000, TimeUnit.MILLISECONDS); - Message msg = msgFuture.get(5000, TimeUnit.MILLISECONDS); - Connection conn = connFuture.get(5000, TimeUnit.MILLISECONDS); + assertTrue(d.isActive()); + assertEquals(subject, msg.getSubject()); + assertNotNull(msg.getSubscription()); + assertNull(msg.getReplyTo()); + assertEquals(16, msg.getData().length); + assertSame(conn, nc); - assertTrue(d.isActive()); - assertEquals(subject, msg.getSubject()); - assertNotNull(msg.getSubscription()); - assertNull(msg.getReplyTo()); - assertEquals(16, msg.getData().length); - assertSame(conn, nc); - } + nc.closeDispatcher(d); } @Test public void testMultiSubject() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getURI())) { - - final CompletableFuture one = new CompletableFuture<>(); - final CompletableFuture two = new CompletableFuture<>(); - String subject1 = random(); - String subject2 = random(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(subject1)) { - one.complete(msg); - } else if (msg.getSubject().equals(subject2)) { - two.complete(msg); - } - }); + final CompletableFuture one = new CompletableFuture<>(); + final CompletableFuture two = new CompletableFuture<>(); + String subject1 = random(); + String subject2 = random(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(subject1)) { + one.complete(msg); + } + else if (msg.getSubject().equals(subject2)) { + two.complete(msg); + } + }); - d.subscribe(subject1); - d.subscribe(subject2); - nc.flush(Duration.ofMillis(500));// Get them all to the server + d.subscribe(subject1); + d.subscribe(subject2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject1, new byte[16]); - nc.publish(subject2, new byte[16]); + nc.publish(subject1, new byte[16]); + nc.publish(subject2, new byte[16]); - Message msg = one.get(500, TimeUnit.MILLISECONDS); - assertEquals(subject1, msg.getSubject()); - msg = two.get(500, TimeUnit.MILLISECONDS); - assertEquals(subject2, msg.getSubject()); + Message msg = one.get(500, TimeUnit.MILLISECONDS); + assertEquals(subject1, msg.getSubject()); + msg = two.get(500, TimeUnit.MILLISECONDS); + assertEquals(subject2, msg.getSubject()); - nc.closeDispatcher(d); - } + nc.closeDispatcher(d); } @Test @@ -362,60 +357,59 @@ else if (msg.getSubject().equals(phase2)) { @Test public void testQueueSubscribers() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getURI())) { - int msgs = 100; - AtomicInteger received = new AtomicInteger(); - AtomicInteger sub1Count = new AtomicInteger(); - AtomicInteger sub2Count = new AtomicInteger(); + int msgs = 100; + AtomicInteger received = new AtomicInteger(); + AtomicInteger sub1Count = new AtomicInteger(); + AtomicInteger sub2Count = new AtomicInteger(); - final CompletableFuture done1 = new CompletableFuture<>(); - final CompletableFuture done2 = new CompletableFuture<>(); - - String subject = random(); - String done = random(); - String queue = random(); - - Dispatcher d1 = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - done1.complete(Boolean.TRUE); - } else { - sub1Count.incrementAndGet(); - received.incrementAndGet(); - } - }); + final CompletableFuture done1 = new CompletableFuture<>(); + final CompletableFuture done2 = new CompletableFuture<>(); - Dispatcher d2 = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - done2.complete(Boolean.TRUE); - } else { - sub2Count.incrementAndGet(); - received.incrementAndGet(); - } - }); + String subject = random(); + String done = random(); + String queue = random(); - d1.subscribe(subject, queue); - d2.subscribe(subject, queue); - d1.subscribe(done); - d2.subscribe(done); - nc.flush(Duration.ofMillis(500)); + Dispatcher d1 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + done1.complete(Boolean.TRUE); + } + else { + sub1Count.incrementAndGet(); + received.incrementAndGet(); + } + }); - for (int i = 0; i < msgs; i++) { - nc.publish(subject, new byte[16]); + Dispatcher d2 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + done2.complete(Boolean.TRUE); + } + else { + sub2Count.incrementAndGet(); + received.incrementAndGet(); } + }); - nc.publish(done, null); + d1.subscribe(subject, queue); + d2.subscribe(subject, queue); + d1.subscribe(done); + d2.subscribe(done); + nc.flush(Duration.ofMillis(500)); - nc.flush(Duration.ofMillis(500)); - done1.get(500, TimeUnit.MILLISECONDS); - done2.get(500, TimeUnit.MILLISECONDS); + for (int i = 0; i < msgs; i++) { + nc.publish(subject, new byte[16]); + } - assertEquals(msgs, received.get()); - assertEquals(msgs, sub1Count.get() + sub2Count.get()); + nc.publish(done, null); - nc.closeDispatcher(d1); - nc.closeDispatcher(d2); - } + nc.flush(Duration.ofMillis(500)); + done1.get(500, TimeUnit.MILLISECONDS); + done2.get(500, TimeUnit.MILLISECONDS); + + assertEquals(msgs, received.get()); + assertEquals(msgs, sub1Count.get() + sub2Count.get()); + + nc.closeDispatcher(d1); + nc.closeDispatcher(d2); } @Test @@ -662,8 +656,9 @@ public void testAutoUnsubFromCallback() throws Exception { @Test public void testCloseFromCallback() throws Exception { + // custom connection since we must close it. try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getURI())) + Connection nc = standardConnectionWait(ts.getLocalhostUri())) { final CompletableFuture fDone = new CompletableFuture<>(); @@ -850,6 +845,7 @@ public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Ex @Test public void testDispatcherFactoryCoverage() throws Exception { + // custom connection since useDispatcherWithExecutor try (NatsTestServer ts = new NatsTestServer(); Connection nc = longConnectionWait(optionsBuilder(ts).useDispatcherWithExecutor().build())) { diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 07e675e21..4b9754efc 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -88,12 +88,12 @@ public void testSimpleDispatchDrain() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(2000); // go slow so the main app can drain us }); d.subscribe("draintest"); - d.subscribe("draintest", (msg) -> count.incrementAndGet()); + d.subscribe("draintest", msg -> count.incrementAndGet()); subCon.flush(Duration.ofSeconds(5)); // Get the sub to the server pubCon.publish("draintest", null); @@ -121,7 +121,7 @@ public void testSimpleConnectionDrain() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); @@ -160,7 +160,7 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); @@ -266,7 +266,7 @@ public void testCreateDispatcherDuringDrainThrows() { CompletableFuture tracker = subCon.drain(Duration.ofSeconds(500)); - subCon.createDispatcher((msg) -> { + subCon.createDispatcher(msg -> { }); assertTrue(tracker.get(1000, TimeUnit.SECONDS)); } @@ -282,7 +282,7 @@ public void testUnsubDuringDrainIsNoop() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(1000); // go slow so the main app can drain us }); @@ -327,7 +327,7 @@ public void testDrainInMessageHandler() throws Exception { AtomicInteger count = new AtomicInteger(); AtomicReference dispatcher = new AtomicReference<>(); AtomicReference> tracker = new AtomicReference<>(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); tracker.set(dispatcher.get().drain(Duration.ofSeconds(1))); }); @@ -358,7 +358,7 @@ public void testDrainFutureMatches() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); @@ -406,7 +406,7 @@ public void testFirstTimeRequestReplyDuringDrain() { Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - Dispatcher d = pubCon.createDispatcher((msg) -> pubCon.publish(msg.getReplyTo(), null)); + Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); d.subscribe("reply"); pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -444,7 +444,7 @@ public void testRequestReplyDuringDrain() { Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - Dispatcher d = pubCon.createDispatcher((msg) -> pubCon.publish(msg.getReplyTo(), null)); + Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); d.subscribe("reply"); pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -495,7 +495,7 @@ public void testQueueHandoffWithDrain() throws Exception { Connection draining = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertSame(Connection.Status.CONNECTED, draining.getStatus(), "Connected Status"); - drainingD = (NatsDispatcher) draining.createDispatcher((msg) -> count.incrementAndGet()).subscribe("draintest", "queue"); + drainingD = (NatsDispatcher) draining.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); draining.flush(Duration.ofSeconds(5)); Thread pubThread = new Thread(() -> { @@ -512,7 +512,7 @@ public void testQueueHandoffWithDrain() throws Exception { working = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertSame(Connection.Status.CONNECTED, working.getStatus(), "Connected Status"); - workingD = (NatsDispatcher) working.createDispatcher((msg) -> count.incrementAndGet()).subscribe("draintest", "queue"); + workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); working.flush(Duration.ofSeconds(5)); park(sleepBetweenDrains); @@ -585,7 +585,7 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { try { Thread.sleep(1500); // go slow so the main app can drain us } catch (Exception e) { @@ -625,7 +625,7 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); AtomicInteger count = new AtomicInteger(); - Dispatcher d = subCon.createDispatcher((msg) -> { + Dispatcher d = subCon.createDispatcher(msg -> { try { Thread.sleep(3000); // go slow so the main app can drain us } catch (Exception e) { diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index ee2ec5434..d97c1c909 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -46,9 +46,9 @@ public void testLastError() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { Options options = optionsBuilder() - .server(ts.getURI()) - .server(ts2.getURI()) - .server(ts3.getURI()) + .server(ts.getLocalhostUri()) + .server(ts2.getLocalhostUri()) + .server(ts3.getLocalhostUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) @@ -56,7 +56,7 @@ public void testLastError() throws Exception { .build(); nc = (NatsConnection) Nats.connect(options); assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); @@ -76,7 +76,7 @@ public void testLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 2000)); assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts3.getURI(), nc.getConnectedUrl()); + assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); } finally { standardCloseConnection(nc); } @@ -92,9 +92,9 @@ public void testClearLastError() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { Options options = optionsBuilder() - .server(ts.getURI()) - .server(ts2.getURI()) - .server(ts3.getURI()) + .server(ts.getLocalhostUri()) + .server(ts2.getLocalhostUri()) + .server(ts3.getLocalhostUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) @@ -102,7 +102,7 @@ public void testClearLastError() throws Exception { .build(); nc = (NatsConnection) Nats.connect(options); assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); @@ -122,7 +122,7 @@ public void testClearLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 2000)); assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts3.getURI(), nc.getConnectedUrl()); + assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); nc.clearLastError(); assertNull(nc.getLastError()); @@ -168,7 +168,7 @@ public void testExceptionOnBadDispatcher() throws Exception { .build(); Connection nc = Nats.connect(options); try { - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { throw new ArithmeticException(); }); d.subscribe("subject"); @@ -236,7 +236,7 @@ public void testExceptionInExceptionHandler() throws Exception { Options options = optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); Connection nc = Nats.connect(options); try { - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { throw new ArithmeticException(); }); d.subscribe("subject"); diff --git a/src/test/java/io/nats/client/impl/InfoHandlerTests.java b/src/test/java/io/nats/client/impl/InfoHandlerTests.java index 6efead94b..a4a99e3fc 100644 --- a/src/test/java/io/nats/client/impl/InfoHandlerTests.java +++ b/src/test/java/io/nats/client/impl/InfoHandlerTests.java @@ -30,8 +30,8 @@ public class InfoHandlerTests { public void testInitialInfo() throws IOException, InterruptedException { String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\"}"; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(null, customInfo)) { - Connection nc = Nats.connect(ts.getURI()); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo)) { + Connection nc = Nats.connect(mockTs.getMockUri()); try { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); @@ -85,8 +85,8 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec } }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(infoCustomizer, customInfo)) { - Connection nc = Nats.connect(ts.getURI()); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(infoCustomizer, customInfo)) { + Connection nc = Nats.connect(mockTs.getMockUri()); try { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); @@ -146,13 +146,13 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti } }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(infoCustomizer, customInfo)) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(infoCustomizer, customInfo)) { ConnectionListener cl = (conn, type) -> { if (type.equals(ConnectionListener.Events.LAME_DUCK)) connectLDM.complete(type); }; - Options options = optionsBuilder().server(ts.getURI()).connectionListener(cl).build(); + Options options = optionsBuilder().server(mockTs.getMockUri()).connectionListener(cl).build(); Connection nc = Nats.connect(options); try { diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index 318dadbe9..4de9956c3 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -402,7 +402,7 @@ private static void validateMultipleSubjectFilterSub(JetStreamSubscription sub, @Test public void testRaiseStatusWarnings1194() throws Exception { ListenerForTesting listener = new ListenerForTesting(false, false); - runInLrServer(listener, (nc, jstc) -> { + runInLrServerOwnNc(listener, (nc, jstc) -> { // Setup StreamContext streamContext = nc.getStreamContext(jstc.stream); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index dae5375fd..a5f6cb14d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -1426,7 +1426,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_10_26, (nc, jsm, js) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, jsm, js) -> { String stream = random(); String subject = random(); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 4614dfc89..9bd91bc79 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -29,7 +29,7 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { try (NatsTestServer ts = configuredJsServer("pagination.conf")) { - try (Connection nc = standardConnectionWait(ts.getURI())) { + try (Connection nc = standardConnectionWait(ts.getLocalhostUri())) { if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { JetStreamManagement jsm = nc.jetStreamManagement(); JetStream js = nc.jetStream(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index a5085aee1..f01101c53 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -28,8 +28,7 @@ import static io.nats.client.support.NatsJetStreamConstants.MSG_TTL_HDR; import static io.nats.client.support.NatsJetStreamConstants.NATS_MARKER_REASON_HDR; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.ConnectionUtils.standardOptionsBuilder; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.atLeast2_12; import static org.junit.jupiter.api.Assertions.*; @@ -463,62 +462,49 @@ public void testPublishNoAck() throws Exception { @Test public void testMaxPayloadJs() throws Exception { - String streamName = "stream-max-payload-test"; - String subject1 = "mptest1"; - String subject2 = "mptest2"; + String streamName = random(); + String subject1 = random(); + String subject2 = random(); - try (NatsTestServer ts = new NatsTestServer(false, true)) - { - Options options = standardOptionsBuilder().noReconnect().server(ts.getURI()).build(); + runInLrServerOwnNc(optionsBuilder().noReconnect(), (nc, jsm, js) -> { long expectedSeq = 0; - try (Connection nc = standardConnectionWait(options)){ - JetStreamManagement jsm = nc.jetStreamManagement(); - try { jsm.deleteStream(streamName); } catch (JetStreamApiException ignore) {} - jsm.addStream(StreamConfiguration.builder() - .name(streamName) - .storageType(StorageType.Memory) - .subjects(subject1, subject2) - .maximumMessageSize(1000) - .build() - ); - - JetStream js = nc.jetStream(); - for (int x = 1; x <= 3; x++) + jsm.addStream(StreamConfiguration.builder() + .name(streamName) + .storageType(StorageType.Memory) + .subjects(subject1, subject2) + .maximumMessageSize(1000) + .build() + ); + + for (int x = 1; x <= 3; x++) { + int size = 1000 + x - 2; + if (size > 1000) { + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(subject1, new byte[size])); + assertEquals(10054, e.getApiErrorCode()); + } + else { - int size = 1000 + x - 2; - if (size > 1000) - { - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(subject1, new byte[size])); - assertEquals(10054, e.getApiErrorCode()); - } - else - { - PublishAck pa = js.publish(subject1, new byte[size]); - assertEquals(++expectedSeq, pa.getSeqno()); - } + PublishAck pa = js.publish(subject1, new byte[size]); + assertEquals(++expectedSeq, pa.getSeqno()); } } - try (Connection nc = standardConnectionWait(options)){ - JetStream js = nc.jetStream(); - for (int x = 1; x <= 3; x++) + for (int x = 1; x <= 3; x++) { + int size = 1000 + x - 2; + CompletableFuture paFuture = js.publishAsync(subject1, new byte[size]); + if (size > 1000) { - int size = 1000 + x - 2; - CompletableFuture paFuture = js.publishAsync(subject1, new byte[size]); - if (size > 1000) - { - ExecutionException e = assertThrows(ExecutionException.class, () -> paFuture.get(1000, TimeUnit.MILLISECONDS)); - JetStreamApiException j = (JetStreamApiException)e.getCause().getCause(); - assertEquals(10054, j.getApiErrorCode()); - } - else - { - PublishAck pa = paFuture.get(1000, TimeUnit.MILLISECONDS); - assertEquals(++expectedSeq, pa.getSeqno()); - } + ExecutionException e = assertThrows(ExecutionException.class, () -> paFuture.get(1000, TimeUnit.MILLISECONDS)); + JetStreamApiException j = (JetStreamApiException)e.getCause().getCause(); + assertEquals(10054, j.getApiErrorCode()); + } + else + { + PublishAck pa = paFuture.get(1000, TimeUnit.MILLISECONDS); + assertEquals(++expectedSeq, pa.getSeqno()); } } - } + }); } @Test diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 93af7f8a7..037fa071f 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -301,7 +301,7 @@ public void testBasic() throws Exception { @Test public void testNoWait() throws Exception { - runInLrServer(noPullWarnings(), (nc, jstc) -> { + runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); @@ -369,7 +369,7 @@ public void testNoWait() throws Exception { @Test public void testPullExpires() throws Exception { - runInLrServer(noPullWarnings(), (nc, jstc) -> { + runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); @@ -570,7 +570,7 @@ public void testAckWaitTimeout() throws Exception { @Test public void testDurable() throws Exception { - runInLrServer(noPullWarnings(), (nc, jstc) -> { + runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { String durable = random(); // Build our subscription options normally @@ -605,7 +605,7 @@ public void testDurable() throws Exception { @Test public void testNamed() throws Exception { - runInLrServer(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { + runInLrServerOwnNc(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { String name = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() @@ -740,7 +740,7 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { private void testConflictStatus(int statusCode, String statusText, int type, String targetVersion, ConflictSetup setup) throws Exception { ListenerForTesting listener = new ListenerForTesting(); AtomicBoolean skip = new AtomicBoolean(false); - runInLrServer(listener, (nc, jstc) -> { + runInLrServerOwnNc(listener, (nc, jstc) -> { skip.set(versionIsBefore(nc, targetVersion)); if (skip.get()) { return; @@ -1005,7 +1005,7 @@ public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String dur = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(jstc.subject()).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); @@ -1030,7 +1030,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesExactBytes() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes @@ -1117,7 +1117,7 @@ private static Thread getReaderThread(AtomicInteger count, int stopCount, JetStr @Test public void testOverflow() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Setting PriorityPolicy requires at least one PriorityGroup to be set @@ -1243,7 +1243,7 @@ public void testPrioritized() throws Exception { // close the #1, #2 should get messages // start another priority 1 (#3), #2 should stop getting messages #3 should get messages ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); @@ -1340,7 +1340,7 @@ public void testPinnedClient() throws Exception { // start consuming, tracking pin ids and counts // unpin 10 times and make sure that new pins are made ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index 93c9eaeb9..aa130c407 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -140,7 +140,7 @@ public void testCantNextMessageOnAsyncPushSub() throws Exception { @Test public void testPushAsyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, (nc, jstc) -> { + runInLrServerOwnNc(listener, (nc, jstc) -> { byte[] data = new byte[8192]; int MSG_COUNT = 1000; diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 4aad6146e..16487d258 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; @@ -27,16 +28,11 @@ import static org.junit.jupiter.api.Assertions.*; -public class MessageContentTests { +public class MessageContentTests extends TestBase { @Test public void testSimpleString() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - nc.publish(msg.getReplyTo(), msg.getData()); - }); + runInLrServer(nc -> { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); String body = "hello world"; @@ -47,18 +43,13 @@ public void testSimpleString() throws Exception { assertNotNull(msg); assertEquals(bodyBytes.length, msg.getData().length); assertEquals(body, new String(msg.getData(), StandardCharsets.UTF_8)); - } + }); } @Test public void testUTF8String() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - nc.publish(msg.getReplyTo(), msg.getData()); - }); + runInLrServer(nc -> { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); String body = "??????"; @@ -69,18 +60,13 @@ public void testUTF8String() throws Exception { assertNotNull(msg); assertEquals(bodyBytes.length, msg.getData().length); assertEquals(body, new String(msg.getData(), StandardCharsets.UTF_8)); - } + }); } @Test public void testDifferentSizes() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - nc.publish(msg.getReplyTo(), msg.getData()); - }); + runInLrServer(nc -> { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); String body = "hello world"; @@ -96,18 +82,13 @@ public void testDifferentSizes() throws Exception { body = body+body; } - } + }); } @Test public void testZeros() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - nc.publish(msg.getReplyTo(), msg.getData()); - }); + runInLrServer(nc -> { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); byte[] data = new byte[17]; @@ -117,7 +98,7 @@ public void testZeros() throws Exception { assertNotNull(msg); assertEquals(data.length, msg.getData().length); assertArrayEquals(msg.getData(), data); - } + }); } @Test @@ -202,13 +183,13 @@ public void testDisconnectOnBadProtocol() throws Exception { void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableFuture ready) throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(badServer, null)) { - Options options = optionsBuilder(). - server(ts.getURI()). - maxReconnects(0). - errorListener(listener). - connectionListener(listener). - build(); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(badServer, null)) { + Options options = optionsBuilder() + .server(mockTs.getMockUri()) + .maxReconnects(0) + .errorListener(listener) + .connectionListener(listener) + .build(); Connection nc = Nats.connect(options); try { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); diff --git a/src/test/java/io/nats/client/impl/MessageQueueTests.java b/src/test/java/io/nats/client/impl/MessageQueueTests.java index de0789b52..79f02ad7d 100644 --- a/src/test/java/io/nats/client/impl/MessageQueueTests.java +++ b/src/test/java/io/nats/client/impl/MessageQueueTests.java @@ -561,7 +561,7 @@ public void testFilterTail() throws InterruptedException { long before = q.sizeInBytes(); q.pause(); - q.filter((msg) -> Arrays.equals(expected, msg.getProtocolBytes())); + q.filter(msg -> Arrays.equals(expected, msg.getProtocolBytes())); q.resume(); long after = q.sizeInBytes(); @@ -585,7 +585,7 @@ public void testFilterHead() throws InterruptedException { long before = q.sizeInBytes(); q.pause(); - q.filter((msg) -> Arrays.equals(expected, msg.getProtocolBytes())); + q.filter(msg -> Arrays.equals(expected, msg.getProtocolBytes())); q.resume(); long after = q.sizeInBytes(); @@ -609,7 +609,7 @@ public void testFilterMiddle() throws InterruptedException { long before = q.sizeInBytes(); q.pause(); - q.filter((msg) -> Arrays.equals(expected, msg.getProtocolBytes())); + q.filter(msg -> Arrays.equals(expected, msg.getProtocolBytes())); q.resume(); long after = q.sizeInBytes(); @@ -631,7 +631,7 @@ public void testPausedAccumulate() throws InterruptedException { public void testThrowOnFilterIfRunning() { assertThrows(IllegalStateException.class, () -> { MessageQueue q = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); - q.filter((msg) -> true); + q.filter(msg -> true); fail(); }); } diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index 56ee3b61e..b1cdf8320 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -30,7 +30,7 @@ public class NatsConnectionImplTests { @Test public void testConnectionClosedProperly() throws Exception { try (NatsTestServer server = new NatsTestServer()) { - Options options = standardOptions(server.getNatsLocalhostUri()); + Options options = standardOptions(server.getLocalhostUri()); verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); // using the same options to demonstrate the executors came @@ -47,7 +47,7 @@ public void testConnectionClosedProperly() throws Exception { assertFalse(es.isShutdown()); assertFalse(ses.isShutdown()); - options = standardOptionsBuilder(server.getNatsLocalhostUri()) + options = standardOptionsBuilder(server.getLocalhostUri()) .executor(es) .scheduledExecutor(ses) .build(); diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index 0d0ecac52..ff37569e8 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -140,8 +140,8 @@ public void testBigProtocolLineWithoutBody() { subject += subject; } - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getMockUri())) { standardConnectionWait(nc); nc.subscribe(subject); } @@ -159,8 +159,8 @@ public void testBigProtocolLineWithBody() { subject += subject; } - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getMockUri())) { standardConnectionWait(nc); nc.publish(subject, replyTo, body); } diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index 58dd82d6c..565488ed2 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -32,8 +32,8 @@ public class NatsStatisticsTests extends TestBase { @Test public void testHumanReadableString() throws Exception { - runInLrServer(optionsBuilder().turnOnAdvancedStats(), nc -> { - Dispatcher d = nc.createDispatcher((msg) -> { + runInLrServerOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { + Dispatcher d = nc.createDispatcher(msg -> { nc.publish(msg.getReplyTo(), new byte[16]); }); d.subscribe("subject"); @@ -54,8 +54,8 @@ public void testHumanReadableString() throws Exception { @Test public void testInOutOKRequestStats() throws Exception { - runInLrServer(optionsBuilder().verbose(), nc -> { - Dispatcher d = nc.createDispatcher((msg) -> { + runInLrServerOwnNc(optionsBuilder().verbose(), nc -> { + Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) .data(new byte[16]) @@ -86,8 +86,8 @@ public void testInOutOKRequestStats() throws Exception { @Test public void testReadWriteAdvancedStatsEnabled() throws Exception { - runInLrServer(optionsBuilder().verbose().turnOnAdvancedStats(), nc -> { - Dispatcher d = nc.createDispatcher((msg) -> { + runInLrServerOwnNc(optionsBuilder().verbose().turnOnAdvancedStats(), nc -> { + Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) .data(new byte[16]) @@ -124,8 +124,8 @@ public void testReadWriteAdvancedStatsEnabled() throws Exception { @Test public void testReadWriteAdvancedStatsDisabled() throws Exception { - runInLrServer(optionsBuilder().verbose(), nc -> { - Dispatcher d = nc.createDispatcher((msg) -> { + runInLrServerOwnNc(optionsBuilder().verbose(), nc -> { + Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) .data(new byte[16]) @@ -177,9 +177,9 @@ public void testReadWriteAdvancedStatsDisabled() throws Exception { @Test public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { - runInLrServer(optionsBuilder().turnOnAdvancedStats(), nc -> { + runInLrServerOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { AtomicInteger requests = new AtomicInteger(); - MessageHandler handler = (msg) -> { + MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; @@ -222,7 +222,7 @@ public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { public void testOrphanDuplicateRepliesAdvancedStatsDisabled() throws Exception { runInServer(optionsBuilder(), nc -> { AtomicInteger requests = new AtomicInteger(); - MessageHandler handler = (msg) -> { + MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index 2c4630fda..4f40f76c7 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -15,7 +15,9 @@ import io.nats.client.Nats; import io.nats.client.NatsTestServer; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -25,19 +27,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -public class ParseTests { +@Isolated +public class ParseTests extends TestBase { @Test public void testGoodNumbers() { - int i=1; - + int i = 1; while (i < 2_000_000_000 && i > 0) { assertEquals(i, NatsConnectionReader.parseLength(String.valueOf(i))); i *= 11; } - assertEquals(0, NatsConnectionReader.parseLength("0")); - } @Test @@ -53,129 +53,64 @@ public void testTooBig() { } @Test - public void testLongProtocolOpThrows() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("thisistoolong\r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - } + public void testBadGather() throws Exception { + runInLrServerOwnNc(c -> { + NatsConnection nc = (NatsConnection)c; + NatsConnectionReader reader = nc.getReader(); + _testBadGather(reader, "thisistoolong\r\n"); // too long protocol + _testBadGather(reader, "PING\rPONG"); // missing Line Feed }); } - @Test - public void testMissingLineFeed() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("PING\rPONG").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - } - }); + private static void _testBadGather(NatsConnectionReader reader, String bad) { + byte[] bytes = bad.getBytes(StandardCharsets.US_ASCII); + reader.fakeReadForTest(bytes); + assertThrows(IOException.class, () -> reader.gatherOp(bytes.length)); } @Test - public void testMissingSubject() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("MSG 1 1\r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherMessageProtocol(bytes.length); - reader.parseProtocolMessage(); - } + public void testBadParse() throws Exception { + runInLrServerOwnNc(c -> { + NatsConnection nc = (NatsConnection)c; + NatsConnectionReader reader = nc.getReader(); + _testBadParse(reader, "MSG 1 1\r\n"); // missing subject + _testBadParse(reader, "MSG subject 1\r\n"); // missing sid + _testBadParse(reader, "MSG subject 2 \r\n"); // missing length + _testBadParse(reader, "MSG subject 2 x\r\n"); // bad length }); } - @Test - public void testMissingSID() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("MSG subject 1\r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherMessageProtocol(bytes.length); - reader.parseProtocolMessage(); - } - }); + private static void _testBadParse(NatsConnectionReader reader, String bad) throws IOException { + byte[] bytes = bad.getBytes(StandardCharsets.US_ASCII); + reader.fakeReadForTest(bytes); + reader.gatherOp(bytes.length); + reader.gatherMessageProtocol(bytes.length); + assertThrows(IOException.class, reader::parseProtocolMessage); } @Test - public void testMissingLength() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("MSG subject 2 \r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherMessageProtocol(bytes.length); - reader.parseProtocolMessage(); - } - }); + public void testTooShortMaxControlLineToConnect() throws Exception { + try (NatsTestServer ts = new NatsTestServer()) { + assertThrows(IOException.class, () -> Nats.connect(optionsBuilder(ts).maxControlLine(16).build())); + } } @Test - public void testBadLength() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("MSG subject 2 x\r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherMessageProtocol(bytes.length); - reader.parseProtocolMessage(); + public void testProtocolLineTooLong() throws Exception { + runInLrServerOwnNc(optionsBuilder().maxControlLine(1024), c -> { + NatsConnection nc = (NatsConnection)c; + NatsConnectionReader reader = nc.getReader(); + StringBuilder longString = new StringBuilder(); + longString.append("INFO "); + for (int i=0;i<500;i++ ){ + longString.append("helloworld"); } - }); - } - @Test - public void testMessageLineTooLong() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect( - optionsBuilder(ts.getURI()).maxControlLine(16).build()) - ) { - NatsConnectionReader reader = nc.getReader(); - byte[] bytes = ("MSG reallylongsubjectobreakthelength 1 1\r\n").getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherMessageProtocol(bytes.length); - reader.parseProtocolMessage(); - } - }); - } - - @Test - public void testProtocolLineTooLong() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect( - optionsBuilder(ts.getURI()).maxControlLine(1024).build()) - ) { - NatsConnectionReader reader = nc.getReader(); - StringBuilder longString = new StringBuilder(); - - longString.append("INFO "); - for (int i=0;i<500;i++ ){ - longString.append("helloworld"); - } - - byte[] bytes = longString.toString().getBytes(StandardCharsets.US_ASCII); - reader.fakeReadForTest(bytes); - reader.gatherOp(bytes.length); - reader.gatherProtocol(bytes.length); - reader.parseProtocolMessage(); - } + byte[] bytes = longString.toString().getBytes(StandardCharsets.US_ASCII); + reader.fakeReadForTest(bytes); + reader.gatherOp(bytes.length); + reader.gatherProtocol(bytes.length); + assertThrows(IllegalArgumentException.class, reader::parseProtocolMessage); }); } @@ -200,9 +135,8 @@ public void testProtocolStrings() throws Exception { OP_ERR, OP_INFO, OP_PING, OP_MSG, OP_OK, OP_PONG, OP_PONG, OP_MSG }; - - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { + runInLrServerOwnNc(c -> { + NatsConnection nc = (NatsConnection) c; NatsConnectionReader reader = nc.getReader(); for (int i=0; i gotPong = new CompletableFuture<>(); @@ -56,8 +58,8 @@ public void testHandlingPing() throws Exception,ExecutionException { } }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(pingPongCustomizer)) { - Connection nc = Nats.connect(ts.getURI()); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(pingPongCustomizer)) { + Connection nc = Nats.connect(mockTs.getMockUri()); try { assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertTrue(gotPong.get(), "Got pong."); @@ -70,29 +72,20 @@ public void testHandlingPing() throws Exception,ExecutionException { @Test public void testPingTimer() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) - .pingInterval(Duration.ofMillis(5)) - .maxPingsOut(10000) // just don't want this to be what fails the test - .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings - assertTrue(stats.getPings() > 10, "got pings"); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } - } + Options.Builder builder = optionsBuilder() + .pingInterval(Duration.ofMillis(5)) + .maxPingsOut(10000); // just don't want this to be what fails the test + runInLrServerOwnNc(builder, nc -> { + Statistics stats = nc.getStatistics(); + try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings + assertTrue(stats.getPings() > 10, "got pings"); + }); } @Test public void testPingFailsWhenClosed() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder().server(ts.getURI()). + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options options = optionsBuilder().server(mockTs.getMockUri()). pingInterval(Duration.ofMillis(10)). maxPingsOut(5). maxReconnects(0). @@ -113,9 +106,9 @@ public void testPingFailsWhenClosed() throws Exception { @Test public void testMaxPingsOut() throws Exception { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { Options options = optionsBuilder(). - server(ts.getURI()). + server(mockTs.getMockUri()). pingInterval(Duration.ofSeconds(10)). // Avoid auto pings maxPingsOut(2). maxReconnects(0). @@ -137,9 +130,9 @@ public void testMaxPingsOut() throws Exception { @Test public void testFlushTimeout() { assertThrows(TimeoutException.class, () -> { - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { Options options = optionsBuilder(). - server(ts.getURI()). + server(mockTs.getMockUri()). maxReconnects(0). build(); NatsConnection nc = (NatsConnection) Nats.connect(options); @@ -157,26 +150,24 @@ public void testFlushTimeout() { } @Test - public void testFlushTimeoutDisconnected() { - assertThrows(TimeoutException.class, () -> { - ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).connectionListener(listener).build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - nc.flush(Duration.ofSeconds(2)); - listener.prepForStatusChange(Events.DISCONNECTED); - ts.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); - nc.flush(Duration.ofSeconds(2)); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); - } + public void testFlushTimeoutDisconnected() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).connectionListener(listener).build(); + NatsConnection nc = (NatsConnection) Nats.connect(options); + try { + assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + nc.flush(Duration.ofSeconds(2)); + listener.prepForStatusChange(Events.DISCONNECTED); + ts.close(); + listener.waitForStatusChange(2, TimeUnit.SECONDS); + assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofSeconds(2))); } - }); + finally { + nc.close(); + assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + } + } } @Test @@ -184,36 +175,23 @@ public void testPingTimerThroughReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder() + Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) .connectionListener(listener) - .server(ts.getURI()) - .server(ts2.getURI()) .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - try { - Thread.sleep(200); // should get 10+ pings - } catch (Exception exp) - { - //Ignore - } + try (NatsConnection nc = (NatsConnection) standardConnectionWait(options)) { + StatisticsCollector stats = nc.getStatisticsCollector(); + sleep(200); long pings = stats.getPings(); assertTrue(pings > 10, "got pings"); listener.prepForStatusChange(Events.RECONNECTED); ts.close(); listener.waitForStatusChange(5, TimeUnit.SECONDS); pings = stats.getPings(); - Thread.sleep(250); // should get more pings + sleep(250); // should get more pings assertTrue(stats.getPings() > pings, "more pings"); - Thread.sleep(1000); - } finally { - nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + sleep(1000); } } } @@ -222,46 +200,38 @@ public void testPingTimerThroughReconnect() throws Exception { @Test public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts). - pingInterval(Duration.ofMillis(200)).build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - StatisticsCollector stats = nc.getStatisticsCollector(); - - try { - final CompletableFuture done = new CompletableFuture<>(); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - - Dispatcher d = nc.createDispatcher((msg) -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } - }); - - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - - long b4 = stats.getPings(); - for (int i=0;i<10;i++) { - Thread.sleep(50); - nc.publish("subject", new byte[16]); + Options.Builder builder = optionsBuilder().pingInterval(Duration.ofMillis(200)); + runInLrServerOwnNc(builder, nc -> { + Statistics stats = nc.getStatistics(); + final CompletableFuture done = new CompletableFuture<>(); + + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals("done")) { + done.complete(Boolean.TRUE); } - long after = stats.getPings(); - assertEquals(after, b4, "pings hidden"); - nc.publish("done", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - done.get(500, TimeUnit.MILLISECONDS); + }); - // no more messages, pings should start to go through - b4 = stats.getPings(); - Thread.sleep(500); - after = stats.getPings(); - assertTrue(after > b4, "pings restarted"); - } finally { - nc.close(); + d.subscribe("subject"); + d.subscribe("done"); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + + long b4 = stats.getPings(); + for (int i=0;i<10;i++) { + Thread.sleep(50); + nc.publish("subject", new byte[16]); } - } + long after = stats.getPings(); + assertEquals(after, b4, "pings hidden"); + nc.publish("done", new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + done.get(500, TimeUnit.MILLISECONDS); + + // no more messages, pings should start to go through + b4 = stats.getPings(); + sleep(500); + after = stats.getPings(); + assertTrue(after > b4, "pings restarted"); + }); } @Test diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 152c5b842..7f6928746 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -34,7 +34,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; -import static io.nats.client.NatsTestServer.getNatsLocalhostUri; +import static io.nats.client.NatsTestServer.configFileServer; +import static io.nats.client.NatsTestServer.getLocalhostUri; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; @@ -48,13 +49,12 @@ public class ReconnectTests { void checkReconnectingStatus(Connection nc) { Connection.Status status = nc.getStatus(); - assertTrue(Connection.Status.RECONNECTING == status || - Connection.Status.DISCONNECTED == status, "Reconnecting status"); + assertTrue(Connection.Status.RECONNECTING == status || Connection.Status.DISCONNECTED == status, "Reconnecting status"); } @Test public void testSimpleReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - _testReconnect(NatsServerRunner.builder(), (ts, optionsBuilder) -> optionsBuilder.server(ts.getNatsLocalhostUri())); + _testReconnect(NatsServerRunner.builder(), (ts, optionsBuilder) -> optionsBuilder.server(ts.getLocalhostUri())); } @Test @@ -75,7 +75,7 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer nnc.publish(msg.getReplyTo(), msg.getData()) ); + Dispatcher d = nc.createDispatcher(msg -> nnc.publish(msg.getReplyTo(), msg.getData()) ); d.subscribe("dispatchSubject"); flushConnection(nc); @@ -155,7 +155,7 @@ public void testSubscribeDuringReconnect() throws Exception { sub = nc.subscribe("subsubject"); final NatsConnection nnc = nc; - Dispatcher d = nc.createDispatcher((msg) -> nnc.publish(msg.getReplyTo(), msg.getData())); + Dispatcher d = nc.createDispatcher(msg -> nnc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("dispatchSubject"); listener.prepForStatusChange(Events.RECONNECTED); @@ -201,7 +201,7 @@ public void testReconnectBuffer() throws Exception { sub = nc.subscribe("subsubject"); final NatsConnection nnc = nc; - Dispatcher d = nc.createDispatcher((msg) -> nnc.publish(msg.getReplyTo(), msg.getData())); + Dispatcher d = nc.createDispatcher(msg -> nnc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("dispatchSubject"); nc.flush(Duration.ofMillis(1000)); @@ -274,28 +274,27 @@ public void testMaxReconnects() throws Exception { } @Test - public void testReconnectToSecondServer() throws Exception { - NatsConnection nc; + public void testReconnectToSecondServerInBootstrap() throws Exception { ListenerForTesting listener = new ListenerForTesting(); + NatsConnection nc; - try (NatsTestServer ts = new NatsTestServer()) { + try (NatsTestServer ts1 = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder() - .server(ts2.getNatsLocalhostUri()) - .server(ts.getNatsLocalhostUri()) + // need both in bootstrap b/c these are not clustered + Options options = optionsBuilder(ts2.getLocalhostUri(), ts1.getLocalhostUri()) .noRandomize() .connectionListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(ts2.getURI(), nc.getConnectedUrl()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts.getURI(), nc.getConnectedUrl()); + assertEquals(ts1.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -307,22 +306,20 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder() - .server(ts2.getNatsLocalhostUri()) - .server(ts.getNatsLocalhostUri()) + Options options = optionsBuilder(ts2.getLocalhostUri(), ts.getLocalhostUri()) .noRandomize() .connectionListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); + assertEquals(nc.getConnectedUrl(), ts2.getLocalhostUri()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts.getNatsLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -333,18 +330,18 @@ public void testReconnectToSecondServerFromInfo() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - String striped = ts.getURI().substring("nats://".length()); // info doesn't have protocol + String striped = ts.getLocalhostUri().substring("nats://".length()); // info doesn't have protocol String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}"; - try (NatsServerProtocolMock ts2 = new NatsServerProtocolMock(null, customInfo)) { + try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) { Options options = optionsBuilder() - .server(ts2.getURI()) + .server(mockTs2.getMockUri()) .connectionListener(listener) .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts2.getURI()); + assertEquals(nc.getConnectedUrl(), mockTs2.getMockUri()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -352,7 +349,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { assertConnected(nc); assertNotNull(nc.getConnectedUrl()); - assertTrue(ts.getURI().endsWith(nc.getConnectedUrl())); + assertTrue(ts.getLocalhostUri().endsWith(nc.getConnectedUrl())); standardCloseConnection(nc); } } @@ -446,14 +443,14 @@ public void testReconnectDropOnLineFeed() throws Exception { w.flush(); }; - try (NatsServerProtocolMock ts = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { Options options = optionsBuilder() - .server(ts.getURI()) + .server(mockTs.getMockUri()) .maxReconnects(-1) .reconnectWait(reconnectWait) .connectionListener(listener) .build(); - port = ts.getPort(); + port = mockTs.getPort(); nc = (NatsConnection) Nats.connect(options); assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); nc.subscribe("test"); @@ -543,7 +540,7 @@ public void testReconnectNoIPTLSConnection() throws Exception { listener.prepForStatusChange(Events.DISCOVERED_SERVERS); nc = (NatsConnection) longConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts.getURI()); + assertEquals(nc.getConnectedUrl(), ts.getLocalhostUri()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -563,8 +560,8 @@ public void testReconnectNoIPTLSConnection() throws Exception { public void testURISchemeNoIPTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); SslTestingHelper.setKeystoreSystemParameters(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", false)) { - Options options = optionsBuilder("tls://localhost:"+ts.getPort()) + try (NatsTestServer ts = configFileServer("tls_noip.conf")) { + Options options = optionsBuilder(ts, "tls") .connectionTimeout(Duration.ofSeconds(5)) .maxReconnects(0) .build(); @@ -576,8 +573,8 @@ public void testURISchemeNoIPTLSConnection() throws Exception { public void testURISchemeNoIPOpenTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); SslTestingHelper.setKeystoreSystemParameters(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", false)) { - Options options = optionsBuilder("opentls://localhost:"+ts.getPort()) + try (NatsTestServer ts = configFileServer("tls_noip.conf")) { + Options options = optionsBuilder(ts, "opentls") .maxReconnects(0) .build(); assertCanConnect(options); @@ -637,27 +634,27 @@ public void testReconnectWait() throws Exception { TestReconnectWaitHandler trwh = new TestReconnectWaitHandler(); int port = NatsTestServer.nextPort(); - Options options = optionsBuilder("nats://localhost:"+port) - .maxReconnects(-1) - .connectionTimeout(Duration.ofSeconds(1)) - .reconnectWait(Duration.ofMillis(250)) - .connectionListener(trwh) - .build(); - - NatsTestServer ts = new NatsTestServer(port, false); - Connection c = Nats.connect(options); - ts.close(); - sleep(250); - assertTrue(trwh.getDisconnectCount() < 3, "disconnectCount"); + try (NatsTestServer ts = new NatsTestServer(port, false)) { + Options options = optionsBuilder(ts) + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(1)) + .reconnectWait(Duration.ofMillis(250)) + .connectionListener(trwh) + .build(); - c.close(); + try (Connection nc = Nats.connect(options)) { + ts.close(); + sleep(250); + assertTrue(trwh.getDisconnectCount() < 3, "disconnectCount"); + } + } } @Test public void testReconnectOnConnect() throws Exception { int port = NatsTestServer.nextPort(); - Options options = options(getNatsLocalhostUri(port)); + Options options = options(port); CountDownLatch latch = new CountDownLatch(1); AtomicReference testConn = new AtomicReference<>(); @@ -837,7 +834,7 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount, ReconnectQueueCheckConnectionListener listener = new ReconnectQueueCheckConnectionListener(); - Options options = optionsBuilder(getNatsLocalhostUri(port)) + Options options = optionsBuilder(port) .connectionListener(listener) .dataPortType(ForceReconnectQueueCheckDataPort.class.getCanonicalName()) .build(); @@ -902,7 +899,7 @@ public ReconnectQueueCheckSubscriber(String subject, int pubCount, int port) { @Override public void run() { - Options options = optionsBuilder().server(getNatsLocalhostUri(port)).build(); + Options options = options(port); try (Connection nc = Nats.connect(options)) { Subscription sub = nc.subscribe(subject); while (!subscriberDone.get()) { @@ -946,8 +943,8 @@ public void testSocketDataPortTimeout() throws Exception { int port2 = nc2.getServerInfo().getPort(); String[] servers = new String[]{ - getNatsLocalhostUri(port1), - getNatsLocalhostUri(port2) + getLocalhostUri(port1), + getLocalhostUri(port2) }; Connection nc = standardConnectionWait(builder.servers(servers).build()); String subject = TestBase.random(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index 24782dfd1..1e96e6a65 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -37,7 +37,7 @@ public void testSimpleRequest() throws Exception { Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), null); @@ -71,7 +71,7 @@ public void testSimpleRequest() throws Exception { @Test public void testRequestVarieties() throws Exception { runInServer(nc -> { - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), msg.getData()); } @@ -124,7 +124,7 @@ public void testSimpleResponseMessageHasConnection() throws Exception { Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); msg.getConnection().publish(msg.getReplyTo(), null); }); @@ -147,7 +147,7 @@ public void testSafeRequest() throws Exception { Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe("subject"); Message msg = nc.request("subject", null, Duration.ofMillis(1000)); @@ -165,7 +165,7 @@ public void testMultipleRequest() throws Exception { Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), new byte[7])); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); d.subscribe("subject"); for (int i=0; i<10; i++) { @@ -185,7 +185,7 @@ public void testMultipleReplies() throws Exception { Options.Builder builder = optionsBuilder().turnOnAdvancedStats(); runInServer(builder, nc -> { AtomicInteger requests = new AtomicInteger(); - MessageHandler handler = (msg) -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; + MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; Dispatcher d1 = nc.createDispatcher(handler); Dispatcher d2 = nc.createDispatcher(handler); Dispatcher d3 = nc.createDispatcher(handler); @@ -218,7 +218,7 @@ public void testMultipleReplies() throws Exception { @Test public void testManualRequestReplyAndPublishSignatures() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getLocalhostUri())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); Dispatcher d = nc.createDispatcher(msg -> { @@ -257,7 +257,7 @@ public void testRequestWithCustomInboxPrefix() throws Exception { Connection nc = Nats.connect(optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith("myinbox")); nc.publish(msg.getReplyTo(), null); }); @@ -335,7 +335,7 @@ public void testSimpleRequestWithTimeout() throws Exception { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), null); @@ -390,7 +390,7 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { //slow responder long delay = 2 * cleanupInterval + Options.DEFAULT_CONNECTION_TIMEOUT.toMillis(); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); Thread.sleep(delay); nc.publish(msg.getReplyTo(), null); @@ -540,7 +540,7 @@ public void testRequestsVsCleanup() throws Exception { try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe("subject"); long start = System.nanoTime(); @@ -570,11 +570,11 @@ public void testDelayInPickingUpFuture() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int msgCount = 100; ArrayList> messages = new ArrayList<>(); - Connection nc = Nats.connect(ts.getURI()); + Connection nc = Nats.connect(ts.getLocalhostUri()); try { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), new byte[1])); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[1])); d.subscribe("subject"); for (int i=0;i { + runInLrServerOwnNc(Options.builder().oldRequestStyle(), nc -> { String subject = random(); - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), null)); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe(subject); Future incoming = nc.request(subject, null); @@ -621,7 +621,7 @@ public void testBuffersResize() throws Exception { int messageSize = 1024; Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); try (Connection nc = standardConnectionWait(options)) { - Dispatcher d = nc.createDispatcher((msg) -> nc.publish(msg.getReplyTo(), msg.getData())); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); Future incoming = nc.request("subject", new byte[messageSize]); // force the buffers to resize @@ -644,7 +644,7 @@ public void testBuffersResize() throws Exception { public void throwsIfClosed() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getLocalhostUri())) { nc.close(); nc.request("subject", null); fail(); @@ -656,7 +656,7 @@ public void throwsIfClosed() { public void testThrowsWithoutSubject() { assertThrows(IllegalArgumentException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getLocalhostUri())) { //noinspection DataFlowIssue nc.request((String)null, null); fail(); @@ -668,7 +668,7 @@ public void testThrowsWithoutSubject() { public void testThrowsEmptySubject() { assertThrows(IllegalArgumentException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getURI())) { + Connection nc = Nats.connect(ts.getLocalhostUri())) { nc.request("", null); fail(); } @@ -741,7 +741,7 @@ public void testNatsImplAndEmptyStatsCoverage() { public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() - .server(ts.getURI()) + .server(ts.getLocalhostUri()) .noNoResponders() .requestCleanupInterval(Duration.ofSeconds(10)) .build(); diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 7f366f08e..8c489da5e 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -1525,7 +1525,7 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending @@ -1611,7 +1611,7 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 1000); // Testing min ack pending @@ -1677,7 +1677,7 @@ public void testOverflowConsume() throws Exception { @Test public void testFinishEmptyStream() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServer(listener, (nc, jstc) -> { + runInLrServerOwnNc(listener, (nc, jstc) -> { String name = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(name) @@ -1714,7 +1714,7 @@ public void testReconnectOverOrdered() throws Exception { Options options = optionsBuilder() .connectionListener(lft) .errorListener(lft) - .server(NatsTestServer.getNatsLocalhostUri(port)).build(); + .server(NatsTestServer.getLocalhostUri(port)).build(); NatsConnection nc; String stream = random(); diff --git a/src/test/java/io/nats/client/impl/SlowConsumerTests.java b/src/test/java/io/nats/client/impl/SlowConsumerTests.java index f76ced752..a46d9ff26 100644 --- a/src/test/java/io/nats/client/impl/SlowConsumerTests.java +++ b/src/test/java/io/nats/client/impl/SlowConsumerTests.java @@ -13,7 +13,11 @@ package io.nats.client.impl; -import io.nats.client.*; +import io.nats.client.Consumer; +import io.nats.client.Dispatcher; +import io.nats.client.Message; +import io.nats.client.Subscription; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -22,188 +26,185 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; -public class SlowConsumerTests { +public class SlowConsumerTests extends TestBase { @Test public void testDefaultPendingLimits() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - - Subscription sub = nc.subscribe("subject"); + runInLrServerOwnNc(nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); Dispatcher d = nc.createDispatcher((Message m) -> {}); - assertEquals(sub.getPendingMessageLimit(), Consumer.DEFAULT_MAX_MESSAGES); - assertEquals(sub.getPendingByteLimit(), Consumer.DEFAULT_MAX_BYTES); + assertEquals(Consumer.DEFAULT_MAX_MESSAGES, sub.getPendingMessageLimit()); + assertEquals(Consumer.DEFAULT_MAX_BYTES, sub.getPendingByteLimit()); - assertEquals(d.getPendingMessageLimit(), Consumer.DEFAULT_MAX_MESSAGES); - assertEquals(d.getPendingByteLimit(), Consumer.DEFAULT_MAX_BYTES); - } + assertEquals(Consumer.DEFAULT_MAX_MESSAGES, d.getPendingMessageLimit()); + assertEquals(Consumer.DEFAULT_MAX_BYTES, d.getPendingByteLimit()); + nc.closeDispatcher(d); + }); } @Test public void testSlowSubscriberByMessages() throws Exception { - - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - - Subscription sub = nc.subscribe("subject"); + runInLrServerOwnNc(nc -> { + String subject = random(); + int expectedPending = subject.length() + 12; + Subscription sub = nc.subscribe(subject); sub.setPendingLimits(1, -1); assertEquals(1, sub.getPendingMessageLimit()); assertEquals(0, sub.getPendingByteLimit()); assertEquals(0, sub.getDroppedCount()); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(3, sub.getDroppedCount()); assertEquals(1, sub.getPendingMessageCount()); - assertEquals(19, sub.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf + assertEquals(expectedPending, sub.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf sub.clearDroppedCount(); - nc.publish("subject", null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, sub.getDroppedCount()); assertEquals(1, sub.getPendingMessageCount()); - } + }); } @Test public void testSlowSubscriberByBytes() throws Exception { - - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - - Subscription sub = nc.subscribe("subject"); - sub.setPendingLimits(-1, 10); // will take the first, not the second - - assertEquals(10, sub.getPendingByteLimit()); + runInLrServerOwnNc(nc -> { + String subject = random(); + int maxBytes = subject.length() + 3; + int expectedPending = maxBytes + 9; + Subscription sub = nc.subscribe(subject); + sub.setPendingLimits(-1, maxBytes); // will take the first, not the second + + assertEquals(maxBytes, sub.getPendingByteLimit()); assertEquals(0, sub.getPendingMessageLimit()); assertEquals(0, sub.getDroppedCount()); - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, sub.getDroppedCount()); assertEquals(1, sub.getPendingMessageCount()); - assertEquals(19, sub.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf + assertEquals(expectedPending, sub.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf sub.clearDroppedCount(); - nc.publish("subject", null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, sub.getDroppedCount()); assertEquals(1, sub.getPendingMessageCount()); - } + }); } @Test public void testSlowSDispatcherByMessages() throws Exception { + runInLrServerOwnNc(nc -> { + String subject = random(); + int expectedPending = subject.length() + 12; - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - final CompletableFuture ok = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { ok.complete(null); Thread.sleep(5 * 60 * 1000); // will wait until interrupted }); d.setPendingLimits(1, -1); - d.subscribe("subject"); + d.subscribe(subject); assertEquals(1, d.getPendingMessageLimit()); assertEquals(0, d.getPendingByteLimit()); assertEquals(0, d.getDroppedCount()); - nc.publish("subject", null); + nc.publish(subject, null); ok.get(1000,TimeUnit.MILLISECONDS); // make sure we got the first one - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); assertEquals(1, d.getDroppedCount()); assertEquals(1, d.getPendingMessageCount()); - assertEquals(19, d.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf + assertEquals(expectedPending, d.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf d.clearDroppedCount(); - nc.publish("subject", null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, d.getDroppedCount()); assertEquals(1, d.getPendingMessageCount()); - } + }); } @Test public void testSlowSDispatcherByBytes() throws Exception { - - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(ts.getURI())) { - + runInLrServerOwnNc(nc -> { + String subject = random(); + int maxBytes = subject.length() + 3; + int expectedPending = maxBytes + 9; final CompletableFuture ok = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { ok.complete(null); Thread.sleep(5 * 60 * 1000); // will wait until interrupted }); - d.setPendingLimits(-1, 10); - d.subscribe("subject"); + d.setPendingLimits(-1, maxBytes); + d.subscribe(subject); assertEquals(0, d.getPendingMessageLimit()); - assertEquals(10, d.getPendingByteLimit()); + assertEquals(maxBytes, d.getPendingByteLimit()); assertEquals(0, d.getDroppedCount()); - nc.publish("subject", null); + nc.publish(subject, null); ok.get(1000,TimeUnit.MILLISECONDS); // make sure we got the first one - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, d.getDroppedCount()); assertEquals(1, d.getPendingMessageCount()); - assertEquals(19, d.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf + assertEquals(expectedPending, d.getPendingByteCount()); // "msg 1 subject 0" + crlf + crlf d.clearDroppedCount(); - nc.publish("subject", null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); assertEquals(1, d.getDroppedCount()); assertEquals(1, d.getPendingMessageCount()); - } + }); } @Test public void testSlowSubscriberNotification() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(); - NatsConnection nc = (NatsConnection) Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { - - Subscription sub = nc.subscribe("subject"); + runInLrServerOwnNc(listener, nc -> { + String subject = random(); + Subscription sub = nc.subscribe(subject); sub.setPendingLimits(1, -1); Future waitForSlow = listener.waitForSlow(); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); // Notification is in another thread, wait for it, or fail @@ -214,7 +215,7 @@ public void testSlowSubscriberNotification() throws Exception { assertEquals(sub, slow.get(0)); slow.clear(); - nc.publish("subject", null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); assertEquals(0, slow.size()); // no renotifiy @@ -224,14 +225,14 @@ public void testSlowSubscriberNotification() throws Exception { sub.nextMessage(Duration.ofMillis(1000)); // only 1 to get // Notification again on 2nd message - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); waitForSlow.get(1000, TimeUnit.MILLISECONDS); assertEquals(1, slow.size()); // should only appear once assertEquals(sub, slow.get(0)); - } + }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 619802bf3..63c094745 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -28,52 +28,41 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.TestBase.assertCanConnectAndPubSub; -import static io.nats.client.utils.TestBase.flushAndWaitLong; +import static io.nats.client.utils.TestBase.*; +import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.atLeast2_10_3; -import static io.nats.client.utils.VersionUtils.ensureRunServerInfo; import static org.junit.jupiter.api.Assertions.*; public class TLSConnectTests { - private String convertToProtocol(String proto, NatsTestServer... servers) { - StringBuilder sb = new StringBuilder(); - for (int x = 0; x < servers.length; x++) { - if (x > 0) { - sb.append(","); - } - sb.append(proto).append("://localhost:").append(servers[x].getPort()); - } - return sb.toString(); - } - - private static Options createTestOptionsManually(String servers) throws Exception { + private static Options createTestOptionsManually(String... servers) throws Exception { return optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .build(); } - private static Options createTestOptionsViaProperties(String servers) { + private static Options createTestOptionsViaProperties(String... servers) { Options options; Properties props = SslTestingHelper.createTestSSLProperties(); - props.setProperty(Options.PROP_SERVERS, servers); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); props.setProperty(Options.PROP_MAX_RECONNECT, "0"); options = new Options.Builder(props).build(); return options; } - private static Options createTestOptionsViaFactoryInstance(String servers) { + private static Options createTestOptionsViaFactoryInstance(String... servers) { return optionsBuilder(servers) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) .build(); } - private static Options createTestOptionsViaFactoryClassName(String servers) { + private static Options createTestOptionsViaFactoryClassName(String... servers) { Properties properties = new Properties(); properties.setProperty(PROP_SSL_CONTEXT_FACTORY_CLASS, SSLContextFactoryForTesting.class.getCanonicalName()); return optionsBuilder(servers) @@ -87,7 +76,7 @@ private static Options createTestOptionsViaFactoryClassName(String servers) { public void testSimpleTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { - String servers = ts.getURI(); + String servers = ts.getLocalhostUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -97,7 +86,7 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testSimpleTlsFirstConnection() throws Exception { - if (atLeast2_10_3(ensureRunServerInfo())) { + if (atLeast2_10_3(ensureVersionServerInfo())) { try (NatsTestServer ts = new NatsTestServer( NatsTestServer.builder() .configFilePath("src/test/resources/tls_first.conf") @@ -117,7 +106,7 @@ public void testSimpleTlsFirstConnection() throws Exception { public void testSimpleUrlTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { - String servers = convertToProtocol("tls", ts); + String[] servers = NatsTestServer.getLocalhostUris("tls", ts); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -129,9 +118,9 @@ public void testSimpleUrlTLSConnection() throws Exception { public void testMultipleUrlTLSConnectionSetContext() throws Exception { //System.setProperty("javax.net.debug", "all"); try (NatsTestServer server1 = new NatsTestServer("src/test/resources/tls.conf", false); - NatsTestServer server2 = new NatsTestServer("src/test/resources/tls.conf", false); + NatsTestServer server2 = new NatsTestServer("src/test/resources/tls.conf", false) ) { - String servers = convertToProtocol("tls", server1, server2); + String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -154,7 +143,7 @@ public void testSimpleIPTLSConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { - String servers = ts.getURI(); + String servers = ts.getLocalhostUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -165,7 +154,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testOpenTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { - String servers = ts.getURI(); + String servers = ts.getLocalhostUri(); Options options = optionsBuilder() .server(servers) .maxReconnects(0) @@ -206,16 +195,15 @@ public void testURISchemeIPTLSConnection() throws Exception { @Test public void testURISchemeOpenTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { - String servers = convertToProtocol("opentls", ts); - Options options = optionsBuilder() - .server(servers) + String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); + Options options = optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); assertCanConnectAndPubSub(options); Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, servers); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); props.setProperty(Options.PROP_MAX_RECONNECT, "0"); props.setProperty(Options.PROP_OPENTLS, "true"); assertCanConnectAndPubSub(new Options.Builder(props).build()); @@ -225,19 +213,18 @@ public void testURISchemeOpenTLSConnection() throws Exception { @Test public void testMultipleUrlOpenTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer server1 = new NatsTestServer("src/test/resources/tls.conf", false); - NatsTestServer server2 = new NatsTestServer("src/test/resources/tls.conf", false); + try (NatsTestServer server1 = NatsTestServer.configFileServer("tls.conf"); + NatsTestServer server2 = NatsTestServer.configFileServer("tls.conf") ) { - String servers = convertToProtocol("opentls", server1, server2); - Options options = optionsBuilder() - .server(servers) + String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); + Options options = optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); assertCanConnectAndPubSub(options); Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, servers); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); props.setProperty(Options.PROP_MAX_RECONNECT, "0"); props.setProperty(Options.PROP_OPENTLS, "true"); assertCanConnectAndPubSub(new Options.Builder(props).build()); @@ -246,7 +233,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { @Test public void testTLSMessageFlow() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; Options options = optionsBuilder(ts) @@ -254,9 +241,8 @@ public void testTLSMessageFlow() throws Exception { .sslContext(ctx) .build(); Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher((msg) -> { - nc.publish(msg.getReplyTo(), new byte[16]); - }); + Dispatcher d = nc.createDispatcher( + msg -> nc.publish(msg.getReplyTo(), new byte[16])); d.subscribe("subject"); for (int i=0;i { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = optionsBuilder(ts) .maxReconnects(0) @@ -321,7 +307,7 @@ public void testDisconnectOnUpgrade() { @Test public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { Options options = optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); } @@ -350,7 +336,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { }; assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); Options options = optionsBuilder(ts) .maxReconnects(0) @@ -439,25 +425,21 @@ void handleInfo(String infoJson) { */ @Test public void testProxyTlsFirst() throws Exception { - if (atLeast2_10_3(ensureRunServerInfo())) { + if (atLeast2_10_3(ensureVersionServerInfo())) { // cannot check connect b/c tls first - try (NatsTestServer ts = new NatsTestServer( - NatsTestServer.builder() - .configFilePath("src/test/resources/tls_first.conf") - .skipConnectValidate()) - ) { + try (NatsTestServer ts = NatsTestServer.skipConnectValidateServer("tls_first.conf")) { // 1. client tls first | secure proxy | server insecure -> connects - ProxyConnection connTI = new ProxyConnection(ts.getURI(), true, null, SERVER_INSECURE); + ProxyConnection connTI = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_INSECURE); connTI.connect(false); closeConnection(standardConnectionWait(connTI), 1000); // 2. client tls first | secure proxy | server tls required -> connects - ProxyConnection connTR = new ProxyConnection(ts.getURI(), true, null, SERVER_TLS_REQUIRED); + ProxyConnection connTR = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_TLS_REQUIRED); connTR.connect(false); closeConnection(standardConnectionWait(connTR), 1000); // 3. client tls first | secure proxy | server tls available -> connects - ProxyConnection connTA = new ProxyConnection(ts.getURI(), true, null, SERVER_TLS_AVAILABLE); + ProxyConnection connTA = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_TLS_AVAILABLE); connTA.connect(false); closeConnection(standardConnectionWait(connTA), 1000); } @@ -466,21 +448,22 @@ public void testProxyTlsFirst() throws Exception { @Test public void testProxyNotTlsFirst() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { - // 4. client regular secure | secure proxy | server insecure -> mismatch exception + try (NatsTestServer ts = NatsTestServer.configFileServer("tls.conf")) { + // 1. client regular secure | secure proxy | server insecure -> mismatch exception ListenerForTesting listener = new ListenerForTesting(); - ProxyConnection connRI = new ProxyConnection(ts.getURI(), false, listener, SERVER_INSECURE); + ProxyConnection connRI = new ProxyConnection(ts.getLocalhostUri(), false, listener, SERVER_INSECURE); assertThrows(Exception.class, () -> connRI.connect(false)); + sleep(100); // give time for listener to get message assertEquals(1, listener.getExceptions().size()); assertTrue(listener.getExceptions().get(0).getMessage().contains("SSL connection wanted by client")); - // 5. client regular secure | secure proxy | server tls required -> connects - ProxyConnection connRR = new ProxyConnection(ts.getURI(), false, null, SERVER_TLS_REQUIRED); + // 2. client regular secure | secure proxy | server tls required -> connects + ProxyConnection connRR = new ProxyConnection(ts.getLocalhostUri(), false, null, SERVER_TLS_REQUIRED); connRR.connect(false); closeConnection(standardConnectionWait(connRR), 1000); - // 6. client regular secure | secure proxy | server tls available -> connects - ProxyConnection connRA = new ProxyConnection(ts.getURI(), false, null, SERVER_TLS_AVAILABLE); + // 3. client regular secure | secure proxy | server tls available -> connects + ProxyConnection connRA = new ProxyConnection(ts.getLocalhostUri(), false, null, SERVER_TLS_AVAILABLE); connRA.connect(false); closeConnection(standardConnectionWait(connRA), 1000); } diff --git a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java index 93e59b83f..a8486c340 100644 --- a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java +++ b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java @@ -13,7 +13,6 @@ package io.nats.client.impl; -import io.nats.NatsRunnerUtils; import io.nats.client.*; import org.junit.jupiter.api.Test; @@ -52,7 +51,7 @@ public void errorOccurred(Connection conn, String error) { } }; - Options options = optionsBuilder("nats://" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port) + Options options = optionsBuilder(port) .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) .reconnectBufferSize(NUMBER_OF_SUBS * 100) diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 861be9e10..3db1f8948 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -32,7 +32,8 @@ import java.util.concurrent.TimeUnit; import static io.nats.client.ConnectionListener.Events.CONNECTED; -import static io.nats.client.NatsTestServer.*; +import static io.nats.client.NatsTestServer.getLocalhostUri; +import static io.nats.client.NatsTestServer.nextPort; import static io.nats.client.utils.ConnectionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -43,11 +44,11 @@ public void testRequestReply() throws Exception { //System.setProperty("javax.net.debug", "all"); try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws.conf", false)) { standardRequestReply(Options.builder() - .server(getNatsLocalhostUri(ts.getPort())) + .server(getLocalhostUri(ts.getPort())) .maxReconnects(0).build()); standardRequestReply(Options.builder(). - server(getLocalhostUri("ws", ts.getPort("ws"))) + server(NatsTestServer.getLocalhostUri("ws", ts.getPort("ws"))) .maxReconnects(0).build()); } } @@ -80,7 +81,7 @@ public void testTLSRequestReply() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .httpRequestInterceptor(interceptor) - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .sslContext(ctx) .build(); @@ -97,7 +98,7 @@ public void testProxyRequestReply() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws.conf", false)) { Options options = Options.builder() - .server(getLocalhostUri("ws", ts.getPort("ws"))) + .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("ws"))) .maxReconnects(0) .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) .build(); @@ -111,7 +112,7 @@ public void testSimpleTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .sslContext(ctx) .build(); @@ -138,7 +139,7 @@ public void testVerifiedTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .sslContext(ctx) .build(); @@ -150,7 +151,7 @@ public void testVerifiedTLSConnection() throws Exception { public void testOpenTLSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .opentls() .build(); @@ -162,7 +163,7 @@ public void testOpenTLSConnection() throws Exception { public void testURIWSSHostConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one .maxReconnects(0) .build(); @@ -188,7 +189,7 @@ public void testURISchemeWSSConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .build(); assertCanConnect(options); @@ -203,7 +204,7 @@ public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Excepti try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .tlsFirst() .build(); @@ -219,12 +220,12 @@ public void testTLSMessageFlow() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; Options options = Options.builder() - .server(getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) .sslContext(ctx) .build(); Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher((msg) -> { + Dispatcher d = nc.createDispatcher(msg -> { nc.publish(msg.getReplyTo(), new byte[16]); }); d.subscribe("subject"); @@ -255,7 +256,7 @@ public void testTLSOnReconnect() throws Exception { // Use two server ports to avoid port release timing issues try (NatsTestServer ignored = new NatsTestServer(builder)) { Options options = Options.builder() - .server(getLocalhostUri("wss", wssPort)) + .server(NatsTestServer.getLocalhostUri("wss", wssPort)) .noRandomize() .maxReconnects(-1) .sslContext(ctx) @@ -298,7 +299,7 @@ public void testServerSecureClientNotMismatch() throws Exception { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { Options options = Options.builder() - .server(getLocalhostUri("ws", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("wss"))) .maxReconnects(0) .build(); Nats.connect(options); diff --git a/src/test/java/io/nats/client/utils/LongRunningServer.java b/src/test/java/io/nats/client/utils/LongRunningServer.java index 370113095..de34f2f41 100644 --- a/src/test/java/io/nats/client/utils/LongRunningServer.java +++ b/src/test/java/io/nats/client/utils/LongRunningServer.java @@ -90,7 +90,7 @@ private static void ensureInitialized() throws IOException { .jetstream(true) .customName("LongRunningServer") ); - server = natsTestServer.getURI(); + server = natsTestServer.getLocalhostUri(); final Thread shutdownHookThread = new Thread("LongRunningServer-Shutdown-Hook") { @Override diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 3f24cfa2e..d94995553 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -21,8 +21,6 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import static io.nats.NatsRunnerUtils.getNatsLocalhostUri; - /** * ---------------------------------------------------------------------------------------------------- * THIS IS THE PREFERRED WAY TO BUILD ANY OPTIONS FOR TESTING @@ -42,17 +40,29 @@ public static Options.Builder optionsBuilder(ErrorListener el) { } public static Options.Builder optionsBuilder(NatsTestServer ts) { - return optionsBuilder().server(ts.getNatsLocalhostUri()); + return optionsBuilder().server(ts.getLocalhostUri()); + } + + public static Options.Builder optionsBuilder(NatsTestServer ts, String schema) { + return optionsBuilder().server(ts.getLocalhostUri(schema)); } public static Options.Builder optionsBuilder(int port) { - return optionsBuilder().server(getNatsLocalhostUri(port)); + return optionsBuilder().server(NatsTestServer.getLocalhostUri(port)); } public static Options.Builder optionsBuilder(String... servers) { return optionsBuilder().servers(servers); } + public static Options options(int port) { + return optionsBuilder(port).build(); + } + + public static Options options(NatsTestServer ts) { + return optionsBuilder(ts).build(); + } + public static Options options(String... servers) { return optionsBuilder().servers(servers).build(); } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 2603b3934..34f0c3ab5 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -14,13 +14,12 @@ package io.nats.client.utils; import io.nats.client.*; +import io.nats.client.api.ServerInfo; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; import io.nats.client.api.StreamInfo; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.function.Executable; import java.io.IOException; @@ -43,11 +42,6 @@ import static org.junit.jupiter.api.Assertions.*; public class TestBase { - @BeforeAll - public static void setup(TestInfo info) { - TestDebugger.clazz(info.getDisplayName()); - } - public static final String STAR_SEGMENT = "*.star.*.segment.*"; public static final String GT_NOT_LAST_SEGMENT = "gt.>.notlast"; public static final String GT_LAST_SEGMENT = "gt.last.>"; @@ -87,6 +81,13 @@ public static void setup(TestInfo info) { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; + public static ServerInfo ensureVersionServerInfo() throws Exception { + if (VERSION_SERVER_INFO == null) { + runInLrServer(VersionUtils::initVersionServerInfo); + } + return VERSION_SERVER_INFO; + } + // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- @@ -149,7 +150,7 @@ private static void _runInServer(boolean jetstream, Options.Builder builder, Ver builder = optionsBuilder(); } - try (Connection nc = standardConnectionWait(builder.server(ts.getURI()).build())) { + try (Connection nc = standardConnectionWait(builder.server(ts.getLocalhostUri()).build())) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { try { @@ -196,11 +197,15 @@ public static void runInLrServer(InServerTest test) throws Exception { _runInLrServer(null, null, test, null, null); } - public static void runInLrServerCloseableConnection(InServerTest test) throws Exception { + public static void runInLrServerOwnNc(InServerTest test) throws Exception { _runInLrServer(optionsBuilder(LongRunningServer.server()), null, test, null, null); } - public static void runInLrServer(Options.Builder builder, InServerTest test) throws Exception { + public static void runInLrServerOwnNc(ErrorListener el, InServerTest test) throws Exception { + _runInLrServer(optionsBuilder(el), null, test, null, null); + } + + public static void runInLrServerOwnNc(Options.Builder builder, InServerTest test) throws Exception { _runInLrServer(builder, null, test, null, null); } @@ -212,15 +217,19 @@ public static void runInLrServer(VersionCheck vc, InJetStreamTest jsTest) throws _runInLrServer(null, vc, null, jsTest, null); } + public static void runInLrServerOwnNc(Options.Builder builder, InJetStreamTest jsTest) throws Exception { + _runInLrServer(builder, null, null, jsTest, null); + } + public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTest jsTest) throws Exception { _runInLrServer(builder, vc, null, jsTest, null); } - public static void runInLrServer(ErrorListener el, InJetStreamTest jsTest) throws Exception { + public static void runInLrServerOwnNc(ErrorListener el, InJetStreamTest jsTest) throws Exception { _runInLrServer(optionsBuilder(el), null, null, jsTest, null); } - public static void runInLrServer(ErrorListener el, VersionCheck vc, InJetStreamTest jsTest) throws Exception { + public static void runInLrServerOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTest jsTest) throws Exception { _runInLrServer(optionsBuilder(el), vc, null, jsTest, null); } @@ -232,19 +241,19 @@ public static void runInLrServer(VersionCheck vc, InJetStreamTestingContextTest _runInLrServer(null, vc, null, null, oneSubjectJstcTest); } - public static void runInLrServer(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + public static void runInLrServerOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { _runInLrServer(optionsBuilder(el), vc, null, null, oneSubjectJstcTest); } - public static void runInLrServer(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + public static void runInLrServerOwnNc(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { _runInLrServer(optionsBuilder(el), null, null, null, oneSubjectJstcTest); } - public static void runInLrServer(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + public static void runInLrServerOwnNc(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { _runInLrServer(builder, null, null, null, oneSubjectJstcTest); } - public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + public static void runInLrServerOwnNc(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { _runInLrServer(builder, vc, null, null, oneSubjectJstcTest); } @@ -348,9 +357,9 @@ public static void runInJsHubLeaf(TwoServerTest twoServerTest) throws Exception }; try (NatsTestServer hub = new NatsTestServer(hubPort, false, true, null, hubInserts, null); - Connection nchub = standardConnectionWait(hub.getURI()); + Connection nchub = standardConnectionWait(hub.getLocalhostUri()); NatsTestServer leaf = new NatsTestServer(leafPort, false, true, null, leafInserts, null); - Connection ncleaf = standardConnectionWait(leaf.getURI()) + Connection ncleaf = standardConnectionWait(leaf.getLocalhostUri()) ) { try { twoServerTest.test(nchub, ncleaf); @@ -442,12 +451,12 @@ private static Options makeOptions(int id, ThreeServerTestOptions tstOpts, NatsT String[] servers = new String[srvs.length]; for (int i = 0; i < srvs.length; i++) { NatsTestServer nts = srvs[i]; - servers[i] = nts.getURI(); + servers[i] = nts.getLocalhostUri(); } b.servers(servers); } else { - b.server(srvs[0].getURI()); + b.server(srvs[0].getLocalhostUri()); } if (tstOpts.configureAccount()) { b.authHandler(Nats.staticCredentials(null, USER_SEED.toCharArray())); diff --git a/src/test/java/io/nats/client/utils/VersionUtils.java b/src/test/java/io/nats/client/utils/VersionUtils.java index da5a4bcd1..ed8aa28bf 100644 --- a/src/test/java/io/nats/client/utils/VersionUtils.java +++ b/src/test/java/io/nats/client/utils/VersionUtils.java @@ -23,14 +23,6 @@ public interface VersionCheck { boolean runTest(ServerInfo si); } - public static ServerInfo ensureRunServerInfo() throws Exception { -// if (VERSION_SERVER_INFO == null) { -// _runInServer(false, null, null, nc -> {}); -// } -// return VERSION_SERVER_INFO; - return null; - } - public static void initVersionServerInfo(Connection nc) { if (VERSION_SERVER_INFO == null) { VERSION_SERVER_INFO = nc.getServerInfo(); diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 50900a594..fa2430fa5 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -71,9 +71,9 @@ public class ServiceTests extends JetStreamTestBase { @Test public void testServiceWorkflow() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); - Connection serviceNc2 = standardConnectionWait(ts.getURI()); - Connection clientNc = standardConnectionWait(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); + Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); + Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { Endpoint endEcho = Endpoint.builder() .name(ECHO_ENDPOINT_NAME) @@ -472,9 +472,9 @@ private static String reverse(byte[] data) { @Test public void testQueueGroup() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); - Connection serviceNc2 = standardConnectionWait(ts.getURI()); - Connection clientNc = standardConnectionWait(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); + Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); + Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { String yesQueueSubject = "subjyes"; String noQueueSubject = "subjno"; @@ -566,9 +566,9 @@ public void testQueueGroup() throws Exception { @Test public void testResponsesFromAllInstances() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getURI()); - Connection serviceNc2 = standardConnectionWait(ts.getURI()); - Connection clientNc = standardConnectionWait(ts.getURI())) { + try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); + Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); + Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { Endpoint ep = Endpoint.builder() .name("ep") @@ -658,7 +658,7 @@ else if (response.getName().equals(SERVICE_NAME_2)) { @Test public void testDispatchers() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection nc = standardConnectionWait(ts.getURI())) { + try (Connection nc = standardConnectionWait(ts.getLocalhostUri())) { Map dispatchers = getDispatchers(nc); assertEquals(0, dispatchers.size()); From 4de8a708788c684b86a5fd0011c507d6c0020f75 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 21 Nov 2025 16:50:37 -0500 Subject: [PATCH 08/51] Resuing long running server as much as possible --- ThreadOptions.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 ThreadOptions.md diff --git a/ThreadOptions.md b/ThreadOptions.md deleted file mode 100644 index 83df4b322..000000000 --- a/ThreadOptions.md +++ /dev/null @@ -1,3 +0,0 @@ -## Threading Options - -The client can, in an optional manner, per \ No newline at end of file From f6baf7f3785f5363baa3d4b2cf00812502da867f Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 23 Nov 2025 13:00:21 -0500 Subject: [PATCH 09/51] Reusing long running when possible --- .../io/nats/client/JetStreamManagement.java | 35 + .../io/nats/client/impl/NatsConnection.java | 10 +- .../io/nats/client/impl/NatsFeatureBase.java | 12 +- .../client/impl/NatsJetStreamManagement.java | 24 + .../io/nats/client/impl/NatsKeyValue.java | 6 +- .../client/impl/NatsKeyValueManagement.java | 11 +- .../io/nats/client/impl/NatsObjectStore.java | 4 +- .../impl/NatsObjectStoreManagement.java | 9 +- src/test/java/io/nats/client/AuthTests.java | 352 +++-- .../java/io/nats/client/ConnectTests.java | 16 +- src/test/java/io/nats/client/EchoTests.java | 59 +- src/test/java/io/nats/client/NKeyTests.java | 2 +- .../java/io/nats/client/NatsTestServer.java | 54 +- .../java/io/nats/client/OptionsTests.java | 23 +- .../java/io/nats/client/PublishTests.java | 19 +- .../java/io/nats/client/SslTestingHelper.java | 6 +- .../java/io/nats/client/SubscriberTests.java | 75 +- .../client/api/StreamConfigurationTests.java | 7 +- .../io/nats/client/impl/AuthHandlerTests.java | 15 +- ...tionDuringReconnectOnFlushTimeoutTest.java | 2 +- .../client/impl/ConnectionListenerTests.java | 11 +- .../io/nats/client/impl/DispatcherTests.java | 1143 +++++++++-------- .../nats/client/impl/ErrorListenerTests.java | 10 +- .../client/impl/JetStreamConsumerTests.java | 31 +- .../client/impl/JetStreamGeneralTests.java | 166 ++- .../client/impl/JetStreamManagementTests.java | 502 ++++---- .../JetStreamManagementWithConfTests.java | 124 +- .../impl/JetStreamMirrorAndSourcesTests.java | 179 ++- .../nats/client/impl/JetStreamPubTests.java | 57 +- .../nats/client/impl/JetStreamPullTests.java | 36 +- .../client/impl/JetStreamPushAsyncTests.java | 62 +- .../client/impl/JetStreamPushQueueTests.java | 2 +- .../nats/client/impl/JetStreamPushTests.java | 64 +- .../client/impl/JetStreamTestingContext.java | 68 +- .../io/nats/client/impl/KeyValueTests.java | 170 +-- .../nats/client/impl/MessageContentTests.java | 8 +- .../nats/client/impl/MessageManagerTests.java | 18 +- .../io/nats/client/impl/NatsMessageTests.java | 2 +- .../nats/client/impl/NatsStatisticsTests.java | 12 +- .../io/nats/client/impl/ObjectStoreTests.java | 42 +- .../java/io/nats/client/impl/ParseTests.java | 8 +- .../java/io/nats/client/impl/PingTests.java | 6 +- .../io/nats/client/impl/ReconnectTests.java | 37 +- .../io/nats/client/impl/RequestTests.java | 48 +- .../nats/client/impl/SimplificationTests.java | 58 +- .../nats/client/impl/SlowConsumerTests.java | 12 +- .../io/nats/client/impl/TLSConnectTests.java | 29 +- .../client/impl/ValidateIssue1426Test.java | 2 +- .../client/impl/WebsocketConnectTests.java | 46 +- .../support/WebsocketSupportClassesTests.java | 3 +- .../nats/client/utils/LongRunningServer.java | 114 -- .../io/nats/client/utils/ResourceUtils.java | 20 +- .../io/nats/client/utils/ReusableServer.java | 164 +++ .../java/io/nats/client/utils/TestBase.java | 309 +++-- .../java/io/nats/service/ServiceTests.java | 6 +- 55 files changed, 2149 insertions(+), 2161 deletions(-) delete mode 100644 src/test/java/io/nats/client/utils/LongRunningServer.java create mode 100644 src/test/java/io/nats/client/utils/ReusableServer.java diff --git a/src/main/java/io/nats/client/JetStreamManagement.java b/src/main/java/io/nats/client/JetStreamManagement.java index 283522cfb..ce8cf70f6 100644 --- a/src/main/java/io/nats/client/JetStreamManagement.java +++ b/src/main/java/io/nats/client/JetStreamManagement.java @@ -13,6 +13,7 @@ package io.nats.client; import io.nats.client.api.*; +import org.jspecify.annotations.NonNull; import java.io.IOException; import java.time.ZonedDateTime; @@ -375,4 +376,38 @@ public interface JetStreamManagement { * @return a JetStream instance. */ JetStream jetStream(); + + /** + * Gets a context for working with a Key Value bucket + * @param bucketName the bucket name + * @return a KeyValue instance. + * @throws IOException various IO exception such as timeout or interruption + */ + @NonNull + KeyValue keyValue(@NonNull String bucketName) throws IOException; + + /** + * Gets a context for managing Key Value buckets + * @return a KeyValueManagement instance. + * @throws IOException various IO exception such as timeout or interruption + */ + @NonNull + KeyValueManagement keyValueManagement() throws IOException; + + /** + * Gets a context for working with an Object Store. + * @param bucketName the bucket name + * @return an ObjectStore instance. + * @throws IOException various IO exception such as timeout or interruption + */ + @NonNull + ObjectStore objectStore(@NonNull String bucketName) throws IOException; + + /** + * Gets a context for managing Object Stores + * @return an ObjectStoreManagement instance. + * @throws IOException various IO exception such as timeout or interruption + */ + @NonNull + ObjectStoreManagement objectStoreManagement() throws IOException; } diff --git a/src/main/java/io/nats/client/impl/NatsConnection.java b/src/main/java/io/nats/client/impl/NatsConnection.java index 8dbe3bbd6..b00feb6e4 100644 --- a/src/main/java/io/nats/client/impl/NatsConnection.java +++ b/src/main/java/io/nats/client/impl/NatsConnection.java @@ -2559,7 +2559,7 @@ public KeyValue keyValue(@NonNull String bucketName) throws IOException { public KeyValue keyValue(@NonNull String bucketName, @Nullable KeyValueOptions options) throws IOException { Validator.validateBucketName(bucketName, true); ensureNotClosing(); - return new NatsKeyValue(this, bucketName, options); + return new NatsKeyValue(bucketName, this, options, null); } /** @@ -2578,7 +2578,7 @@ public KeyValueManagement keyValueManagement() throws IOException { @NonNull public KeyValueManagement keyValueManagement(@Nullable KeyValueOptions options) throws IOException { ensureNotClosing(); - return new NatsKeyValueManagement(this, options); + return new NatsKeyValueManagement(this, options, null); } /** @@ -2598,7 +2598,7 @@ public ObjectStore objectStore(@NonNull String bucketName) throws IOException { public ObjectStore objectStore(@NonNull String bucketName, @Nullable ObjectStoreOptions options) throws IOException { Validator.validateBucketName(bucketName, true); ensureNotClosing(); - return new NatsObjectStore(this, bucketName, options); + return new NatsObjectStore(bucketName, this, options, null); } /** @@ -2608,7 +2608,7 @@ public ObjectStore objectStore(@NonNull String bucketName, @Nullable ObjectStore @NonNull public ObjectStoreManagement objectStoreManagement() throws IOException { ensureNotClosing(); - return new NatsObjectStoreManagement(this, null); + return new NatsObjectStoreManagement(this, null, null); } /** @@ -2618,7 +2618,7 @@ public ObjectStoreManagement objectStoreManagement() throws IOException { @NonNull public ObjectStoreManagement objectStoreManagement(@Nullable ObjectStoreOptions options) throws IOException { ensureNotClosing(); - return new NatsObjectStoreManagement(this, options); + return new NatsObjectStoreManagement(this, options, null); } private void ensureNotClosing() throws IOException { diff --git a/src/main/java/io/nats/client/impl/NatsFeatureBase.java b/src/main/java/io/nats/client/impl/NatsFeatureBase.java index eb9c08877..0b8eaab95 100644 --- a/src/main/java/io/nats/client/impl/NatsFeatureBase.java +++ b/src/main/java/io/nats/client/impl/NatsFeatureBase.java @@ -32,14 +32,18 @@ public class NatsFeatureBase { protected final NatsJetStreamManagement jsm; protected String streamName; - NatsFeatureBase(NatsConnection connection, FeatureOptions fo) throws IOException { - if (fo == null) { + NatsFeatureBase(NatsConnection connection, FeatureOptions fo, NatsJetStreamManagement jsm) throws IOException { + if (jsm != null) { + this.jsm = jsm; + js = (NatsJetStream)jsm.jetStream(); + } + else if (fo == null) { js = new NatsJetStream(connection, null); - jsm = new NatsJetStreamManagement(connection, null); + this.jsm = new NatsJetStreamManagement(connection, null); } else { js = new NatsJetStream(connection, fo.getJetStreamOptions()); - jsm = new NatsJetStreamManagement(connection, fo.getJetStreamOptions()); + this.jsm = new NatsJetStreamManagement(connection, fo.getJetStreamOptions()); } } diff --git a/src/main/java/io/nats/client/impl/NatsJetStreamManagement.java b/src/main/java/io/nats/client/impl/NatsJetStreamManagement.java index b21793185..ca7f41e99 100644 --- a/src/main/java/io/nats/client/impl/NatsJetStreamManagement.java +++ b/src/main/java/io/nats/client/impl/NatsJetStreamManagement.java @@ -16,6 +16,8 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.api.Error; +import io.nats.client.support.Validator; +import org.jspecify.annotations.NonNull; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -386,4 +388,26 @@ public JetStream jetStream() { } return js; } + + @Override + public @NonNull KeyValue keyValue(@NonNull String bucketName) throws IOException { + Validator.validateBucketName(bucketName, true); + return new NatsKeyValue(bucketName, null, null, this); + } + + @Override + public @NonNull KeyValueManagement keyValueManagement() throws IOException { + return new NatsKeyValueManagement(null, null, this); + } + + @Override + public @NonNull ObjectStore objectStore(@NonNull String bucketName) throws IOException { + Validator.validateBucketName(bucketName, true); + return new NatsObjectStore(bucketName, null, null, this); + } + + @Override + public @NonNull ObjectStoreManagement objectStoreManagement() throws IOException { + return new NatsObjectStoreManagement(null, null, this); + } } diff --git a/src/main/java/io/nats/client/impl/NatsKeyValue.java b/src/main/java/io/nats/client/impl/NatsKeyValue.java index 457344845..5779184ac 100644 --- a/src/main/java/io/nats/client/impl/NatsKeyValue.java +++ b/src/main/java/io/nats/client/impl/NatsKeyValue.java @@ -40,13 +40,13 @@ public class NatsKeyValue extends NatsFeatureBase implements KeyValue { private final String readPrefix; private final String writePrefix; - NatsKeyValue(NatsConnection connection, String bucketName, KeyValueOptions kvo) throws IOException { - super(connection, kvo); + NatsKeyValue(String bucketName, NatsConnection connection, KeyValueOptions kvo, NatsJetStreamManagement jsm) throws IOException { + super(connection, kvo, jsm); this.bucketName = Validator.validateBucketName(bucketName, true); streamName = toStreamName(bucketName); StreamInfo si; try { - si = jsm.getStreamInfo(streamName); + si = this.jsm.getStreamInfo(streamName); } catch (JetStreamApiException e) { // can't throw directly, that would be a breaking change throw new IOException(e); diff --git a/src/main/java/io/nats/client/impl/NatsKeyValueManagement.java b/src/main/java/io/nats/client/impl/NatsKeyValueManagement.java index dab2c9f2c..ed2bde935 100644 --- a/src/main/java/io/nats/client/impl/NatsKeyValueManagement.java +++ b/src/main/java/io/nats/client/impl/NatsKeyValueManagement.java @@ -31,9 +31,14 @@ public class NatsKeyValueManagement implements KeyValueManagement { private final NatsJetStreamManagement jsm; private final boolean serverOlderThan272; - NatsKeyValueManagement(NatsConnection connection, KeyValueOptions kvo) throws IOException { - jsm = new NatsJetStreamManagement(connection, kvo == null ? null : kvo.getJetStreamOptions()); - serverOlderThan272 = jsm.conn.getServerInfo().isOlderThanVersion("2.7.2"); + NatsKeyValueManagement(NatsConnection connection, KeyValueOptions kvo, NatsJetStreamManagement jsm) throws IOException { + if (jsm == null) { + this.jsm = new NatsJetStreamManagement(connection, kvo == null ? null : kvo.getJetStreamOptions()); + } + else { + this.jsm = jsm; + } + serverOlderThan272 = this.jsm.conn.getServerInfo().isOlderThanVersion("2.7.2"); } /** diff --git a/src/main/java/io/nats/client/impl/NatsObjectStore.java b/src/main/java/io/nats/client/impl/NatsObjectStore.java index d3b5b243c..13ad7c743 100644 --- a/src/main/java/io/nats/client/impl/NatsObjectStore.java +++ b/src/main/java/io/nats/client/impl/NatsObjectStore.java @@ -37,8 +37,8 @@ public class NatsObjectStore extends NatsFeatureBase implements ObjectStore { private final String rawChunkPrefix; private final String rawMetaPrefix; - NatsObjectStore(NatsConnection connection, String bucketName, ObjectStoreOptions oso) throws IOException { - super(connection, oso); + NatsObjectStore(String bucketName, NatsConnection connection, ObjectStoreOptions oso, NatsJetStreamManagement jsm) throws IOException { + super(connection, oso, jsm); this.oso = oso; this.bucketName = Validator.validateBucketName(bucketName, true); streamName = toStreamName(bucketName); diff --git a/src/main/java/io/nats/client/impl/NatsObjectStoreManagement.java b/src/main/java/io/nats/client/impl/NatsObjectStoreManagement.java index b2892e46e..6d2a84e0a 100644 --- a/src/main/java/io/nats/client/impl/NatsObjectStoreManagement.java +++ b/src/main/java/io/nats/client/impl/NatsObjectStoreManagement.java @@ -30,8 +30,13 @@ public class NatsObjectStoreManagement implements ObjectStoreManagement { private final NatsJetStreamManagement jsm; - NatsObjectStoreManagement(NatsConnection connection, ObjectStoreOptions oso) throws IOException { - jsm = new NatsJetStreamManagement(connection, oso == null ? null : oso.getJetStreamOptions()); + NatsObjectStoreManagement(NatsConnection connection, ObjectStoreOptions oso, NatsJetStreamManagement jsm) throws IOException { + if (jsm == null) { + this.jsm = new NatsJetStreamManagement(connection, oso == null ? null : oso.getJetStreamOptions()); + } + else { + this.jsm = jsm; + } } /** diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 3f9cffec4..08b928b5a 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -13,6 +13,7 @@ package io.nats.client; +import io.nats.NatsRunnerUtils; import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; @@ -40,26 +41,54 @@ import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ResourceUtils.jwtResource; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @Isolated public class AuthTests extends TestBase { + private String userPassInUrl(String user, String pass, int port) { + return "nats://" + user + ":" + pass + "@" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port; + } + + private String tokenInUrl(String userOrToken, int port) { + return "nats://" + userOrToken + "@" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port; + } + + public static AuthHandler getUserCredsAuthHander() { + return Nats.credentials(jwtResource("user.creds")); + } + @Test public void testUserPass() throws Exception { - String[] customArgs = { "--user", "stephen", "--pass", "password" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0) - .userInfo("stephen".toCharArray(), "password".toCharArray()).build(); - assertCanConnect(options); + String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; + try (NatsTestServer ts = new NatsTestServer(customArgs)) { + // u/p in url + Options inUrl = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); + assertCanConnect(inUrl); + + // u/p in options + Options inOptions = optionsBuilder(ts).maxReconnects(0) + .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); + assertCanConnect(inOptions); + + Options badUser = optionsBuilder(ts).maxReconnects(0) + .userInfo("zzz".toCharArray(), "ppp".toCharArray()).build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(badUser)); + + Options badPass = optionsBuilder(ts).maxReconnects(0) + .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(badPass)); + + Options missingUserPass = optionsBuilder(ts).maxReconnects(0).build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPass)); } } @Test public void testEncodedPassword() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/encoded_pass.conf", false)) { + try (NatsTestServer ts = configFileServer("encoded_pass.conf")) { int port = ts.getPort(); assertEncoded("space%20space", port); assertEncoded("colon%3Acolon", port); @@ -90,7 +119,7 @@ public void testEncodedPassword() throws Exception { } private void assertEncoded(String encoded, int port) throws IOException, InterruptedException { - String url = "nats://u" + encoded + ":p" + encoded + "@localhost:" + port; + String url = userPassInUrl("u" + encoded, "p" + encoded, port); Options options = optionsBuilder(url).build(); Connection c = Nats.connect(options); c.getServerInfo(); @@ -117,7 +146,7 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsServerRunner.builder().customArgs(customArgs))) { // See config file for user/pass - Options options = optionsBuilder("nats://localhost:" + ts.getPort()) + Options options = optionsBuilder(ts) .userInfo(user, pass) .maxReconnects(0).build(); assertCanConnect(options); @@ -129,14 +158,14 @@ public void testUserPassOnReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); Connection nc; Subscription sub; - String[] customArgs = { "--user", "stephen", "--pass", "password" }; + String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; int port; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + try (NatsTestServer ts = new NatsTestServer(customArgs)) { port = ts.getPort(); // See config file for user/pass Options options = optionsBuilder(ts).maxReconnects(-1) - .userInfo("stephen".toCharArray(), "password".toCharArray()).connectionListener(listener).build(); + .userInfo("uuu".toCharArray(), "ppp".toCharArray()).connectionListener(listener).build(); nc = standardConnectionWait(options); sub = nc.subscribe("test"); @@ -154,7 +183,7 @@ public void testUserPassOnReconnect() throws Exception { Connection.Status.RECONNECTING == nc.getStatus() || Connection.Status.DISCONNECTED == nc.getStatus(), "Reconnecting status"); listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = new NatsTestServer(customArgs, port, false)) { + try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { listenerConnectionWait(nc, listener); nc.publish("test", null); @@ -169,26 +198,15 @@ public void testUserPassOnReconnect() throws Exception { @Test public void testUserBCryptPass() throws Exception { /* - * go run mkpasswd.go -p password: password bcrypt hash: - * $2a$11$1oJy/wZYNTxr9jNwMNwS3eUGhBpHT3On8CL9o7ey89mpgo88VG6ba + * use a bcrypt hash generator on the cleartext pass + * ppp -> $2a$12$UjzncyjtsE6rJG4LSGk.JOweXV3P2umZ38gHuj4OMY0X/nQudiDgG */ - String[] customArgs = { "--user", "ginger", "--pass", - "$2a$11$1oJy/wZYNTxr9jNwMNwS3eUGhBpHT3On8CL9o7ey89mpgo88VG6ba" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + String[] customArgs = { "--user", "uuu", "--pass", + "$2a$12$UjzncyjtsE6rJG4LSGk.JOweXV3P2umZ38gHuj4OMY0X/nQudiDgG" }; + try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass Options options = optionsBuilder(ts).maxReconnects(0) - .userInfo("ginger".toCharArray(), "password".toCharArray()).build(); - assertCanConnect(options); - } - } - - @Test - public void testUserPassInURL() throws Exception { - String[] customArgs = { "--user", "stephen", "--pass", "password" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://stephen:password@localhost:" + ts.getPort()) - .maxReconnects(0).build(); + .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); assertCanConnect(options); } } @@ -199,12 +217,12 @@ public void testUserPassInURLOnReconnect() throws Exception { int port; Connection nc; Subscription sub; - String[] customArgs = { "--user", "stephen", "--pass", "password" }; + String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + try (NatsTestServer ts = new NatsTestServer(customArgs)) { port = ts.getPort(); // See config file for user/pass - Options options = optionsBuilder("nats://stephen:password@localhost:" + ts.getPort()) + Options options = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())) .maxReconnects(-1).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -225,7 +243,7 @@ public void testUserPassInURLOnReconnect() throws Exception { Connection.Status.RECONNECTING == status || Connection.Status.DISCONNECTED == status, "Reconnecting status"); listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = new NatsTestServer(customArgs, port, false)) { + try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { listenerConnectionWait(nc, listener); nc.publish("test", null); flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); @@ -237,46 +255,52 @@ public void testUserPassInURLOnReconnect() throws Exception { @Test public void testUserPassInURLClusteredWithDifferentUser() throws Exception { - String[] customArgs1 = { "--user", "stephen", "--pass", "password" }; - String[] customArgs2 = { "--user", "alberto", "--pass", "casadecampo" }; + String[] customArgs1 = { "--user", "uuu", "--pass", "ppp" }; + String[] customArgs2 = { "--user", "uuu2", "--pass", "ppp2" }; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); - NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://stephen:password@localhost:" + ts1.getPort()) - .server("nats://alberto:casadecampo@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() - .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); + try (NatsTestServer ts1 = new NatsTestServer(customArgs1); + NatsTestServer ts2 = new NatsTestServer(customArgs2)) { + String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); + String url2 = userPassInUrl("uuu2", "ppp2", ts2.getPort()); + Options options = optionsBuilder(url1, url2) + .maxReconnects(4) + .noRandomize() + .connectionListener(listener) + .pingInterval(Duration.ofMillis(100)) + .build(); Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), "nats://stephen:password@localhost:" + ts1.getPort()); + assertEquals(nc.getConnectedUrl(), url1); listener.prepForStatusChange(Events.RESUBSCRIBED); ts1.close(); listenerConnectionWait(nc, listener); - assertEquals(nc.getConnectedUrl(), "nats://alberto:casadecampo@localhost:" + ts2.getPort()); + assertEquals(nc.getConnectedUrl(), url2); standardCloseConnection(nc); } } @Test public void testUserPassInURLWithFallback() throws Exception { - String[] customArgs1 = { "--user", "stephen", "--pass", "password" }; - String[] customArgs2 = { "--user", "alberto", "--pass", "casadecampo" }; + String[] customArgs1 = { "--user", "uuu", "--pass", "ppp" }; + String[] customArgs2 = { "--user", "uuu2", "--pass", "ppp2" }; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); - NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://stephen:password@localhost:" + ts1.getPort()) - .server("nats://localhost:" + ts2.getPort()).noRandomize() - .userInfo("alberto".toCharArray(), "casadecampo".toCharArray()).maxReconnects(4).noRandomize() - .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); + try (NatsTestServer ts1 = new NatsTestServer(customArgs1); + NatsTestServer ts2 = new NatsTestServer(customArgs2)) { + String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); + Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) + .userInfo("uuu2".toCharArray(), "ppp2".toCharArray()) + .maxReconnects(4) + .noRandomize() + .connectionListener(listener) + .pingInterval(Duration.ofMillis(100)).build(); Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), "nats://stephen:password@localhost:" + ts1.getPort()); + assertEquals(nc.getConnectedUrl(), url1); listener.prepForStatusChange(Events.RESUBSCRIBED); ts1.close(); listener.waitForStatusChange(10, TimeUnit.SECONDS); assertConnected(nc); - assertEquals(nc.getConnectedUrl(), "nats://localhost:" + ts2.getPort()); + assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); standardCloseConnection(nc); } } @@ -286,21 +310,25 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { String[] customArgs1 = { "--auth", "token_one" }; String[] customArgs2 = { "--auth", "token_two" }; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); - NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://token_one@localhost:" + ts1.getPort()) - .server("nats://token_two@localhost:" + ts2.getPort()).maxReconnects(4).noRandomize() - .connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); + try (NatsTestServer ts1 = new NatsTestServer(customArgs1); + NatsTestServer ts2 = new NatsTestServer(customArgs2)) { + String url1 = tokenInUrl("token_one", ts1.getPort()); + String url2 = tokenInUrl("token_two", ts2.getPort()); + Options options = optionsBuilder(url1, url2) + .maxReconnects(4) + .noRandomize() + .connectionListener(listener) + .pingInterval(Duration.ofMillis(100)) + .build(); Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), "nats://token_one@localhost:" + ts1.getPort()); + assertEquals(nc.getConnectedUrl(), url1); listener.prepForStatusChange(Events.RESUBSCRIBED); ts1.close(); listener.waitForStatusChange(2, TimeUnit.SECONDS); standardConnectionWait(nc); - assertEquals(nc.getConnectedUrl(), "nats://token_two@localhost:" + ts2.getPort()); + assertEquals(nc.getConnectedUrl(), url2); standardCloseConnection(nc); } } @@ -311,97 +339,58 @@ public void testTokenInURLWithFallback() throws Exception { String[] customArgs2 = { "--auth", "token_two" }; ListenerForTesting listener = new ListenerForTesting(); Connection nc; - try (NatsTestServer ts1 = new NatsTestServer(customArgs1, false); - NatsTestServer ts2 = new NatsTestServer(customArgs2, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://token_one@localhost:" + ts1.getPort()) - .server("nats://localhost:" + ts2.getPort()).token("token_two".toCharArray()).maxReconnects(4) - .noRandomize().connectionListener(listener).pingInterval(Duration.ofMillis(100)).build(); + try (NatsTestServer ts1 = new NatsTestServer(customArgs1); + NatsTestServer ts2 = new NatsTestServer(customArgs2)) { + String url1 = tokenInUrl("token_one", ts1.getPort()); + Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) + .token("token_two".toCharArray()) + .maxReconnects(4) + .noRandomize() + .connectionListener(listener) + .pingInterval(Duration.ofMillis(100)) + .build(); nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), "nats://token_one@localhost:" + ts1.getPort()); + assertEquals(nc.getConnectedUrl(), url1); listener.prepForStatusChange(Events.RESUBSCRIBED); ts1.close(); listener.waitForStatusChange(STANDARD_CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); listenerConnectionWait(nc, listener); - assertEquals(nc.getConnectedUrl(), "nats://localhost:" + ts2.getPort()); + assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); standardCloseConnection(nc); } } @Test public void testToken() throws Exception { - String[] customArgs = { "--auth", "derek" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0).token("derek".toCharArray()) - .build(); + String[] customArgs = { "--auth", "token" }; + try (NatsTestServer ts = new NatsTestServer(customArgs)) { + // token in options + Options options = optionsBuilder(ts) + .maxReconnects(0) + .token("token".toCharArray()) + .build(); assertCanConnect(options); - } - } - @Test - public void testTokenInURL() throws Exception { - String[] customArgs = { "--auth", "alberto" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder("nats://alberto@localhost:" + ts.getPort()).maxReconnects(0) - .build(); + // token in url + options = optionsBuilder(tokenInUrl("token", ts.getPort())) + .maxReconnects(0).build(); assertCanConnect(options); - } - } - - @Test - public void testBadUserBadPass() { - assertThrows(AuthenticationException.class, () -> { - String[] customArgs = { "--user", "stephen", "--pass", "password" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0) - .userInfo("sam".toCharArray(), "notthepassword".toCharArray()).build(); - Nats.connect(options); // expected to fail - } - }); - } - @Test - public void testMissingUserPass() { - assertThrows(AuthenticationException.class, () -> { - String[] customArgs = { "--user", "wally", "--pass", "password" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0).build(); - Nats.connect(options); // expected to fail - } - }); - } - - @Test - public void testBadToken() { - assertThrows(AuthenticationException.class, () -> { - String[] customArgs = { "--auth", "colin" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts) - .maxReconnects(0) - .token("notthetoken".toCharArray()) - .build(); - Nats.connect(options); // expected to fail - } - }); - } + // incorrect token + Options incorrectToken = optionsBuilder(ts) + .maxReconnects(0) + .token("incorrectToken".toCharArray()) + .build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(incorrectToken)); - @Test - public void testMissingToken() { - assertThrows(AuthenticationException.class, () -> { - String[] customArgs = { "--auth", "ivan" }; - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { - // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0).build(); - Nats.connect(options); // expected to fail - } - }); + // incorrect token + Options missingToken = optionsBuilder(ts) + .maxReconnects(0) + .build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(missingToken)); + } } String createNKeyConfigFile(char[] nkey) throws Exception { @@ -431,34 +420,28 @@ String createNKeyConfigFile(char[] nkey) throws Exception { public void testNKeyAuth() throws Exception { NKey theKey = NKey.createUser(null); assertNotNull(theKey); + String configFilePath = createNKeyConfigFile(theKey.getPublicKey()); - String configFile = createNKeyConfigFile(theKey.getPublicKey()); - - try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(new AuthHandlerForTesting(theKey)).build(); - assertCanConnect(options); - } - } - - @Test - public void testStaticNKeyAuth() throws Exception { - NKey theKey = NKey.createUser(null); - assertNotNull(theKey); + NatsServerRunner.Builder b = NatsServerRunner.builder().configFilePath(configFilePath); + try (NatsTestServer ts = new NatsTestServer(b)) { - String configFile = createNKeyConfigFile(theKey.getPublicKey()); + Options authHandlerOptions = optionsBuilder(ts).maxReconnects(0) + .authHandler(new AuthHandlerForTesting(theKey)).build(); + assertCanConnect(authHandlerOptions); - try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); - assertCanConnect(options); - } + Options staticOptions = optionsBuilder(ts).maxReconnects(0) + .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); + assertCanConnect(staticOptions); - //test Nats.connect method - try (NatsTestServer ts = new NatsTestServer(configFile, false)) { + // direct through Nats.connect Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.staticCredentials(null, theKey.getSeed())); standardConnectionWait(nc); standardCloseConnection(nc); + + // fails with no nkey + Options noNkey = optionsBuilder(ts).maxReconnects(0) + .authHandler(new AuthHandlerForTesting(null)).build(); + assertThrows(IOException.class, () -> Nats.connect(noNkey)); } } @@ -467,26 +450,27 @@ public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) + .authHandler(getUserCredsAuthHander()) .build(); assertCanConnect(options); options = optionsBuilder(ts).maxReconnects(0) - .credentialPath("src/test/resources/jwt_nkey/user.creds") + .credentialPath(jwtResource("user.creds")) .build(); assertCanConnect(options); - } - //test Nats.connect method - try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { - Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials("src/test/resources/jwt_nkey/user.creds")); + //test Nats.connect method + Connection nc = Nats.connect(ts.getLocalhostUri(), getUserCredsAuthHander()); standardConnectionWait(nc); standardCloseConnection(nc); } + } + @Test + public void testJWTAuthWithCredsFileAlso() throws Exception { //test Nats.connect method try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { - Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials("src/test/resources/jwt_nkey/userJnatsTest.creds")); + Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -496,15 +480,13 @@ public void testJWTAuthWithCredsFile() throws Exception { public void testWsJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); + // in options Options options = optionsBuilder(uri).maxReconnects(0) - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); + .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); - } - //test Nats.connect method - try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { - String uri = ts.getLocalhostUri("ws"); - Connection nc = Nats.connect(uri, Nats.credentials("src/test/resources/jwt_nkey/user.creds")); + // directly Nats.connect + Connection nc = Nats.connect(uri, getUserCredsAuthHander()); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -517,7 +499,7 @@ public void testWssJWTAuthWithCredsFile() throws Exception { { String uri = ts.getLocalhostUri("wss"); Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); + .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); } } @@ -528,38 +510,20 @@ public void testStaticJWTAuth() throws Exception { String jwt = "eyJ0eXAiOiJqd3QiLCJhbGciOiJlZDI1NTE5In0.eyJqdGkiOiI3UE1GTkc0R1c1WkE1NEg3N09TUUZKNkJNQURaSUQ2NTRTVk1XMkRFQVZINVIyUVU0MkhBIiwiaWF0IjoxNTY1ODg5ODk4LCJpc3MiOiJBQUhWU0k1NVlQTkJRWjVQN0Y2NzZDRkFPNFBIQlREWUZRSUVHVEtMUVRJUEVZUEZEVEpOSEhPNCIsIm5hbWUiOiJkZW1vIiwic3ViIjoiVUMzT01MSlhUWVBZN0ZUTVVZNUNaNExHRVdRSTNZUzZKVFZXU0VGRURBMk9MTEpZSVlaVFo3WTMiLCJ0eXBlIjoidXNlciIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fX19.ROSJ7D9ETt9c8ZVHxsM4_FU2dBRLh5cNfb56MxPQth74HAxxtGMl0nn-9VVmWjXgFQn4JiIbwrGfFDBRMzxsAA"; String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; - try (NatsTestServer ts = new NatsTestServer("src/test/resources/operator.conf", false)) { + try (NatsTestServer ts = configFileServer("operator.conf")) { Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); } } - @Test - public void testBadAuthHandler() { - assertThrows(IOException.class, () -> { - NKey theKey = NKey.createUser(null); - assertNotNull(theKey); - - String configFile = createNKeyConfigFile(theKey.getPublicKey()); - - try (NatsTestServer ts = new NatsTestServer(configFile, false)) { - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(new AuthHandlerForTesting(null)). // No nkey - build(); - Connection nc = Nats.connect(options); - assertNotConnected(nc); - } - }); - } - @Test public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) - .noRandomize().maxReconnects(-1).authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); + .noRandomize().maxReconnects(-1).authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); @@ -583,7 +547,7 @@ public void testCloseOnReconnectWithSameError() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")).build(); + .authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); @@ -608,7 +572,7 @@ public void testThatAuthErrorIsCleared() throws Exception { .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) // wait a tad to allow restarts - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) + .authHandler(getUserCredsAuthHander()) .errorListener(new ListenerForTesting()) .build(); Connection nc = standardConnectionWait(options); @@ -686,7 +650,7 @@ private static void _testReconnectAfter(String errText) throws Exception { .servers(new String[]{mockTs.getMockUri(), ts2.getLocalhostUri()}) .maxReconnects(-1) .noRandomize() - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds")) + .authHandler(getUserCredsAuthHander()) .build(); Connection nc = standardConnectionWait(options); diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 01a3defda..d59b93776 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -133,7 +133,7 @@ public void testConnectionFailureWithFallback() throws Exception { @Test public void testConnectWithConfig() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/simple.conf", false)) { + try (NatsTestServer ts = NatsTestServer.configFileServer("simple.conf")) { assertCanConnect(ts.getLocalhostUri()); } } @@ -276,7 +276,7 @@ public void testAsyncConnectionWithReconnect() throws Exception { assertNotNull(nc); listener.prepForStatusChange(Events.RECONNECTED); - try (NatsTestServer ignored = new NatsTestServer(port, false)) { + try (NatsTestServer ignored = new NatsTestServer(port)) { listenerConnectionWait(nc, listener); standardCloseConnection(nc); } @@ -513,7 +513,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { Connection connection = null; // 1. DO NOT RECONNECT ON CONNECT - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { try { SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); connection = Nats.connect(options); @@ -528,7 +528,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { simExReceived.set(false); // 2. RECONNECT ON CONNECT - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { try { SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); listener.prepForStatusChange(Events.RECONNECTED); @@ -546,7 +546,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { // 2. NORMAL RECONNECT listener.prepForStatusChange(Events.RECONNECTED); - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); try { assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); @@ -581,13 +581,13 @@ public boolean includeAllServers() { } }; - runInJsCluster(ConnectTests::validateRunInJsCluster); + runInCluster(ConnectTests::validateRunInJsCluster); listeners[0] = new ListenerForTesting(); listeners[1] = new ListenerForTesting(); listeners[2] = new ListenerForTesting(); - runInJsCluster(tstOpts, ConnectTests::validateRunInJsCluster); + runInCluster(tstOpts, ConnectTests::validateRunInJsCluster); } private static void validateRunInJsCluster(Connection nc1, Connection nc2, Connection nc3) throws InterruptedException { @@ -638,7 +638,7 @@ void testConnectWithFastFallback() throws Exception { @Test void testConnectPendingCountCoverage() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { AtomicLong outgoingPendingMessageCount = new AtomicLong(); AtomicLong outgoingPendingBytes = new AtomicLong(); diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 0f396a432..3c63d18e2 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -14,13 +14,13 @@ package io.nats.client; import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.utils.LongRunningServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; +import static io.nats.client.utils.ConnectionUtils.longConnectionWait; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -62,44 +62,45 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { - // do not open LrConns in try-resources - Connection nc1 = LongRunningServer.getLrConn(); - Connection nc2 = LongRunningServer.getLrConn2(); - // Echo is on so both sub should get messages from both pub - String subject = TestBase.random(); - Subscription sub1 = nc1.subscribe(subject); - nc1.flush(Duration.ofSeconds(1)); - Subscription sub2 = nc2.subscribe(subject); - nc2.flush(Duration.ofSeconds(1)); + runInSharedOwnNc(nc1 -> { + try (Connection nc2 = longConnectionWait(optionsBuilder(nc1.getConnectedUrl()).build())) { + // Echo is on so both sub should get messages from both pub + String subject = TestBase.random(); + Subscription sub1 = nc1.subscribe(subject); + nc1.flush(Duration.ofSeconds(1)); + Subscription sub2 = nc2.subscribe(subject); + nc2.flush(Duration.ofSeconds(1)); - // Pub from connect 1 - nc1.publish(subject, null); - nc1.flush(Duration.ofSeconds(1)); - Message msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); + // Pub from connect 1 + nc1.publish(subject, null); + nc1.flush(Duration.ofSeconds(1)); + Message msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); - // Pub from connect 2 - nc2.publish(subject, null); - nc2.flush(Duration.ofSeconds(1)); - msg = sub1.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); - msg = sub2.nextMessage(Duration.ofSeconds(1)); - assertNotNull(msg); + // Pub from connect 2 + nc2.publish(subject, null); + nc2.flush(Duration.ofSeconds(1)); + msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + } + }); } @Test public void testWithNoEcho() throws Exception { - runInLrServerOwnNc(optionsBuilder().noEcho().noReconnect(), nc1 -> { + runInSharedOwnNc(optionsBuilder().noEcho().noReconnect(), nc -> { String subject = TestBase.random(); // Echo is off so sub should get messages from pub from other connections - Subscription sub1 = nc1.subscribe(subject); - nc1.flush(Duration.ofSeconds(1)); + Subscription sub1 = nc.subscribe(subject); + nc.flush(Duration.ofSeconds(1)); // Pub from connect 1 - nc1.publish(subject, null); - nc1.flush(Duration.ofSeconds(1)); + nc.publish(subject, null); + nc.flush(Duration.ofSeconds(1)); Message msg = sub1.nextMessage(Duration.ofSeconds(1)); assertNull(msg); // no message for sub1 from pub 1 }); diff --git a/src/test/java/io/nats/client/NKeyTests.java b/src/test/java/io/nats/client/NKeyTests.java index 66f9fb774..711d2bd88 100644 --- a/src/test/java/io/nats/client/NKeyTests.java +++ b/src/test/java/io/nats/client/NKeyTests.java @@ -473,7 +473,7 @@ public void testBigSignVerify() throws Exception { byte[] data = Files.readAllBytes(Paths.get("src/test/resources/keystore.jks")); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); char[] publicKey = theKey.getPublicKey(); diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index c5b25ee9e..bf069c6c8 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.logging.Level; -public class NatsTestServer extends NatsServerRunner { +import static io.nats.client.utils.ResourceUtils.configResource; - private static final String CONFIG_FILE_BASE = "src/test/resources/"; +public class NatsTestServer extends NatsServerRunner { static { NatsTestServer.quiet(); @@ -39,12 +39,8 @@ public static void verbose() { NatsRunnerUtils.setDefaultOutputLevel(Level.ALL); } - public static String configFilePath(String configFilePath) { - return configFilePath.startsWith(CONFIG_FILE_BASE) ? configFilePath : CONFIG_FILE_BASE + configFilePath; - } - public static Builder configFileBuilder(String configFilePath) { - return NatsServerRunner.builder().configFilePath(configFilePath(configFilePath)); + return NatsServerRunner.builder().configFilePath(configResource(configFilePath)); } public static NatsTestServer configFileServer(String configFilePath) throws IOException { @@ -67,48 +63,28 @@ public NatsTestServer() throws IOException { this(builder()); } - public NatsTestServer(boolean debug) throws IOException { - this(builder().debug(debug)); - } - - public NatsTestServer(boolean debug, boolean jetstream) throws IOException { - this(builder().debug(debug).jetstream(jetstream)); - } - - public NatsTestServer(int port, boolean debug) throws IOException { - this(builder().port(port).debug(debug)); - } - - public NatsTestServer(int port, boolean debug, boolean jetstream) throws IOException { - this(builder().port(port).debug(debug).jetstream(jetstream)); - } - - public NatsTestServer(String configFilePath, boolean debug) throws IOException { - this(builder().configFilePath(configFilePath).debug(debug)); - } - - public NatsTestServer(String configFilePath, boolean debug, boolean jetstream) throws IOException { - this(builder().configFilePath(configFilePath).debug(debug).jetstream(jetstream)); + public NatsTestServer(int port) throws IOException { + this(builder().port(port)); } - public NatsTestServer(String configFilePath, String[] configInserts, int port, boolean debug) throws IOException { - this(builder().configFilePath(configFilePath).configInserts(configInserts).debug(debug)); + public NatsTestServer(int port, boolean jetstream) throws IOException { + this(builder().port(port).jetstream(jetstream)); } - public NatsTestServer(String configFilePath, int port, boolean debug) throws IOException { - this(builder().configFilePath(configFilePath).port(port).debug(debug)); + public NatsTestServer(String configFilePath, String[] configInserts, int port) throws IOException { + this(builder().configFilePath(configResource(configFilePath)).configInserts(configInserts).port(port)); } - public NatsTestServer(String[] customArgs, boolean debug) throws IOException { - this(builder().customArgs(customArgs).debug(debug)); + public NatsTestServer(String[] customArgs) throws IOException { + this(builder().customArgs(customArgs)); } - public NatsTestServer(String[] customArgs, int port, boolean debug) throws IOException { - this(builder().customArgs(customArgs).port(port).debug(debug)); + public NatsTestServer(String[] customArgs, int port) throws IOException { + this(builder().customArgs(customArgs).port(port)); } - public NatsTestServer(int port, boolean debug, boolean jetstream, String configFilePath, String[] configInserts, String[] customArgs) throws IOException { - this(builder().port(port).debug(debug).jetstream(jetstream).configFilePath(configFilePath).configInserts(configInserts).customArgs(customArgs)); + public NatsTestServer(int port, boolean jetstream, String configFilePath, String[] configInserts, String[] customArgs) throws IOException { + this(builder().port(port).jetstream(jetstream).configFilePath(configResource(configFilePath)).configInserts(configInserts).customArgs(customArgs)); } public NatsTestServer(Builder b) throws IOException { diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index 36db53161..f7c5f8179 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -41,6 +41,7 @@ import static io.nats.client.support.NatsConstants.DEFAULT_PORT; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ResourceUtils.jwtResource; import static org.junit.jupiter.api.Assertions.*; public class OptionsTests { @@ -222,12 +223,8 @@ private static void _testChainedDurationOptions(Options o) { @Test public void testHttpRequestInterceptors() { - java.util.function.Consumer interceptor1 = req -> { - req.getHeaders().add("Test1", "Header"); - }; - java.util.function.Consumer interceptor2 = req -> { - req.getHeaders().add("Test2", "Header"); - }; + java.util.function.Consumer interceptor1 = req -> req.getHeaders().add("Test1", "Header"); + java.util.function.Consumer interceptor2 = req -> req.getHeaders().add("Test2", "Header"); Options o = optionsBuilder() .httpRequestInterceptor(interceptor1) .httpRequestInterceptor(interceptor2) @@ -398,7 +395,7 @@ public void testProperties() throws Exception { props.setProperty(Options.PROP_CONNECTION_NAME, "name"); // stringProperty builds an auth handler - props.setProperty(Options.PROP_CREDENTIAL_PATH, "src/test/resources/jwt_nkey/test.creds"); + props.setProperty(Options.PROP_CREDENTIAL_PATH, jwtResource("test.creds")); // charArrayProperty props.setProperty(Options.PROP_USERNAME, "user"); @@ -490,7 +487,7 @@ private static void _testProperties(Options o) { } @Test - public void testPropertiesCoverageOptions() throws Exception { + public void testPropertiesCoverageOptions() { Properties props = new Properties(); props.setProperty(Options.PROP_SECURE, "false"); props.setProperty(Options.PROP_OPENTLS, "false"); @@ -1036,9 +1033,8 @@ public void testCallbackExecutor() throws ExecutionException, InterruptedExcepti Options options = optionsBuilder() .callbackThreadFactory(threadFactory) .build(); - Future callbackFuture = options.getCallbackExecutor().submit(() -> { - assertEquals("test", Thread.currentThread().getName()); - }); + Future callbackFuture = options.getCallbackExecutor().submit( + () -> assertEquals("test", Thread.currentThread().getName())); callbackFuture.get(5, TimeUnit.SECONDS); } @@ -1048,9 +1044,8 @@ public void testConnectExecutor() throws ExecutionException, InterruptedExceptio Options options = optionsBuilder() .connectThreadFactory(threadFactory) .build(); - Future connectFuture = options.getConnectExecutor().submit(() -> { - assertEquals("test", Thread.currentThread().getName()); - }); + Future connectFuture = options.getConnectExecutor().submit( + () -> assertEquals("test", Thread.currentThread().getName())); connectFuture.get(5, TimeUnit.SECONDS); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index b7dd59981..53db71d05 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -13,6 +13,7 @@ package io.nats.client; +import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; import io.nats.client.impl.Headers; import io.nats.client.impl.NatsMessage; @@ -31,13 +32,12 @@ import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; -import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; -public class PublishTests { +public class PublishTests extends TestBase { @Test public void throwsIfClosed() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { nc.close(); // can't publish after close assertThrows(IllegalStateException.class, () -> nc.publish("subject", "replyto", null)); @@ -49,7 +49,7 @@ public void throwsIfClosed() throws Exception { @Test public void testThrowsWithoutSubject() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.publish(null, null)); }); @@ -227,14 +227,14 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header @Test public void testMaxPayload() throws Exception { - TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect(), nc -> { + runInSharedOwnNc(standardOptionsBuilder().noReconnect(), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); nc.publish("mptest", new byte[maxPayload-1]); nc.publish("mptest", new byte[maxPayload]); }); try { - TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { + runInSharedOwnNc(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); for (int x = 1; x < 1000; x++) { nc.publish("mptest", new byte[maxPayload + x]); @@ -245,7 +245,7 @@ public void testMaxPayload() throws Exception { catch (IllegalStateException ignore) {} try { - TestBase.runInLrServerOwnNc(standardOptionsBuilder().noReconnect(), nc -> { + runInSharedOwnNc(standardOptionsBuilder().noReconnect(), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); for (int x = 1; x < 1000; x++) { nc.publish("mptest", new byte[maxPayload + x]); @@ -271,12 +271,13 @@ public void testUtf8Subjects() throws Exception { CountDownLatch jsReceivedLatchWhenSupported = new CountDownLatch(1); Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); - TestBase.runInLrServerOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { + runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { Options ncSupportedOptions = optionsBuilder(ncNotSupported.getConnectedUrl()).supportUTF8Subjects().build(); try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { ncNotSupported.jetStreamManagement().addStream( StreamConfiguration.builder() - .name(TestBase.random()) + .name(random()) + .storageType(StorageType.Memory) .subjects(jsSubject) .build()); JetStream jsNotSupported = ncNotSupported.jetStream(); diff --git a/src/test/java/io/nats/client/SslTestingHelper.java b/src/test/java/io/nats/client/SslTestingHelper.java index f5884a8d8..c8ca62a5a 100644 --- a/src/test/java/io/nats/client/SslTestingHelper.java +++ b/src/test/java/io/nats/client/SslTestingHelper.java @@ -22,9 +22,11 @@ import java.security.SecureRandom; import java.util.Properties; +import static io.nats.client.utils.ResourceUtils.configResource; + public class SslTestingHelper { - public static String KEYSTORE_PATH = "src/test/resources/keystore.jks"; - public static String TRUSTSTORE_PATH = "src/test/resources/truststore.jks"; + public static String KEYSTORE_PATH = configResource("keystore.jks"); + public static String TRUSTSTORE_PATH = configResource("truststore.jks"); public static String PASSWORD = "password"; public static char[] PASSWORD_CHARS = PASSWORD.toCharArray(); diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index c4c0de7fd..805e82ae0 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -28,7 +28,7 @@ public class SubscriberTests { @Test public void testCreateInbox() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { HashSet check = new HashSet<>(); for (int i=0; i < 100; i++) { String inbox = nc.createInbox(); @@ -40,7 +40,7 @@ public void testCreateInbox() throws Exception { @Test public void testSingleMessage() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); nc.publish(subject, new byte[16]); @@ -57,7 +57,7 @@ public void testSingleMessage() throws Exception { @Test public void testMessageFromSubscriptionContainsConnection() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); nc.publish(subject, new byte[16]); @@ -131,7 +131,7 @@ public void testTabInProtocolLine() throws Exception { @Test public void testMultiMessage() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); nc.publish(subject, new byte[16]); @@ -155,7 +155,7 @@ public void testMultiMessage() throws Exception { @Test public void testQueueSubscribers() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { int msgs = 100; int received = 0; int sub1Count = 0; @@ -204,7 +204,7 @@ public void testQueueSubscribers() throws Exception { @Test public void testUnsubscribe() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); nc.publish(subject, new byte[16]); @@ -220,7 +220,7 @@ public void testUnsubscribe() throws Exception { @Test public void testAutoUnsubscribe() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject).unsubscribe(1); nc.publish(subject, new byte[16]); @@ -234,7 +234,7 @@ public void testAutoUnsubscribe() throws Exception { @Test public void testMultiAutoUnsubscribe() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); int msgCount = 10; Subscription sub = nc.subscribe(subject).unsubscribe(msgCount); @@ -255,18 +255,17 @@ public void testMultiAutoUnsubscribe() throws Exception { @Test public void testOnlyOneUnsubscribe() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); sub.unsubscribe(); - assertThrows(IllegalStateException.class, sub::unsubscribe); }); } @Test public void testOnlyOneAutoUnsubscribe() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject).unsubscribe(1); @@ -281,7 +280,7 @@ public void testOnlyOneAutoUnsubscribe() throws Exception { @Test public void testUnsubscribeInAnotherThread() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); new Thread(sub::unsubscribe).start(); @@ -291,7 +290,7 @@ public void testUnsubscribeInAnotherThread() throws Exception { @Test public void testAutoUnsubAfterMaxIsReached() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); @@ -313,50 +312,38 @@ public void testAutoUnsubAfterMaxIsReached() throws Exception { } @Test - public void testThrowOnNullSubject() throws Exception { - runInLrServer(nc -> { + public void testSubscribesThatException() throws Exception { + // own nc b/c we will close + runInShared(nc -> { + + // null subject //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.subscribe(null)); - }); - } - @Test - public void testThrowOnEmptySubject() throws Exception { - runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe(""))); - } + // empty subject + assertThrows(IllegalArgumentException.class, () -> nc.subscribe("")); - @Test - public void testThrowOnNullQueue() throws Exception { - runInLrServer(nc -> { + // null queue //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.subscribe(random(), null)); - }); - } - @Test - public void testThrowOnEmptyQueue() throws Exception { - runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe(random(), ""))); - } + // empty queue + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(random(), "")); - @Test - public void testThrowOnNullSubjectWithQueue() throws Exception { - runInLrServer(nc -> { + // null subject with queue //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> nc.subscribe(null, random())); - }); - } - @Test - public void testThrowOnEmptySubjectWithQueue() throws Exception { - runInLrServer(nc -> assertThrows(IllegalArgumentException.class, () -> nc.subscribe("", random()))); + // empty subject with queue + assertThrows(IllegalArgumentException.class, () -> nc.subscribe("", random())); + }); } @Test - public void throwsSubscriptionExceptions() throws Exception { - runInLrServerOwnNc(nc -> { - String subject = random(); - Subscription sub = nc.subscribe(subject); - + public void testSubscribesThatExceptionAfterClose() throws Exception { + // own nc b/c we will close + runInSharedOwnNc(nc -> { + Subscription sub = nc.subscribe(random()); nc.close(); /// can't subscribe when closed @@ -372,7 +359,7 @@ public void throwsSubscriptionExceptions() throws Exception { @Test public void testUnsubscribeWhileWaiting() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); nc.flush(Duration.ofMillis(1000)); diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java index 39aabe826..06659b4ba 100644 --- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java +++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java @@ -54,11 +54,10 @@ private StreamConfiguration getTestConfiguration() { @Test public void testRoundTrip() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { CompressionOption compressionOption = atLeast2_10() ? S2 : None; - String stream = random(); StreamConfiguration sc = StreamConfiguration.builder(getTestConfiguration()) - .name(stream) + .name(jstc.stream) .mirror(null) .sources() .replicas(1) @@ -71,7 +70,7 @@ public void testRoundTrip() throws Exception { .allowMessageCounter(false) .persistMode(null) .build(); - validateTestStreamConfiguration(jsm.addStream(sc).getConfiguration(), true, stream); + validateTestStreamConfiguration(jstc.jsm.addStream(sc).getConfiguration(), true, jstc.stream); }); } diff --git a/src/test/java/io/nats/client/impl/AuthHandlerTests.java b/src/test/java/io/nats/client/impl/AuthHandlerTests.java index 3762fbf3e..2d73d488a 100644 --- a/src/test/java/io/nats/client/impl/AuthHandlerTests.java +++ b/src/test/java/io/nats/client/impl/AuthHandlerTests.java @@ -20,9 +20,10 @@ import java.nio.charset.StandardCharsets; +import static io.nats.client.utils.ResourceUtils.jwtResource; import static io.nats.client.utils.ResourceUtils.resourceAsString; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; public class AuthHandlerTests { @@ -31,8 +32,8 @@ public class AuthHandlerTests { @Test public void testCredsFile() throws Exception { - AuthHandler auth = Nats.credentials("src/test/resources/jwt_nkey/test.creds"); - assertTrue(auth instanceof FileAuthHandler); + AuthHandler auth = Nats.credentials(jwtResource("test.creds")); + assertInstanceOf(FileAuthHandler.class, auth); NKey key = NKey.fromSeed(SEED.toCharArray()); byte[] test = "hello world".getBytes(StandardCharsets.UTF_8); @@ -47,7 +48,7 @@ public void testMemoryAuth() throws Exception { String creds = resourceAsString("jwt_nkey/test.creds"); AuthHandler auth = Nats.staticCredentials(creds.getBytes(StandardCharsets.UTF_8)); - assertTrue(auth instanceof MemoryAuthHandler); + assertInstanceOf(MemoryAuthHandler.class, auth); NKey key = NKey.fromSeed(SEED.toCharArray()); byte[] test = "hello world".getBytes(StandardCharsets.UTF_8); @@ -59,7 +60,7 @@ public void testMemoryAuth() throws Exception { @Test public void testSeparateWrappedFiles() throws Exception { - AuthHandler auth = Nats.credentials("src/test/resources/jwt_nkey/test_wrapped.jwt", "src/test/resources/jwt_nkey/test_wrapped.nk"); + AuthHandler auth = Nats.credentials(jwtResource("test_wrapped.jwt"), jwtResource("test_wrapped.nk")); NKey key = NKey.fromSeed(SEED.toCharArray()); byte[] test = "hello world again".getBytes(StandardCharsets.UTF_8); @@ -71,7 +72,7 @@ public void testSeparateWrappedFiles() throws Exception { @Test public void testSeparateNKeyWrappedFile() throws Exception { - AuthHandler auth = Nats.credentials(null, "src/test/resources/jwt_nkey/test_wrapped.nk"); + AuthHandler auth = Nats.credentials(null, jwtResource("test_wrapped.nk")); NKey key = NKey.fromSeed(SEED.toCharArray()); byte[] test = "hello world again".getBytes(StandardCharsets.UTF_8); @@ -83,7 +84,7 @@ public void testSeparateNKeyWrappedFile() throws Exception { @Test public void testSeparateBareFiles() throws Exception { - AuthHandler auth = Nats.credentials("src/test/resources/jwt_nkey/test.jwt", "src/test/resources/jwt_nkey/test.nk"); + AuthHandler auth = Nats.credentials(jwtResource("test.jwt"), jwtResource("test.nk")); NKey key = NKey.fromSeed(SEED.toCharArray()); byte[] test = "hello world and again".getBytes(StandardCharsets.UTF_8); diff --git a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java index 52ca34a0d..8a660e97f 100644 --- a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java +++ b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java @@ -19,7 +19,7 @@ public class AuthViolationDuringReconnectOnFlushTimeoutTest { private static final int NUMBER_OF_SUBS = 1_000_000; private static void startServer(Context ctx) throws IOException { - ctx.server.set(new NatsTestServer(new String[]{"--auth", "1234"}, ctx.port, false)); + ctx.server.set(new NatsTestServer(new String[]{"--auth", "1234"}, ctx.port)); } private static void restartServer(Context ctx) { diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index db51446a4..78f2bc62d 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -39,7 +39,7 @@ public void testToString() { @Test public void testCloseCount() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { + runInSharedOwnNc(listener, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); assertEquals(1, listener.getEventCount(Events.CLOSED)); @@ -89,7 +89,7 @@ public void testDisconnectReconnectCount() throws Exception { assertTrue(listener.getEventCount(Events.DISCONNECTED) >= 1); assertNull(nc.getConnectedUrl()); - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { standardConnectionWait(nc); assertEquals(1, listener.getEventCount(Events.RECONNECTED)); assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); @@ -100,7 +100,7 @@ public void testDisconnectReconnectCount() throws Exception { @Test public void testExceptionInConnectionListener() throws Exception { BadHandler listener = new BadHandler(); - runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { + runInSharedOwnNc(listener, nc -> { standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); }); @@ -108,10 +108,9 @@ public void testExceptionInConnectionListener() throws Exception { @Test public void testMultipleConnectionListeners() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); Set capturedEvents = ConcurrentHashMap.newKeySet(); - runInLrServerOwnNc(optionsBuilder().connectionListener(listener), nc -> { - + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull assertThrows(NullPointerException.class, () -> nc.addConnectionListener(null)); //noinspection DataFlowIssue // removeConnectionListener parameter is annotated as @NonNull diff --git a/src/test/java/io/nats/client/impl/DispatcherTests.java b/src/test/java/io/nats/client/impl/DispatcherTests.java index ddf670ea7..e5e482938 100644 --- a/src/test/java/io/nats/client/impl/DispatcherTests.java +++ b/src/test/java/io/nats/client/impl/DispatcherTests.java @@ -14,12 +14,9 @@ package io.nats.client.impl; import io.nats.client.*; -import io.nats.client.utils.LongRunningServer; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; -import java.io.IOException; import java.time.Duration; import java.util.ArrayList; import java.util.Collections; @@ -28,12 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.ConnectionUtils.longConnectionWait; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.TestBase.BAD_SUBJECTS_OR_QUEUES; -import static io.nats.client.utils.TestBase.random; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -42,102 +34,90 @@ // uses a single queue, so the subject messages go through before // the done message (or should) - wanted to note that somewhere -public class DispatcherTests { - static Connection nc; - - @BeforeAll - public static void beforeAll() { - try { - nc = longConnectionWait(options(LongRunningServer.server())); - } - catch (IOException e) { - throw new RuntimeException(e); - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException(e); - } - } - - @AfterAll - public static void afterAll() { - try { - nc.close(); - } - catch (Exception ignore) {} - } +public class DispatcherTests extends TestBase { @Test public void testDispatcherSubscribingExceptions() throws Exception { // InvalidSubjectsAndQueueNames - Dispatcher dx = nc.createDispatcher(m -> {}); - for (String bad : BAD_SUBJECTS_OR_QUEUES) { - assertThrows(IllegalArgumentException.class, () -> nc.subscribe(bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, m -> {})); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q")); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q", m -> {})); - assertThrows(IllegalArgumentException.class, () -> nc.subscribe("s", bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad)); - assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad, m -> {})); - } + runInShared(nc -> { - String subject = random(); - dx.subscribe(subject); + Dispatcher dx = nc.createDispatcher(m -> { + }); + for (String bad : BAD_SUBJECTS_OR_QUEUES) { + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, m -> { + })); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q")); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(bad, "q", m -> { + })); + assertThrows(IllegalArgumentException.class, () -> nc.subscribe("s", bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad)); + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("s", bad, m -> { + })); + } - // can't subscribe to empty subject -> subject, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", msg -> {})); + String subject = random(); + dx.subscribe(subject); - // can't subscribe to null handler -> subject, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), (MessageHandler) null)); + // can't subscribe to empty subject -> subject, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", msg -> { + })); - // can't subscribe null subject -> subject, queue, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(null, random(), msg -> {})); + // can't subscribe to null handler -> subject, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), (MessageHandler) null)); - // can't subscribe empty subject -> subject, queue, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", random(), msg -> {})); + // can't subscribe null subject -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(null, random(), msg -> { + })); - // can't subscribe with null queue -> subject, queue, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), null, msg -> {})); + // can't subscribe empty subject -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe("", random(), msg -> { + })); - // can't subscribe with empty queue -> subject, queue, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), "", msg -> {})); + // can't subscribe with null queue -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), null, msg -> { + })); - // can't subscribe with null handler -> subject, queue, handler - assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), random(), null)); + // can't subscribe with empty queue -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), "", msg -> { + })); - // can't unsubscribe with null subject - assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe((String) null)); + // can't subscribe with null handler -> subject, queue, handler + assertThrows(IllegalArgumentException.class, () -> dx.subscribe(random(), random(), null)); - // can't unsubscribe with empty subject - assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe("")); + // can't unsubscribe with null subject + assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe((String) null)); - nc.closeDispatcher(dx); + // can't unsubscribe with empty subject + assertThrows(IllegalArgumentException.class, () -> dx.unsubscribe("")); - // can't close if already closed - assertThrows(IllegalArgumentException.class, () -> nc.closeDispatcher(dx)); + nc.closeDispatcher(dx); - // can't unsubscribe if dispatcher is closed - assertThrows(IllegalStateException.class, () -> dx.unsubscribe(subject)); + // can't close if already closed + assertThrows(IllegalArgumentException.class, () -> nc.closeDispatcher(dx)); - // can't subscribe if dispatcher is closed - assertThrows(IllegalStateException.class, () -> dx.subscribe(random())); + // can't unsubscribe if dispatcher is closed + assertThrows(IllegalStateException.class, () -> dx.unsubscribe(subject)); - // If dispatcher was made without a default handler, - // you must subscribe with a specific handler - Dispatcher dNoHandler = nc.createDispatcher(); - dNoHandler.subscribe(random(), m -> {}); // This is fine - IllegalStateException ise = assertThrows(IllegalStateException.class, () -> dNoHandler.subscribe(random())); - assertTrue(ise.getMessage().contains("Dispatcher was made without a default handler.")); - nc.closeDispatcher(dNoHandler); + // can't subscribe if dispatcher is closed + assertThrows(IllegalStateException.class, () -> dx.subscribe(random())); + + // If dispatcher was made without a default handler, + // you must subscribe with a specific handler + Dispatcher dNoHandler = nc.createDispatcher(); + dNoHandler.subscribe(random(), m -> { + }); // This is fine + IllegalStateException ise = assertThrows(IllegalStateException.class, () -> dNoHandler.subscribe(random())); + assertTrue(ise.getMessage().contains("Dispatcher was made without a default handler.")); + + nc.closeDispatcher(dNoHandler); + }); } @Test public void throwsOnCreateIfConnectionClosed() throws Exception { - // custom connection since we must close it. - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = longConnectionWait(ts.getLocalhostUri())) - { + runInSharedOwnNc(nc -> { Dispatcher d = nc.createDispatcher(msg -> {}); // close connection nc.close(); @@ -153,46 +133,48 @@ public void throwsOnCreateIfConnectionClosed() throws Exception { // can't close dispatcher if connection is closed assertThrows(IllegalStateException.class, () -> nc.closeDispatcher(d)); - } + }); } @Test public void testProperlyUnsubscribeBySubject() throws Exception { - // MultipleSubscriptionsBySubject - String subject1 = random(); - String subject2 = random(); - - List dflt = Collections.synchronizedList(new ArrayList<>()); - List sub21 = Collections.synchronizedList(new ArrayList<>()); - List sub22 = Collections.synchronizedList(new ArrayList<>()); - List sub31 = Collections.synchronizedList(new ArrayList<>()); - List sub32 = Collections.synchronizedList(new ArrayList<>()); - Dispatcher d1 = nc.createDispatcher(m -> dflt.add(getDataId(m))); - d1.subscribe(subject1); - d1.subscribe(subject1, m -> sub21.add(getDataId(m))); - d1.subscribe(subject1, m -> sub22.add(getDataId(m))); - d1.subscribe(subject2, m -> sub31.add(getDataId(m))); - d1.subscribe(subject2, m -> sub32.add(getDataId(m))); - - nc.publish(subject1, "1".getBytes()); - nc.publish(subject2, "1".getBytes()); - Thread.sleep(1000); - d1.unsubscribe(subject1); - nc.publish(subject1, "2".getBytes()); - nc.publish(subject2, "2".getBytes()); - Thread.sleep(1000); - - assertTrue(dflt.contains(1)); - assertTrue(sub21.contains(1)); - assertTrue(sub22.contains(1)); - assertTrue(sub31.contains(1)); - assertTrue(sub32.contains(1)); - - assertFalse(dflt.contains(2)); - assertFalse(sub21.contains(2)); - assertFalse(sub22.contains(2)); - assertTrue(sub31.contains(2)); - assertTrue(sub32.contains(2)); + runInShared(nc -> { + // MultipleSubscriptionsBySubject + String subject1 = random(); + String subject2 = random(); + + List dflt = Collections.synchronizedList(new ArrayList<>()); + List sub21 = Collections.synchronizedList(new ArrayList<>()); + List sub22 = Collections.synchronizedList(new ArrayList<>()); + List sub31 = Collections.synchronizedList(new ArrayList<>()); + List sub32 = Collections.synchronizedList(new ArrayList<>()); + Dispatcher d1 = nc.createDispatcher(m -> dflt.add(getDataId(m))); + d1.subscribe(subject1); + d1.subscribe(subject1, m -> sub21.add(getDataId(m))); + d1.subscribe(subject1, m -> sub22.add(getDataId(m))); + d1.subscribe(subject2, m -> sub31.add(getDataId(m))); + d1.subscribe(subject2, m -> sub32.add(getDataId(m))); + + nc.publish(subject1, "1".getBytes()); + nc.publish(subject2, "1".getBytes()); + Thread.sleep(1000); + d1.unsubscribe(subject1); + nc.publish(subject1, "2".getBytes()); + nc.publish(subject2, "2".getBytes()); + Thread.sleep(1000); + + assertTrue(dflt.contains(1)); + assertTrue(sub21.contains(1)); + assertTrue(sub22.contains(1)); + assertTrue(sub31.contains(1)); + assertTrue(sub32.contains(1)); + + assertFalse(dflt.contains(2)); + assertFalse(sub21.contains(2)); + assertFalse(sub22.contains(2)); + assertTrue(sub31.contains(2)); + assertTrue(sub32.contains(2)); + }); } private static int getDataId(Message m) { @@ -201,465 +183,490 @@ private static int getDataId(Message m) { @Test public void testSingleMessage() throws Exception { - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msgFuture::complete); + runInShared(nc -> { + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - String subject = random(); - d.subscribe(subject); - nc.flush(Duration.ofMillis(500));// Get them all to the server + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - assertTrue(d.isActive()); - assertEquals(subject, msg.getSubject()); - assertNotNull(msg.getSubscription()); - assertNull(msg.getReplyTo()); - assertEquals(16, msg.getData().length); + assertTrue(d.isActive()); + assertEquals(subject, msg.getSubject()); + assertNotNull(msg.getSubscription()); + assertNull(msg.getReplyTo()); + assertEquals(16, msg.getData().length); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testDispatcherMessageContainsConnection() throws Exception { - final CompletableFuture msgFuture = new CompletableFuture<>(); - final CompletableFuture connFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msg -> { - msgFuture.complete(msg); - connFuture.complete(msg.getConnection()); - }); + runInShared(nc -> { + final CompletableFuture msgFuture = new CompletableFuture<>(); + final CompletableFuture connFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msg -> { + msgFuture.complete(msg); + connFuture.complete(msg.getConnection()); + }); - String subject = random(); - d.subscribe(subject); - nc.flush(Duration.ofMillis(5000));// Get them all to the server + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(5000));// Get them all to the server - nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); - Message msg = msgFuture.get(5000, TimeUnit.MILLISECONDS); - Connection conn = connFuture.get(5000, TimeUnit.MILLISECONDS); + Message msg = msgFuture.get(5000, TimeUnit.MILLISECONDS); + Connection conn = connFuture.get(5000, TimeUnit.MILLISECONDS); - assertTrue(d.isActive()); - assertEquals(subject, msg.getSubject()); - assertNotNull(msg.getSubscription()); - assertNull(msg.getReplyTo()); - assertEquals(16, msg.getData().length); - assertSame(conn, nc); + assertTrue(d.isActive()); + assertEquals(subject, msg.getSubject()); + assertNotNull(msg.getSubscription()); + assertNull(msg.getReplyTo()); + assertEquals(16, msg.getData().length); + assertSame(conn, nc); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testMultiSubject() throws Exception { - final CompletableFuture one = new CompletableFuture<>(); - final CompletableFuture two = new CompletableFuture<>(); - String subject1 = random(); - String subject2 = random(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(subject1)) { - one.complete(msg); - } - else if (msg.getSubject().equals(subject2)) { - two.complete(msg); - } - }); + runInShared(nc -> { + final CompletableFuture one = new CompletableFuture<>(); + final CompletableFuture two = new CompletableFuture<>(); + String subject1 = random(); + String subject2 = random(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(subject1)) { + one.complete(msg); + } + else if (msg.getSubject().equals(subject2)) { + two.complete(msg); + } + }); - d.subscribe(subject1); - d.subscribe(subject2); - nc.flush(Duration.ofMillis(500));// Get them all to the server + d.subscribe(subject1); + d.subscribe(subject2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject1, new byte[16]); - nc.publish(subject2, new byte[16]); + nc.publish(subject1, new byte[16]); + nc.publish(subject2, new byte[16]); - Message msg = one.get(500, TimeUnit.MILLISECONDS); - assertEquals(subject1, msg.getSubject()); - msg = two.get(500, TimeUnit.MILLISECONDS); - assertEquals(subject2, msg.getSubject()); + Message msg = one.get(500, TimeUnit.MILLISECONDS); + assertEquals(subject1, msg.getSubject()); + msg = two.get(500, TimeUnit.MILLISECONDS); + assertEquals(subject2, msg.getSubject()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testMultiMessage() throws Exception { - final CompletableFuture done = new CompletableFuture<>(); - int msgCount = 100; - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } - else { - q.add(msg); - } - }); + runInShared(nc -> { + final CompletableFuture done = new CompletableFuture<>(); + int msgCount = 100; + + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals("done")) { + done.complete(Boolean.TRUE); + } + else { + q.add(msg); + } + }); - String subject = random(); - d.subscribe(subject); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + String subject = random(); + d.subscribe(subject); + d.subscribe("done"); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish("done", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish("done", new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - done.get(500, TimeUnit.MILLISECONDS); + done.get(500, TimeUnit.MILLISECONDS); - assertEquals(msgCount, q.size()); + assertEquals(msgCount, q.size()); + }); } @Test public void testClosedDispatcherBehavior() throws Exception { - final CompletableFuture fPhase1 = new CompletableFuture<>(); - final CompletableFuture fPhase2 = new CompletableFuture<>(); - - final ConcurrentLinkedQueue received = new ConcurrentLinkedQueue<>(); - String subject = random(); - String phase1 = random(); - String phase2 = random(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(phase1)) { - fPhase1.complete(Boolean.TRUE); - } - else if (msg.getSubject().equals(phase2)) { - fPhase2.complete(Boolean.TRUE); - } - else { - received.add(msg); - } - }); + runInShared(nc -> { + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); - d.subscribe(subject); - d.subscribe(phase1); - d.subscribe(phase2); - nc.flush(Duration.ofMillis(500));// Get them all to the server + final ConcurrentLinkedQueue received = new ConcurrentLinkedQueue<>(); + String subject = random(); + String phase1 = random(); + String phase2 = random(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); + } + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); + } + else { + received.add(msg); + } + }); + + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); - nc.publish(phase1, null); + nc.publish(subject, new byte[16]); + nc.publish(phase1, null); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - fPhase1.get(200, TimeUnit.MILLISECONDS); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fPhase1.get(200, TimeUnit.MILLISECONDS); - assertEquals(1, received.size()); + assertEquals(1, received.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); - assertFalse(d.isActive()); + assertFalse(d.isActive()); - // This won't arrive - nc.publish(phase2, new byte[16]); + // This won't arrive + nc.publish(phase2, new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - assertThrows(TimeoutException.class, () -> fPhase2.get(200, TimeUnit.MILLISECONDS)); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + assertThrows(TimeoutException.class, () -> fPhase2.get(200, TimeUnit.MILLISECONDS)); + }); } @Test public void testQueueSubscribers() throws Exception { - int msgs = 100; - AtomicInteger received = new AtomicInteger(); - AtomicInteger sub1Count = new AtomicInteger(); - AtomicInteger sub2Count = new AtomicInteger(); + runInShared(nc -> { + int msgs = 100; + AtomicInteger received = new AtomicInteger(); + AtomicInteger sub1Count = new AtomicInteger(); + AtomicInteger sub2Count = new AtomicInteger(); - final CompletableFuture done1 = new CompletableFuture<>(); - final CompletableFuture done2 = new CompletableFuture<>(); + final CompletableFuture done1 = new CompletableFuture<>(); + final CompletableFuture done2 = new CompletableFuture<>(); - String subject = random(); - String done = random(); - String queue = random(); + String subject = random(); + String done = random(); + String queue = random(); - Dispatcher d1 = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - done1.complete(Boolean.TRUE); - } - else { - sub1Count.incrementAndGet(); - received.incrementAndGet(); - } - }); + Dispatcher d1 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + done1.complete(Boolean.TRUE); + } + else { + sub1Count.incrementAndGet(); + received.incrementAndGet(); + } + }); - Dispatcher d2 = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - done2.complete(Boolean.TRUE); - } - else { - sub2Count.incrementAndGet(); - received.incrementAndGet(); - } - }); + Dispatcher d2 = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + done2.complete(Boolean.TRUE); + } + else { + sub2Count.incrementAndGet(); + received.incrementAndGet(); + } + }); - d1.subscribe(subject, queue); - d2.subscribe(subject, queue); - d1.subscribe(done); - d2.subscribe(done); - nc.flush(Duration.ofMillis(500)); + d1.subscribe(subject, queue); + d2.subscribe(subject, queue); + d1.subscribe(done); + d2.subscribe(done); + nc.flush(Duration.ofMillis(500)); - for (int i = 0; i < msgs; i++) { - nc.publish(subject, new byte[16]); - } + for (int i = 0; i < msgs; i++) { + nc.publish(subject, new byte[16]); + } - nc.publish(done, null); + nc.publish(done, null); - nc.flush(Duration.ofMillis(500)); - done1.get(500, TimeUnit.MILLISECONDS); - done2.get(500, TimeUnit.MILLISECONDS); + nc.flush(Duration.ofMillis(500)); + done1.get(500, TimeUnit.MILLISECONDS); + done2.get(500, TimeUnit.MILLISECONDS); - assertEquals(msgs, received.get()); - assertEquals(msgs, sub1Count.get() + sub2Count.get()); + assertEquals(msgs, received.get()); + assertEquals(msgs, sub1Count.get() + sub2Count.get()); - nc.closeDispatcher(d1); - nc.closeDispatcher(d2); + nc.closeDispatcher(d1); + nc.closeDispatcher(d2); + }); } @Test public void testCantUnsubSubFromDispatcher() throws Exception { - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msgFuture::complete); + runInShared(nc -> { + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - String subject = random(); - d.subscribe(subject); - nc.flush(Duration.ofMillis(500));// Get them all to the server + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe()); + assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testCantAutoUnsubSubFromDispatcher() throws Exception { - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msgFuture::complete); + runInShared(nc -> { + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msgFuture::complete); - String subject = random(); - d.subscribe(subject); - nc.flush(Duration.ofMillis(500));// Get them all to the server + String subject = random(); + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe(1)); + assertThrows(IllegalStateException.class, () -> msg.getSubscription().unsubscribe(1)); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testPublishAndFlushFromCallback() throws Exception { - String subject = random(); + runInShared(nc -> { + String subject = random(); - long startCount = nc.getStatistics().getFlushCounter(); + long startCount = nc.getStatistics().getFlushCounter(); - final CompletableFuture msgFuture = new CompletableFuture<>(); - Dispatcher d = nc.createDispatcher(msg -> { - try { - nc.flush(Duration.ofMillis(1000)); - } catch (Exception ex) { - ex.printStackTrace(); - } - msgFuture.complete(msg); - }); + final CompletableFuture msgFuture = new CompletableFuture<>(); + Dispatcher d = nc.createDispatcher(msg -> { + try { + nc.flush(Duration.ofMillis(1000)); + } + catch (Exception ex) { + ex.printStackTrace(); + } + msgFuture.complete(msg); + }); - d.subscribe(subject); - nc.flush(Duration.ofMillis(500));// Get them all to the server + d.subscribe(subject); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); // publish one to kick it off + nc.publish(subject, new byte[16]); // publish one to kick it off - Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); + Message msg = msgFuture.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); - long diffCount = nc.getStatistics().getFlushCounter() - startCount; - assertEquals(2, diffCount); - nc.closeDispatcher(d); + long diffCount = nc.getStatistics().getFlushCounter() - startCount; + assertEquals(2, diffCount); + nc.closeDispatcher(d); + }); } @Test public void testUnsub() throws Exception { - final CompletableFuture fPhase1 = new CompletableFuture<>(); - final CompletableFuture fPhase2 = new CompletableFuture<>(); - int msgCount = 10; - - String subject = random(); - String phase1 = random(); - String phase2 = random(); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(phase1)) { - fPhase1.complete(Boolean.TRUE); - } - else if (msg.getSubject().equals(phase2)) { - fPhase2.complete(Boolean.TRUE); - } - else { - q.add(msg); - } - }); + runInShared(nc -> { + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); + int msgCount = 10; - d.subscribe(subject); - d.subscribe(phase1); - d.subscribe(phase2); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + String subject = random(); + String phase1 = random(); + String phase2 = random(); - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(phase1, new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); + } + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); + } + else { + q.add(msg); + } + }); + + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(1000));// Get them all to the server - fPhase1.get(5000, TimeUnit.MILLISECONDS); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase1, new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - d.unsubscribe(subject); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + fPhase1.get(5000, TimeUnit.MILLISECONDS); - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(phase2, new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through + d.unsubscribe(subject); + nc.flush(Duration.ofMillis(1000));// Get them all to the server + + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase2, new byte[16]); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through - fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them - assertEquals(msgCount, q.size()); + assertEquals(msgCount, q.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testAutoUnsub() throws Exception { - final CompletableFuture fPhase1 = new CompletableFuture<>(); - final CompletableFuture fPhase2 = new CompletableFuture<>(); - int msgCount = 100; - - String subject = random(); - String phase1 = random(); - String phase2 = random(); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - NatsDispatcher d = (NatsDispatcher) nc.createDispatcher(msg -> { - if (msg.getSubject().equals(phase1)) { - fPhase1.complete(Boolean.TRUE); - } - else if (msg.getSubject().equals(phase2)) { - fPhase2.complete(Boolean.TRUE); - } - else { - q.add(msg); - } - }); + runInShared(nc -> { + final CompletableFuture fPhase1 = new CompletableFuture<>(); + final CompletableFuture fPhase2 = new CompletableFuture<>(); + int msgCount = 100; - d.subscribe(subject); - d.subscribe(phase1); - d.subscribe(phase2); - nc.flush(Duration.ofMillis(500));// Get them all to the server + String subject = random(); + String phase1 = random(); + String phase2 = random(); - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(phase1, new byte[16]); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + NatsDispatcher d = (NatsDispatcher) nc.createDispatcher(msg -> { + if (msg.getSubject().equals(phase1)) { + fPhase1.complete(Boolean.TRUE); + } + else if (msg.getSubject().equals(phase2)) { + fPhase2.complete(Boolean.TRUE); + } + else { + q.add(msg); + } + }); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - fPhase1.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + d.subscribe(subject); + d.subscribe(phase1); + d.subscribe(phase2); + nc.flush(Duration.ofMillis(500));// Get them all to the server - assertEquals(msgCount, q.size()); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase1, new byte[16]); - d.unsubscribe(subject, msgCount + 1); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fPhase1.get(1000, TimeUnit.MILLISECONDS); // make sure we got them - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(phase2, new byte[16]); + assertEquals(msgCount, q.size()); + + d.unsubscribe(subject, msgCount + 1); + + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(phase2, new byte[16]); - nc.flush(Duration.ofMillis(1000)); // Wait for it all to get processed - fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them + nc.flush(Duration.ofMillis(1000)); // Wait for it all to get processed + fPhase2.get(1000, TimeUnit.MILLISECONDS); // make sure we got them - assertEquals(msgCount + 1, q.size()); + assertEquals(msgCount + 1, q.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testUnsubFromCallback() throws Exception { - final CompletableFuture fDone = new CompletableFuture<>(); - String subject = random(); - String done = random(); - - final AtomicReference dispatcher = new AtomicReference<>(); - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - final Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - fDone.complete(Boolean.TRUE); - } - else { - q.add(msg); - dispatcher.get().unsubscribe(subject); - } - }); + runInShared(nc -> { + final CompletableFuture fDone = new CompletableFuture<>(); + String subject = random(); + String done = random(); - dispatcher.set(d); + final AtomicReference dispatcher = new AtomicReference<>(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + final Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + dispatcher.get().unsubscribe(subject); + } + }); + + dispatcher.set(d); - d.subscribe(subject); - d.subscribe(done); - nc.flush(Duration.ofMillis(500));// Get them all to the server + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(500));// Get them all to the server - nc.publish(subject, new byte[16]); - nc.publish(subject, new byte[16]); - nc.publish(done, new byte[16]); // when we get this we know the others are dispatched - nc.flush(Duration.ofMillis(1000)); // Wait for the publish, or we will get multiples for sure - fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(done, new byte[16]); // when we get this we know the others are dispatched + nc.flush(Duration.ofMillis(1000)); // Wait for the publish, or we will get multiples for sure + fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them - assertEquals(1, q.size()); + assertEquals(1, q.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testAutoUnsubFromCallback() throws Exception { - final CompletableFuture fDone = new CompletableFuture<>(); - - String subject = random(); - String done = random(); - final AtomicReference dispatcher = new AtomicReference<>(); - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - final Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - fDone.complete(Boolean.TRUE); - } - else { - q.add(msg); - dispatcher.get().unsubscribe(subject, 2); // get 1 more, for a total of 2 - } - }); + runInShared(nc -> { + final CompletableFuture fDone = new CompletableFuture<>(); + + String subject = random(); + String done = random(); + final AtomicReference dispatcher = new AtomicReference<>(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + final Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + dispatcher.get().unsubscribe(subject, 2); // get 1 more, for a total of 2 + } + }); - dispatcher.set(d); + dispatcher.set(d); - d.subscribe(subject); - d.subscribe(done); - nc.flush(Duration.ofMillis(1000));// Get them all to the server + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(1000));// Get them all to the server - nc.publish(subject, new byte[16]); - nc.publish(subject, new byte[16]); - nc.publish(subject, new byte[16]); - nc.publish(done, new byte[16]); // when we get this we know the others are dispatched - nc.flush(Duration.ofMillis(1000)); // Wait for the publish + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(subject, new byte[16]); + nc.publish(done, new byte[16]); // when we get this we know the others are dispatched + nc.flush(Duration.ofMillis(1000)); // Wait for the publish - fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them + fDone.get(200, TimeUnit.MILLISECONDS); // make sure we got them - assertEquals(2, q.size()); + assertEquals(2, q.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testCloseFromCallback() throws Exception { // custom connection since we must close it. - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = standardConnectionWait(ts.getLocalhostUri())) - { + runInSharedOwnNc(nc -> { final CompletableFuture fDone = new CompletableFuture<>(); String subject = random(); @@ -681,174 +688,186 @@ public void testCloseFromCallback() throws Exception { nc.publish(subject, new byte[16]); fDone.get(5000, TimeUnit.MILLISECONDS); - } + }); } @Test public void testDispatchHandlesExceptionInHandler() throws Exception { - final CompletableFuture fDone = new CompletableFuture<>(); - int msgCount = 100; - - String subject = random(); - String done = random(); - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - fDone.complete(Boolean.TRUE); - } else { - q.add(msg); - throw new NumberFormatException(); - } - }); + runInShared(nc -> { + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; + + String subject = random(); + String done = random(); + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + throw new NumberFormatException(); + } + }); - d.subscribe(subject); - d.subscribe(done); - nc.flush(Duration.ofMillis(500));// Get them all to the server + d.subscribe(subject); + d.subscribe(done); + nc.flush(Duration.ofMillis(500));// Get them all to the server - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(done, new byte[16]); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - fDone.get(200, TimeUnit.MILLISECONDS); + nc.flush(Duration.ofMillis(1000)); // wait for them to go through + fDone.get(200, TimeUnit.MILLISECONDS); - assertEquals(msgCount, q.size()); + assertEquals(msgCount, q.size()); - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test - public void testThrowOnBadInput() { - Dispatcher d = nc.createDispatcher(msg -> {}); - // Null Subject - assertThrows(IllegalArgumentException.class, () -> d.subscribe(null)); - // Empty Subject - assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); - // Empty Subject - assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); - // Null Subject With Queue - assertThrows(IllegalArgumentException.class, () -> d.subscribe(null, random())); - // Empty Subject With Queue - assertThrows(IllegalArgumentException.class, () -> d.subscribe("", random())); - nc.closeDispatcher(d); + public void testThrowOnBadInput() throws Exception { + runInShared(nc -> { + Dispatcher d = nc.createDispatcher(msg -> { + }); + // Null Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe(null)); + // Empty Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); + // Empty Subject + assertThrows(IllegalArgumentException.class, () -> d.subscribe("")); + // Null Subject With Queue + assertThrows(IllegalArgumentException.class, () -> d.subscribe(null, random())); + // Empty Subject With Queue + assertThrows(IllegalArgumentException.class, () -> d.subscribe("", random())); + nc.closeDispatcher(d); + }); } @Test public void testDoubleSubscribe() throws Exception { - final CompletableFuture fDone = new CompletableFuture<>(); - int msgCount = 100; - - String subject = random(); - String done = random(); - - final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals(done)) { - fDone.complete(Boolean.TRUE); - } else { - q.add(msg); - } - }); + runInShared(nc -> { + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; - d.subscribe(subject).subscribe(subject).subscribe(subject).subscribe(done); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + String subject = random(); + String done = random(); - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(done, new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue<>(); + Dispatcher d = nc.createDispatcher(msg -> { + if (msg.getSubject().equals(done)) { + fDone.complete(Boolean.TRUE); + } + else { + q.add(msg); + } + }); + + d.subscribe(subject).subscribe(subject).subscribe(subject).subscribe(done); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - fDone.get(5, TimeUnit.SECONDS); + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through + + fDone.get(5, TimeUnit.SECONDS); - assertEquals(msgCount, q.size()); // Should only get one since all the extra subs do nothing?? + assertEquals(msgCount, q.size()); // Should only get one since all the extra subs do nothing?? - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testDoubleSubscribeWithCustomHandler() throws Exception { - final CompletableFuture fDone = new CompletableFuture<>(); - int msgCount = 100; + runInShared(nc -> { + final CompletableFuture fDone = new CompletableFuture<>(); + int msgCount = 100; - final AtomicInteger count = new AtomicInteger(0); - Dispatcher d = nc.createDispatcher(msg -> { - }); + final AtomicInteger count = new AtomicInteger(0); + Dispatcher d = nc.createDispatcher(msg -> { + }); - String subject = random(); - String done = random(); - String queue = random(); - d.subscribe(subject, msg -> count.incrementAndGet()); - d.subscribe(subject, queue, msg -> count.incrementAndGet()); - d.subscribe(done, msg -> fDone.complete(Boolean.TRUE)); + String subject = random(); + String done = random(); + String queue = random(); + d.subscribe(subject, msg -> count.incrementAndGet()); + d.subscribe(subject, queue, msg -> count.incrementAndGet()); + d.subscribe(done, msg -> fDone.complete(Boolean.TRUE)); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(done, new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for them to go through + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for them to go through - fDone.get(5, TimeUnit.SECONDS); + fDone.get(5, TimeUnit.SECONDS); - assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. + assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Exception { - final CompletableFuture fDone1 = new CompletableFuture<>(); - final CompletableFuture fDone2 = new CompletableFuture<>(); - int msgCount = 100; + runInShared(nc -> { + final CompletableFuture fDone1 = new CompletableFuture<>(); + final CompletableFuture fDone2 = new CompletableFuture<>(); + int msgCount = 100; - String subject = random(); - String done = random(); - final AtomicInteger count = new AtomicInteger(0); - Dispatcher d = nc.createDispatcher(msg -> {}); - Subscription s1 = d.subscribe(subject, msg -> count.incrementAndGet()); - Subscription doneSub = d.subscribe(done, msg -> fDone1.complete(Boolean.TRUE)); - d.subscribe(subject, msg -> count.incrementAndGet()); + String subject = random(); + String done = random(); + final AtomicInteger count = new AtomicInteger(0); + Dispatcher d = nc.createDispatcher(msg -> { + }); + Subscription s1 = d.subscribe(subject, msg -> count.incrementAndGet()); + Subscription doneSub = d.subscribe(done, msg -> fDone1.complete(Boolean.TRUE)); + d.subscribe(subject, msg -> count.incrementAndGet()); - nc.flush(Duration.ofSeconds(5)); // wait for the subs to go through + nc.flush(Duration.ofSeconds(5)); // wait for the subs to go through - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(done, new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - fDone1.get(5, TimeUnit.SECONDS); + fDone1.get(5, TimeUnit.SECONDS); - assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. + assertEquals(msgCount * 2, count.get()); // We should get 2x the messages because we subscribed 2 times. - count.set(0); - d.unsubscribe(s1); - d.unsubscribe(doneSub); - d.subscribe(done, msg -> fDone2.complete(Boolean.TRUE)); - nc.flush(Duration.ofSeconds(5)); // wait for the unsub to go through + count.set(0); + d.unsubscribe(s1); + d.unsubscribe(doneSub); + d.subscribe(done, msg -> fDone2.complete(Boolean.TRUE)); + nc.flush(Duration.ofSeconds(5)); // wait for the unsub to go through - for (int i = 0; i < msgCount; i++) { - nc.publish(subject, new byte[16]); - } - nc.publish(done, new byte[16]); - nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through + for (int i = 0; i < msgCount; i++) { + nc.publish(subject, new byte[16]); + } + nc.publish(done, new byte[16]); + nc.flush(Duration.ofSeconds(5)); // wait for the messages to go through - fDone2.get(5, TimeUnit.SECONDS); + fDone2.get(5, TimeUnit.SECONDS); - assertEquals(msgCount, count.get()); // We only have 1 active subscription, so we should only get msgCount. + assertEquals(msgCount, count.get()); // We only have 1 active subscription, so we should only get msgCount. - nc.closeDispatcher(d); + nc.closeDispatcher(d); + }); } @Test public void testDispatcherFactoryCoverage() throws Exception { // custom connection since useDispatcherWithExecutor - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = longConnectionWait(optionsBuilder(ts).useDispatcherWithExecutor().build())) - { + runInSharedOwnNc(optionsBuilder().useDispatcherWithExecutor(), nc -> { CountDownLatch latch = new CountDownLatch(1); Dispatcher d = nc.createDispatcher(msg -> latch.countDown()); assertInstanceOf(NatsDispatcherWithExecutor.class, d); @@ -856,6 +875,6 @@ public void testDispatcherFactoryCoverage() throws Exception { d.subscribe(subject); nc.publish(subject, null); assertTrue(latch.await(1, TimeUnit.SECONDS)); - } + }); } } diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index d97c1c909..9989ccb4e 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -43,7 +43,7 @@ public void testLastError() throws Exception { String[] customArgs = {"--user", "stephen", "--pass", "password"}; try (NatsTestServer ts = new NatsTestServer(); - NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth + NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { Options options = optionsBuilder() .server(ts.getLocalhostUri()) @@ -73,7 +73,7 @@ public void testLastError() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); listener.waitForStatusChange(5, TimeUnit.SECONDS); - assertTrue(listener.errorsEventually("Authorization Violation", 2000)); + assertTrue(listener.errorsEventually("Authorization Violation", 3000)); assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); @@ -89,7 +89,7 @@ public void testClearLastError() throws Exception { String[] customArgs = {"--user", "stephen", "--pass", "password"}; try (NatsTestServer ts = new NatsTestServer(); - NatsTestServer ts2 = new NatsTestServer(customArgs, false); //ts2 requires auth + NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { Options options = optionsBuilder() .server(ts.getLocalhostUri()) @@ -136,7 +136,7 @@ public void testClearLastError() throws Exception { public void testErrorOnNoAuth() throws Exception { String[] customArgs = {"--user", "stephen", "--pass", "password"}; ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + try (NatsTestServer ts = new NatsTestServer(customArgs)) { sleep(1000); // give the server time to get ready, otherwise sometimes this test flaps // See config file for user/pass // no or wrong u/p in the options is an error @@ -194,7 +194,7 @@ public void testExceptionOnBadDispatcher() throws Exception { public void testExceptionInErrorHandler() throws Exception { String[] customArgs = {"--user", "stephen", "--pass", "password"}; BadHandler listener = new BadHandler(); - try (NatsTestServer ts = new NatsTestServer(customArgs, false)) { + try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass // don't put u/p in options Options options = optionsBuilder(ts) diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index 4de9956c3..a40cc4f08 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -22,7 +22,6 @@ import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -60,8 +59,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedConsumerSync() throws Exception { - runInJsServer(nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared((nc, jstc) -> { // Get this in place before any subscriptions are made jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; @@ -77,7 +75,7 @@ public void testOrderedConsumerSync() throws Exception { }); } - private static void _testOrderedConsumerSync(JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, TimeoutException, InterruptedException { + private static void _testOrderedConsumerSync(JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, InterruptedException { JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); String firstConsumerName = validateOrderedConsumerNamePrefix(sub, consumerNamePrefix); @@ -117,21 +115,24 @@ private static void reValidateOrderedConsumerNamePrefix(JetStreamSubscription su } @Test - public void testOrderedConsumerAsync() throws Exception { - runInJsServer(nc -> { + public void testOrderedConsumerAsyncNoName() throws Exception { + runInShared((nc, jstc) -> { // without name (prefix) - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); _testOrderedConsumerAsync(nc, jstc, null, PushSubscribeOptions.builder().ordered(true).build()); + }); + } + @Test + public void testOrderedConsumerAsyncWithName() throws Exception { + runInShared((nc, jstc) -> { // with name (prefix) - jstc = new JetStreamTestingContext(nc); _testOrderedConsumerAsync(nc, jstc, jstc.consumerName(), PushSubscribeOptions.builder().name(jstc.consumerName()).ordered(true).build()); }); } - private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, TimeoutException, InterruptedException { + private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, InterruptedException { // Get this in place before any subscriptions are made jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; @@ -254,9 +255,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testHeartbeatError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); - + runInSharedOwnNc(listener, (nc, jstc) -> { Dispatcher d = nc.createDispatcher(); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); JetStream js = jstc.js; @@ -326,8 +325,6 @@ private static SimulatorState setupOrderedFactory(JetStream js) { private static SimulatorState setupPullFactory(JetStream js) { SimulatorState state = new SimulatorState(); - // the expected latch count is 1 b/c pull is dead once there is a hb error - CountDownLatch latch = new CountDownLatch(1); ((NatsJetStream)js)._pullMessageManagerFactory = (conn, lJs, stream, so, serverCC, qmode, dispatcher) -> new PullHeartbeatErrorSimulator(conn, false, state); @@ -336,8 +333,8 @@ private static SimulatorState setupPullFactory(JetStream js) { @Test public void testMultipleSubjectFilters() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { + jstc.createStream(2); jsPublish(jstc.js, jstc.subject(0), 10); jsPublish(jstc.js, jstc.subject(1), 5); @@ -402,7 +399,7 @@ private static void validateMultipleSubjectFilterSub(JetStreamSubscription sub, @Test public void testRaiseStatusWarnings1194() throws Exception { ListenerForTesting listener = new ListenerForTesting(false, false); - runInLrServerOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, jstc) -> { // Setup StreamContext streamContext = nc.getStreamContext(jstc.stream); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index ae6e50631..042b85233 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsJetStreamUtil; -import io.nats.client.utils.LongRunningServer; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -29,6 +28,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; +import static io.nats.client.NatsTestServer.configuredJsServer; import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.*; @@ -42,7 +42,7 @@ public class JetStreamGeneralTests extends JetStreamTestBase { @Test public void testJetStreamContextCreate() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { jstc.jsm.getAccountStatistics(); // another management jstc.js.publish(jstc.subject(), dataBytes(1)); }); @@ -50,7 +50,7 @@ public void testJetStreamContextCreate() throws Exception { @Test public void testJetNotEnabled() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { // get normal context, try to do an operation JetStream js = nc.jetStream(); assertThrows(IOException.class, () -> js.subscribe(random())); @@ -63,7 +63,7 @@ public void testJetNotEnabled() throws Exception { @Test public void testJetEnabledGoodAccount() throws Exception { - try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_authorization.conf")) { + try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { Options options = optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = longConnectionWait(options)) { @@ -75,27 +75,22 @@ public void testJetEnabledGoodAccount() throws Exception { @Test public void testJetStreamPublishDefaultOptions() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { PublishAck ack = jsPublish(jstc.js, jstc.subject()); assertEquals(1, ack.getSeqno()); }); } @Test - public void testConnectionClosing() throws Exception { - runInJsServer(null, null, nc -> { - nc.close(); - assertThrows(IOException.class, nc::jetStream); - assertThrows(IOException.class, nc::jetStreamManagement); - }); - } - - @Test - public void testCreateWithOptionsForCoverage() throws Exception { - runInLrServer((nc, jsm, js) -> { + public void testExceptionsAndCoverage() throws Exception { + runInSharedOwnNc(nc -> { JetStreamOptions jso = JetStreamOptions.builder().build(); nc.jetStream(jso); nc.jetStreamManagement(jso); + + nc.close(); + assertThrows(IOException.class, nc::jetStream); + assertThrows(IOException.class, nc::jetStreamManagement); }); } @@ -111,7 +106,7 @@ public void testMiscMetaDataCoverage() { @Test public void testJetStreamSubscribe() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { jsPublish(jstc.js, jstc.subject()); // default ephemeral subscription. @@ -231,7 +226,7 @@ public void testJetStreamSubscribe() throws Exception { @Test public void testJetStreamSubscribeLenientSubject() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { Dispatcher d = nc.createDispatcher(); jstc.js.subscribe(jstc.subject(), (PushSubscribeOptions)null); @@ -278,7 +273,7 @@ public void testJetStreamSubscribeLenientSubject() throws Exception { @Test public void testJetStreamSubscribeErrors() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { String stream = random(); // stream not found PushSubscribeOptions psoInvalidStream = PushSubscribeOptions.builder().stream(stream).build(); @@ -329,23 +324,22 @@ public void testJetStreamSubscribeErrors() throws Exception { @Test public void testFilterSubjectEphemeral() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); + runInSharedCustomStream((nc, jstc) -> { String subject = random(); String subjectWild = subject + ".*"; String subjectA = subject + ".A"; String subjectB = subject + ".B"; - createMemoryStream(jsm, stream, subjectWild); + jstc.createStream(subjectWild); - jsPublish(js, subjectA, 1); - jsPublish(js, subjectB, 1); - jsPublish(js, subjectA, 1); - jsPublish(js, subjectB, 1); + jsPublish(jstc.js, subjectA, 1); + jsPublish(jstc.js, subjectB, 1); + jsPublish(jstc.js, subjectA, 1); + jsPublish(jstc.js, subjectB, 1); // subscribe to the wildcard ConsumerConfiguration cc = builder().ackPolicy(AckPolicy.None).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = js.subscribe(subjectWild, pso); + JetStreamSubscription sub = jstc.js.subscribe(subjectWild, pso); nc.flush(Duration.ofSeconds(1)); Message m = sub.nextMessage(Duration.ofSeconds(1)); @@ -364,7 +358,7 @@ public void testFilterSubjectEphemeral() throws Exception { // subscribe to A cc = builder().filterSubject(subjectA).ackPolicy(AckPolicy.None).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); nc.flush(Duration.ofSeconds(1)); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -379,7 +373,7 @@ public void testFilterSubjectEphemeral() throws Exception { // subscribe to B cc = builder().filterSubject(subjectB).ackPolicy(AckPolicy.None).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = js.subscribe(subjectB, pso); + sub = jstc.js.subscribe(subjectB, pso); nc.flush(Duration.ofSeconds(1)); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -401,7 +395,7 @@ public void testPrefix() throws Exception { String subjectMadeBySrc = "sub-made-by.src"; String subjectMadeByTar = "sub-made-by.tar"; - try (NatsTestServer ts = NatsTestServer.configuredJsServer("js_prefix.conf")) { + try (NatsTestServer ts = configuredJsServer("js_prefix.conf")) { Options optionsSrc = optionsBuilder(ts) .userInfo("src".toCharArray(), "spass".toCharArray()).build(); @@ -465,7 +459,7 @@ private void readPrefixMessages(Connection nc, JetStream js, String subject, Str @Test public void testBindPush() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 1, 1); PushSubscribeOptions pso = PushSubscribeOptions.builder() .durable(jstc.consumerName()) @@ -513,7 +507,7 @@ public void testBindPush() throws Exception { @Test public void testBindPull() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 1, 1); PullSubscribeOptions pso = PullSubscribeOptions.builder() @@ -553,7 +547,7 @@ public void testBindPull() throws Exception { @Test public void testBindErrors() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // bind errors PushSubscribeOptions pushbinderr = PushSubscribeOptions.bind(jstc.stream, "binddur"); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushbinderr)); @@ -567,87 +561,92 @@ public void testBindErrors() throws Exception { @Test public void testFilterMismatchErrors() throws Exception { - runInLrServer((nc, jstc) -> { + runInOwnJsServer((nc, jsm, js) -> { + String stream = random(); + String subject = random(); + + createMemoryStream(nc, stream, subject); + // will work as SubscribeSubject equals Filter Subject - filterMatchSubscribeOk(jstc, jstc.stream, jstc.subject(), jstc.subject()); - filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); - filterMatchSubscribeOk(jstc, jstc.stream, "*", "*"); + filterMatchSubscribeOk(js, jsm, stream, subject, subject); + filterMatchSubscribeOk(js, jsm, stream, ">", ">"); + filterMatchSubscribeOk(js, jsm, stream, "*", "*"); // will not work - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ""); - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ">"); - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), "*"); + filterMatchSubscribeEx(js, jsm, stream, subject, ""); + filterMatchSubscribeEx(js, jsm, stream, subject, ">"); + filterMatchSubscribeEx(js, jsm, stream, subject, "*"); // multiple subjects no wildcards - jstc.jsm.deleteStream(jstc.stream); - createMemoryStream(jstc.jsm, jstc.stream, jstc.subject(), random()); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subject, subject(2)); // will work as SubscribeSubject equals Filter Subject - filterMatchSubscribeOk(jstc, jstc.stream, jstc.subject(), jstc.subject()); - filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); - filterMatchSubscribeOk(jstc, jstc.stream, "*", "*"); + filterMatchSubscribeOk(js, jsm, stream, subject, subject); + filterMatchSubscribeOk(js, jsm, stream, ">", ">"); + filterMatchSubscribeOk(js, jsm, stream, "*", "*"); // will not work because stream has more than 1 subject - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ""); - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), ">"); - filterMatchSubscribeEx(jstc, jstc.stream, jstc.subject(), "*"); + filterMatchSubscribeEx(js, jsm, stream, subject, ""); + filterMatchSubscribeEx(js, jsm, stream, subject, ">"); + filterMatchSubscribeEx(js, jsm, stream, subject, "*"); - String subjectGt = jstc.subject() + ".>"; - String subjectStar = jstc.subject() + ".*"; - String subjectDot = jstc.subject() + "." + random(); + String subjectGt = subject + ".>"; + String subjectStar = subject + ".*"; + String subjectDot = subject + "." + random(); // multiple subjects via '>' - jstc.jsm.deleteStream(jstc.stream); - createMemoryStream(jstc.jsm, jstc.stream, subjectGt); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subjectGt); // will work, exact matches - filterMatchSubscribeOk(jstc, jstc.stream, subjectDot, subjectDot); - filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); + filterMatchSubscribeOk(js, jsm, stream, subjectDot, subjectDot); + filterMatchSubscribeOk(js, jsm, stream, ">", ">"); // will not work because mismatch / stream has more than 1 subject - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ""); - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ">"); - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, subjectGt); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, ""); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, ">"); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, subjectGt); // multiple subjects via '*' - jstc.jsm.deleteStream(jstc.stream); - createMemoryStream(jstc.jsm, jstc.stream, subjectStar); + jsm.deleteStream(stream); + createMemoryStream(jsm, stream, subjectStar); // will work, exact matches - filterMatchSubscribeOk(jstc, jstc.stream, subjectDot, subjectDot); - filterMatchSubscribeOk(jstc, jstc.stream, ">", ">"); + filterMatchSubscribeOk(js, jsm, stream, subjectDot, subjectDot); + filterMatchSubscribeOk(js, jsm, stream, ">", ">"); // will not work because mismatch / stream has more than 1 subject - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ""); - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, ">"); - filterMatchSubscribeEx(jstc, jstc.stream, subjectDot, subjectStar); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, ""); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, ">"); + filterMatchSubscribeEx(js, jsm, stream, subjectDot, subjectStar); }); } - private void filterMatchSubscribeOk(JetStreamTestingContext jstc, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { + private void filterMatchSubscribeOk(JetStream js, JetStreamManagement jsm, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { String deliver = random(); String dur = random(); - filterMatchSetupConsumer(jstc, deliver, dur, stream, filterSubjects); - unsubscribeEnsureNotBound(jstc.js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); + filterMatchSetupConsumer(jsm, deliver, dur, stream, filterSubjects); + unsubscribeEnsureNotBound(js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); } - private void filterMatchSubscribeEx(JetStreamTestingContext jstc, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { + private void filterMatchSubscribeEx(JetStream js, JetStreamManagement jsm, String stream, String subscribeSubject, String... filterSubjects) throws IOException, JetStreamApiException { String deliver = random(); String dur = random(); - filterMatchSetupConsumer(jstc, deliver, dur, stream, filterSubjects); + filterMatchSetupConsumer(jsm, deliver, dur, stream, filterSubjects); IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); + () -> js.subscribe(subscribeSubject, builder().durable(dur).buildPushSubscribeOptions())); assertTrue(iae.getMessage().contains(JsSubSubjectDoesNotMatchFilter.id())); } - private void filterMatchSetupConsumer(JetStreamTestingContext jstc, String deliver, String dur, String stream, String... fs) throws IOException, JetStreamApiException { - jstc.jsm.addOrUpdateConsumer(stream, + private void filterMatchSetupConsumer(JetStreamManagement jsm, String deliver, String dur, String stream, String... fs) throws IOException, JetStreamApiException { + jsm.addOrUpdateConsumer(stream, builder().deliverSubject(deliver).durable(dur).filterSubjects(fs).build()); } @Test public void testBindDurableDeliverSubject() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // create a durable push subscriber - has a deliver subject String dur1 = random(); String dur2 = random(); @@ -697,7 +696,7 @@ public void testBindDurableDeliverSubject() throws Exception { @Test public void testConsumerIsNotModified() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // test with config in issue 105 String dur = random(); String q = random(); @@ -799,7 +798,7 @@ public void testConsumerIsNotModified() throws Exception { @Test public void testSubscribeDurableConsumerMustMatch() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { String stream = jstc.stream; String subject = jstc.subject(); @@ -926,7 +925,7 @@ private Builder pullDurableBuilder(String subject, String durable) { @Test public void testGetConsumerInfoFromSubscription() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -937,7 +936,7 @@ public void testGetConsumerInfoFromSubscription() throws Exception { @Test public void testInternalLookupConsumerInfoCoverage() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // - consumer not found // - stream does not exist jstc.js.subscribe(jstc.subject()); @@ -1006,7 +1005,7 @@ public void testNatsConnectionTimeCheckLogic() { @Test public void testMoreCreateSubscriptionErrors() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { IllegalStateException ise = assertThrows(IllegalStateException.class, () -> jstc.js.subscribe(random())); assertTrue(ise.getMessage().contains(JsSubNoMatchingStreamForSubject.id())); @@ -1107,19 +1106,18 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { - runInLrServer((ncCancel, jsm, js) -> { - Options optReport = optionsBuilder(LongRunningServer.server()).reportNoResponders().build(); + runInSharedCustomStream((ncCancel, jstc) -> { + Options optReport = optionsBuilder(ncCancel.getConnectedUrl()).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); assertInstanceOf(JetStreamStatusException.class, ee.getCause()); assertTrue(ee.getMessage().contains("503 No Responders Available For Request")); - String stream = random(); String subject = random(); - ncCancel.jetStreamManagement().addStream( + jstc.jsm.addStream( StreamConfiguration.builder() - .name(stream).subjects(subject).storageType(StorageType.Memory) + .name(jstc.stream).subjects(subject).storageType(StorageType.Memory) .build()); JetStream jsCancel = ncCancel.jetStream(); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index a5f6cb14d..696e77c07 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -41,26 +41,20 @@ public class JetStreamManagementTests extends JetStreamTestBase { @Test public void testStreamCreate() throws Exception { - runInLrServer((nc, jsm, js) -> { - long now = ZonedDateTime.now().toEpochSecond(); + long now = ZonedDateTime.now().toEpochSecond(); - String stream = random(); - String subject0 = random(); - String subject1 = random(); + runInSharedCustomStream((nc, jstc) -> { + StreamConfiguration sc = jstc.scBuilder(2).build(); + String subject0 = jstc.subject(0); + String subject1 = jstc.subject(1); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .subjects(subject0, subject1) - .build(); - - StreamInfo si = jsm.addStream(sc); + StreamInfo si = jstc.addStream(sc); assertNotNull(si.getStreamState().toString()); // coverage assertTrue(now <= si.getCreateTime().toEpochSecond()); assertNotNull(si.getConfiguration()); sc = si.getConfiguration(); - assertEquals(stream, sc.getName()); + assertEquals(jstc.stream, sc.getName()); assertEquals(2, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -91,35 +85,28 @@ public void testStreamCreate() throws Exception { assertEquals(0, ss.getFirstSequence()); assertEquals(0, ss.getLastSequence()); assertEquals(0, ss.getConsumerCount()); + }); + } - if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { - stream = random(); - sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .firstSequence(42) - .subjects("test-first-seq").build(); - si = jsm.addStream(sc); - assertNotNull(si.getTimestamp()); - assertEquals(42, si.getConfiguration().getFirstSequence()); - PublishAck pa = js.publish("test-first-seq", null); - assertEquals(42, pa.getSeqno()); - } + @Test + public void testStreamCreate210() throws Exception { + runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { + StreamConfiguration sc = jstc.scBuilder(1) + .firstSequence(42).build(); + StreamInfo si = jstc.addStream(sc); + assertNotNull(si.getTimestamp()); + assertEquals(42, si.getConfiguration().getFirstSequence()); + PublishAck pa = jstc.js.publish(jstc.subject(), null); + assertEquals(42, pa.getSeqno()); }); } @Test public void testStreamMetadata() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { + runInSharedCustomStream(VersionUtils::atLeast2_9_0, (nc, jstc) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); - StreamConfiguration sc = StreamConfiguration.builder() - .name(random()) - .storageType(StorageType.Memory) - .subjects(random()) - .metadata(metaData) - .build(); - - StreamInfo si = jsm.addStream(sc); + StreamConfiguration sc = jstc.scBuilder(1).metadata(metaData).build(); + StreamInfo si = jstc.addStream(sc); assertNotNull(si.getConfiguration()); assertMetaData(si.getConfiguration().getMetadata()); }); @@ -127,23 +114,17 @@ public void testStreamMetadata() throws Exception { @Test public void testStreamCreateWithNoSubject() throws Exception { - runInLrServer((nc, jsm, js) -> { - long now = ZonedDateTime.now().toEpochSecond(); - - String stream = random(); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .build(); - - StreamInfo si = jsm.addStream(sc); + long now = ZonedDateTime.now().toEpochSecond(); + runInSharedCustomStream((nc, jstc) -> { + StreamConfiguration sc = jstc.scBuilder(0).build(); + StreamInfo si = jstc.addStream(sc); assertTrue(now <= si.getCreateTime().toEpochSecond()); sc = si.getConfiguration(); - assertEquals(stream, sc.getName()); + assertEquals(jstc.stream, sc.getName()); assertEquals(1, sc.getSubjects().size()); - assertEquals(stream, sc.getSubjects().get(0)); + assertEquals(jstc.stream, sc.getSubjects().get(0)); assertEquals(RetentionPolicy.Limits, sc.getRetentionPolicy()); assertEquals(DiscardPolicy.Old, sc.getDiscardPolicy()); @@ -173,15 +154,14 @@ public void testStreamCreateWithNoSubject() throws Exception { @Test public void testUpdateStream() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); - String subject0 = random(); - String subject1 = random(); - String subject2 = random(); - StreamInfo si = jsm.addStream(getTestStreamConfiguration(stream, new String[]{subject0, subject1})); - StreamConfiguration sc = si.getConfiguration(); + runInSharedCustomStream((nc, jstc) -> { + jstc.createStream(2); + String subject0 = jstc.subject(0); + String subject1 = jstc.subject(1); + + StreamConfiguration sc = jstc.si.getConfiguration(); assertNotNull(sc); - assertEquals(stream, sc.getName()); + assertEquals(jstc.stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(2, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -197,10 +177,7 @@ public void testUpdateStream() throws Exception { assertEquals(Duration.ofMinutes(2), sc.getDuplicateWindow()); assertNull(sc.getTemplateOwner()); - sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) // File is default, this ensures it's not a change - .subjects(subject0, subject1, subject2) + sc = jstc.scBuilder(3) .maxMessages(42) .maxBytes(43) .maximumMessageSize(44) @@ -210,12 +187,13 @@ public void testUpdateStream() throws Exception { .duplicateWindow(Duration.ofMinutes(3)) .maxMessagesPerSubject(45) .build(); - si = jsm.updateStream(sc); + StreamInfo si = jstc.jsm.updateStream(sc); assertNotNull(si); + String subject2 = jstc.subject(2); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(stream, sc.getName()); + assertEquals(jstc.stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(3, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -234,56 +212,48 @@ public void testUpdateStream() throws Exception { assertNull(sc.getTemplateOwner()); // allowed to change Allow Direct - jsm.deleteStream(stream); - jsm.addStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(false).build()); - jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(true).build()); - jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).allowDirect(false).build()); + jstc.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(true).build()); + jstc.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(false).build()); // allowed to change Mirror Direct - jsm.deleteStream(stream); - jsm.addStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(false).build()); - jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(true).build()); - jsm.updateStream(getTestStreamConfigurationBuilder(stream, subject0).mirrorDirect(false).build()); + jstc.replaceStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); + jstc.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(true).build()); + jstc.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); }); } @Test public void testAddStreamInvalids() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - assertThrows(IllegalArgumentException.class, () -> jsm.addStream(null)); + runInSharedCustomStream((nc, jstc) -> { + assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addStream(null)); - String stream = random(); - - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) + StreamConfiguration sc = jstc.scBuilder(1) .description(random()) - .storageType(StorageType.Memory) - .subjects(random()) .build(); - jsm.addStream(sc); - - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).description(random()).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); + jstc.addStream(sc); + + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).description(random()).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); //noinspection deprecation - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); - - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).noAck(true).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).allowRollup(true).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).allowDirect(true).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).denyDelete(true).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).denyPurge(true).build())); - assert10058(() -> jsm.addStream(StreamConfiguration.builder(sc).firstSequence(100).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); + + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).noAck(true).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).allowRollup(true).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).allowDirect(true).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).denyDelete(true).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).denyPurge(true).build())); + assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).firstSequence(100).build())); }); } @@ -294,73 +264,45 @@ private void assert10058(Executable executable) { @Test public void testUpdateStreamInvalids() throws Exception { - runInLrServer((nc, jsm, js) -> { - assertThrows(IllegalArgumentException.class, () -> jsm.updateStream(null)); - - String stream = random(); - String[] subjects = new String[]{random(), random()}; + runInSharedCustomStream((nc, jstc) -> { + assertThrows(IllegalArgumentException.class, () -> jstc.jsm.updateStream(null)); + StreamConfiguration sc = jstc.scBuilder(2).build(); // cannot update non existent stream - StreamConfiguration sc = getTestStreamConfiguration(stream, subjects); - // stream not added yet - assertThrows(JetStreamApiException.class, () -> jsm.updateStream(sc)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(sc)); // add the stream - jsm.addStream(sc); + jstc.addStream(sc); // cannot change storage type - StreamConfiguration scMemToFile = getTestStreamConfigurationBuilder(stream, subjects) + StreamConfiguration scMemToFile = jstc.scBuilder(2) .storageType(StorageType.File) .build(); - assertThrows(JetStreamApiException.class, () -> jsm.updateStream(scMemToFile)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scMemToFile)); // cannot change MaxConsumers - StreamConfiguration scMaxCon = getTestStreamConfigurationBuilder(stream, subjects) + StreamConfiguration scMaxCon = jstc.scBuilder(2) .maxConsumers(2) .build(); - assertThrows(JetStreamApiException.class, () -> jsm.updateStream(scMaxCon)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scMaxCon)); - StreamConfiguration scReten = getTestStreamConfigurationBuilder(stream, subjects) + StreamConfiguration scReten = jstc.scBuilder(2) .retentionPolicy(RetentionPolicy.Interest) .build(); if (nc.getServerInfo().isOlderThanVersion("2.10")) { // cannot change RetentionPolicy - assertThrows(JetStreamApiException.class, () -> jsm.updateStream(scReten)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scReten)); } else { - jsm.updateStream(scReten); + jstc.jsm.updateStream(scReten); } - - jsm.deleteStream(stream); - - jsm.addStream(getTestStreamConfigurationBuilder(stream, subjects).storageType(StorageType.File).build()); - assertThrows(JetStreamApiException.class, () -> jsm.updateStream(getTestStreamConfiguration(stream, subjects))); }); } - private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(String stream, String subject) { - return StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .subjects(subject); - } - - private static StreamConfiguration getTestStreamConfiguration(String stream, String[] subjects) { - return getTestStreamConfigurationBuilder(stream, subjects).build(); - } - - private static StreamConfiguration.Builder getTestStreamConfigurationBuilder(String stream, String[] subjects) { - return StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .subjects(subjects); - } - @Test public void testGetStreamInfo() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); - assertThrows(JetStreamApiException.class, () -> jsm.getStreamInfo(stream)); + runInSharedCustomStream((nc, jstc) -> { + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getStreamInfo(jstc.stream)); String[] subjects = new String[6]; String subjectIx5 = random(); @@ -369,10 +311,10 @@ public void testGetStreamInfo() throws Exception { } subjects[5] = subjectIx5 + ".>"; - createMemoryStream(jsm, stream, subjects); + jstc.createStream(subjects); - StreamInfo si = jsm.getStreamInfo(stream); - assertEquals(stream, si.getConfiguration().getName()); + StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); + assertEquals(jstc.stream, si.getConfiguration().getName()); assertEquals(0, si.getStreamState().getSubjectCount()); assertEquals(0, si.getStreamState().getSubjects().size()); assertEquals(0, si.getStreamState().getDeletedCount()); @@ -389,23 +331,23 @@ public void testGetStreamInfo() throws Exception { List packs = new ArrayList<>(); for (int x = 0; x < 5; x++) { - jsPublish(js, subjects[x], x + 1); - PublishAck pa = jsPublish(js, subjects[x], data(x + 2)); + jsPublish(jstc.js, subjects[x], x + 1); + PublishAck pa = jsPublish(jstc.js, subjects[x], data(x + 2)); packs.add(pa); - jsm.deleteMessage(stream, pa.getSeqno()); + jstc.jsm.deleteMessage(jstc.stream, pa.getSeqno()); } - jsPublish(js, subjectIx5 + ".bar", 6); + jsPublish(jstc.js, subjectIx5 + ".bar", 6); - si = jsm.getStreamInfo(stream); - assertEquals(stream, si.getConfiguration().getName()); + si = jstc.jsm.getStreamInfo(jstc.stream); + assertEquals(jstc.stream, si.getConfiguration().getName()); assertEquals(6, si.getStreamState().getSubjectCount()); assertEquals(0, si.getStreamState().getSubjects().size()); assertEquals(5, si.getStreamState().getDeletedCount()); assertEquals(0, si.getStreamState().getDeleted().size()); assertTrue(si.getStreamState().getSubjectMap().isEmpty()); - si = jsm.getStreamInfo(stream, StreamInfoOptions.builder().allSubjects().deletedDetails().build()); - assertEquals(stream, si.getConfiguration().getName()); + si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().allSubjects().deletedDetails().build()); + assertEquals(jstc.stream, si.getConfiguration().getName()); assertEquals(6, si.getStreamState().getSubjectCount()); List list = si.getStreamState().getSubjects(); assertNotNull(list); @@ -430,10 +372,10 @@ public void testGetStreamInfo() throws Exception { assertTrue(si.getStreamState().getDeleted().contains(pa.getSeqno())); } - jsPublish(js, subjectIx5 + ".baz", 2); + jsPublish(jstc.js, subjectIx5 + ".baz", 2); sleep(100); - si = jsm.getStreamInfo(stream, StreamInfoOptions.builder().filterSubjects(subjectIx5 + ".>").deletedDetails().build()); + si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().filterSubjects(subjectIx5 + ".>").deletedDetails().build()); assertEquals(7, si.getStreamState().getSubjectCount()); list = si.getStreamState().getSubjects(); assertNotNull(list); @@ -449,7 +391,7 @@ public void testGetStreamInfo() throws Exception { assertNotNull(s); assertEquals(2, s.getCount()); - si = jsm.getStreamInfo(stream, StreamInfoOptions.builder().filterSubjects(subjects[4]).build()); + si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().filterSubjects(subjects[4]).build()); list = si.getStreamState().getSubjects(); assertNotNull(list); assertEquals(1, list.size()); @@ -461,10 +403,9 @@ public void testGetStreamInfo() throws Exception { @Test public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { // getStreams pages at 256 // getStreamNames pages at 1024 - String prefix = random(); addStreams(jsm, prefix, 300, 0, "x256"); @@ -504,7 +445,7 @@ private void addStreams(JetStreamManagement jsm, String prefix, int count, int a @Test public void testGetStreamNamesBySubjectFilter() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { String stream1 = random(); String stream2 = random(); String stream3 = random(); @@ -550,66 +491,64 @@ private void assertStreamNameList(List list, String... streams) { @Test public void testDeleteStream() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamApiException jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteStream(random())); assertEquals(10059, jsapiEx.getApiErrorCode()); assertNotNull(jstc.jsm.getStreamInfo(jstc.stream)); - assertTrue(jstc.jsm.deleteStream(jstc.stream)); + assertTrue(jstc.deleteStream()); jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.getStreamInfo(jstc.stream)); assertEquals(10059, jsapiEx.getApiErrorCode()); - jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteStream(jstc.stream)); + jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.deleteStream()); assertEquals(10059, jsapiEx.getApiErrorCode()); }); } @Test public void testPurgeStreamAndOptions() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { // invalid to have both keep and seq assertThrows(IllegalArgumentException.class, () -> PurgeOptions.builder().keep(1).sequence(1).build()); // error to purge a stream that does not exist - assertThrows(JetStreamApiException.class, () -> jsm.purgeStream(random())); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.purgeStream(random())); - JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); - createMemoryStream(jsm, jstc.stream, jstc.subject(0), jstc.subject(1)); - - StreamInfo si = jsm.getStreamInfo(jstc.stream); + jstc.createStream(2); + StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(0, si.getStreamState().getMsgCount()); jsPublish(nc, jstc.subject(0), 10); - si = jsm.getStreamInfo(jstc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(10, si.getStreamState().getMsgCount()); PurgeOptions options = PurgeOptions.builder().keep(7).build(); - PurgeResponse pr = jsm.purgeStream(jstc.stream, options); + PurgeResponse pr = jstc.jsm.purgeStream(jstc.stream, options); assertTrue(pr.isSuccess()); assertEquals(3, pr.getPurged()); options = PurgeOptions.builder().sequence(9).build(); - pr = jsm.purgeStream(jstc.stream, options); + pr = jstc.jsm.purgeStream(jstc.stream, options); assertTrue(pr.isSuccess()); assertEquals(5, pr.getPurged()); - si = jsm.getStreamInfo(jstc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(2, si.getStreamState().getMsgCount()); - pr = jsm.purgeStream(jstc.stream); + pr = jstc.jsm.purgeStream(jstc.stream); assertTrue(pr.isSuccess()); assertEquals(2, pr.getPurged()); - si = jsm.getStreamInfo(jstc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(0, si.getStreamState().getMsgCount()); jsPublish(nc, jstc.subject(0), 10); jsPublish(nc, jstc.subject(1), 10); - si = jsm.getStreamInfo(jstc.stream); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(20, si.getStreamState().getMsgCount()); - jsm.purgeStream(jstc.stream, PurgeOptions.subject(jstc.subject(0))); - si = jsm.getStreamInfo(jstc.stream); + jstc.jsm.purgeStream(jstc.stream, PurgeOptions.subject(jstc.subject(0))); + si = jstc.jsm.getStreamInfo(jstc.stream); assertEquals(10, si.getStreamState().getMsgCount()); options = PurgeOptions.builder().subject(jstc.subject(0)).sequence(1).build(); @@ -622,93 +561,95 @@ public void testPurgeStreamAndOptions() throws Exception { } @Test - public void testAddDeleteConsumer() throws Exception { - runInLrServer((nc, jsm, js) -> { - boolean atLeast2dot9 = nc.getServerInfo().isSameOrNewerThanVersion("2.9"); - - String stream = random(); + public void testAddDeleteConsumerPart1() throws Exception { + runInSharedCustomStream((nc, jstc) -> { String subject = random(); - createMemoryStream(jsm, stream, subjectGt(subject)); + jstc.createStream(subjectGt(subject)); - List list = jsm.getConsumers(stream); + List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); final ConsumerConfiguration cc = ConsumerConfiguration.builder().build(); IllegalArgumentException iae = - assertThrows(IllegalArgumentException.class, () -> jsm.addOrUpdateConsumer(null, cc)); + assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addOrUpdateConsumer(null, cc)); assertTrue(iae.getMessage().contains("Stream cannot be null or empty")); - iae = assertThrows(IllegalArgumentException.class, () -> jsm.addOrUpdateConsumer(stream, null)); + iae = assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, null)); assertTrue(iae.getMessage().contains("Config cannot be null")); // durable and name can both be null - ConsumerInfo ci = jsm.addOrUpdateConsumer(stream, cc); + ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); assertNotNull(ci.getName()); // threshold can be set for durable final ConsumerConfiguration cc2 = ConsumerConfiguration.builder().durable(random()).inactiveThreshold(10000).build(); - ci = jsm.addOrUpdateConsumer(stream, cc2); + ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc2); assertNotNull(ci.getName()); ConsumerConfiguration cc2cc = ci.getConsumerConfiguration(); assertNotNull(cc2cc); Duration duration = ci.getConsumerConfiguration().getInactiveThreshold(); assertNotNull(duration); assertEquals(10000, duration.toMillis()); + }); + } - // prep for next part of test - jsm.deleteStream(stream); - createMemoryStream(jsm, stream, subjectGt(subject)); + @Test + public void testAddDeleteConsumerPart2() throws Exception { + runInSharedCustomStream((nc, jstc) -> { + boolean atLeast2dot9 = nc.getServerInfo().isSameOrNewerThanVersion("2.9"); + String subject = random(); + jstc.createStream(subjectGt(subject)); // with and w/o deliver subject for push/pull String dur0 = random(); - addConsumer(jsm, stream, atLeast2dot9, dur0, null, null, ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, atLeast2dot9, dur0, null, null, ConsumerConfiguration.builder() .durable(dur0) .build()); String dur = random(); String deliver = random(); - addConsumer(jsm, stream, atLeast2dot9, dur, deliver, null, ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, atLeast2dot9, dur, deliver, null, ConsumerConfiguration.builder() .durable(dur) .deliverSubject(deliver) .build()); // test delete here - List consumers = jsm.getConsumerNames(stream); + List consumers = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(2, consumers.size()); - assertTrue(jsm.deleteConsumer(stream, dur0)); - consumers = jsm.getConsumerNames(stream); + assertTrue(jstc.jsm.deleteConsumer(jstc.stream, dur0)); + consumers = jstc.jsm.getConsumerNames(jstc.stream); assertEquals(1, consumers.size()); - assertThrows(JetStreamApiException.class, () -> jsm.deleteConsumer(stream, dur0)); + assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteConsumer(jstc.stream, dur0)); // some testing of new name if (atLeast2dot9) { dur = random(); - addConsumer(jsm, stream, true, dur, null, null, ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, true, dur, null, null, ConsumerConfiguration.builder() .durable(dur) .name(dur) .build()); dur = random(); deliver = random(); - addConsumer(jsm, stream, true, dur, deliver, null, ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, true, dur, deliver, null, ConsumerConfiguration.builder() .durable(dur) .name(dur) .deliverSubject(deliver) .build()); dur = random(); - addConsumer(jsm, stream, true, dur, null, ">", ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, true, dur, null, ">", ConsumerConfiguration.builder() .durable(dur) .filterSubject(">") .build()); dur = random(); - addConsumer(jsm, stream, true, dur, null, subjectGt(subject), ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, true, dur, null, subjectGt(subject), ConsumerConfiguration.builder() .durable(dur) .filterSubject(subjectGt(subject)) .build()); dur = random(); - addConsumer(jsm, stream, true, dur, null, subjectDot(subject, "foo"), ConsumerConfiguration.builder() + addConsumer(jstc.jsm, jstc.stream, true, dur, null, subjectDot(subject, "foo"), ConsumerConfiguration.builder() .durable(dur) .filterSubject(subjectDot(subject, "foo")) .build()); @@ -718,7 +659,7 @@ public void testAddDeleteConsumer() throws Exception { @Test public void testAddPausedConsumer() throws Exception { - runInLrServer(VersionUtils::atLeast2_11, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_11, (nc, jstc) -> { List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); @@ -739,7 +680,7 @@ public void testAddPausedConsumer() throws Exception { @Test public void testPauseResumeConsumer() throws Exception { - runInLrServer(VersionUtils::atLeast2_11, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_11, (nc, jstc) -> { List list = jstc.jsm.getConsumers(jstc.stream); assertEquals(0, list.size()); @@ -806,61 +747,51 @@ private static void addConsumer(JetStreamManagement jsm, String stream, boolean @Test public void testValidConsumerUpdates() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); + runInSharedCustomStream((nc, jstc) -> { String subject = random(); String subjectGt = subjectGt(subject); - createMemoryStream(jsm, stream, subjectGt); + jstc.createStream(subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jsm, stream, subjectGt, null); + ConsumerConfiguration cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverSubject(random()).build(); - assertValidAddOrUpdate(jsm, cc, stream); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).ackWait(Duration.ofSeconds(5)).build(); - assertValidAddOrUpdate(jsm, cc, stream); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).rateLimit(100).build(); - assertValidAddOrUpdate(jsm, cc, stream); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxAckPending(100).build(); - assertValidAddOrUpdate(jsm, cc, stream); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxDeliver(4).build(); - assertValidAddOrUpdate(jsm, cc, stream); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); - if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); - cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); - assertValidAddOrUpdate(jsm, cc, stream); - } + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); + assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); }); } @Test public void testInvalidConsumerUpdates() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); + runInSharedCustomStream((nc, jstc) -> { String subject = random(); String subjectGt = subjectGt(subject); - createMemoryStream(jsm, stream, subjectGt); + jstc.createStream(subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jsm, stream, subjectGt, null); + ConsumerConfiguration cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverPolicy(DeliverPolicy.New).build(); - assertInvalidConsumerUpdate(jsm, cc, stream); - - if (nc.getServerInfo().isSameOrOlderThanVersion("2.8.4")) { - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); - cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); - assertInvalidConsumerUpdate(jsm, cc, stream); - } + assertInvalidConsumerUpdate(jstc.jsm, cc, jstc.stream); - cc = prepForUpdateTest(jsm, stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).idleHeartbeat(Duration.ofMillis(111)).build(); - assertInvalidConsumerUpdate(jsm, cc, stream); + assertInvalidConsumerUpdate(jstc.jsm, cc, jstc.stream); }); } @@ -904,7 +835,7 @@ private void assertValidAddOrUpdate(JetStreamManagement jsm, ConsumerConfigurati @Test public void testConsumerMetadata() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); ConsumerConfiguration cc = ConsumerConfiguration.builder() @@ -919,50 +850,46 @@ public void testConsumerMetadata() throws Exception { @Test public void testCreateConsumersWithFilters() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); - String subject = random(); - createMemoryStream(jsm, stream, subject); + runInShared((nc, jstc) -> { + String subject = jstc.subject(); // plain subject ConsumerConfiguration.Builder builder = ConsumerConfiguration.builder().durable(random()); - jsm.addOrUpdateConsumer(stream, builder.filterSubject(subject).build()); - List cis = jsm.getConsumers(stream); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subject).build()); + List cis = jstc.jsm.getConsumers(jstc.stream); assertEquals(subject, cis.get(0).getConsumerConfiguration().getFilterSubject()); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { // 2.10 and later you can set the filter to something that does not match - jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectDot(subject, "two-ten-allows-not-matching")).build()); - cis = jsm.getConsumers(stream); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectDot(subject, "two-ten-allows-not-matching")).build()); + cis = jstc.jsm.getConsumers(jstc.stream); assertEquals(subjectDot(subject, "two-ten-allows-not-matching"), cis.get(0).getConsumerConfiguration().getFilterSubject()); } else { assertThrows(JetStreamApiException.class, - () -> jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectDot(subject, "not-match")).build())); + () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectDot(subject, "not-match")).build())); } // wildcard subject - jsm.deleteStream(stream); - createMemoryStream(jsm, stream, subjectStar(subject)); + jstc.replaceStream(subjectStar(subject)); String subjectA = subjectDot(subject, "A"); - jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectA).build()); - cis = jsm.getConsumers(stream); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectA).build()); + cis = jstc.jsm.getConsumers(jstc.stream); assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); // gt subject - jsm.deleteStream(stream); - createMemoryStream(jsm, stream, subjectGt(subject)); + jstc.replaceStream(subjectGt(subject)); - jsm.addOrUpdateConsumer(stream, builder.filterSubject(subjectA).build()); - cis = jsm.getConsumers(stream); + jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectA).build()); + cis = jstc.jsm.getConsumers(jstc.stream); assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); }); } @Test public void testGetConsumerInfo() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { assertThrows(JetStreamApiException.class, () -> jstc.jsm.getConsumerInfo(jstc.stream, jstc.consumerName())); ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); @@ -983,7 +910,7 @@ public void testGetConsumerInfo() throws Exception { @Test public void testGetConsumers() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { addConsumers(jstc.jsm, jstc.stream, 600); // getConsumers pages at 256 List list = jstc.jsm.getConsumers(jstc.stream); @@ -1023,7 +950,7 @@ public void testDeleteMessage() throws Exception { assertFalse(mdr.isErase()); assertTrue(mdr.isNoErase()); - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { Headers h = new Headers(); h.add("foo", "bar"); @@ -1064,7 +991,7 @@ public void testDeleteMessage() throws Exception { @Test public void testSealed() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { assertFalse(jstc.si.getConfiguration().getSealed()); jstc.js.publish(jstc.subject(), "data1".getBytes()); @@ -1090,7 +1017,7 @@ public void testStorageTypeCoverage() { @Test public void testConsumerReplica() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { final ConsumerConfiguration cc0 = ConsumerConfiguration.builder() .durable(jstc.consumerName()) .build(); @@ -1109,8 +1036,8 @@ public void testConsumerReplica() throws Exception { @Test public void testGetMessage() throws Exception { - runInLrServer((nc, jsm, js) -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + runInSharedCustomStream((nc, jstc) -> { + jstc.createStream(2); assertFalse(jstc.si.getConfiguration().getAllowDirect()); ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); @@ -1144,7 +1071,6 @@ private static NatsMessage buildTestGetMessage(JetStreamTestingContext jstc, int } private void validateGetMessage(JetStreamManagement jsm, JetStreamTestingContext jstc, ZonedDateTime timeBeforeCreated) throws IOException, JetStreamApiException { - assertMessageInfo(jstc, 0, 1, jsm.getMessage(jstc.stream, 1), timeBeforeCreated); assertMessageInfo(jstc, 0, 5, jsm.getLastMessage(jstc.stream, jstc.subject(0)), timeBeforeCreated); assertMessageInfo(jstc, 1, 6, jsm.getLastMessage(jstc.stream, jstc.subject(1)), timeBeforeCreated); @@ -1257,7 +1183,7 @@ public void testMessageGetRequestObjectDeprecatedMethods() { @Test public void testDirectMessageRepublishedSubject() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { + runInSharedCustomStream(VersionUtils::atLeast2_9_0, (nc, jstc) -> { String streamBucketName = "sb-" + random(); String subject = random(); String streamSubject = subject + ".>"; @@ -1266,16 +1192,16 @@ public void testDirectMessageRepublishedSubject() throws Exception { String publishSubject3 = subject + ".three"; String republishDest = "$KV." + streamBucketName + ".>"; - StreamConfiguration sc = StreamConfiguration.builder() + StreamConfiguration sc = jstc.scBuilder(0) .name(streamBucketName) - .storageType(StorageType.Memory) .subjects(streamSubject) .republish(Republish.builder().source(">").destination(republishDest).build()) .build(); - jsm.addStream(sc); + jstc.addStream(sc); KeyValueConfiguration kvc = KeyValueConfiguration.builder().name(streamBucketName).build(); - nc.keyValueManagement().create(kvc); + KeyValueManagement kvm = nc.keyValueManagement(); + kvm.create(kvc); KeyValue kv = nc.keyValue(streamBucketName); nc.publish(publishSubject1, "uno".getBytes()); @@ -1296,12 +1222,15 @@ public void testDirectMessageRepublishedSubject() throws Exception { assertEquals(streamBucketName, kve3.getBucket()); assertEquals(publishSubject3, kve3.getKey()); assertEquals("tres", kve3.getValueAsString()); + + // cleanup + kvm.delete(streamBucketName); }); } @Test public void testCreateConsumerUpdateConsumer() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { String streamPrefix = random(); JetStreamManagement jsmNew = nc.jetStreamManagement(); JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build()); @@ -1426,57 +1355,60 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, jsm, js) -> { - String stream = random(); - String subject = random(); + runInSharedOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, jstc) -> { + // stream isn't even created yet + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); + + jstc.createStream(); - assertThrows(JetStreamApiException.class, () -> jsm.getMessage(stream, 1)); + // no messages yet + assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); - createMemoryStream(jsm, stream, subject); + String subject = jstc.subject(); for (int x = 0; x < 5; x++) { - js.publish(subject, null); + jstc.js.publish(subject, null); } - String consumer = create1026Consumer(jsm, stream, subject); - PullSubscribeOptions so = PullSubscribeOptions.fastBind(stream, consumer); - JetStreamSubscription sub = js.subscribe(null, so); - jsm.deleteConsumer(stream, consumer); + String consumer = create1026Consumer(jstc.jsm, jstc.stream, subject); + PullSubscribeOptions so = PullSubscribeOptions.fastBind(jstc.stream, consumer); + JetStreamSubscription sub = jstc.js.subscribe(null, so); + jstc.jsm.deleteConsumer(jstc.stream, consumer); sub.pull(5); validate1026(sub.nextMessage(500), listener, false); - ConsumerContext context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + ConsumerContext context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); validate1026(context.next(1000), listener, true); // simplification next never raises warnings, so empty = true - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); //noinspection resource FetchConsumer fc = context.fetch(FetchConsumeOptions.builder().maxMessages(1).raiseStatusWarnings(false).build()); validate1026(fc.nextMessage(), listener, true); // we said not to raise status warnings in the FetchConsumeOptions - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); //noinspection resource fc = context.fetch(FetchConsumeOptions.builder().maxMessages(1).raiseStatusWarnings().build()); validate1026(fc.nextMessage(), listener, false); // we said raise status warnings in the FetchConsumeOptions - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); IterableConsumer ic = context.iterate(ConsumeOptions.builder().raiseStatusWarnings(false).build()); validate1026(ic.nextMessage(1000), listener, true); // we said not to raise status warnings in the ConsumeOptions - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); ic = context.iterate(ConsumeOptions.builder().raiseStatusWarnings().build()); validate1026(ic.nextMessage(1000), listener, false); // we said raise status warnings in the ConsumeOptions AtomicInteger count = new AtomicInteger(); MessageHandler handler = m -> count.incrementAndGet(); - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); //noinspection resource context.consume(ConsumeOptions.builder().raiseStatusWarnings(false).build(), handler); Thread.sleep(100); // give time to get a message assertEquals(0, count.get()); validate1026(null, listener, true); - context = setupFor1026Simplification(nc, jsm, listener, stream, subject); + context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); //noinspection resource context.consume(ConsumeOptions.builder().raiseStatusWarnings().build(), handler); Thread.sleep(100); // give time to get a message @@ -1555,7 +1487,7 @@ public void testMessageDeleteRequest() { @Test public void testStreamPersistMode() throws Exception { - runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() .name(random()) .storageType(StorageType.File) diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 9bd91bc79..b96d3f72d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -30,84 +30,82 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { public void testGetStreamInfoSubjectPagination() throws Exception { try (NatsTestServer ts = configuredJsServer("pagination.conf")) { try (Connection nc = standardConnectionWait(ts.getLocalhostUri())) { - if (nc.getServerInfo().isNewerVersionThan("2.8.4")) { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - String stream1 = random(); - String stream2 = random(); - long rounds = 101; - long size = 1000; - long count = rounds * size; - jsm.addStream(StreamConfiguration.builder() - .name(stream1) - .storageType(StorageType.Memory) - .subjects("s.*.*") - .build()); - - jsm.addStream(StreamConfiguration.builder() - .name(stream2) - .storageType(StorageType.Memory) - .subjects("t.*.*") - .build()); - - for (int x = 1; x <= rounds; x++) { - for (int y = 1; y <= size; y++) { - js.publish("s." + x + "." + y, null); - } - } + JetStreamManagement jsm = nc.jetStreamManagement(); + JetStream js = nc.jetStream(); + + String stream1 = random(); + String stream2 = random(); + long rounds = 101; + long size = 1000; + long count = rounds * size; + jsm.addStream(StreamConfiguration.builder() + .name(stream1) + .storageType(StorageType.Memory) + .subjects("s.*.*") + .build()); + + jsm.addStream(StreamConfiguration.builder() + .name(stream2) + .storageType(StorageType.Memory) + .subjects("t.*.*") + .build()); + for (int x = 1; x <= rounds; x++) { for (int y = 1; y <= size; y++) { - js.publish("t.7." + y, null); + js.publish("s." + x + "." + y, null); } + } - StreamInfo si = jsm.getStreamInfo(stream1); - validateStreamInfo(si.getStreamState(), 0, 0, count); + for (int y = 1; y <= size; y++) { + js.publish("t.7." + y, null); + } - si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); - validateStreamInfo(si.getStreamState(), count, count, count); + StreamInfo si = jsm.getStreamInfo(stream1); + validateStreamInfo(si.getStreamState(), 0, 0, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); - validateStreamInfo(si.getStreamState(), size, size, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); + validateStreamInfo(si.getStreamState(), count, count, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); + validateStreamInfo(si.getStreamState(), size, size, count); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); - validateStreamInfo(si.getStreamState(), size, size, size); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, count); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, size); + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); + validateStreamInfo(si.getStreamState(), size, size, size); - List infos = jsm.getStreams(); - assertEquals(2, infos.size()); - si = infos.get(0); - if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { - validateStreamInfo(si.getStreamState(), 0, 0, count); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); - } - else { - validateStreamInfo(si.getStreamState(), 0, 0, size); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); - } + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, size); - infos = jsm.getStreams(">"); - assertEquals(2, infos.size()); + List infos = jsm.getStreams(); + assertEquals(2, infos.size()); + si = infos.get(0); + if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { + validateStreamInfo(si.getStreamState(), 0, 0, count); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); + } + else { + validateStreamInfo(si.getStreamState(), 0, 0, size); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); + } - infos = jsm.getStreams("*.7.*"); - assertEquals(2, infos.size()); + infos = jsm.getStreams(">"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("*.7.1"); - assertEquals(2, infos.size()); + infos = jsm.getStreams("*.7.*"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("s.7.*"); - assertEquals(1, infos.size()); - assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + infos = jsm.getStreams("*.7.1"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("t.7.1"); - assertEquals(1, infos.size()); - assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); - } + infos = jsm.getStreams("s.7.*"); + assertEquals(1, infos.size()); + assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + + infos = jsm.getStreams("t.7.1"); + assertEquals(1, infos.size()); + assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); } } } diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index 0380edb0e..4fe44f23b 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -42,75 +42,70 @@ public void testMirrorBasics() throws Exception { String U3 = random(); String M1 = random(); - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { Mirror mirror = Mirror.builder().sourceName(S1).build(); // Create source stream - StreamConfiguration sc = StreamConfiguration.builder() + StreamConfiguration sc = jstc.scBuilder(0) .name(S1) - .storageType(StorageType.Memory) .subjects(U1, U2, U3) .build(); - StreamInfo si = jsm.addStream(sc); + StreamInfo si = jstc.addStream(sc); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(S1, sc.getName()); // Now create our mirror stream. - sc = StreamConfiguration.builder() + sc = jstc.scBuilder(0) .name(M1) - .storageType(StorageType.Memory) .mirror(mirror) .build(); - jsm.addStream(sc); - assertMirror(jsm, M1, S1, null, null); + jstc.addStream(sc); + assertMirror(jstc.jsm, M1, S1, null, null); // Send 100 messages. - jsPublish(js, U2, 100); + jsPublish(jstc.js, U2, 100); // Check the state - assertMirror(jsm, M1, S1, 100L, null); + assertMirror(jstc.jsm, M1, S1, 100L, null); // Purge the source stream. - jsm.purgeStream(S1); + jstc.jsm.purgeStream(S1); - jsPublish(js, U2, 50); + jsPublish(jstc.js, U2, 50); // Create second mirror - sc = StreamConfiguration.builder() + sc = jstc.scBuilder(0) .name(S2) - .storageType(StorageType.Memory) .mirror(mirror) .build(); - jsm.addStream(sc); + jstc.addStream(sc); // Check the state - assertMirror(jsm, S2, S1, 50L, 101L); + assertMirror(jstc.jsm, S2, S1, 50L, 101L); - jsPublish(js, U3, 100); + jsPublish(jstc.js, U3, 100); // third mirror checks start seq - sc = StreamConfiguration.builder() + sc = jstc.scBuilder(0) .name(S3) - .storageType(StorageType.Memory) .mirror(Mirror.builder().sourceName(S1).startSeq(150).build()) .build(); - jsm.addStream(sc); + jstc.addStream(sc); // Check the state - assertMirror(jsm, S3, S1, 101L, 150L); + assertMirror(jstc.jsm, S3, S1, 101L, 150L); // third mirror checks start seq ZonedDateTime zdt = DateTimeUtils.fromNow(Duration.ofHours(-2)); - sc = StreamConfiguration.builder() + sc = jstc.scBuilder(0) .name(S4) - .storageType(StorageType.Memory) .mirror(Mirror.builder().sourceName(S1).startTime(zdt).build()) .build(); - jsm.addStream(sc); + jstc.addStream(sc); // Check the state - assertMirror(jsm, S4, S1, 150L, 101L); + assertMirror(jstc.jsm, S4, S1, 150L, 101L); }); } @@ -121,14 +116,13 @@ public void testMirrorReading() throws Exception { String U2 = random(); String M1 = random(); - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { // Create source stream - StreamConfiguration sc = StreamConfiguration.builder() + StreamConfiguration sc = jstc.scBuilder(0) .name(S1) - .storageType(StorageType.Memory) .subjects(U1, U2) .build(); - StreamInfo si = jsm.addStream(sc); + StreamInfo si = jstc.addStream(sc); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(S1, sc.getName()); @@ -136,28 +130,27 @@ public void testMirrorReading() throws Exception { Mirror mirror = Mirror.builder().sourceName(S1).build(); // Now create our mirror stream. - sc = StreamConfiguration.builder() + sc = jstc.scBuilder(0) .name(M1) - .storageType(StorageType.Memory) .mirror(mirror) .build(); - jsm.addStream(sc); - assertMirror(jsm, M1, S1, null, null); + jstc.addStream(sc); + assertMirror(jstc.jsm, M1, S1, null, null); // Send messages. - jsPublish(js, U1, 10); - jsPublish(js, U2, 20); + jsPublish(jstc.js, U1, 10); + jsPublish(jstc.js, U2, 20); - assertMirror(jsm, M1, S1, 30L, null); + assertMirror(jstc.jsm, M1, S1, 30L, null); - JetStreamSubscription sub = js.subscribe(U1); + JetStreamSubscription sub = jstc.js.subscribe(U1); List list = readMessagesAck(sub); assertEquals(10, list.size()); for (Message m : list) { assertEquals(S1, m.metaData().getStream()); } - sub = js.subscribe(U2); + sub = jstc.js.subscribe(U2); list = readMessagesAck(sub); assertEquals(20, list.size()); for (Message m : list) { @@ -167,14 +160,14 @@ public void testMirrorReading() throws Exception { //noinspection deprecation PushSubscribeOptions.bind(M1); // coverage for deprecated PushSubscribeOptions pso = PushSubscribeOptions.stream(M1); - sub = js.subscribe(U1, pso); + sub = jstc.js.subscribe(U1, pso); list = readMessagesAck(sub); assertEquals(10, list.size()); for (Message m : list) { assertEquals(M1, m.metaData().getStream()); } - sub = js.subscribe(U2, pso); + sub = jstc.js.subscribe(U2, pso); list = readMessagesAck(sub); assertEquals(20, list.size()); for (Message m : list) { @@ -185,15 +178,14 @@ public void testMirrorReading() throws Exception { @Test public void testMirrorExceptions() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { Mirror mirror = Mirror.builder().sourceName(random()).build(); - StreamConfiguration scEx = StreamConfiguration.builder() .name(random()) .subjects(random()) .mirror(mirror) .build(); - assertThrows(JetStreamApiException.class, () -> jsm.addStream(scEx)); + assertThrows(JetStreamApiException.class, () -> jstc.addStream(scEx)); }); } @@ -209,84 +201,75 @@ public void testSourceBasics() throws Exception { String R1 = random(); String R2 = random(); - runInLrServer((nc, jsm, js) -> { + runInSharedCustomStream((nc, jstc) -> { // Create streams - StreamInfo si = jsm.addStream(StreamConfiguration.builder() - .name(N1).storageType(StorageType.Memory).build()); + StreamInfo si = jstc.addStream(jstc.scBuilder(0).name(N1).build()); StreamConfiguration sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N1, sc.getName()); - si = jsm.addStream(StreamConfiguration.builder() - .name(N2).storageType(StorageType.Memory).build()); + si = jstc.addStream(jstc.scBuilder(0).name(N2).build()); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N2, sc.getName()); - si = jsm.addStream(StreamConfiguration.builder() - .name(N3).storageType(StorageType.Memory).build()); + si = jstc.addStream(jstc.scBuilder(0).name(N3).build()); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N3, sc.getName()); // Populate each one. - jsPublish(js, N1, 10); - jsPublish(js, N2, 15); - jsPublish(js, N3, 25); - - sc = StreamConfiguration.builder() - .name(R1) - .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(N1).build(), - Source.builder().sourceName(N2).build(), - Source.builder().sourceName(N3).build()) + jsPublish(jstc.js, N1, 10); + jsPublish(jstc.js, N2, 15); + jsPublish(jstc.js, N3, 25); + + sc = jstc.scBuilder(0) + .name(R1) + .sources(Source.builder().sourceName(N1).build(), + Source.builder().sourceName(N2).build(), + Source.builder().sourceName(N3).build()) .build(); + jstc.addStream(sc); - jsm.addStream(sc); - - assertSource(jsm, R1, 50L, null); + assertSource(jstc.jsm, R1, 50L, null); - sc = StreamConfiguration.builder() - .name(R1) - .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(N1).build(), - Source.builder().sourceName(N2).build(), - Source.builder().sourceName(N4).build()) - .build(); + sc = jstc.scBuilder(0) + .name(R1) + .sources(Source.builder().sourceName(N1).build(), + Source.builder().sourceName(N2).build(), + Source.builder().sourceName(N4).build()) + .build(); - jsm.updateStream(sc); + jstc.jsm.updateStream(sc); - sc = StreamConfiguration.builder() - .name(N5) - .storageType(StorageType.Memory) - .subjects(N4, U1) - .build(); - jsm.addStream(sc); + sc = jstc.scBuilder(0) + .name(N5) + .subjects(N4, U1) + .build(); + jstc.addStream(sc); - jsPublish(js, N4, 20); - jsPublish(js, U1, 20); - jsPublish(js, N4, 10); + jsPublish(jstc.js, N4, 20); + jsPublish(jstc.js, U1, 20); + jsPublish(jstc.js, N4, 10); - sc = StreamConfiguration.builder() - .name(R2) - .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(N5).startSeq(26).build()) - .build(); - jsm.addStream(sc); - assertSource(jsm, R2, 25L, null); + sc = jstc.scBuilder(0) + .name(R2) + .sources(Source.builder().sourceName(N5).startSeq(26).build()) + .build(); + jstc.addStream(sc); + assertSource(jstc.jsm, R2, 25L, null); - MessageInfo info = jsm.getMessage(R2, 1); + MessageInfo info = jstc.jsm.getMessage(R2, 1); assertStreamSource(info, N5, 26); - sc = StreamConfiguration.builder() - .name(N6) - .storageType(StorageType.Memory) - .sources(Source.builder().sourceName(N5).startSeq(11).filterSubject(N4).build()) - .build(); - jsm.addStream(sc); - assertSource(jsm, N6, 20L, null); + sc = jstc.scBuilder(0) + .name(N6) + .sources(Source.builder().sourceName(N5).startSeq(11).filterSubject(N4).build()) + .build(); + jstc.addStream(sc); + assertSource(jstc.jsm, N6, 20L, null); - info = jsm.getMessage(N6, 1); + info = jstc.jsm.getMessage(N6, 1); assertStreamSource(info, N5, 11); }); } @@ -294,7 +277,7 @@ public void testSourceBasics() throws Exception { @Test @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); @@ -336,7 +319,7 @@ public void testSourceAndTransformsRoundTrips() throws Exception { @Test public void testMirror() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scMirror = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationMirrorSubjectTransform.json"); diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index f01101c53..c242dc0c5 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -37,7 +37,7 @@ public class JetStreamPubTests extends JetStreamTestBase { @Test public void testPublishVarieties() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { PublishAck pa = jstc.js.publish(jstc.subject(), dataBytes(1)); assertPublishAck(pa, jstc.stream, 1); @@ -118,7 +118,7 @@ private void assertPublishAck(PublishAck pa, String stream, long seqno) { @Test public void testPublishAsyncVarieties() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { List> futures = new ArrayList<>(); futures.add(jstc.js.publishAsync(jstc.subject(), dataBytes(1))); @@ -186,7 +186,7 @@ public void testMultithreadedPublishAsync() throws Exception { //noinspection resource final ExecutorService executorService = Executors.newFixedThreadPool(3); try { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { final int messagesToPublish = 6; // create a new connection that does not have the inbox dispatcher set try (NatsConnection nc2 = new NatsConnection(nc.getOptions())){ @@ -227,7 +227,7 @@ private void assertFutureJetStreamApiException(CompletableFuture fut @Test public void testPublishExpectations() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { String stream1 = random(); String subjectPrefix = random(); String streamSubject = subjectPrefix + ".>"; @@ -409,7 +409,7 @@ public void testPublishExpectations() throws Exception { @Test public void testPublishMiscExceptions() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // stream supplied and matches //noinspection deprecation PublishOptions po = PublishOptions.builder().stream(jstc.stream).build(); @@ -437,7 +437,7 @@ public void testPublishAckJson() throws IOException, JetStreamApiException { @Test public void testPublishNoAck() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamOptions jso = JetStreamOptions.builder().publishNoAck(true).build(); JetStream customJs = nc.jetStream(jso); @@ -462,36 +462,27 @@ public void testPublishNoAck() throws Exception { @Test public void testMaxPayloadJs() throws Exception { - String streamName = random(); - String subject1 = random(); - String subject2 = random(); - - runInLrServerOwnNc(optionsBuilder().noReconnect(), (nc, jsm, js) -> { + runInSharedCustomStream(optionsBuilder().noReconnect(), (nc, jstc) -> { long expectedSeq = 0; - jsm.addStream(StreamConfiguration.builder() - .name(streamName) - .storageType(StorageType.Memory) - .subjects(subject1, subject2) - .maximumMessageSize(1000) - .build() - ); + jstc.addStream(jstc.scBuilder(1).maximumMessageSize(1000)); + String subject0 = jstc.subject(0); for (int x = 1; x <= 3; x++) { int size = 1000 + x - 2; if (size > 1000) { - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(subject1, new byte[size])); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jstc.js.publish(subject0, new byte[size])); assertEquals(10054, e.getApiErrorCode()); } else { - PublishAck pa = js.publish(subject1, new byte[size]); + PublishAck pa = jstc.js.publish(subject0, new byte[size]); assertEquals(++expectedSeq, pa.getSeqno()); } } for (int x = 1; x <= 3; x++) { int size = 1000 + x - 2; - CompletableFuture paFuture = js.publishAsync(subject1, new byte[size]); + CompletableFuture paFuture = jstc.js.publishAsync(subject0, new byte[size]); if (size > 1000) { ExecutionException e = assertThrows(ExecutionException.class, () -> paFuture.get(1000, TimeUnit.MILLISECONDS)); @@ -509,7 +500,7 @@ public void testMaxPayloadJs() throws Exception { @Test public void testPublishWithTTL() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { String stream = random(); String subject = random(); StreamConfiguration sc = StreamConfiguration.builder() @@ -549,40 +540,36 @@ public void testPublishWithTTL() throws Exception { @Test public void testMsgDeleteMarkerMaxAge() throws Exception { - runInLrServer((nc, jsm, js) -> { - String stream = random(); - String subject = random(); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) + runInSharedCustomStream((nc, jstc) -> { + StreamConfiguration sc = jstc.scBuilder(1) .allowMessageTtl() .subjectDeleteMarkerTtl(Duration.ofSeconds(50)) .maxAge(1000) - .subjects(subject).build(); - - jsm.addStream(sc); + .build(); + jstc.addStream(sc); + String subject = jstc.subject(); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); - PublishAck pa = js.publish(subject, null, opts); + PublishAck pa = jstc.js.publish(subject, null, opts); assertNotNull(pa); sleep(1200); - MessageInfo mi = jsm.getLastMessage(stream, subject); + MessageInfo mi = jstc.jsm.getLastMessage(jstc.stream, subject); Headers h = mi.getHeaders(); assertNotNull(h); assertEquals("MaxAge", h.getFirst(NATS_MARKER_REASON_HDR)); assertEquals("50s", h.getFirst(MSG_TTL_HDR)); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.builder() - .name(stream) + .name(jstc.stream) .storageType(StorageType.Memory) .allowMessageTtl() .subjectDeleteMarkerTtl(Duration.ofMillis(999)) .subjects(subject).build()); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.builder() - .name(stream) + .name(jstc.stream) .storageType(StorageType.Memory) .allowMessageTtl() .subjectDeleteMarkerTtl(999) diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 037fa071f..ededc2c1b 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -58,7 +58,7 @@ private Options.Builder noPullWarnings() { @Test public void testFetch() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { long fetchMs = 3000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -127,7 +127,7 @@ public void testFetch() throws Exception { @Test public void testIterate() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { long fetchMs = 5000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -208,7 +208,7 @@ public void testIterate() throws Exception { @Test public void testBasic() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // Build our subscription options. PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); @@ -301,7 +301,7 @@ public void testBasic() throws Exception { @Test public void testNoWait() throws Exception { - runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { + runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); @@ -369,7 +369,7 @@ public void testNoWait() throws Exception { @Test public void testPullExpires() throws Exception { - runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { + runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { // Build our subscription options. PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); @@ -454,7 +454,7 @@ public void testPullExpires() throws Exception { @Test public void testAckNak() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -484,7 +484,7 @@ public void testAckNak() throws Exception { @Test public void testAckTerm() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -506,7 +506,7 @@ public void testAckTerm() throws Exception { @Test public void testAckReplySyncCoverage() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -525,7 +525,7 @@ public void testAckReplySyncCoverage() throws Exception { @Test public void testAckWaitTimeout() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder() .ackWait(1500) .build(); @@ -570,7 +570,7 @@ public void testAckWaitTimeout() throws Exception { @Test public void testDurable() throws Exception { - runInLrServerOwnNc(noPullWarnings(), (nc, jstc) -> { + runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { String durable = random(); // Build our subscription options normally @@ -605,7 +605,7 @@ public void testDurable() throws Exception { @Test public void testNamed() throws Exception { - runInLrServerOwnNc(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { + runInSharedOwnNc(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { String name = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() @@ -740,7 +740,7 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { private void testConflictStatus(int statusCode, String statusText, int type, String targetVersion, ConflictSetup setup) throws Exception { ListenerForTesting listener = new ListenerForTesting(); AtomicBoolean skip = new AtomicBoolean(false); - runInLrServerOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, jstc) -> { skip.set(versionIsBefore(nc, targetVersion)); if (skip.get()) { return; @@ -1005,7 +1005,7 @@ public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String dur = random(); jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(jstc.subject()).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); @@ -1030,7 +1030,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesExactBytes() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { String stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes @@ -1058,7 +1058,7 @@ public void testExceedsMaxRequestBytesExactBytes() throws Exception { @Test public void testReader() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // Pre define a consumer ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).filterSubjects(jstc.subject()).build(); jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); @@ -1117,7 +1117,7 @@ private static Thread getReaderThread(AtomicInteger count, int stopCount, JetStr @Test public void testOverflow() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Setting PriorityPolicy requires at least one PriorityGroup to be set @@ -1243,7 +1243,7 @@ public void testPrioritized() throws Exception { // close the #1, #2 should get messages // start another priority 1 (#3), #2 should stop getting messages #3 should get messages ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); @@ -1340,7 +1340,7 @@ public void testPinnedClient() throws Exception { // start consuming, tracking pin ids and counts // unpin 10 times and make sure that new pins are made ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { String consumer = random(); String group = random(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index aa130c407..33fa24b69 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -32,7 +32,7 @@ public class JetStreamPushAsyncTests extends JetStreamTestBase { @Test public void testHandlerSub() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // publish some messages jsPublish(jstc.js, jstc.subject(), 10); @@ -62,7 +62,7 @@ public void testHandlerSub() throws Exception { @Test public void testHandlerAutoAck() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // publish some messages jsPublish(jstc.js, jstc.subject(), 10); @@ -128,7 +128,7 @@ public void testHandlerAutoAck() throws Exception { @Test public void testCantNextMessageOnAsyncPushSub() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), nc.createDispatcher(), msg -> {}, false); // this should exception, can't next message on an async push sub @@ -140,7 +140,7 @@ public void testCantNextMessageOnAsyncPushSub() throws Exception { @Test public void testPushAsyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, jstc) -> { byte[] data = new byte[8192]; int MSG_COUNT = 1000; @@ -187,16 +187,14 @@ public void testPushAsyncFlowControl() throws Exception { public void testDoNotAutoAckSituations() throws Exception { String mockAckReply = random(); // "mock-ack-reply."; - runInLrServer((nc, jsm, js) -> { - // create the stream. - String stream = random(); - String subject = random(); - createMemoryStream(nc, stream, subject, subjectStar(mockAckReply)); + runInSharedCustomStream((nc, jstc) -> { + String subject = jstc.subject(); + jstc.createStream(subject, subjectStar(mockAckReply)); int pubCount = 5; // publish a message - jsPublish(js, subject, pubCount); + jsPublish(jstc.js, subject, pubCount); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -237,7 +235,7 @@ else if (f == 4) { }; // subscribe using the handler, auto ack true - JetStreamSubscription async = js.subscribe(subject, dispatcher, handler, true); + JetStreamSubscription async = jstc.js.subscribe(subject, dispatcher, handler, true); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -245,7 +243,7 @@ else if (f == 4) { assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); - JetStreamSubscription mockAckReplySub = js.subscribe(subjectStar(mockAckReply)); + JetStreamSubscription mockAckReplySub = jstc.js.subscribe(subjectStar(mockAckReply)); Message msg = mockAckReplySub.nextMessage(2000); assertEquals(subjectDot(mockAckReply, "ack"), msg.getSubject()); assertEquals("+ACK", new String(msg.getData())); @@ -274,7 +272,7 @@ else if (f == 4) { // coverage explicit no ack flag msgLatchRef.set(new CountDownLatch(pubCount)); PushSubscribeOptions pso = ConsumerConfiguration.builder().ackWait(Duration.ofMinutes(2)).buildPushSubscribeOptions(); - async = js.subscribe(subject, dispatcher, handler, false, pso); + async = jstc.js.subscribe(subject, dispatcher, handler, false, pso); awaitAndAssert(msgLatchRef.get()); assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); @@ -285,7 +283,7 @@ else if (f == 4) { // coverage explicit AckPolicyNone msgLatchRef.set(new CountDownLatch(pubCount)); pso = ConsumerConfiguration.builder().ackPolicy(AckPolicy.None).buildPushSubscribeOptions(); - async = js.subscribe(subject, dispatcher, handler, true, pso); + async = jstc.js.subscribe(subject, dispatcher, handler, true, pso); awaitAndAssert(msgLatchRef.get()); assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); @@ -318,16 +316,14 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .put(KV_OPERATION_HEADER_KEY, KeyValueOperation.PURGE.name()) .put(ROLLUP_HDR, ROLLUP_HDR_SUBJECT); - runInLrServer((nc, jsm, js) -> { - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) + runInSharedCustomStream((nc, jstc) -> { + StreamConfiguration sc = jstc.scBuilder(0) .subjects(sub) .allowRollup(true) .denyDelete(true) .build(); - jsm.addStream(sc); + jstc.jsm.addStream(sc); MemStorBugHandler fullHandler = new MemStorBugHandler(); MemStorBugHandler onlyHandler = new MemStorBugHandler(); @@ -349,8 +345,8 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .buildPushSubscribeOptions(); Dispatcher d = nc.createDispatcher(); - js.subscribe(sub, d, fullHandler, false, psoFull); - js.subscribe(sub, d, onlyHandler, false, psoOnly); + jstc.js.subscribe(sub, d, fullHandler, false, psoFull); + jstc.js.subscribe(sub, d, onlyHandler, false, psoOnly); Object[] expecteds = new Object[] { "a", "aa", "z", "zz", @@ -360,22 +356,22 @@ public void testMemoryStorageServerBugPR2719() throws Exception { KeyValueOperation.PURGE, KeyValueOperation.PURGE, }; - js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[0]).build()); - js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[1]).build()); - js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[2]).build()); - js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[3]).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[0]).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[1]).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[2]).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[3]).build()); - js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); - js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); - js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[6]).build()); - js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[7]).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[6]).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[7]).build()); - js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); - js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); - js.publish(NatsMessage.builder().subject(key1).headers(purgeHeaders).build()); - js.publish(NatsMessage.builder().subject(key2).headers(purgeHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key1).headers(purgeHeaders).build()); + jstc.js.publish(NatsMessage.builder().subject(key2).headers(purgeHeaders).build()); sleep(2000); // give time for the handler to get messages diff --git a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java index 2323ed069..ffbc944af 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java @@ -32,7 +32,7 @@ public class JetStreamPushQueueTests extends JetStreamTestBase { @Test public void testQueueSubWorkflow() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // Set up the subscribers // - the PushSubscribeOptions can be re-used since all the subscribers are the same // - use a concurrent integer to track all the messages received diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index 5b9785b07..2f7b8897c 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -46,8 +46,7 @@ public void testPushEphemeralWithDeliver() throws Exception { } private void _testPushEphemeral(String deliverSubject) throws Exception { - runInJsServer(nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared((nc, jstc) -> { // publish some messages jsPublish(jstc.js, jstc.subject(), 1, 5); @@ -124,7 +123,7 @@ public void testPushDurableWithDeliver() throws Exception { } private void _testPushDurable(boolean useDeliverSubject) throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { // create the stream. String stream = random(); String subjectDotGt = random() + ".>"; @@ -275,7 +274,7 @@ private void _testPushDurableSubAsync(JetStreamTestingContext jstc, Dispatcher d @Test public void testCantPullOnPushSub() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); assertSubscription(sub, jstc.stream, null, null, false); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -308,7 +307,7 @@ private void assertCantPullOnPushSub(JetStreamSubscription sub) { @Test public void testHeadersOnly() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { PushSubscribeOptions pso = ConsumerConfiguration.builder().headersOnly(true).buildPushSubscribeOptions(); JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server @@ -325,7 +324,7 @@ public void testHeadersOnly() throws Exception { @Test public void testAcks() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder().ackWait(Duration.ofMillis(1500)).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); @@ -458,30 +457,28 @@ public void testAcks() throws Exception { @Test public void testDeliveryPolicy() throws Exception { - runInLrServer((nc, jsm, js) -> { - // create the stream. - String stream = random(); - String subject = random(); + runInSharedCustomStream((nc, jstc) -> { + String subject = jstc.subject(); String subjectStar = subjectStar(subject); - createMemoryStream(jsm, stream, subjectStar); + jstc.createStream(subjectStar); String subjectA = subjectDot(subject, "A"); String subjectB = subjectDot(subject, "B"); - js.publish(subjectA, dataBytes(1)); - js.publish(subjectA, dataBytes(2)); + jstc.js.publish(subjectA, dataBytes(1)); + jstc.js.publish(subjectA, dataBytes(2)); sleep(1500); - js.publish(subjectA, dataBytes(3)); - js.publish(subjectB, dataBytes(91)); - js.publish(subjectB, dataBytes(92)); + jstc.js.publish(subjectA, dataBytes(3)); + jstc.js.publish(subjectB, dataBytes(91)); + jstc.js.publish(subjectB, dataBytes(92)); - jsm.deleteMessage(stream, 4); + jstc.jsm.deleteMessage(jstc.stream, 4); // DeliverPolicy.All PushSubscribeOptions pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.All).build()) .build(); - JetStreamSubscription sub = js.subscribe(subjectA, pso); + JetStreamSubscription sub = jstc.js.subscribe(subjectA, pso); Message m1 = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m1, 1); Message m2 = sub.nextMessage(Duration.ofSeconds(1)); @@ -493,7 +490,7 @@ public void testDeliveryPolicy() throws Exception { pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.Last).build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); Message m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); assertNull(sub.nextMessage(Duration.ofMillis(200))); @@ -502,12 +499,12 @@ public void testDeliveryPolicy() throws Exception { pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.New).build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); assertNull(sub.nextMessage(Duration.ofSeconds(1))); // DeliverPolicy.New - New message between subscribe and next message - sub = js.subscribe(subjectA, pso); - js.publish(subjectA, dataBytes(4)); + sub = jstc.js.subscribe(subjectA, pso); + jstc.js.publish(subjectA, dataBytes(4)); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 4); @@ -518,7 +515,7 @@ public void testDeliveryPolicy() throws Exception { .startSequence(3) .build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -531,7 +528,7 @@ public void testDeliveryPolicy() throws Exception { .startTime(m3.metaData().timestamp().minusSeconds(1)) .build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -544,16 +541,16 @@ public void testDeliveryPolicy() throws Exception { .filterSubject(subjectA) .build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 4); // DeliverPolicy.ByStartSequence with a deleted record - PublishAck pa4 = js.publish(subjectA, dataBytes(4)); - PublishAck pa5 = js.publish(subjectA, dataBytes(5)); - js.publish(subjectA, dataBytes(6)); - jsm.deleteMessage(stream, pa4.getSeqno()); - jsm.deleteMessage(stream, pa5.getSeqno()); + PublishAck pa4 = jstc.js.publish(subjectA, dataBytes(4)); + PublishAck pa5 = jstc.js.publish(subjectA, dataBytes(5)); + jstc.js.publish(subjectA, dataBytes(6)); + jstc.jsm.deleteMessage(jstc.stream, pa4.getSeqno()); + jstc.jsm.deleteMessage(jstc.stream, pa5.getSeqno()); pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder() @@ -561,7 +558,7 @@ public void testDeliveryPolicy() throws Exception { .startSequence(pa4.getSeqno()) .build()) .build(); - sub = js.subscribe(subjectA, pso); + sub = jstc.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 6); }); @@ -575,8 +572,7 @@ private void assertMessage(Message m, int i) { @Test public void testPushSyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInSharedOwnNc(listener, (nc, jstc) -> { byte[] data = new byte[1024*10]; int MSG_COUNT = 1000; @@ -613,7 +609,7 @@ public void testPushSyncFlowControl() throws Exception { @Test public void testPendingLimits() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { int customMessageLimit = 1000; int customByteLimit = 1024 * 1024; diff --git a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java index e66b0e4e8..9929e34f0 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java @@ -15,6 +15,8 @@ import io.nats.client.Connection; import io.nats.client.JetStreamApiException; +import io.nats.client.api.StorageType; +import io.nats.client.api.StreamConfiguration; import io.nats.client.api.StreamInfo; import io.nats.client.utils.TestBase; @@ -46,21 +48,71 @@ public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStream consumerNameBase = TestBase.random(); this.consumerNames = new HashMap<>(); - subjectCount = Math.max(subjectCount, 1); + if (subjectCount > 0) { + this.si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); + } + else { + this.si = null; + } + } + + public String[] getSubjects(int subjectCount) { String[] subjects = new String[subjectCount]; for (int x = 0; x < subjectCount; x++) { subjects[x] = subject(x); } - this.si = TestBase.createMemoryStream(jsm, stream, subjects); + return subjects; + } + + public void createStream() throws JetStreamApiException, IOException { + si = TestBase.createMemoryStream(jsm, stream, subject(0)); + } + + public void createStream(int subjectCount) throws JetStreamApiException, IOException { + si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); + } + + public void createStream(String... subjects) throws JetStreamApiException, IOException { + si = TestBase.createMemoryStream(jsm, stream, subjects); + } + + public StreamConfiguration.Builder scBuilder(int subjectCount) { + StreamConfiguration.Builder b = StreamConfiguration.builder() + .name(stream) + .storageType(StorageType.Memory); + if (subjectCount > 0) { + b.subjects(getSubjects(subjectCount)); + } + return b; + } + + public StreamInfo addStream(StreamConfiguration.Builder builder) throws JetStreamApiException, IOException { + si = jsm.addStream(builder.name(stream).storageType(StorageType.Memory).build()); + return si; + } + + public StreamInfo addStream(StreamConfiguration sc) throws JetStreamApiException, IOException { + si = jsm.addStream(sc); + return si; + } + + public void replaceStream(String... newSubjects) throws JetStreamApiException, IOException { + jsm.deleteStream(stream); + createStream(newSubjects); + } + + public StreamInfo replaceStream(StreamConfiguration newSc) throws JetStreamApiException, IOException { + jsm.deleteStream(stream); + return addStream(newSc); + } + + public boolean deleteStream() throws JetStreamApiException, IOException { + return jsm.deleteStream(stream); } @Override public void close() throws Exception { - try { - jsm.deleteStream(stream); - } - catch (Exception ignore) { - } + try { jsm.deleteStream(stream); } catch (Exception ignore) {} } public String subject() { @@ -68,7 +120,7 @@ public String subject() { } public String subject(Object variant) { - return subjects.computeIfAbsent(variant, v -> subjectBase + "-" + v); + return subjects.computeIfAbsent(variant, v -> subjectBase + "_" + v); } public String consumerName() { diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 7947d7c97..e128becfa 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.JetStreamOptions.DEFAULT_JS_OPTIONS; +import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.api.KeyValuePurgeOptions.DEFAULT_THRESHOLD_MILLIS; import static io.nats.client.api.KeyValueWatchOption.*; import static io.nats.client.support.NatsConstants.DOT; @@ -54,9 +55,9 @@ public void testWorkflow() throws Exception { String stringValue1 = "String Value 1"; String stringValue2 = "String Value 2"; - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { // get the kv management context - KeyValueManagement kvm = nc.keyValueManagement(); + KeyValueManagement kvm = jsm.keyValueManagement(); nc.keyValueManagement(KeyValueOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage Map metadata = new HashMap<>(); @@ -366,8 +367,8 @@ private void assertInitialStatus(KeyValueStatus status, String bucket, String de @Test public void testGetRevision() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); kvm.create(KeyValueConfiguration.builder() @@ -404,8 +405,8 @@ public void testGetRevision() throws Exception { @Test public void testKeys() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -494,8 +495,8 @@ private static List getKeysFromQueue(LinkedBlockingQueue q) { @Test public void testMaxHistoryPerKey() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket1 = random(); String bucket2 = random(); @@ -535,8 +536,8 @@ public void testMaxHistoryPerKey() throws Exception { @Test public void testCreateUpdate() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); @@ -608,8 +609,8 @@ public void testCreateUpdate() throws Exception { @Test public void testHistoryDeletePurge() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -639,8 +640,8 @@ public void testHistoryDeletePurge() throws Exception { @Test public void testAtomicDeleteAtomicPurge() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -696,8 +697,8 @@ public void testAtomicDeleteAtomicPurge() throws Exception { @Test public void testPurgeDeletes() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -756,8 +757,8 @@ private void assertPurgeDeleteEntries(JetStream js, String bucket, String[] expe @Test public void testCreateAndUpdate() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -864,8 +865,8 @@ private void assertKvEquals(KeyValueEntry kv1, KeyValueEntry kv2) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket 1 String bucket1 = random(); @@ -1023,42 +1024,42 @@ public void testWatch() throws Exception { List allKeys = Arrays.asList(TEST_WATCH_KEY_1, TEST_WATCH_KEY_2, TEST_WATCH_KEY_NULL); - runInLrServer((nc, jsm, js) -> { - _testWatch(nc, key1FullWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1FullWatcher, key1FullWatcher.watchOptions)); - _testWatch(nc, key1MetaWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1MetaWatcher, key1MetaWatcher.watchOptions)); - _testWatch(nc, key1StartNewWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartNewWatcher, key1StartNewWatcher.watchOptions)); - _testWatch(nc, key1StartAllWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartAllWatcher, key1StartAllWatcher.watchOptions)); - _testWatch(nc, key2FullWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2FullWatcher, key2FullWatcher.watchOptions)); - _testWatch(nc, key2MetaWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2MetaWatcher, key2MetaWatcher.watchOptions)); - _testWatch(nc, allAllFullWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllFullWatcher, allAllFullWatcher.watchOptions)); - _testWatch(nc, allAllMetaWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllMetaWatcher, allAllMetaWatcher.watchOptions)); - _testWatch(nc, allIgDelFullWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelFullWatcher, allIgDelFullWatcher.watchOptions)); - _testWatch(nc, allIgDelMetaWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelMetaWatcher, allIgDelMetaWatcher.watchOptions)); - _testWatch(nc, starFullWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starFullWatcher, starFullWatcher.watchOptions)); - _testWatch(nc, starMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starMetaWatcher, starMetaWatcher.watchOptions)); - _testWatch(nc, gtFullWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtFullWatcher, gtFullWatcher.watchOptions)); - _testWatch(nc, gtMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtMetaWatcher, gtMetaWatcher.watchOptions)); - _testWatch(nc, key1AfterWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterWatcher, key1AfterWatcher.watchOptions)); - _testWatch(nc, key1AfterIgDelWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterIgDelWatcher, key1AfterIgDelWatcher.watchOptions)); - _testWatch(nc, key1AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartNewWatcher, key1AfterStartNewWatcher.watchOptions)); - _testWatch(nc, key1AfterStartFirstWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartFirstWatcher, key1AfterStartFirstWatcher.watchOptions)); - _testWatch(nc, key2AfterWatcher, key2AfterExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterWatcher, key2AfterWatcher.watchOptions)); - _testWatch(nc, key2AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartNewWatcher, key2AfterStartNewWatcher.watchOptions)); - _testWatch(nc, key2AfterStartFirstWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartFirstWatcher, key2AfterStartFirstWatcher.watchOptions)); - _testWatch(nc, key1FromRevisionAfterWatcher, key1FromRevisionExpecteds, 2, kv -> kv.watch(TEST_WATCH_KEY_1, key1FromRevisionAfterWatcher, 2, key1FromRevisionAfterWatcher.watchOptions)); - _testWatch(nc, allFromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watchAll(allFromRevisionAfterWatcher, 2, allFromRevisionAfterWatcher.watchOptions)); + runInOwnJsServer((nc, jsm, js) -> { + _testWatch(jsm, key1FullWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1FullWatcher, key1FullWatcher.watchOptions)); + _testWatch(jsm, key1MetaWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1MetaWatcher, key1MetaWatcher.watchOptions)); + _testWatch(jsm, key1StartNewWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartNewWatcher, key1StartNewWatcher.watchOptions)); + _testWatch(jsm, key1StartAllWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartAllWatcher, key1StartAllWatcher.watchOptions)); + _testWatch(jsm, key2FullWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2FullWatcher, key2FullWatcher.watchOptions)); + _testWatch(jsm, key2MetaWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2MetaWatcher, key2MetaWatcher.watchOptions)); + _testWatch(jsm, allAllFullWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllFullWatcher, allAllFullWatcher.watchOptions)); + _testWatch(jsm, allAllMetaWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllMetaWatcher, allAllMetaWatcher.watchOptions)); + _testWatch(jsm, allIgDelFullWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelFullWatcher, allIgDelFullWatcher.watchOptions)); + _testWatch(jsm, allIgDelMetaWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelMetaWatcher, allIgDelMetaWatcher.watchOptions)); + _testWatch(jsm, starFullWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starFullWatcher, starFullWatcher.watchOptions)); + _testWatch(jsm, starMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starMetaWatcher, starMetaWatcher.watchOptions)); + _testWatch(jsm, gtFullWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtFullWatcher, gtFullWatcher.watchOptions)); + _testWatch(jsm, gtMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtMetaWatcher, gtMetaWatcher.watchOptions)); + _testWatch(jsm, key1AfterWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterWatcher, key1AfterWatcher.watchOptions)); + _testWatch(jsm, key1AfterIgDelWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterIgDelWatcher, key1AfterIgDelWatcher.watchOptions)); + _testWatch(jsm, key1AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartNewWatcher, key1AfterStartNewWatcher.watchOptions)); + _testWatch(jsm, key1AfterStartFirstWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartFirstWatcher, key1AfterStartFirstWatcher.watchOptions)); + _testWatch(jsm, key2AfterWatcher, key2AfterExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterWatcher, key2AfterWatcher.watchOptions)); + _testWatch(jsm, key2AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartNewWatcher, key2AfterStartNewWatcher.watchOptions)); + _testWatch(jsm, key2AfterStartFirstWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartFirstWatcher, key2AfterStartFirstWatcher.watchOptions)); + _testWatch(jsm, key1FromRevisionAfterWatcher, key1FromRevisionExpecteds, 2, kv -> kv.watch(TEST_WATCH_KEY_1, key1FromRevisionAfterWatcher, 2, key1FromRevisionAfterWatcher.watchOptions)); + _testWatch(jsm, allFromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watchAll(allFromRevisionAfterWatcher, 2, allFromRevisionAfterWatcher.watchOptions)); List keys = Arrays.asList(TEST_WATCH_KEY_1, TEST_WATCH_KEY_2); - _testWatch(nc, key1Key2FromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watch(keys, key1Key2FromRevisionAfterWatcher, 2, key1Key2FromRevisionAfterWatcher.watchOptions)); + _testWatch(jsm, key1Key2FromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watch(keys, key1Key2FromRevisionAfterWatcher, 2, key1Key2FromRevisionAfterWatcher.watchOptions)); if (atLeast2_10()) { - _testWatch(nc, multipleFullWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleFullWatcher, multipleFullWatcher.watchOptions)); - _testWatch(nc, multipleMetaWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleMetaWatcher, multipleMetaWatcher.watchOptions)); + _testWatch(jsm, multipleFullWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleFullWatcher, multipleFullWatcher.watchOptions)); + _testWatch(jsm, multipleMetaWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleMetaWatcher, multipleMetaWatcher.watchOptions)); } }); } - private void _testWatch(Connection nc, TestKeyValueWatcher watcher, Object[] expectedKves, long fromRevision, TestWatchSubSupplier supplier) throws Exception { - KeyValueManagement kvm = nc.keyValueManagement(); + private void _testWatch(JetStreamManagement jsm, TestKeyValueWatcher watcher, Object[] expectedKves, long fromRevision, TestWatchSubSupplier supplier) throws Exception { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random() + watcher.name + "Bucket"; kvm.create(KeyValueConfiguration.builder() @@ -1067,7 +1068,7 @@ private void _testWatch(Connection nc, TestKeyValueWatcher watcher, Object[] exp .storageType(StorageType.Memory) .build()); - KeyValue kv = nc.keyValue(bucket); + KeyValue kv = jsm.keyValue(bucket); NatsKeyValueWatchSubscription sub = null; @@ -1106,7 +1107,7 @@ private void _testWatch(Connection nc, TestKeyValueWatcher watcher, Object[] exp // only testing this consumer name prefix on not meta only tests // this way there is coverage on working with and without a prefix if (!watcher.metaOnly) { - List names = nc.jetStreamManagement().getConsumerNames("KV_" + bucket); + List names = jsm.getConsumerNames("KV_" + bucket); assertEquals(1, names.size()); assertNotNull(watcher.getConsumerNamePrefix()); assertTrue(names.get(0).startsWith(watcher.getConsumerNamePrefix())); @@ -1168,7 +1169,7 @@ else if (expected instanceof String) { @Test public void testWithAccount() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/kv_account.conf", false)) { + try (NatsTestServer ts = configFileServer("kv_account.conf")) { Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); @@ -1360,8 +1361,8 @@ public void testCoverPrefix() { @Test public void testKeyValueEntryEqualsImpl() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket 1 String bucket1 = random(); @@ -1484,8 +1485,8 @@ public void testKeyValuePurgeOptionsBuilderCoverage() { @Test public void testCreateDiscardPolicy() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket1 = random(); @@ -1506,8 +1507,8 @@ public void testCreateDiscardPolicy() throws Exception { @Test public void testEntryCoercion() throws Exception { - runInLrServer((nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer((nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); // create bucket String bucket = random(); @@ -1630,9 +1631,9 @@ public void testMirrorSourceBuilderPrefixConversion() { @Test public void testKeyValueMirrorCrossDomains() throws Exception { - runInJsHubLeaf((hub, leaf) -> { - KeyValueManagement hubKvm = hub.keyValueManagement(); - KeyValueManagement leafKvm = leaf.keyValueManagement(); + runInJsHubLeaf((hubNc, leafNc) -> { + KeyValueManagement hubKvm = hubNc.keyValueManagement(); + KeyValueManagement leafKvm = leafNc.keyValueManagement(); // Create main KV on HUB String hubBucket = random(); @@ -1641,7 +1642,7 @@ public void testKeyValueMirrorCrossDomains() throws Exception { .storageType(StorageType.Memory) .build()); - KeyValue hubKv = hub.keyValue(hubBucket); + KeyValue hubKv = hubNc.keyValue(hubBucket); hubKv.put("key1", "aaa0"); hubKv.put("key2", "bb0"); hubKv.put("key3", "c0"); @@ -1651,6 +1652,7 @@ public void testKeyValueMirrorCrossDomains() throws Exception { String leafStream = "KV_" + leafBucket; leafKvm.create(KeyValueConfiguration.builder() .name(leafBucket) + .storageType(StorageType.Memory) .mirror(Mirror.builder() .sourceName(hubBucket) .domain(null) // just for coverage! @@ -1659,19 +1661,23 @@ public void testKeyValueMirrorCrossDomains() throws Exception { .build()); sleep(200); // make sure things get a chance to propagate - StreamInfo si = leaf.jetStreamManagement().getStreamInfo(leafStream); - if (hub.getServerInfo().isSameOrNewerThanVersion("2.9")) { + StreamInfo si = leafNc.jetStreamManagement().getStreamInfo(leafStream); + if (hubNc.getServerInfo().isSameOrNewerThanVersion("2.9")) { assertTrue(si.getConfiguration().getMirrorDirect()); } assertEquals(3, si.getStreamState().getMsgCount()); - KeyValue leafKv = leaf.keyValue(leafBucket); + KeyValue leafKv = leafNc.keyValue(leafBucket); _testMirror(hubKv, leafKv, 1); // Bind through leafnode connection but to origin KV. KeyValue hubViaLeafKv = - leaf.keyValue(hubBucket, KeyValueOptions.builder().jsDomain(HUB_DOMAIN).build()); + leafNc.keyValue(hubBucket, KeyValueOptions.builder().jsDomain(HUB_DOMAIN).build()); _testMirror(hubKv, hubViaLeafKv, 2); + + // just cleanup + hubKvm.delete(hubBucket); + leafKvm.delete(leafBucket); }); } @@ -1711,8 +1717,8 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { @Test public void testKeyValueTransform() throws Exception { - runInLrServer(VersionUtils::atLeast2_10_3, (nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer(VersionUtils::atLeast2_10_3, (nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String kvName1 = random(); String kvName2 = kvName1 + "-mir"; @@ -1769,8 +1775,8 @@ public void testKeyValueTransform() throws Exception { @Test public void testSubjectFiltersAgainst209OptOut() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); kvm.create(KeyValueConfiguration.builder() @@ -1789,8 +1795,8 @@ public void testSubjectFiltersAgainst209OptOut() throws Exception { @Test public void testTtlAndDuplicateWindowRoundTrip() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) @@ -1828,8 +1834,8 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { @Test public void testConsumeKeys() throws Exception { int count = 10000; - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) @@ -1863,8 +1869,8 @@ public void testConsumeKeys() throws Exception { @Test public void testLimitMarkerCoverage() throws Exception { - runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { - KeyValueManagement kvm = nc.keyValueManagement(); + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + KeyValueManagement kvm = jsm.keyValueManagement(); String bucket = random(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) @@ -1912,13 +1918,13 @@ public void testLimitMarkerCoverage() throws Exception { @Test public void testLimitMarkerBehavior() throws Exception { - runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String key1 = random(); String key2 = random(); String key3 = random(); - KeyValueManagement kvm = nc.keyValueManagement(); + KeyValueManagement kvm = jsm.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -2029,12 +2035,12 @@ public void endOfData() { @Test public void testJustLimitMarkerCreatePurge() throws Exception { - runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); - KeyValueManagement kvm = nc.keyValueManagement(); + KeyValueManagement kvm = jsm.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) @@ -2138,12 +2144,12 @@ else if (mcount == 4) { @Test public void testJustTtlForDeletePurge() throws Exception { - runInLrServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); - KeyValueManagement kvm = nc.keyValueManagement(); + KeyValueManagement kvm = jsm.keyValueManagement(); KeyValueConfiguration config = KeyValueConfiguration.builder() .name(bucket) .storageType(StorageType.Memory) diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 16487d258..69636d20b 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -31,7 +31,7 @@ public class MessageContentTests extends TestBase { @Test public void testSimpleString() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); @@ -48,7 +48,7 @@ public void testSimpleString() throws Exception { @Test public void testUTF8String() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); @@ -65,7 +65,7 @@ public void testUTF8String() throws Exception { @Test public void testDifferentSizes() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); @@ -87,7 +87,7 @@ public void testDifferentSizes() throws Exception { @Test public void testZeros() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index d450d6cf0..3c7afc131 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -39,7 +39,7 @@ public class MessageManagerTests extends JetStreamTestBase { @Test public void testConstruction() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInShared(nc -> { NatsJetStreamSubscription sub = genericPushSub(nc); _pushConstruction(nc, true, true, push_hb_fc(), sub); _pushConstruction(nc, true, false, push_hb_xfc(), sub); @@ -72,7 +72,7 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO @Test public void testPushBeforeQueueProcessorAndManage() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { + runInSharedOwnNc(listener, nc -> { NatsJetStreamSubscription sub = genericPushSub(nc); PushMessageManager pushMgr = getPushManager(nc, push_hb_fc(), sub, false, true, false); @@ -135,7 +135,7 @@ private void testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTest @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { + runInSharedOwnNc(listener, nc -> { NatsJetStreamSubscription sub = genericPullSub(nc); String pullSubject = random(); @@ -209,7 +209,7 @@ private void testPullBqpAndManage(NatsJetStreamSubscription sub, ListenerForTest @Test public void testPushManagerHeartbeats() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { + runInSharedOwnNc(listener, nc -> { PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), null, false, true, false); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pushMgr); @@ -249,7 +249,7 @@ public void testPushManagerHeartbeats() throws Exception { @Test public void testPullManagerHeartbeats() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, nc -> { + runInSharedOwnNc(listener, nc -> { PullMessageManager pullMgr = getPullManager(nc, null, true); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pullMgr); pullMgr.startup(sub); @@ -389,7 +389,7 @@ private void _push_xfc(SubscribeOptions so) { @Test public void test_received_time() throws Exception { - runInLrServer((nc, jstc) -> { + runInShared((nc, jstc) -> { _received_time_yes(push_hb_fc(), jstc.js, jstc.subject()); _received_time_yes(push_hb_xfc(), jstc.js, jstc.subject()); _received_time_no(jstc.js, jstc.jsm, jstc.stream, jstc.subject(), jstc.js.subscribe(jstc.subject(), push_xhb_xfc())); @@ -415,7 +415,7 @@ PushMessageManager findStatusManager(NatsJetStreamSubscription sub) { return (PushMessageManager)mm; } return null; - }; + } private void _received_time_no(JetStream js, JetStreamManagement jsm, String stream, String subject, JetStreamSubscription sub) throws IOException, JetStreamApiException, InterruptedException { js.publish(subject, dataBytes(0)); @@ -428,7 +428,7 @@ private void _received_time_no(JetStream js, JetStreamManagement jsm, String str @Test public void test_hb_yes_settings() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInShared(nc -> { NatsJetStreamSubscription sub = genericPushSub(nc); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(1000).build(); @@ -461,7 +461,7 @@ public void test_hb_yes_settings() throws Exception { @Test public void test_hb_no_settings() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInShared(nc -> { NatsJetStreamSubscription sub = genericPushSub(nc); SubscribeOptions so = push_xhb_xfc(); PushMessageManager manager = getPushManager(nc, so, sub, false); diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index ff37569e8..ad2061186 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -329,7 +329,7 @@ private NatsMessage testMessage() { @Test public void testHeadersMutableBeforePublish() throws Exception { - runInLrServer(nc -> { + runInShared(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index 565488ed2..0cb79d968 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -32,7 +32,7 @@ public class NatsStatisticsTests extends TestBase { @Test public void testHumanReadableString() throws Exception { - runInLrServerOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { + runInSharedOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { Dispatcher d = nc.createDispatcher(msg -> { nc.publish(msg.getReplyTo(), new byte[16]); }); @@ -54,7 +54,7 @@ public void testHumanReadableString() throws Exception { @Test public void testInOutOKRequestStats() throws Exception { - runInLrServerOwnNc(optionsBuilder().verbose(), nc -> { + runInSharedOwnNc(optionsBuilder().verbose(), nc -> { Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) @@ -86,7 +86,7 @@ public void testInOutOKRequestStats() throws Exception { @Test public void testReadWriteAdvancedStatsEnabled() throws Exception { - runInLrServerOwnNc(optionsBuilder().verbose().turnOnAdvancedStats(), nc -> { + runInSharedOwnNc(optionsBuilder().verbose().turnOnAdvancedStats(), nc -> { Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) @@ -124,7 +124,7 @@ public void testReadWriteAdvancedStatsEnabled() throws Exception { @Test public void testReadWriteAdvancedStatsDisabled() throws Exception { - runInLrServerOwnNc(optionsBuilder().verbose(), nc -> { + runInSharedOwnNc(optionsBuilder().verbose(), nc -> { Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) @@ -177,7 +177,7 @@ public void testReadWriteAdvancedStatsDisabled() throws Exception { @Test public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { - runInLrServerOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { + runInSharedOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = msg -> { requests.incrementAndGet(); @@ -220,7 +220,7 @@ public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { @Test public void testOrphanDuplicateRepliesAdvancedStatsDisabled() throws Exception { - runInServer(optionsBuilder(), nc -> { + runInSharedOwnNc(optionsBuilder(), nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = msg -> { requests.incrementAndGet(); diff --git a/src/test/java/io/nats/client/impl/ObjectStoreTests.java b/src/test/java/io/nats/client/impl/ObjectStoreTests.java index 9d0f674fa..d3e17e01f 100644 --- a/src/test/java/io/nats/client/impl/ObjectStoreTests.java +++ b/src/test/java/io/nats/client/impl/ObjectStoreTests.java @@ -37,8 +37,8 @@ public class ObjectStoreTests extends JetStreamTestBase { @Test public void testWorkflow() throws Exception { - runInLrServer((nc, jsm, js) -> { - ObjectStoreManagement osm = nc.objectStoreManagement(); + runInOwnJsServer((nc, jsm, js) -> { + ObjectStoreManagement osm = jsm.objectStoreManagement(); nc.objectStoreManagement(ObjectStoreOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage Map metadata = new HashMap<>(); @@ -249,8 +249,8 @@ private static Object[] getInput(int size) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - runInLrServer((nc, jsm, js) -> { - ObjectStoreManagement osm = nc.objectStoreManagement(); + runInOwnJsServer((nc, jsm, js) -> { + ObjectStoreManagement osm = jsm.objectStoreManagement(); // create bucket 1 String bucket1 = random(); @@ -311,8 +311,8 @@ private void assertOso(ObjectStoreOptions oso) { @Test public void testObjectLinks() throws Exception { - runInLrServer((nc, jsm, js) -> { - ObjectStoreManagement osm = nc.objectStoreManagement(); + runInOwnJsServer((nc, jsm, js) -> { + ObjectStoreManagement osm = jsm.objectStoreManagement(); String bucket1 = "b1"; // bucket(); String bucket2 = "b2"; // bucket(); @@ -432,8 +432,8 @@ private void validateLink(ObjectInfo oiLink, String linkName, ObjectInfo targetI @Test public void testList() throws Exception { - runInLrServer((nc, jsm, js) -> { - ObjectStoreManagement osm = nc.objectStoreManagement(); + runInOwnJsServer((nc, jsm, js) -> { + ObjectStoreManagement osm = jsm.objectStoreManagement(); String bucket = random(); osm.create(ObjectStoreConfiguration.builder(bucket).storageType(StorageType.Memory).build()); @@ -467,9 +467,9 @@ public void testList() throws Exception { @Test public void testSeal() throws Exception { - runInLrServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { String bucket = random(); - ObjectStoreManagement osm = nc.objectStoreManagement(); + ObjectStoreManagement osm = jsm.objectStoreManagement(); osm.create(ObjectStoreConfiguration.builder(bucket) .storageType(StorageType.Memory) .build()); @@ -490,9 +490,9 @@ public void testSeal() throws Exception { @Test public void testCompression() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { String bucket = random(); - ObjectStoreManagement osm = nc.objectStoreManagement(); + ObjectStoreManagement osm = jsm.objectStoreManagement(); osm.create(ObjectStoreConfiguration.builder(bucket) .storageType(StorageType.Memory) .compression(true) @@ -555,21 +555,21 @@ public void testWatch() throws Exception { TestObjectStoreWatcher fullAfterWatcher = new TestObjectStoreWatcher("fullAfterWatcher", false); TestObjectStoreWatcher delAfterWatcher = new TestObjectStoreWatcher("delAfterWatcher", false, IGNORE_DELETE); - runInLrServer((nc, jsm, js) -> { - _testWatch(nc, fullB4Watcher, new Object[]{"A", "B", null}, os -> os.watch(fullB4Watcher, fullB4Watcher.watchOptions)); - _testWatch(nc, delB4Watcher, new Object[]{"A", "B"}, os -> os.watch(delB4Watcher, delB4Watcher.watchOptions)); - _testWatch(nc, fullAfterWatcher, new Object[]{"B", null}, os -> os.watch(fullAfterWatcher, fullAfterWatcher.watchOptions)); - _testWatch(nc, delAfterWatcher, new Object[]{"B"}, os -> os.watch(delAfterWatcher, delAfterWatcher.watchOptions)); + runInOwnJsServer((nc, jsm, js) -> { + _testWatch(jsm, fullB4Watcher, new Object[]{"A", "B", null}, os -> os.watch(fullB4Watcher, fullB4Watcher.watchOptions)); + _testWatch(jsm, delB4Watcher, new Object[]{"A", "B"}, os -> os.watch(delB4Watcher, delB4Watcher.watchOptions)); + _testWatch(jsm, fullAfterWatcher, new Object[]{"B", null}, os -> os.watch(fullAfterWatcher, fullAfterWatcher.watchOptions)); + _testWatch(jsm, delAfterWatcher, new Object[]{"B"}, os -> os.watch(delAfterWatcher, delAfterWatcher.watchOptions)); }); } - private void _testWatch(Connection nc, TestObjectStoreWatcher watcher, Object[] expecteds, TestWatchSubSupplier supplier) throws Exception { - ObjectStoreManagement osm = nc.objectStoreManagement(); + private void _testWatch(JetStreamManagement jsm, TestObjectStoreWatcher watcher, Object[] expecteds, TestWatchSubSupplier supplier) throws Exception { + ObjectStoreManagement osm = jsm.objectStoreManagement(); String bucket = watcher.name + "Bucket"; osm.create(ObjectStoreConfiguration.builder(bucket).storageType(StorageType.Memory).build()); - ObjectStore os = nc.objectStore(bucket); + ObjectStore os = jsm.objectStore(bucket); NatsObjectStoreWatchSubscription sub = null; @@ -609,6 +609,7 @@ private void validateWatcher(Object[] expecteds, TestObjectStoreWatcher watcher) for (ObjectInfo oi : watcher.entries) { + assertNotNull(oi.getModified()); assertTrue(oi.getModified().isAfter(lastMod) || oi.getModified().isEqual(lastMod)); lastMod = oi.getModified(); @@ -619,6 +620,7 @@ private void validateWatcher(Object[] expecteds, TestObjectStoreWatcher watcher) assertTrue(oi.isDeleted()); } else { + assertNotNull(oi.getObjectMeta().getObjectMetaOptions()); assertEquals(CHUNK_SIZE, oi.getObjectMeta().getObjectMetaOptions().getChunkSize()); assertEquals(CHUNKS, oi.getChunks()); assertEquals(SIZE, oi.getSize()); diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index 4f40f76c7..436aca5b7 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -54,7 +54,7 @@ public void testTooBig() { @Test public void testBadGather() throws Exception { - runInLrServerOwnNc(c -> { + runInSharedOwnNc(c -> { NatsConnection nc = (NatsConnection)c; NatsConnectionReader reader = nc.getReader(); _testBadGather(reader, "thisistoolong\r\n"); // too long protocol @@ -70,7 +70,7 @@ private static void _testBadGather(NatsConnectionReader reader, String bad) { @Test public void testBadParse() throws Exception { - runInLrServerOwnNc(c -> { + runInSharedOwnNc(c -> { NatsConnection nc = (NatsConnection)c; NatsConnectionReader reader = nc.getReader(); _testBadParse(reader, "MSG 1 1\r\n"); // missing subject @@ -97,7 +97,7 @@ public void testTooShortMaxControlLineToConnect() throws Exception { @Test public void testProtocolLineTooLong() throws Exception { - runInLrServerOwnNc(optionsBuilder().maxControlLine(1024), c -> { + runInSharedOwnNc(optionsBuilder().maxControlLine(1024), c -> { NatsConnection nc = (NatsConnection)c; NatsConnectionReader reader = nc.getReader(); StringBuilder longString = new StringBuilder(); @@ -135,7 +135,7 @@ public void testProtocolStrings() throws Exception { OP_ERR, OP_INFO, OP_PING, OP_MSG, OP_OK, OP_PONG, OP_PONG, OP_MSG }; - runInLrServerOwnNc(c -> { + runInSharedOwnNc(c -> { NatsConnection nc = (NatsConnection) c; NatsConnectionReader reader = nc.getReader(); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index d445a67ce..0a30e0bca 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -75,7 +75,7 @@ public void testPingTimer() throws Exception { Options.Builder builder = optionsBuilder() .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000); // just don't want this to be what fails the test - runInLrServerOwnNc(builder, nc -> { + runInSharedOwnNc(builder, nc -> { Statistics stats = nc.getStatistics(); try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings assertTrue(stats.getPings() > 10, "got pings"); @@ -201,7 +201,7 @@ public void testPingTimerThroughReconnect() throws Exception { @Test public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { Options.Builder builder = optionsBuilder().pingInterval(Duration.ofMillis(200)); - runInLrServerOwnNc(builder, nc -> { + runInSharedOwnNc(builder, nc -> { Statistics stats = nc.getStatistics(); final CompletableFuture done = new CompletableFuture<>(); @@ -236,7 +236,7 @@ public void testMessagesDelayPings() throws Exception, ExecutionException, Timeo @Test public void testRtt() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { assertTrue(nc.RTT().toMillis() < 10); nc.close(); assertThrows(IOException.class, nc::RTT); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 7f6928746..dc613ada6 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -34,8 +34,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; -import static io.nats.client.NatsTestServer.configFileServer; -import static io.nats.client.NatsTestServer.getLocalhostUri; +import static io.nats.client.AuthTests.getUserCredsAuthHander; +import static io.nats.client.NatsTestServer.*; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; @@ -59,11 +59,11 @@ public void testSimpleReconnect() throws Exception { //Includes test for subscri @Test public void testWsReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - _testReconnect(NatsServerRunner.builder().configFilePath("src/test/resources/ws_operator.conf"), + _testReconnect(configFileBuilder("ws_operator.conf"), (ts, optionsBuilder) -> optionsBuilder .server(ts.getLocalhostUri("ws")) - .authHandler(Nats.credentials("src/test/resources/jwt_nkey/user.creds"))); + .authHandler(getUserCredsAuthHander())); } private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer optSetter) throws Exception { @@ -160,7 +160,7 @@ public void testSubscribeDuringReconnect() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); - try (NatsTestServer ignored = new NatsTestServer(port, false)) { + try (NatsTestServer ignored = new NatsTestServer(port)) { listenerConnectionWait(nc, listener); // Make sure the dispatcher and subscription are still there @@ -189,7 +189,7 @@ public void testReconnectBuffer() throws Exception { long end; String[] customArgs = {"--user","stephen","--pass","password"}; - try (NatsTestServer ts = new NatsTestServer(customArgs, port, false)) { + try (NatsTestServer ts = new NatsTestServer(customArgs, port)) { Options options = optionsBuilder(ts) .maxReconnects(-1) .userInfo("stephen".toCharArray(), "password".toCharArray()) @@ -228,7 +228,7 @@ public void testReconnectBuffer() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = new NatsTestServer(customArgs, port, false)) { + try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { listenerConnectionWait(nc, listener); end = System.nanoTime(); @@ -258,7 +258,7 @@ public void testMaxReconnects() throws Exception { ListenerForTesting listener = new ListenerForTesting(); int port = NatsTestServer.nextPort(); - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { Options options = optionsBuilder(ts) .maxReconnects(1) .connectionListener(listener) @@ -467,7 +467,7 @@ public void testReconnectDropOnLineFeed() throws Exception { // connect good then bad listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = new NatsTestServer(port, false)) { + try (NatsTestServer ignored = new NatsTestServer(port)) { listenerConnectionWait(nc, listener); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -525,8 +525,8 @@ public void testReconnectNoIPTLSConnection() throws Exception { }; // Regular tls for first connection, then no ip for second - try ( NatsTestServer ts = new NatsTestServer("src/test/resources/tls_noip.conf", tsInserts, tsPort, false); - NatsTestServer ts2 = new NatsTestServer("src/test/resources/tls_noip.conf", ts2Inserts, ts2Port, false) ) { + try (NatsTestServer ts = new NatsTestServer("tls_noip.conf", tsInserts, tsPort); + NatsTestServer ts2 = new NatsTestServer("tls_noip.conf", ts2Inserts, ts2Port) ) { SslTestingHelper.setKeystoreSystemParameters(); Options options = optionsBuilder(ts) @@ -587,7 +587,7 @@ public void testWriterFilterTiming() throws Exception { ListenerForTesting listener = new ListenerForTesting(); int port = NatsTestServer.nextPort(); - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { Options options = optionsBuilder(ts) .noReconnect() .connectionListener(listener) @@ -635,7 +635,7 @@ public void testReconnectWait() throws Exception { int port = NatsTestServer.nextPort(); - try (NatsTestServer ts = new NatsTestServer(port, false)) { + try (NatsTestServer ts = new NatsTestServer(port)) { Options options = optionsBuilder(ts) .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(1)) @@ -643,6 +643,7 @@ public void testReconnectWait() throws Exception { .connectionListener(trwh) .build(); + //noinspection unused try (Connection nc = Nats.connect(options)) { ts.close(); sleep(250); @@ -684,7 +685,7 @@ private static Thread getReconnectOnConnectTestThread(AtomicReference _testForceReconnect(nc0, listener)); + runInCluster(tstOpts, (nc0, nc1, nc2) -> _testForceReconnect(nc0, listener)); } @Test public void testForceReconnectWithAccount() throws Exception { ListenerForTesting listener = new ListenerForTesting(); ThreeServerTestOptions tstOpts = makeThreeServerTestOptions(listener, true); - runInJsCluster(tstOpts, (nc0, nc1, nc2) -> _testForceReconnect(nc0, listener)); + runInCluster(tstOpts, (nc0, nc1, nc2) -> _testForceReconnect(nc0, listener)); } private static void _testForceReconnect(Connection nc0, ListenerForTesting listener) throws IOException, InterruptedException { @@ -791,7 +792,7 @@ public boolean includeAllServers() { @Test public void testForceReconnectQueueBehaviorCheck() throws Exception { - runInJsCluster((nc0, nc1, nc2) -> { + runInCluster((nc0, nc1, nc2) -> { if (atLeast2_9_0(nc0)) { int pubCount = 100_000; int subscribeTime = 5000; @@ -938,7 +939,7 @@ public void testSocketDataPortTimeout() throws Exception { .errorListener(listener); AtomicBoolean gotOutputQueueIsFull = new AtomicBoolean(); - runInServer(nc1 -> runInServer(nc2 -> { + runInOwnServer(nc1 -> runInOwnServer(nc2 -> { int port1 = nc1.getServerInfo().getPort(); int port2 = nc2.getServerInfo().getPort(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index 1e96e6a65..df9833dfc 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -70,7 +70,7 @@ public void testSimpleRequest() throws Exception { @Test public void testRequestVarieties() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { Dispatcher d = nc.createDispatcher(msg -> { if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), msg.getData()); @@ -183,7 +183,7 @@ public void testMultipleRequest() throws Exception { @Test public void testMultipleReplies() throws Exception { Options.Builder builder = optionsBuilder().turnOnAdvancedStats(); - runInServer(builder, nc -> { + runInOwnServer(builder, nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; Dispatcher d1 = nc.createDispatcher(handler); @@ -376,9 +376,7 @@ public void testSimpleRequestWithTimeout() throws Exception { @Test public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { - - try (NatsTestServer ts = new NatsTestServer()) - { + try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 10; Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); @@ -599,7 +597,7 @@ public void testDelayInPickingUpFuture() throws Exception { @Test public void testOldStyleRequest() throws Exception { - runInLrServerOwnNc(Options.builder().oldRequestStyle(), nc -> { + runInSharedOwnNc(Options.builder().oldRequestStyle(), nc -> { String subject = random(); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe(subject); @@ -641,37 +639,13 @@ public void testBuffersResize() throws Exception { } @Test - public void throwsIfClosed() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getLocalhostUri())) { - nc.close(); - nc.request("subject", null); - fail(); - } - }); - } - - @Test - public void testThrowsWithoutSubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getLocalhostUri())) { - //noinspection DataFlowIssue - nc.request((String)null, null); - fail(); - } - }); - } - - @Test - public void testThrowsEmptySubject() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getLocalhostUri())) { - nc.request("", null); - fail(); - } + public void testRequestErrors() throws Exception { + runInSharedOwnNc(nc -> { + //noinspection DataFlowIssue + assertThrows(IllegalArgumentException.class, () -> nc.request((String)null, null)); // null subject bad + assertThrows(IllegalArgumentException.class, () -> nc.request("", null)); // empty subject bad + nc.close(); + assertThrows(IllegalStateException.class, () -> nc.request("subject", null)); // can't request after close }); } diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 8c489da5e..88643a6d3 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -45,16 +45,16 @@ public class SimplificationTests extends JetStreamTestBase { @Test public void testStreamContextErrors() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jsm, js) -> { + runInShared(VersionUtils::atLeast2_9_1, nc -> { assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random())); assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random(), JetStreamOptions.DEFAULT_JS_OPTIONS)); - assertThrows(JetStreamApiException.class, () -> js.getStreamContext(random())); + assertThrows(JetStreamApiException.class, () -> nc.jetStream().getStreamContext(random())); }); } @Test public void testStreamContextFromConnection() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext streamContext = nc.getStreamContext(jstc.stream); assertEquals(jstc.stream, streamContext.getStreamName()); _testStreamContext(jstc, streamContext); @@ -63,7 +63,7 @@ public void testStreamContextFromConnection() throws Exception { @Test public void testStreamContextFromContext() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext streamContext = jstc.js.getStreamContext(jstc.stream); assertEquals(jstc.stream, streamContext.getStreamName()); _testStreamContext(jstc, streamContext); @@ -194,7 +194,7 @@ private String validateConsumerNameForOrdered(BaseConsumerContext bcc, MessageCo static int FETCH_ORDERED = 3; @Test public void testFetch() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { for (int x = 1; x <= 20; x++) { jstc.js.publish(jstc.subject(), ("test-fetch-msg-" + x).getBytes()); } @@ -333,7 +333,7 @@ private String generateConsumerName(int maxMessages, int maxBytes) { @Test public void testFetchNoWaitPlusExpires() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() .name(jstc.consumerName()) .inactiveThreshold(100000) // I could have used a durable, but this is long enough for the test @@ -397,7 +397,7 @@ private int readMessages(FetchConsumer fc) throws InterruptedException, JetStrea @Test public void testIterableConsumer() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); @@ -424,7 +424,7 @@ public void testIterableConsumer() throws Exception { @Test public void testOrderedConsumerDeliverPolices() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 101, 3, 100); ZonedDateTime startTime = getStartTimeFirstMessage(jstc); @@ -479,7 +479,7 @@ public void testOrderedConsumerCoverage() { @Test public void testOrderedIterableConsumerBasic() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = nc.getStreamContext(jstc.stream); int stopCount = 500; @@ -543,7 +543,7 @@ private void _testIterableBasic(JetStream js, int stopCount, IterableConsumer co @Test public void testConsumeWithHandler() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 2500); // Pre define a consumer @@ -631,7 +631,7 @@ private static void stopAndWaitForFinished(MessageConsumer mcon) throws Interrup @Test public void testNext() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 4); String name = random(); @@ -703,7 +703,7 @@ public void testNext() throws Exception { @Test public void testCoverage() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { // Pre define a consumer jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(1)).build()); jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(2)).build()); @@ -925,8 +925,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorNext() throws Exception { - runInJsServer(VersionUtils::atLeast2_9_1, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = jstc.js.getStreamContext(jstc.stream); jsPublish(jstc.js, jstc.subject(), 101, 6, 100); @@ -1007,8 +1006,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorFetch() throws Exception { - runInJsServer(VersionUtils::atLeast2_9_1, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = jstc.js.getStreamContext(jstc.stream); jsPublish(jstc.js, jstc.subject(), 101, 6, 100); @@ -1077,8 +1075,7 @@ private void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq, Ordere @Test public void testOrderedBehaviorIterable() throws Exception { - runInJsServer(VersionUtils::atLeast2_9_1, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = jstc.js.getStreamContext(jstc.stream); jsPublish(jstc.js, jstc.subject(), 101, 6, 100); @@ -1161,7 +1158,7 @@ public void testOrderedConsumeConstruction() { @Test public void testOrderedConsume() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() .filterSubject(jstc.subject()); _testOrderedConsume(jstc, occ); @@ -1170,7 +1167,7 @@ public void testOrderedConsume() throws Exception { @Test public void testOrderedConsumeWithPrefix() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() .consumerNamePrefix(random()) .filterSubject(jstc.subject()); @@ -1212,8 +1209,8 @@ private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerCo @Test public void testOrderedConsumeMultipleSubjects() throws Exception { - runInLrServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 2); + runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { + jstc.createStream(2); jsPublish(jstc.js, jstc.subject(0), 10); jsPublish(jstc.js, jstc.subject(1), 5); @@ -1245,7 +1242,7 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { @Test public void testOrderedMultipleWays() throws Exception { - runInLrServer(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { StreamContext sctx = jstc.js.getStreamContext(jstc.stream); OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); @@ -1462,8 +1459,7 @@ private Object roundTripSerialize(Serializable s) throws IOException, ClassNotFo @Test public void testOverflowFetch() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInJsServer(listener, VersionUtils::atLeast2_9_1, nc -> { - JetStreamTestingContext jstc = new JetStreamTestingContext(nc); + runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending @@ -1525,7 +1521,7 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 100); // Testing min ack pending @@ -1611,7 +1607,7 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { jsPublish(jstc.js, jstc.subject(), 1000); // Testing min ack pending @@ -1677,7 +1673,7 @@ public void testOverflowConsume() throws Exception { @Test public void testFinishEmptyStream() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, jstc) -> { String name = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(name) @@ -1740,7 +1736,7 @@ public void testReconnectOverOrdered() throws Exception { String firstConsumerName; //noinspection unused - try (NatsTestServer ts = new NatsTestServer(port, false, true)) { + try (NatsTestServer ts = new NatsTestServer(port, true)) { nc = (NatsConnection) standardConnectionWait(options); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) @@ -1771,7 +1767,7 @@ public void testReconnectOverOrdered() throws Exception { assertEquals(count1, nextExpectedSequence.get()); // reconnect and get some more messages - try (NatsTestServer ignored = new NatsTestServer(port, false, true)) { + try (NatsTestServer ignored = new NatsTestServer(port, true)) { standardConnectionWait(nc); sleep(6000); // long enough to get messages and for the hb alarm to have tripped } @@ -1783,7 +1779,7 @@ public void testReconnectOverOrdered() throws Exception { assertEquals(count2, nextExpectedSequence.get()); sleep(6000); // enough delay before reconnect to trip hb alarm again - try (NatsTestServer ignored = new NatsTestServer(port, false, true)) { + try (NatsTestServer ignored = new NatsTestServer(port, true)) { standardConnectionWait(nc); sleep(6000); // long enough to get messages and for the hb alarm to have tripped diff --git a/src/test/java/io/nats/client/impl/SlowConsumerTests.java b/src/test/java/io/nats/client/impl/SlowConsumerTests.java index a46d9ff26..aa7be3327 100644 --- a/src/test/java/io/nats/client/impl/SlowConsumerTests.java +++ b/src/test/java/io/nats/client/impl/SlowConsumerTests.java @@ -32,7 +32,7 @@ public class SlowConsumerTests extends TestBase { @Test public void testDefaultPendingLimits() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); Dispatcher d = nc.createDispatcher((Message m) -> {}); @@ -48,7 +48,7 @@ public void testDefaultPendingLimits() throws Exception { @Test public void testSlowSubscriberByMessages() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { String subject = random(); int expectedPending = subject.length() + 12; Subscription sub = nc.subscribe(subject); @@ -80,7 +80,7 @@ public void testSlowSubscriberByMessages() throws Exception { @Test public void testSlowSubscriberByBytes() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { String subject = random(); int maxBytes = subject.length() + 3; int expectedPending = maxBytes + 9; @@ -111,7 +111,7 @@ public void testSlowSubscriberByBytes() throws Exception { @Test public void testSlowSDispatcherByMessages() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { String subject = random(); int expectedPending = subject.length() + 12; @@ -152,7 +152,7 @@ public void testSlowSDispatcherByMessages() throws Exception { @Test public void testSlowSDispatcherByBytes() throws Exception { - runInLrServerOwnNc(nc -> { + runInSharedOwnNc(nc -> { String subject = random(); int maxBytes = subject.length() + 3; int expectedPending = maxBytes + 9; @@ -194,7 +194,7 @@ public void testSlowSDispatcherByBytes() throws Exception { @Test public void testSlowSubscriberNotification() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInLrServerOwnNc(listener, nc -> { + runInSharedOwnNc(listener, nc -> { String subject = random(); Subscription sub = nc.subscribe(subject); sub.setPendingLimits(1, -1); diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 63c094745..8f26d4bab 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.NatsTestServer.configFileServer; +import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; @@ -75,7 +76,7 @@ private static Options createTestOptionsViaFactoryClassName(String... servers) { @Test public void testSimpleTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { + try (NatsTestServer ts = configFileServer("tls.conf")) { String servers = ts.getLocalhostUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -87,11 +88,7 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testSimpleTlsFirstConnection() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { - try (NatsTestServer ts = new NatsTestServer( - NatsTestServer.builder() - .configFilePath("src/test/resources/tls_first.conf") - .skipConnectValidate()) - ) { + try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { Options options = optionsBuilder(ts) .maxReconnects(0) .tlsFirst() @@ -105,7 +102,7 @@ public void testSimpleTlsFirstConnection() throws Exception { @Test public void testSimpleUrlTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { + try (NatsTestServer ts = configFileServer("tls.conf")) { String[] servers = NatsTestServer.getLocalhostUris("tls", ts); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -117,8 +114,8 @@ public void testSimpleUrlTLSConnection() throws Exception { @Test public void testMultipleUrlTLSConnectionSetContext() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer server1 = new NatsTestServer("src/test/resources/tls.conf", false); - NatsTestServer server2 = new NatsTestServer("src/test/resources/tls.conf", false) + try (NatsTestServer server1 = configFileServer("tls.conf"); + NatsTestServer server2 = configFileServer("tls.conf") ) { String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); assertCanConnectAndPubSub(createTestOptionsManually(servers)); @@ -131,7 +128,7 @@ public void testMultipleUrlTLSConnectionSetContext() throws Exception { @Test public void testSimpleIPTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { + try (NatsTestServer ts = configFileServer("tls.conf")) { String servers = "127.0.0.1:" + ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -142,7 +139,7 @@ public void testSimpleIPTLSConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = configFileServer("tlsverify.conf")) { String servers = ts.getLocalhostUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -153,7 +150,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testOpenTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { + try (NatsTestServer ts = configFileServer("tls.conf")) { String servers = ts.getLocalhostUri(); Options options = optionsBuilder() .server(servers) @@ -172,7 +169,7 @@ public void testOpenTLSConnection() throws Exception { @Test public void testURISchemeTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = configFileServer("tlsverify.conf")) { String servers = "tls://localhost:"+ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -183,7 +180,7 @@ public void testURISchemeTLSConnection() throws Exception { @Test public void testURISchemeIPTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tlsverify.conf", false)) { + try (NatsTestServer ts = configFileServer("tlsverify.conf")) { String servers = "tls://127.0.0.1:"+ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -194,7 +191,7 @@ public void testURISchemeIPTLSConnection() throws Exception { @Test public void testURISchemeOpenTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/tls.conf", false)) { + try (NatsTestServer ts = configFileServer("tls.conf")) { String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); Options options = optionsBuilder(servers) .maxReconnects(0) @@ -427,7 +424,7 @@ void handleInfo(String infoJson) { public void testProxyTlsFirst() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { // cannot check connect b/c tls first - try (NatsTestServer ts = NatsTestServer.skipConnectValidateServer("tls_first.conf")) { + try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { // 1. client tls first | secure proxy | server insecure -> connects ProxyConnection connTI = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_INSECURE); connTI.connect(false); diff --git a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java index a8486c340..ce00b8ab8 100644 --- a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java +++ b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java @@ -114,7 +114,7 @@ public ServerContext(int port) { } public void startServer() throws IOException { - server.set(new NatsTestServer(new String[]{"--auth", "1234"}, port, false)); + server.set(new NatsTestServer(new String[]{"--auth", "1234"}, port)); } private void restartServer() { diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 3db1f8948..a79161f43 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -32,8 +32,7 @@ import java.util.concurrent.TimeUnit; import static io.nats.client.ConnectionListener.Events.CONNECTED; -import static io.nats.client.NatsTestServer.getLocalhostUri; -import static io.nats.client.NatsTestServer.nextPort; +import static io.nats.client.NatsTestServer.*; import static io.nats.client.utils.ConnectionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -42,7 +41,7 @@ public class WebsocketConnectTests extends TestBase { @Test public void testRequestReply() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws.conf", false)) { + try (NatsTestServer ts = configFileServer("ws.conf")) { standardRequestReply(Options.builder() .server(getLocalhostUri(ts.getPort())) .maxReconnects(0).build()); @@ -55,9 +54,8 @@ public void testRequestReply() throws Exception { private static void standardRequestReply(Options options) throws InterruptedException, IOException { try (Connection connection = standardConnectionWait(options)) { - Dispatcher dispatcher = connection.createDispatcher(msg -> { - connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes()); - }); + Dispatcher dispatcher = connection.createDispatcher( + msg -> connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes())); try { dispatcher.subscribe("TEST"); Message response = connection.request("TEST", "REQUEST".getBytes()).join(); @@ -71,7 +69,7 @@ private static void standardRequestReply(Options options) throws InterruptedExce @Test public void testTLSRequestReply() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { java.util.function.Consumer interceptor = req -> { // Ideally we could validate that this header was sent to NATS server @@ -96,7 +94,7 @@ public void testProxyRequestReply() throws Exception { RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); executor.submit(proxy); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws.conf", false)) { + try (NatsTestServer ts = configFileServer("ws.conf")) { Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("ws"))) .maxReconnects(0) @@ -109,7 +107,7 @@ public void testProxyRequestReply() throws Exception { @Test public void testSimpleTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) @@ -123,7 +121,7 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testSimpleWSSIPConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder(). server("wss://127.0.0.1:" + ts.getPort("wss")). @@ -136,7 +134,7 @@ public void testSimpleWSSIPConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) @@ -149,7 +147,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testOpenTLSConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .maxReconnects(0) @@ -161,7 +159,7 @@ public void testOpenTLSConnection() throws Exception { @Test public void testURIWSSHostConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one @@ -173,7 +171,7 @@ public void testURIWSSHostConnection() throws Exception { @Test public void testURIWSSIPConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { Options options = Options.builder() .server("wss://127.0.0.1:" + ts.getPort("wss")) .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one @@ -186,7 +184,7 @@ public void testURIWSSIPConnection() throws Exception { @Test public void testURISchemeWSSConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) @@ -201,7 +199,7 @@ public void testURISchemeWSSConnection() throws Exception { @Test public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wss.conf", false)) { + try (NatsTestServer ts = configFileServer("wss.conf")) { SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) @@ -216,7 +214,7 @@ public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Excepti @Test public void testTLSMessageFlow() throws Exception { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; Options options = Options.builder() @@ -225,9 +223,7 @@ public void testTLSMessageFlow() throws Exception { .sslContext(ctx) .build(); Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher(msg -> { - nc.publish(msg.getReplyTo(), new byte[16]); - }); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); d.subscribe("subject"); for (int i=0;i { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(ts.getLocalhostUri("wss")) @@ -295,9 +291,9 @@ public void testDisconnectOnUpgrade() { } @Test - public void testServerSecureClientNotMismatch() throws Exception { + public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { Options options = Options.builder() .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("wss"))) .maxReconnects(0) @@ -325,7 +321,7 @@ public void testClientSecureServerNotMismatch() { @Test public void testClientServerCertMismatch() { assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer("src/test/resources/wssverify.conf", false)) { + try (NatsTestServer ts = configFileServer("wssverify.conf")) { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); Options options = Options.builder() .server(ts.getLocalhostUri("wss")) diff --git a/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java b/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java index d3ee16566..921e16d80 100644 --- a/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java +++ b/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; +import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.support.WebsocketFrameHeader.OpCode; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.*; @@ -321,7 +322,7 @@ private void testWithWriter(OutputStreamWrite writer, String msgStartsWith) thro @Test public void testWebSocketCoverage() throws Exception { AtomicReference lastMethod = new AtomicReference<>(); - try (NatsTestServer ts = new NatsTestServer("src/test/resources/ws.conf", false)) { + try (NatsTestServer ts = configFileServer("ws.conf")) { try (Socket tcpSocket = new Socket("localhost", ts.getPort("ws"))) { WebSocket webSocket = new WebSocket(new Socket() { @Override diff --git a/src/test/java/io/nats/client/utils/LongRunningServer.java b/src/test/java/io/nats/client/utils/LongRunningServer.java deleted file mode 100644 index de34f2f41..000000000 --- a/src/test/java/io/nats/client/utils/LongRunningServer.java +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright 2025 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client.utils; - -import io.nats.client.Connection; -import io.nats.client.Nats; -import io.nats.client.NatsTestServer; - -import java.io.IOException; -import java.util.concurrent.locks.ReentrantLock; - -import static io.nats.client.utils.ConnectionUtils.VERY_LONG_CONNECTION_WAIT_MS; -import static io.nats.client.utils.ConnectionUtils.connectionWait; -import static io.nats.client.utils.OptionsUtils.options; -import static io.nats.client.utils.VersionUtils.initVersionServerInfo; - -public abstract class LongRunningServer { - - private static final ReentrantLock lock = new ReentrantLock(); - private static final int MAX_TRIES = 3; - - private static NatsTestServer natsTestServer; - private static String server; - private static Connection[] ncs; - - public static String server() throws IOException { - if (server == null) { - ensureInitialized(); - } - return server; - } - - // do not use LrConns in try-resources - public static Connection getLrConn() throws IOException, InterruptedException { - return _getLrConnection(0, 0); - } - - public static Connection getLrConn2() throws IOException, InterruptedException { - return _getLrConnection(1, 0); - } - - private static Connection _getLrConnection(int ix, int tries) throws IOException, InterruptedException { - lock.lock(); - try { - if (ncs == null) { - ncs = new Connection[2]; - } - if (ncs[ix] == null) { - ncs[ix] = connectionWait(Nats.connect(options(server())), VERY_LONG_CONNECTION_WAIT_MS); - initVersionServerInfo(ncs[ix]); - } - else if (ncs[ix].getStatus() != Connection.Status.CONNECTED) { - if (++tries < MAX_TRIES) { - Connection c = ncs[ix]; - c.getOptions().getExecutor().execute(() -> { - try { - c.close(); - } - catch (InterruptedException ignore) { - } - }); - ncs[ix] = null; - return _getLrConnection(ix, tries); - } - } - return ncs[ix]; - } - finally { - lock.unlock(); - } - } - - private static void ensureInitialized() throws IOException { - lock.lock(); - try { - if (natsTestServer == null) { - natsTestServer = new NatsTestServer( - NatsTestServer.builder() - .jetstream(true) - .customName("LongRunningServer") - ); - server = natsTestServer.getLocalhostUri(); - - final Thread shutdownHookThread = new Thread("LongRunningServer-Shutdown-Hook") { - @Override - public void run() { - try { - natsTestServer.shutdown(false); - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - }; - - Runtime.getRuntime().addShutdownHook(shutdownHookThread); - } - } - finally { - lock.unlock(); - } - } -} diff --git a/src/test/java/io/nats/client/utils/ResourceUtils.java b/src/test/java/io/nats/client/utils/ResourceUtils.java index 3e44d13f1..787ef4b62 100644 --- a/src/test/java/io/nats/client/utils/ResourceUtils.java +++ b/src/test/java/io/nats/client/utils/ResourceUtils.java @@ -7,6 +7,24 @@ @SuppressWarnings("DataFlowIssue") public abstract class ResourceUtils { + + public static final String CONFIG_FILE_BASE = "src/test/resources/"; + public static final String JWT_FILE_BASE = "src/test/resources/jwt_nkey/"; + + public static String configResource(String configFilePath) { + if (configFilePath == null) { + return null; + } + return configFilePath.startsWith(CONFIG_FILE_BASE) ? configFilePath : CONFIG_FILE_BASE + configFilePath; + } + + public static String jwtResource(String configFilePath) { + if (configFilePath == null) { + return null; + } + return configFilePath.startsWith(JWT_FILE_BASE) ? configFilePath : JWT_FILE_BASE + configFilePath; + } + public static List dataAsLines(String fileName) { return resourceAsLines("data/" + fileName); } @@ -30,7 +48,7 @@ public static List resourceAsLines(String fileName) { } } - + public static String resourceAsString(String fileName) { try { ClassLoader classLoader = ResourceUtils.class.getClassLoader(); diff --git a/src/test/java/io/nats/client/utils/ReusableServer.java b/src/test/java/io/nats/client/utils/ReusableServer.java new file mode 100644 index 000000000..02e100499 --- /dev/null +++ b/src/test/java/io/nats/client/utils/ReusableServer.java @@ -0,0 +1,164 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.utils; + +import io.nats.client.*; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.locks.ReentrantLock; + +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.ThreadUtils.sleep; +import static io.nats.client.utils.VersionUtils.initVersionServerInfo; + +public class ReusableServer { + + private static final int RETRY_DELAY_INCREMENT = 50; + private static final int CONNECTION_RETRIES = 10; + private static final long RETRY_DELAY = 100; + private static final Thread REUSABLES_SHUTDOWN_HOOK_THREAD; + private static final Map REUSABLES; + private static final ReentrantLock STATIC_LOCK; + + static { + STATIC_LOCK = new ReentrantLock(); + REUSABLES = new HashMap<>(); + REUSABLES_SHUTDOWN_HOOK_THREAD = new Thread("Reusables-Shutdown-Hook") { + @Override + public void run() { + for (ReusableServer rs : REUSABLES.values()) { + rs.shutdown(); + } + REUSABLES.clear(); + } + }; + Runtime.getRuntime().addShutdownHook(REUSABLES_SHUTDOWN_HOOK_THREAD); + } + + private final ReentrantLock instanceLock; + private final String internalConnectionName; + private final Map connectionMap; + private NatsTestServer natsTestServer; + + public final String serverUri; + + public static ReusableServer getInstance(String name) throws IOException { + STATIC_LOCK.lock(); + try { + ReusableServer rs = REUSABLES.get(name); + if (rs == null) { + rs = new ReusableServer(); + REUSABLES.put(name, rs); + } + return rs; + } + finally { + STATIC_LOCK.unlock(); + } + } + + public static void shutdownInstance(String name) { + STATIC_LOCK.lock(); + try { + ReusableServer rs = REUSABLES.remove(name); + if (rs != null) { + rs.shutdown(); + } + } + finally { + STATIC_LOCK.unlock(); + } + } + + private ReusableServer() throws IOException { + instanceLock = new ReentrantLock(); + internalConnectionName = new NUID().next(); + connectionMap = new HashMap<>(); + + natsTestServer = new NatsTestServer( + NatsTestServer.builder() + .jetstream(true) + .customName("Reusable") + ); + serverUri = natsTestServer.getLocalhostUri(); + } + + public Connection getReusableNc() { + return getConnection(internalConnectionName); + } + + private void waitUntilStatus(Connection conn) { + for (long x = 0; x < 100; x++) { + sleep(100); + if (conn.getStatus() == Connection.Status.CONNECTED) { + return; + } + } + } + + private Connection getConnection(String name) { + instanceLock.lock(); + try { + Connection ncs = connectionMap.get(name); + if (ncs == null) { + long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; + Options options = options(serverUri); + for (int x = 0; ncs == null && x < CONNECTION_RETRIES; x++) { + if (x > 0) { + delay += RETRY_DELAY_INCREMENT; + sleep(delay); + } + try { + ncs = Nats.connect(options); + } + catch (IOException ignored) {} + catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + } + } + if (ncs != null) { + connectionMap.put(name, ncs); + waitUntilStatus(ncs); + initVersionServerInfo(ncs); + } + } + else if (ncs.getStatus() != Connection.Status.CONNECTED) { + try { ncs.close(); } catch (Exception ignore) {} + return getConnection(name); + } + return ncs; + } + finally { + instanceLock.unlock(); + } + } + + public void shutdown() { + instanceLock.lock(); + try { + if (natsTestServer != null) { + natsTestServer.shutdown(false); + } + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + finally { + natsTestServer = null; + instanceLock.unlock(); + } + } +} diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 34f0c3ab5..99452c5a0 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -13,6 +13,7 @@ package io.nats.client.utils; +import io.nats.NatsServerRunner; import io.nats.client.*; import io.nats.client.api.ServerInfo; import io.nats.client.api.StorageType; @@ -20,12 +21,16 @@ import io.nats.client.api.StreamInfo; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.function.Executable; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.time.Duration; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -83,7 +88,7 @@ public class TestBase { public static ServerInfo ensureVersionServerInfo() throws Exception { if (VERSION_SERVER_INFO == null) { - runInLrServer(VersionUtils::initVersionServerInfo); + runInShared(VersionUtils::initVersionServerInfo); } return VERSION_SERVER_INFO; } @@ -107,6 +112,7 @@ public interface ThreeServerTestOptions { default void append(int index, Options.Builder builder) {} default boolean configureAccount() { return false; } default boolean includeAllServers() { return false; } + default boolean jetStream() { return false; } } public interface InJetStreamTest { @@ -118,197 +124,191 @@ public interface InJetStreamTestingContextTest { } // ---------------------------------------------------------------------------------------------------- - // runners / js cleanup + // runners -> own server // ---------------------------------------------------------------------------------------------------- - public static void cleanupJs(Connection c) - { - try { - cleanupJs(c.jetStreamManagement()); - } catch (Exception ignore) {} - } - - public static void cleanupJs(JetStreamManagement jsm) - { - try { - List streams = jsm.getStreamNames(); - for (String s : streams) { - jsm.deleteStream(s); - } - } catch (Exception ignore) {} - } - - // ---------------------------------------------------------------------------------------------------- - // runners -> new server - // ---------------------------------------------------------------------------------------------------- - private static void _runInServer(boolean jetstream, Options.Builder builder, VersionCheck vc, InServerTest inServerTest) throws Exception { + private static void _runInOwnServer( + Options.Builder optionsBuilder, + VersionCheck vc, + InServerTest inServerTest, + InJetStreamTest jsTest + ) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } - try (NatsTestServer ts = new NatsTestServer(NatsTestServer.builder().jetstream(jetstream))) { - if (builder == null) { - builder = optionsBuilder(); - } - - try (Connection nc = standardConnectionWait(builder.server(ts.getLocalhostUri()).build())) { + NatsServerRunner.Builder builder = NatsServerRunner.builder().jetstream(jsTest != null); + try (NatsTestServer ts = new NatsTestServer(builder)) { + Options options = (optionsBuilder == null ? optionsBuilder() : optionsBuilder) + .server(ts.getLocalhostUri()) + .build(); + try (Connection nc = standardConnectionWait(options)) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { - try { + if (jsTest == null) { inServerTest.test(nc); } - finally { - if (jetstream) { - cleanupJs(nc); - } + else { + NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); + NatsJetStream js = (NatsJetStream) nc.jetStream(); + jsTest.test(nc, jsm, js); } } } } } - public static void runInServer(InServerTest inServerTest) throws Exception { - _runInServer(false, null, null, inServerTest); - } - - public static void runInServer(Options.Builder builder, InServerTest inServerTest) throws Exception { - _runInServer(false, builder, null, inServerTest); - } - - public static void runInJsServer(InServerTest inServerTest) throws Exception { - _runInServer(true, null, null, inServerTest); + public static void runInOwnServer(InServerTest inServerTest) throws Exception { + _runInOwnServer(null, null, inServerTest, null); } - public static void runInJsServer(VersionCheck vc, InServerTest inServerTest) throws Exception { - _runInServer(true, null, vc, inServerTest); + public static void runInOwnServer(Options.Builder builder, InServerTest inServerTest) throws Exception { + _runInOwnServer(builder, null, inServerTest, null); } - public static void runInJsServer(ErrorListener el, InServerTest inServerTest) throws Exception { - _runInServer(true, optionsBuilder(el), null, inServerTest); + public static void runInOwnJsServer(InJetStreamTest inJetStreamTest) throws Exception { + _runInOwnServer(null, null, null, inJetStreamTest); } - public static void runInJsServer(ErrorListener el, VersionCheck vc, InServerTest inServerTest) throws Exception { - _runInServer(true, optionsBuilder(el), vc, inServerTest); + public static void runInOwnJsServer(VersionCheck vc, InJetStreamTest inJetStreamTest) throws Exception { + _runInOwnServer(null, vc, null, inJetStreamTest); } // ---------------------------------------------------------------------------------------------------- // runners -> long running server // ---------------------------------------------------------------------------------------------------- - public static void runInLrServer(InServerTest test) throws Exception { - _runInLrServer(null, null, test, null, null); + private static String classReusable; + + @BeforeAll + public static void beforeAll(TestInfo info) throws Exception { + classReusable = info.getDisplayName(); } - public static void runInLrServerOwnNc(InServerTest test) throws Exception { - _runInLrServer(optionsBuilder(LongRunningServer.server()), null, test, null, null); + @AfterAll + public static void afterAll() throws Exception { + ReusableServer.shutdownInstance(classReusable); } - public static void runInLrServerOwnNc(ErrorListener el, InServerTest test) throws Exception { - _runInLrServer(optionsBuilder(el), null, test, null, null); + public static void runInShared(InServerTest test) throws Exception { + _runInShared(null, null, test, null, -1); } - public static void runInLrServerOwnNc(Options.Builder builder, InServerTest test) throws Exception { - _runInLrServer(builder, null, test, null, null); + public static void runInShared(VersionCheck vc, InServerTest test) throws Exception { + _runInShared(null, vc, test, null, -1); } - public static void runInLrServer(InJetStreamTest jsTest) throws Exception { - _runInLrServer(null, null, null, jsTest, null); + public static void runInSharedOwnNc(InServerTest test) throws Exception { + _runInShared(optionsBuilder(), null, test, null, -1); } - public static void runInLrServer(VersionCheck vc, InJetStreamTest jsTest) throws Exception { - _runInLrServer(null, vc, null, jsTest, null); + public static void runInSharedOwnNc(ErrorListener el, InServerTest test) throws Exception { + _runInShared(optionsBuilder(el), null, test, null, -1); } - public static void runInLrServerOwnNc(Options.Builder builder, InJetStreamTest jsTest) throws Exception { - _runInLrServer(builder, null, null, jsTest, null); + public static void runInSharedOwnNc(Options.Builder builder, InServerTest test) throws Exception { + _runInShared(builder, null, test, null, -1); } - public static void runInLrServer(Options.Builder builder, VersionCheck vc, InJetStreamTest jsTest) throws Exception { - _runInLrServer(builder, vc, null, jsTest, null); + // -------------------------------------------------- + // InJetStreamTestingContextTest custom stream create + // -------------------------------------------------- + public static void runInSharedCustomStream(InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { + _runInShared(null, null, null, customStreamCreateJstcTest, 0); } - public static void runInLrServerOwnNc(ErrorListener el, InJetStreamTest jsTest) throws Exception { - _runInLrServer(optionsBuilder(el), null, null, jsTest, null); + public static void runInSharedCustomStream(VersionCheck vc, InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { + _runInShared(null, vc, null, customStreamCreateJstcTest, 0); } - public static void runInLrServerOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTest jsTest) throws Exception { - _runInLrServer(optionsBuilder(el), vc, null, jsTest, null); + public static void runInSharedCustomStream(Options.Builder builder, InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { + _runInShared(builder, null, null, customStreamCreateJstcTest, -1); } - public static void runInLrServer(InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(null, null, null, null, oneSubjectJstcTest); + // ------------------------------------------------ + // InJetStreamTestingContextTest oneSubjectJstcTest + // ------------------------------------------------ + public static void runInShared(InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(null, null, null, oneSubjectJstcTest, 1); } - public static void runInLrServer(VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(null, vc, null, null, oneSubjectJstcTest); + public static void runInShared(VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(null, vc, null, oneSubjectJstcTest, 1); } - public static void runInLrServerOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(optionsBuilder(el), vc, null, null, oneSubjectJstcTest); + public static void runInSharedOwnNc(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(optionsBuilder(el), null, null, oneSubjectJstcTest, 1); } - public static void runInLrServerOwnNc(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(optionsBuilder(el), null, null, null, oneSubjectJstcTest); + public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(optionsBuilder(el), vc, null, oneSubjectJstcTest, 1); } - public static void runInLrServerOwnNc(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(builder, null, null, null, oneSubjectJstcTest); + public static void runInSharedOwnNc(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(builder, null, null, oneSubjectJstcTest, 1); } - public static void runInLrServerOwnNc(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInLrServer(builder, vc, null, null, oneSubjectJstcTest); + public static void runInSharedOwnNc(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + _runInShared(builder, vc, null, oneSubjectJstcTest, 1); } - private static void _runInLrServer(Options.Builder builder, VersionCheck vc, - InServerTest test, - InJetStreamTest jsTest, - InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { + private static void _runInShared( + Options.Builder optionsBuilder, + VersionCheck vc, + InServerTest test, + InJetStreamTestingContextTest jstcTest, + int jstcTestSubjectCount + ) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } + ReusableServer reusable = ReusableServer.getInstance("shared"); + // no builder, we can use the long-running connection since it's totally generic // with a builder, just make a fresh connection and close it at the end. - boolean closeWhenDone; + boolean closeNcWhenDone; Connection nc; - if (builder == null) { - closeWhenDone = false; - nc = LongRunningServer.getLrConn(); + if (optionsBuilder == null) { + closeNcWhenDone = false; + nc = reusable.getReusableNc(); } else { - closeWhenDone = true; - nc = longConnectionWait(builder.server(LongRunningServer.server()).build()); + closeNcWhenDone = true; + nc = longConnectionWait(optionsBuilder.server(reusable.serverUri).build()); } initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { try { - if (oneSubjectJstcTest != null) { - try (JetStreamTestingContext jstc = new JetStreamTestingContext(nc, 1)) { - oneSubjectJstcTest.test(nc, jstc); + if (jstcTest != null) { + try (JetStreamTestingContext jstc = new JetStreamTestingContext(nc, jstcTestSubjectCount)) { + jstcTest.test(nc, jstc); } } - else if (jsTest != null) { - NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); - NatsJetStream js = (NatsJetStream) nc.jetStream(); - jsTest.test(nc, jsm, js); - } else { test.test(nc); } } finally { - if (test == null) { - cleanupJs(nc); - } - if (closeWhenDone) { - try { - nc.close(); - } - catch (Exception ignore) {} + if (closeNcWhenDone) { + try { nc.close(); } catch (Exception ignore) {} } } } } + public static void deleteStreams(JetStreamManagement jsm) throws IOException, JetStreamApiException { + List streams = jsm.getStreamNames(); + for (String stream : streams) { + try { jsm.deleteStream(stream); } catch (Exception ignore) {} + } + } + + public static void deleteStreams(JetStreamManagement jsm, String... streams) throws IOException, JetStreamApiException { + for (String stream : streams) { + try { jsm.deleteStream(stream); } catch (Exception ignore) {} + } + } + // ---------------------------------------------------------------------------------------------------- // runners / external // ---------------------------------------------------------------------------------------------------- @@ -356,90 +356,81 @@ public static void runInJsHubLeaf(TwoServerTest twoServerTest) throws Exception "}" }; - try (NatsTestServer hub = new NatsTestServer(hubPort, false, true, null, hubInserts, null); + try (NatsTestServer hub = new NatsTestServer(hubPort, true, null, hubInserts, null); Connection nchub = standardConnectionWait(hub.getLocalhostUri()); - NatsTestServer leaf = new NatsTestServer(leafPort, false, true, null, leafInserts, null); + NatsTestServer leaf = new NatsTestServer(leafPort, true, null, leafInserts, null); Connection ncleaf = standardConnectionWait(leaf.getLocalhostUri()) ) { - try { - twoServerTest.test(nchub, ncleaf); - } - finally { - cleanupJs(nchub); - cleanupJs(ncleaf); - } + twoServerTest.test(nchub, ncleaf); } } - public static void runInJsCluster(ThreeServerTest threeServerTest) throws Exception { - runInJsCluster(null, threeServerTest); + public static void runInCluster(ThreeServerTest threeServerTest) throws Exception { + runInCluster(null, threeServerTest); } - public static void runInJsCluster(ThreeServerTestOptions tstOpts, ThreeServerTest threeServerTest) throws Exception { + public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeServerTest threeServerTest) throws Exception { + if (tstOpts == null) { + tstOpts = new ThreeServerTestOptions() {}; + } + int port1 = NatsTestServer.nextPort(); int port2 = NatsTestServer.nextPort(); int port3 = NatsTestServer.nextPort(); int listen1 = NatsTestServer.nextPort(); int listen2 = NatsTestServer.nextPort(); int listen3 = NatsTestServer.nextPort(); - String dir1 = tempJsStoreDir(); - String dir2 = tempJsStoreDir(); - String dir3 = tempJsStoreDir(); + String dir1 = tstOpts.jetStream() ? tempJsStoreDir() : null; + String dir2 = tstOpts.jetStream() ? tempJsStoreDir() : null; + String dir3 = tstOpts.jetStream() ? tempJsStoreDir() : null; String cluster = "cluster_" + random(); String serverPrefix = "server_" + random() + "_"; - if (tstOpts == null) { - tstOpts = new ThreeServerTestOptions() {}; - } boolean configureAccount = tstOpts.configureAccount(); String[] server1Inserts = makeInsert(cluster, serverPrefix + 1, dir1, listen1, listen2, listen3, configureAccount); String[] server2Inserts = makeInsert(cluster, serverPrefix + 2, dir2, listen2, listen1, listen3, configureAccount); String[] server3Inserts = makeInsert(cluster, serverPrefix + 3, dir3, listen3, listen1, listen2, configureAccount); - try (NatsTestServer srv1 = new NatsTestServer(port1, false, true, null, server1Inserts, null); - NatsTestServer srv2 = new NatsTestServer(port2, false, true, null, server2Inserts, null); - NatsTestServer srv3 = new NatsTestServer(port3, false, true, null, server3Inserts, null); + try (NatsTestServer srv1 = new NatsTestServer(port1, tstOpts.jetStream(), null, server1Inserts, null); + NatsTestServer srv2 = new NatsTestServer(port2, tstOpts.jetStream(), null, server2Inserts, null); + NatsTestServer srv3 = new NatsTestServer(port3, tstOpts.jetStream(), null, server3Inserts, null); Connection nc1 = standardConnectionWait(makeOptions(0, tstOpts, srv1, srv2, srv3)); Connection nc2 = standardConnectionWait(makeOptions(1, tstOpts, srv2, srv1, srv3)); Connection nc3 = standardConnectionWait(makeOptions(2, tstOpts, srv3, srv1, srv2)) ) { - try { - threeServerTest.test(nc1, nc2, nc3); - } - finally { - cleanupJs(nc1); - cleanupJs(nc2); - cleanupJs(nc3); - } + threeServerTest.test(nc1, nc2, nc3); } } private static String[] makeInsert(String clusterName, String serverName, String jsStoreDir, int listen, int route1, int route2, boolean configureAccount) { - String[] serverInserts = new String[configureAccount ? 19 : 12]; - int x = -1; - serverInserts[++x] = "jetstream {"; - serverInserts[++x] = " store_dir=" + jsStoreDir; - serverInserts[++x] = "}"; - serverInserts[++x] = "server_name=" + serverName; - serverInserts[++x] = "cluster {"; - serverInserts[++x] = " name: " + clusterName; - serverInserts[++x] = " listen: 127.0.0.1:" + listen; - serverInserts[++x] = " routes: ["; - serverInserts[++x] = " nats-route://127.0.0.1:" + route1; - serverInserts[++x] = " nats-route://127.0.0.1:" + route2; - serverInserts[++x] = " ]"; - serverInserts[++x] = "}"; + List serverInserts = new ArrayList<>(); + if (jsStoreDir != null) { + serverInserts.add("jetstream {"); + serverInserts.add(" store_dir=" + jsStoreDir); + serverInserts.add("}"); + } + serverInserts.add("server_name=" + serverName); + serverInserts.add("cluster {"); + serverInserts.add(" name: " + clusterName); + serverInserts.add(" listen: 127.0.0.1:" + listen); + serverInserts.add(" routes: ["); + serverInserts.add(" nats-route://127.0.0.1:" + route1); + serverInserts.add(" nats-route://127.0.0.1:" + route2); + serverInserts.add(" ]"); + serverInserts.add("}"); if (configureAccount) { - serverInserts[++x] = "accounts {"; - serverInserts[++x] = " $SYS: {}"; - serverInserts[++x] = " NVCF: {"; - serverInserts[++x] = " jetstream: \"enabled\","; - serverInserts[++x] = " users: [ { nkey: " + USER_NKEY + " } ]"; - serverInserts[++x] = " }"; - serverInserts[++x] = "}"; + serverInserts.add("accounts {"); + serverInserts.add(" $SYS: {}"); + serverInserts.add(" NVCF: {"); + if (jsStoreDir != null) { + serverInserts.add(" jetstream: \"enabled\","); + } + serverInserts.add(" users: [ { nkey: " + USER_NKEY + " } ]"); + serverInserts.add(" }"); + serverInserts.add("}"); } - return serverInserts; + return serverInserts.toArray(new String[0]); } private static final String USER_NKEY = "UBAX6GCZQYLJDLSNPBDDPLY6KIBRO2JAUYNPW4HCWBRCZ4OU57YQQQS3"; diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index fa2430fa5..55e4371da 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -905,7 +905,7 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { @Test public void testHandlerException() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { ServiceEndpoint exServiceEndpoint = ServiceEndpoint.builder() .endpointName("exEndpoint") .endpointSubject("exSubject") @@ -936,7 +936,7 @@ public void testHandlerException() throws Exception { @Test public void testServiceMessage() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { AtomicInteger which = new AtomicInteger(); ServiceEndpoint se = ServiceEndpoint.builder() .endpointName("testServiceMessage") @@ -1575,7 +1575,7 @@ public String get() { @Test public void testInboxSupplier() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { Discovery discovery = new Discovery(nc, 100, 1); TestInboxSupplier supplier = new TestInboxSupplier(); discovery.setInboxSupplier(supplier); From 570daef89f53ce320d5101f5ab36d55f87d402bc Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 23 Nov 2025 13:28:32 -0500 Subject: [PATCH 10/51] Reusing long running when possible --- .../java/io/nats/client/PublishTests.java | 4 +- .../client/impl/ConnectionListenerTests.java | 9 +- .../JetStreamManagementWithConfTests.java | 132 +++++++++--------- .../io/nats/client/utils/OptionsUtils.java | 34 +++-- .../java/io/nats/client/utils/TestBase.java | 21 ++- 5 files changed, 109 insertions(+), 91 deletions(-) diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 53db71d05..c2659fdb1 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -89,10 +89,10 @@ public void exceptionOccurred(Connection conn, Exception exp) { Connection nc2 = longConnectionWait(options); nc2.publish(random(), null, null, body); - if (!mpvLatch.await(1, TimeUnit.SECONDS)) { + if (!mpvLatch.await(3, TimeUnit.SECONDS)) { fail(); } - if (!seLatch.await(1, TimeUnit.SECONDS)) { + if (!seLatch.await(3, TimeUnit.SECONDS)) { fail(); } } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 78f2bc62d..4e11188c8 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -39,7 +39,8 @@ public void testToString() { @Test public void testCloseCount() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { + Options.Builder builder = optionsBuilder().connectionListener(listener); + runInSharedOwnNc(builder, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); assertEquals(1, listener.getEventCount(Events.CLOSED)); @@ -100,7 +101,8 @@ public void testDisconnectReconnectCount() throws Exception { @Test public void testExceptionInConnectionListener() throws Exception { BadHandler listener = new BadHandler(); - runInSharedOwnNc(listener, nc -> { + Options.Builder builder = optionsBuilder().connectionListener(listener); + runInOwnServer(builder, nc -> { standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); }); @@ -110,7 +112,8 @@ public void testExceptionInConnectionListener() throws Exception { public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { + Options.Builder builder = optionsBuilder().connectionListener(listener); + runInSharedOwnNc(builder, nc -> { //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull assertThrows(NullPointerException.class, () -> nc.addConnectionListener(null)); //noinspection DataFlowIssue // removeConnectionListener parameter is annotated as @NonNull diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index b96d3f72d..8c771c43c 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -13,7 +13,10 @@ package io.nats.client.impl; -import io.nats.client.*; +import io.nats.client.Connection; +import io.nats.client.JetStreamManagement; +import io.nats.client.NatsTestServer; +import io.nats.client.Options; import io.nats.client.api.*; import org.junit.jupiter.api.Test; @@ -28,86 +31,81 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { - try (NatsTestServer ts = configuredJsServer("pagination.conf")) { - try (Connection nc = standardConnectionWait(ts.getLocalhostUri())) { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = nc.jetStream(); - - String stream1 = random(); - String stream2 = random(); - long rounds = 101; - long size = 1000; - long count = rounds * size; - jsm.addStream(StreamConfiguration.builder() - .name(stream1) - .storageType(StorageType.Memory) - .subjects("s.*.*") - .build()); - - jsm.addStream(StreamConfiguration.builder() - .name(stream2) - .storageType(StorageType.Memory) - .subjects("t.*.*") - .build()); - - for (int x = 1; x <= rounds; x++) { - for (int y = 1; y <= size; y++) { - js.publish("s." + x + "." + y, null); - } - } - + runInConfiguredJsServer("pagination.conf", (nc, jsm, js) -> { + String stream1 = random(); + String stream2 = random(); + long rounds = 101; + long size = 1000; + long count = rounds * size; + jsm.addStream(StreamConfiguration.builder() + .name(stream1) + .storageType(StorageType.Memory) + .subjects("s.*.*") + .build()); + + jsm.addStream(StreamConfiguration.builder() + .name(stream2) + .storageType(StorageType.Memory) + .subjects("t.*.*") + .build()); + + for (int x = 1; x <= rounds; x++) { for (int y = 1; y <= size; y++) { - js.publish("t.7." + y, null); + js.publish("s." + x + "." + y, null); } + } - StreamInfo si = jsm.getStreamInfo(stream1); - validateStreamInfo(si.getStreamState(), 0, 0, count); + for (int y = 1; y <= size; y++) { + js.publish("t.7." + y, null); + } - si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); - validateStreamInfo(si.getStreamState(), count, count, count); + StreamInfo si = jsm.getStreamInfo(stream1); + validateStreamInfo(si.getStreamState(), 0, 0, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); - validateStreamInfo(si.getStreamState(), size, size, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); + validateStreamInfo(si.getStreamState(), count, count, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); + validateStreamInfo(si.getStreamState(), size, size, count); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); - validateStreamInfo(si.getStreamState(), size, size, size); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, count); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, size); + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); + validateStreamInfo(si.getStreamState(), size, size, size); - List infos = jsm.getStreams(); - assertEquals(2, infos.size()); - si = infos.get(0); - if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { - validateStreamInfo(si.getStreamState(), 0, 0, count); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); - } - else { - validateStreamInfo(si.getStreamState(), 0, 0, size); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); - } + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, size); - infos = jsm.getStreams(">"); - assertEquals(2, infos.size()); + List infos = jsm.getStreams(); + assertEquals(2, infos.size()); + si = infos.get(0); + if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { + validateStreamInfo(si.getStreamState(), 0, 0, count); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); + } + else { + validateStreamInfo(si.getStreamState(), 0, 0, size); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); + } - infos = jsm.getStreams("*.7.*"); - assertEquals(2, infos.size()); + infos = jsm.getStreams(">"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("*.7.1"); - assertEquals(2, infos.size()); + infos = jsm.getStreams("*.7.*"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("s.7.*"); - assertEquals(1, infos.size()); - assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + infos = jsm.getStreams("*.7.1"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("t.7.1"); - assertEquals(1, infos.size()); - assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); - } - } + infos = jsm.getStreams("s.7.*"); + assertEquals(1, infos.size()); + assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + + infos = jsm.getStreams("t.7.1"); + assertEquals(1, infos.size()); + assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + }); } private void validateStreamInfo(StreamState streamState, long subjectsList, long filteredCount, long subjectCount) { diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index d94995553..29ebf3628 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -18,6 +18,7 @@ import io.nats.client.Options; import org.jspecify.annotations.NonNull; +import java.time.Duration; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; @@ -29,7 +30,7 @@ public abstract class OptionsUtils { private static ExecutorService ES; - private static ScheduledThreadPoolExecutor SCHD; + private static ScheduledThreadPoolExecutor SC; private static ThreadFactory CB; private static ThreadFactory CN; @@ -69,46 +70,49 @@ public static Options options(String... servers) { public static Options.Builder optionsBuilder() { if (ES == null) { - ES = new ThreadPoolExecutor(0, Integer.MAX_VALUE, - 500L, TimeUnit.MILLISECONDS, + ES = new ThreadPoolExecutor(5, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, new SynchronousQueue<>(), - new TestThreadFactory("ES")); + new TestThreadFactory("es")); } - if (SCHD == null) { - SCHD = new ScheduledThreadPoolExecutor(3, new TestThreadFactory("SCHD")); - SCHD.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); - SCHD.setRemoveOnCancelPolicy(true); + if (SC == null) { + SC = new ScheduledThreadPoolExecutor(3, new TestThreadFactory("sc")); + SC.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); + SC.setRemoveOnCancelPolicy(true); } if (CB == null) { - CB = new TestThreadFactory("CB"); + CB = new TestThreadFactory("cb"); } if (CN == null) { - CN = new TestThreadFactory("CN"); + CN = new TestThreadFactory("cn"); } return Options.builder() + .connectionTimeout(Duration.ofSeconds(5)) .executor(ES) - .scheduledExecutor(SCHD) + .scheduledExecutor(SC) .callbackThreadFactory(CB) .connectThreadFactory(CN) .errorListener(NOOP_EL); } static class TestThreadFactory implements ThreadFactory { + private final ThreadGroup group; final String name; - final AtomicInteger threadNo; + final AtomicInteger threadNumber; public TestThreadFactory(String name) { + SecurityManager s = System.getSecurityManager(); + group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); this.name = name; - this.threadNo = new AtomicInteger(0); + this.threadNumber = new AtomicInteger(1); } public Thread newThread(@NonNull Runnable r) { - String threadName = "test." + name + "." + threadNo.incrementAndGet(); - Thread t = new Thread(r, threadName); + String threadName = "test." + name + "." + threadNumber.incrementAndGet(); + Thread t = new Thread(group, r, threadName); if (t.isDaemon()) { t.setDaemon(false); } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 99452c5a0..847e06f53 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -42,6 +42,7 @@ import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_STATE; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ResourceUtils.configResource; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -129,6 +130,7 @@ public interface InJetStreamTestingContextTest { private static void _runInOwnServer( Options.Builder optionsBuilder, VersionCheck vc, + String configFilePath, InServerTest inServerTest, InJetStreamTest jsTest ) throws Exception { @@ -137,6 +139,9 @@ private static void _runInOwnServer( } NatsServerRunner.Builder builder = NatsServerRunner.builder().jetstream(jsTest != null); + if (configFilePath != null) { + builder.configFilePath(configResource(configFilePath)); + } try (NatsTestServer ts = new NatsTestServer(builder)) { Options options = (optionsBuilder == null ? optionsBuilder() : optionsBuilder) .server(ts.getLocalhostUri()) @@ -158,19 +163,27 @@ private static void _runInOwnServer( } public static void runInOwnServer(InServerTest inServerTest) throws Exception { - _runInOwnServer(null, null, inServerTest, null); + _runInOwnServer(null, null, null, inServerTest, null); } public static void runInOwnServer(Options.Builder builder, InServerTest inServerTest) throws Exception { - _runInOwnServer(builder, null, inServerTest, null); + _runInOwnServer(builder, null, null, inServerTest, null); } public static void runInOwnJsServer(InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, null, null, inJetStreamTest); + _runInOwnServer(null, null, null, null, inJetStreamTest); } public static void runInOwnJsServer(VersionCheck vc, InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, vc, null, inJetStreamTest); + _runInOwnServer(null, vc, null, null, inJetStreamTest); + } + + public static void runInConfiguredServer(String configFilePath, InServerTest inServerTest) throws Exception { + _runInOwnServer(null, null, null, inServerTest, null); + } + + public static void runInConfiguredJsServer(String configFilePath, InJetStreamTest inJetStreamTest) throws Exception { + _runInOwnServer(null, null, null, null, inJetStreamTest); } // ---------------------------------------------------------------------------------------------------- From 5690337c509bd6408f6680295926f5e82948f862 Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 23 Nov 2025 15:01:25 -0500 Subject: [PATCH 11/51] improving options hopefully to support more parallel connections --- src/main/java/io/nats/client/Options.java | 95 +++++++++++++++---- .../java/io/nats/client/OptionsTests.java | 2 +- .../java/io/nats/client/PublishTests.java | 4 +- .../io/nats/client/utils/OptionsUtils.java | 2 +- 4 files changed, 79 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/nats/client/Options.java b/src/main/java/io/nats/client/Options.java index 0aa0a0127..bdf666ed7 100644 --- a/src/main/java/io/nats/client/Options.java +++ b/src/main/java/io/nats/client/Options.java @@ -533,6 +533,16 @@ public class Options { * {@link Builder#executor(ExecutorService) executor}. */ public static final String PROP_SCHEDULED_EXECUTOR_SERVICE_CLASS = "scheduled.executor.service.class"; + /** + * Property used to set class name for the Connect Executor Service (executor) class + * {@link Builder#connectExecutor(ExecutorService) connectExecutor}. + */ + public static final String PROP_CONNECT_EXECUTOR_SERVICE_CLASS = "connect.executor.service.class"; + /** + * Property used to set class name for the Callback Executor Service (executor) class + * {@link Builder#callbackExecutor(ExecutorService) callbackExecutor}. + */ + public static final String PROP_CALLBACK_EXECUTOR_SERVICE_CLASS = "callback.executor.service.class"; /** * Property used to set class name for the Connect Thread Factory * {@link Builder#connectThreadFactory(ThreadFactory) connectThreadFactory}. @@ -706,6 +716,8 @@ public class Options { private final ExecutorService executor; private final ScheduledExecutorService scheduledExecutor; + private final ExecutorService connectExecutor; + private final ExecutorService callbackExecutor; private final ThreadFactory connectThreadFactory; private final ThreadFactory callbackThreadFactory; private final ServerPool serverPool; @@ -716,17 +728,20 @@ public class Options { private final boolean enableFastFallback; static class DefaultThreadFactory implements ThreadFactory { + final ThreadGroup group; final String name; - final AtomicInteger threadNo; + final AtomicInteger threadNumber; public DefaultThreadFactory (String name){ this.name = name; - threadNo = new AtomicInteger(0); + SecurityManager s = System.getSecurityManager(); + group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); + threadNumber = new AtomicInteger(0); } public Thread newThread(@NonNull Runnable r) { - String threadName = name+":"+threadNo.incrementAndGet(); - Thread t = new Thread(r,threadName); + String threadName = name + ":"+ threadNumber.incrementAndGet(); + Thread t = new Thread(group, r, threadName); if (t.isDaemon()) { t.setDaemon(false); } @@ -851,6 +866,8 @@ public static class Builder { private String dataPortType = DEFAULT_DATA_PORT_TYPE; private ExecutorService executor; private ScheduledExecutorService scheduledExecutor; + private ExecutorService connectExecutor; + private ExecutorService callbackExecutor; private ThreadFactory connectThreadFactory; private ThreadFactory callbackThreadFactory; private List> httpRequestInterceptors; @@ -989,6 +1006,8 @@ public Builder properties(Properties props) { classnameProperty(props, PROP_DISPATCHER_FACTORY_CLASS, o -> this.dispatcherFactory = (DispatcherFactory) o); classnameProperty(props, PROP_EXECUTOR_SERVICE_CLASS, o -> this.executor = (ExecutorService) o); classnameProperty(props, PROP_SCHEDULED_EXECUTOR_SERVICE_CLASS, o -> this.scheduledExecutor = (ScheduledExecutorService) o); + classnameProperty(props, PROP_CONNECT_EXECUTOR_SERVICE_CLASS, o -> this.connectExecutor = (ExecutorService) o); + classnameProperty(props, PROP_CALLBACK_EXECUTOR_SERVICE_CLASS, o -> this.callbackExecutor = (ExecutorService) o); classnameProperty(props, PROP_CONNECT_THREAD_FACTORY_CLASS, o -> this.connectThreadFactory = (ThreadFactory) o); classnameProperty(props, PROP_CALLBACK_THREAD_FACTORY_CLASS, o -> this.callbackThreadFactory = (ThreadFactory) o); return this; @@ -1692,7 +1711,7 @@ public Builder statisticsCollector(StatisticsCollector collector) { } /** - * Set the {@link ExecutorService ExecutorService} used to run threaded tasks. The default is a + * Set the {@link ExecutorService} used to run threaded tasks. The default is a * cached thread pool that names threads after the connection name (or a default). This executor * is used for reading and writing the underlying sockets as well as for each Dispatcher. * The default executor uses a short keepalive time, 500ms, to insure quick shutdowns. This is reasonable @@ -1709,7 +1728,7 @@ public Builder executor(ExecutorService executor) { } /** - * Set the {@link ScheduledExecutorService ScheduledExecutorService} used to run scheduled task like + * Set the {@link ScheduledExecutorService} used to run scheduled task like * heartbeat timers * The default is a ScheduledThreadPoolExecutor that does not * execute delayed tasks after shutdown and removes tasks on cancel; @@ -1721,6 +1740,28 @@ public Builder scheduledExecutor(ScheduledExecutorService scheduledExecutor) { return this; } + /** + * Set the {@link ExecutorService} used to make connections. + * The default is a Single Thread Executor + * @param connectExecutor The ExecutorService to make connections with. + * @return the Builder for chaining + */ + public Builder connectExecutor(ExecutorService connectExecutor) { + this.connectExecutor = connectExecutor; + return this; + } + + /** + * Set the {@link ExecutorService} used to make event callbacks with. + * The default is a Single Thread Executor + * @param callbackExecutor The ExecutorService to make event callbacks with. + * @return the Builder for chaining + */ + public Builder callbackExecutor(ExecutorService callbackExecutor) { + this.callbackExecutor = callbackExecutor; + return this; + } + /** * Sets custom thread factory for the executor service * @@ -2108,6 +2149,8 @@ public Builder(Options o) { this.trackAdvancedStats = o.trackAdvancedStats; this.executor = o.executor; this.scheduledExecutor = o.scheduledExecutor; + this.connectExecutor = o.connectExecutor; + this.callbackExecutor = o.callbackExecutor; this.callbackThreadFactory = o.callbackThreadFactory; this.connectThreadFactory = o.connectThreadFactory; this.httpRequestInterceptors = o.httpRequestInterceptors; @@ -2180,6 +2223,8 @@ private Options(Builder b) { this.trackAdvancedStats = b.trackAdvancedStats; this.executor = b.executor; this.scheduledExecutor = b.scheduledExecutor; + this.connectExecutor = b.connectExecutor; + this.callbackExecutor = b.callbackExecutor; this.callbackThreadFactory = b.callbackThreadFactory; this.connectThreadFactory = b.connectThreadFactory; this.httpRequestInterceptors = b.httpRequestInterceptors; @@ -2235,21 +2280,31 @@ private ScheduledExecutorService _getInternalScheduledExecutor() { } /** - * the callback executor, see {@link Builder#callbackThreadFactory(ThreadFactory) callbackThreadFactory()} in the builder doc + * the connect executor, see {@link Builder#connectThreadFactory(ThreadFactory) connectThreadFactory()} in the builder doc * @return the executor */ - public ExecutorService getCallbackExecutor() { - return this.callbackThreadFactory == null ? - DEFAULT_SINGLE_THREAD_EXECUTOR.get() : Executors.newSingleThreadExecutor(this.callbackThreadFactory); + public ExecutorService getConnectExecutor() { + if (connectExecutor != null) { + return connectExecutor; + } + if (connectThreadFactory != null) { + return Executors.newSingleThreadExecutor(this.connectThreadFactory); + } + return DEFAULT_SINGLE_THREAD_EXECUTOR.get(); } /** - * the connect executor, see {@link Builder#connectThreadFactory(ThreadFactory) connectThreadFactory()} in the builder doc + * the callback executor, see {@link Builder#callbackThreadFactory(ThreadFactory) callbackThreadFactory()} in the builder doc * @return the executor */ - public ExecutorService getConnectExecutor() { - return this.connectThreadFactory == null ? - DEFAULT_SINGLE_THREAD_EXECUTOR.get() : Executors.newSingleThreadExecutor(this.connectThreadFactory); + public ExecutorService getCallbackExecutor() { + if (callbackExecutor != null) { + return callbackExecutor; + } + if (callbackThreadFactory != null) { + return Executors.newSingleThreadExecutor(this.callbackThreadFactory); + } + return DEFAULT_SINGLE_THREAD_EXECUTOR.get(); } /** @@ -2269,19 +2324,19 @@ public boolean scheduledExecutorIsInternal() { } /** - * whether the callback executor is the internal one versus a user supplied one + * whether the connect executor is the internal one versus a user supplied one * @return true if the executor is internal */ - public boolean callbackExecutorIsInternal() { - return this.callbackThreadFactory == null; + public boolean connectExecutorIsInternal() { + return this.connectThreadFactory == null && connectExecutor == null; } /** - * whether the connect executor is the internal one versus a user supplied one + * whether the callback executor is the internal one versus a user supplied one * @return true if the executor is internal */ - public boolean connectExecutorIsInternal() { - return this.connectThreadFactory == null; + public boolean callbackExecutorIsInternal() { + return this.callbackThreadFactory == null && callbackExecutor == null; } /** diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index f7c5f8179..387b44d0a 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -57,7 +57,7 @@ public void testClientVersion() { @Test public void testDefaultOptions() { - Options o = optionsBuilder().errorListener(null).build(); + Options o = new Options.Builder().build(); _testDefaultOptions(o); _testDefaultOptions(new Options.Builder(o).build()); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index c2659fdb1..0e3ec0bbb 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -89,10 +89,10 @@ public void exceptionOccurred(Connection conn, Exception exp) { Connection nc2 = longConnectionWait(options); nc2.publish(random(), null, null, body); - if (!mpvLatch.await(3, TimeUnit.SECONDS)) { + if (!mpvLatch.await(10, TimeUnit.SECONDS)) { fail(); } - if (!seLatch.await(3, TimeUnit.SECONDS)) { + if (!seLatch.await(10, TimeUnit.SECONDS)) { fail(); } } diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 29ebf3628..84fa0093f 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -99,7 +99,7 @@ public static Options.Builder optionsBuilder() { } static class TestThreadFactory implements ThreadFactory { - private final ThreadGroup group; + final ThreadGroup group; final String name; final AtomicInteger threadNumber; From d122fe89643d4a8d4aea784b30a9365f01c9f747 Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 23 Nov 2025 15:33:38 -0500 Subject: [PATCH 12/51] Adding flexibility for executor options --- src/main/java/io/nats/client/Options.java | 5 +-- .../nats/client/impl/ErrorListenerTests.java | 9 ++--- .../io/nats/client/utils/ConnectionUtils.java | 4 +++ .../io/nats/client/utils/OptionsUtils.java | 33 ++++++++++--------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/nats/client/Options.java b/src/main/java/io/nats/client/Options.java index bdf666ed7..aa64f2355 100644 --- a/src/main/java/io/nats/client/Options.java +++ b/src/main/java/io/nats/client/Options.java @@ -728,20 +728,17 @@ public class Options { private final boolean enableFastFallback; static class DefaultThreadFactory implements ThreadFactory { - final ThreadGroup group; final String name; final AtomicInteger threadNumber; public DefaultThreadFactory (String name){ this.name = name; - SecurityManager s = System.getSecurityManager(); - group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); threadNumber = new AtomicInteger(0); } public Thread newThread(@NonNull Runnable r) { String threadName = name + ":"+ threadNumber.incrementAndGet(); - Thread t = new Thread(group, r, threadName); + Thread t = new Thread(r, threadName); if (t.isDaemon()) { t.setDaemon(false); } diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 9989ccb4e..3bec29f34 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -27,8 +27,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -38,7 +37,7 @@ public class ErrorListenerTests { @Test public void testLastError() throws Exception { - NatsConnection nc = null; + NatsConnection nc; ListenerForTesting listener = new ListenerForTesting(); String[] customArgs = {"--user", "stephen", "--pass", "password"}; @@ -75,10 +74,8 @@ public void testLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 3000)); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + longConnectionWait(nc); assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); - } finally { - standardCloseConnection(nc); } } diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index 00aa0d4ae..e44b6f183 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -82,6 +82,10 @@ public static Connection longConnectionWait(Options options) throws IOException, return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); } + public static Connection longConnectionWait(Connection conn) throws IOException, InterruptedException { + return connectionWait(conn, LONG_CONNECTION_WAIT_MS); + } + public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { Connection conn = Nats.connect(options); listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 84fa0093f..dc80c2c51 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -29,10 +29,10 @@ */ public abstract class OptionsUtils { - private static ExecutorService ES; + private static ExecutorService EX; private static ScheduledThreadPoolExecutor SC; - private static ThreadFactory CB; - private static ThreadFactory CN; + private static ExecutorService CB; + private static ExecutorService CN; public static ErrorListener NOOP_EL = new ErrorListener() {}; @@ -69,10 +69,10 @@ public static Options options(String... servers) { } public static Options.Builder optionsBuilder() { - if (ES == null) { - ES = new ThreadPoolExecutor(5, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, + if (EX == null) { + EX = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, new SynchronousQueue<>(), - new TestThreadFactory("es")); + new TestThreadFactory("ex")); } if (SC == null) { @@ -82,37 +82,38 @@ public static Options.Builder optionsBuilder() { } if (CB == null) { - CB = new TestThreadFactory("cb"); + CB = new ThreadPoolExecutor(2, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, + new SynchronousQueue<>(), + new TestThreadFactory("cb")); } if (CN == null) { - CN = new TestThreadFactory("cn"); + CN = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, + new SynchronousQueue<>(), + new TestThreadFactory("cn")); } return Options.builder() - .connectionTimeout(Duration.ofSeconds(5)) - .executor(ES) + .connectionTimeout(Duration.ofSeconds(4)) + .executor(EX) .scheduledExecutor(SC) - .callbackThreadFactory(CB) - .connectThreadFactory(CN) + .callbackExecutor(CB) + .connectExecutor(CN) .errorListener(NOOP_EL); } static class TestThreadFactory implements ThreadFactory { - final ThreadGroup group; final String name; final AtomicInteger threadNumber; public TestThreadFactory(String name) { - SecurityManager s = System.getSecurityManager(); - group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); this.name = name; this.threadNumber = new AtomicInteger(1); } public Thread newThread(@NonNull Runnable r) { String threadName = "test." + name + "." + threadNumber.incrementAndGet(); - Thread t = new Thread(group, r, threadName); + Thread t = new Thread(r, threadName); if (t.isDaemon()) { t.setDaemon(false); } From 8a3d89211750247f9fec60b1fc4ee743c29609bd Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 23 Nov 2025 15:56:20 -0500 Subject: [PATCH 13/51] putting options test back --- .../java/io/nats/client/OptionsTests.java | 122 +++++++++--------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index 387b44d0a..31d4a914b 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -39,8 +39,6 @@ import static io.nats.client.Options.*; import static io.nats.client.support.Encoding.base64UrlEncodeToString; import static io.nats.client.support.NatsConstants.DEFAULT_PORT; -import static io.nats.client.utils.OptionsUtils.options; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.jwtResource; import static org.junit.jupiter.api.Assertions.*; @@ -108,7 +106,7 @@ private static void _testDefaultOptions(Options o) { @Test public void testOldStyle() { - Options o = options(); + Options o = new Options.Builder().build(); assertFalse(o.isOldRequestStyle(), "default oldstyle"); //noinspection deprecation o.setOldRequestStyle(true); @@ -120,7 +118,7 @@ public void testOldStyle() { @Test public void testChainedBooleanOptions() { - Options o = optionsBuilder().verbose().pedantic().noRandomize() + Options o = new Options.Builder().verbose().pedantic().noRandomize() .noEcho().oldRequestStyle().noHeaders().noNoResponders() .discardMessagesWhenOutgoingQueueFull() .build(); @@ -142,7 +140,7 @@ private static void _testChainedBooleanOptions(Options o) { @Test public void testChainedStringOptions() { - Options o = optionsBuilder().userInfo("hello".toCharArray(), "world".toCharArray()).connectionName("name").build(); + Options o = new Options.Builder().userInfo("hello".toCharArray(), "world".toCharArray()).connectionName("name").build(); _testChainedStringOptions(o); _testChainedStringOptions(new Options.Builder(o).build()); } @@ -158,7 +156,7 @@ private static void _testChainedStringOptions(Options o) { public void testChainedSecure() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); SSLContext.setDefault(ctx); - Options o = optionsBuilder().secure().build(); + Options o = new Options.Builder().secure().build(); _testChainedSecure(ctx, o); _testChainedSecure(ctx, new Options.Builder(o).build()); } @@ -170,7 +168,7 @@ private static void _testChainedSecure(SSLContext ctx, Options o) { @Test public void testChainedSSLOptions() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options o = optionsBuilder().sslContext(ctx).build(); + Options o = new Options.Builder().sslContext(ctx).build(); _testChainedSSLOptions(ctx, o); _testChainedSSLOptions(ctx, new Options.Builder(o).build()); } @@ -182,7 +180,7 @@ private static void _testChainedSSLOptions(SSLContext ctx, Options o) { @Test public void testChainedIntOptions() { - Options o = optionsBuilder().maxReconnects(100).maxPingsOut(200).reconnectBufferSize(300) + Options o = new Options.Builder().maxReconnects(100).maxPingsOut(200).reconnectBufferSize(300) .maxControlLine(400) .maxMessagesInOutgoingQueue(500) .build(); @@ -201,7 +199,7 @@ private static void _testChainedIntOptions(Options o) { @Test public void testChainedDurationOptions() { - Options o = optionsBuilder().reconnectWait(Duration.ofMillis(101)) + Options o = new Options.Builder().reconnectWait(Duration.ofMillis(101)) .connectionTimeout(Duration.ofMillis(202)).pingInterval(Duration.ofMillis(303)) .requestCleanupInterval(Duration.ofMillis(404)) .reconnectJitter(Duration.ofMillis(505)) @@ -225,13 +223,13 @@ private static void _testChainedDurationOptions(Options o) { public void testHttpRequestInterceptors() { java.util.function.Consumer interceptor1 = req -> req.getHeaders().add("Test1", "Header"); java.util.function.Consumer interceptor2 = req -> req.getHeaders().add("Test2", "Header"); - Options o = optionsBuilder() + Options o = new Options.Builder() .httpRequestInterceptor(interceptor1) .httpRequestInterceptor(interceptor2) .build(); assertEquals(o.getHttpRequestInterceptors(), Arrays.asList(interceptor1, interceptor2)); - o = optionsBuilder() + o = new Options.Builder() .httpRequestInterceptors(Arrays.asList(interceptor2, interceptor1)) .build(); assertEquals(o.getHttpRequestInterceptors(), Arrays.asList(interceptor2, interceptor1)); @@ -359,10 +357,10 @@ private static void _testPropertiesSSLOptions(Options o) { @Test public void testSupportUTF8Subjects() { - Options o = options(); + Options o = new Options.Builder().build(); assertFalse(o.supportUTF8Subjects()); - o = optionsBuilder().supportUTF8Subjects().build(); + o = new Options.Builder().supportUTF8Subjects().build(); assertTrue(o.supportUTF8Subjects()); Properties props = new Properties(); @@ -373,13 +371,13 @@ public void testSupportUTF8Subjects() { @Test public void testBuilderCoverageOptions() { - Options o = options(); + Options o = new Options.Builder().build(); assertTrue(o.clientSideLimitChecks()); assertNull(o.getServerPool()); // there is a default provider - o = optionsBuilder().clientSideLimitChecks(true).build(); + o = new Options.Builder().clientSideLimitChecks(true).build(); assertTrue(o.clientSideLimitChecks()); - o = optionsBuilder() + o = new Options.Builder() .clientSideLimitChecks(false) .serverPool(new NatsServerPool()) .build(); @@ -455,7 +453,7 @@ public void testProperties() throws Exception { .build(); assertEquals(1000, o.getMaxMessagesInOutgoingQueue()); - o = optionsBuilder() + o = new Options.Builder() .maxMessagesInOutgoingQueue(1000) .properties(props) .build(); @@ -701,7 +699,7 @@ public void testChainOverridesProperties() { @Test public void testDefaultConnectOptions() { - Options o = options(); + Options o = new Options.Builder().build(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "default connect options"); @@ -709,7 +707,7 @@ public void testDefaultConnectOptions() { @Test public void testNonDefaultConnectOptions() { - Options o = optionsBuilder().noNoResponders().noHeaders().noEcho().pedantic().verbose().build(); + Options o = new Options.Builder().noNoResponders().noHeaders().noEcho().pedantic().verbose().build(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":true,\"pedantic\":true,\"tls_required\":false,\"echo\":false,\"headers\":false,\"no_responders\":false}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "non default connect options"); @@ -718,7 +716,7 @@ public void testNonDefaultConnectOptions() { @Test public void testConnectOptionsWithNameAndContext() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options o = optionsBuilder().sslContext(ctx).connectionName("c1").build(); + Options o = new Options.Builder().sslContext(ctx).connectionName("c1").build(); String expected = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\",\"name\":\"c1\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":true,\"echo\":true,\"headers\":true,\"no_responders\":true}"; assertEquals(expected, o.buildProtocolConnectOptionsString("nats://localhost:4222", false, null).toString(), "default connect options"); @@ -726,7 +724,7 @@ public void testConnectOptionsWithNameAndContext() throws Exception { @Test public void testAuthConnectOptions() { - Options o = optionsBuilder().userInfo("hello".toCharArray(), "world".toCharArray()).build(); + Options o = new Options.Builder().userInfo("hello".toCharArray(), "world".toCharArray()).build(); String expectedNoAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; String expectedWithAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" @@ -746,7 +744,7 @@ public void testNKeyConnectOptions() throws Exception { byte[] nonce = "abcdefg".getBytes(StandardCharsets.UTF_8); String sig = base64UrlEncodeToString(th.sign(nonce)); - Options o = optionsBuilder().authHandler(th).build(); + Options o = new Options.Builder().authHandler(th).build(); String expectedNoAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true,\"headers\":true,\"no_responders\":true}"; String expectedWithAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" @@ -774,7 +772,7 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { String sig = Base64.getUrlEncoder().withoutPadding().encodeToString(th.sign(nonce)); // Assert that no auth and user info is given - Options options = optionsBuilder().authHandler(th) + Options options = new Options.Builder().authHandler(th) .userInfo(username.toCharArray(), password.toCharArray()).build(); String expectedWithoutAuth = "{\"lang\":\"java\",\"version\":\"" + Nats.CLIENT_VERSION + "\"" + ",\"protocol\":1,\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"echo\":true," @@ -793,7 +791,7 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { assertEquals(expectedWithAuth, actualWithAuthInOptions); // Assert that auth is given via options and user info is given via server URI - Options optionsWithoutUserInfo = optionsBuilder().authHandler(th).build(); + Options optionsWithoutUserInfo = new Options.Builder().authHandler(th).build(); String serverUriWithAuth = "nats://" + username + ":" + password + "@localhost:4222"; String actualWithAuthInServerUri = optionsWithoutUserInfo .buildProtocolConnectOptionsString(serverUriWithAuth, true, nonce).toString(); @@ -803,12 +801,12 @@ public void testNKeyJWTAndUserInfoOptions() throws Exception { @Test public void testDefaultDataPort() { - Options o = optionsBuilder().socketWriteTimeout(null).build(); + Options o = new Options.Builder().socketWriteTimeout(null).build(); DataPort dataPort = o.buildDataPort(); assertNotNull(dataPort); assertEquals(Options.DEFAULT_DATA_PORT_TYPE, dataPort.getClass().getCanonicalName(), "old default dataPort"); - o = options(); + o = new Options.Builder().build(); dataPort = o.buildDataPort(); assertNotNull(dataPort); assertEquals(SocketDataPortWithWriteTimeout.class.getCanonicalName(), dataPort.getClass().getCanonicalName(), "new default dataPort"); @@ -841,7 +839,7 @@ public void testJetStreamProperties() { @Test public void testUserPassInURL() { String serverURI = "nats://derek:password@localhost:2222"; - Options o = optionsBuilder(serverURI).build(); + Options o = new Options.Builder().server(serverURI).build(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"user\":\"derek\"")); @@ -852,7 +850,7 @@ public void testUserPassInURL() { @Test public void testTokenInURL() { String serverURI = "nats://alberto@localhost:2222"; - Options o = optionsBuilder(serverURI).build(); + Options o = new Options.Builder().server(serverURI).build(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"alberto\"")); @@ -863,31 +861,31 @@ public void testTokenInURL() { @Test public void testTokenSupplier() { String serverURI = "nats://localhost:2222"; - Options o = options(); + Options o = new Options.Builder().build(); String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); //noinspection deprecation - o = optionsBuilder().token((String)null).build(); + o = new Options.Builder().token((String)null).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); //noinspection deprecation - o = optionsBuilder().token(" ").build(); + o = new Options.Builder().token(" ").build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); - o = optionsBuilder().token((char[])null).build(); + o = new Options.Builder().token((char[])null).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); - o = optionsBuilder().token(new char[0]).build(); + o = new Options.Builder().token(new char[0]).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertFalse(connectString.contains("\"auth_token\"")); AtomicInteger counter = new AtomicInteger(0); Supplier tokenSupplier = () -> ("short-lived-token-" + counter.incrementAndGet()).toCharArray(); - o = optionsBuilder().tokenSupplier(tokenSupplier).build(); + o = new Options.Builder().tokenSupplier(tokenSupplier).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"short-lived-token-1\"")); @@ -897,7 +895,7 @@ public void testTokenSupplier() { Properties properties = new Properties(); properties.setProperty(PROP_TOKEN_SUPPLIER, TestingDynamicTokenSupplier.class.getCanonicalName()); - o = optionsBuilder().properties(properties).build(); + o = new Options.Builder().properties(properties).build(); connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString(); assertTrue(connectString.contains("\"auth_token\":\"dynamic-token-1\"")); @@ -934,20 +932,20 @@ public void testServersInProperties() { @Test public void testServers() { String[] serverUrls = {URL_PROTO_HOST_PORT_8080, URL_HOST_PORT_8081}; - Options options = optionsBuilder(serverUrls).build(); + Options options = new Options.Builder().servers(serverUrls).build(); assertServersAndUnprocessed(true, options); } @Test public void testServersWithCommas() { - String commaDelimited = URL_PROTO_HOST_PORT_8080 + "," + URL_HOST_PORT_8081; - assertServersAndUnprocessed(true, optionsBuilder().server(commaDelimited).build()); + String serverURLs = URL_PROTO_HOST_PORT_8080 + "," + URL_HOST_PORT_8081; + assertServersAndUnprocessed(true, new Options.Builder().server(serverURLs).build()); } @Test public void testEmptyAndNullStringsInServers() { String[] serverUrls = {"", null, URL_PROTO_HOST_PORT_8080, URL_HOST_PORT_8081}; - assertServersAndUnprocessed(true, optionsBuilder(serverUrls).build()); + assertServersAndUnprocessed(true, new Options.Builder().servers(serverUrls).build()); } private void assertServersAndUnprocessed(boolean two, Options o) { @@ -990,27 +988,27 @@ public void testBadClassInPropertyStatisticsCollector() { @Test public void testTokenAndUserThrows() { assertThrows(IllegalStateException.class, - () -> optionsBuilder().token("foo".toCharArray()).userInfo("foo".toCharArray(), "bar".toCharArray()).build()); + () -> new Options.Builder().token("foo".toCharArray()).userInfo("foo".toCharArray(), "bar".toCharArray()).build()); } @Test public void testThrowOnBadServerURI() { assertThrows(IllegalArgumentException.class, - () -> optionsBuilder("foo:/bar\\:blammer").build()); + () -> new Options.Builder().server("foo:/bar\\:blammer").build()); } @Test public void testThrowOnBadServersURI() { assertThrows(IllegalArgumentException.class, () -> { String[] serverUrls = {URL_PROTO_HOST_PORT_8080, "foo:/bar\\:blammer"}; - optionsBuilder(serverUrls).build(); + new Options.Builder().servers(serverUrls).build(); }); } @Test public void testSetExecutor() { ExecutorService exec = Executors.newCachedThreadPool(); - Options options = optionsBuilder().executor(exec).build(); + Options options = new Options.Builder().executor(exec).build(); assertEquals(exec, options.getExecutor()); } @@ -1030,7 +1028,7 @@ public void testDefaultExecutor() throws Exception { @Test public void testCallbackExecutor() throws ExecutionException, InterruptedException, TimeoutException { ThreadFactory threadFactory = r -> new Thread(r, "test"); - Options options = optionsBuilder() + Options options = new Options.Builder() .callbackThreadFactory(threadFactory) .build(); Future callbackFuture = options.getCallbackExecutor().submit( @@ -1041,7 +1039,7 @@ public void testCallbackExecutor() throws ExecutionException, InterruptedExcepti @Test public void testConnectExecutor() throws ExecutionException, InterruptedException, TimeoutException { ThreadFactory threadFactory = r -> new Thread(r, "test"); - Options options = optionsBuilder() + Options options = new Options.Builder() .connectThreadFactory(threadFactory) .build(); Future connectFuture = options.getConnectExecutor().submit( @@ -1144,7 +1142,7 @@ private static void checkCreate(NatsUri uri, boolean secure, boolean ws, boolean public void testReconnectDelayHandler() { ReconnectDelayHandler rdh = l -> Duration.ofSeconds(l * 2); - Options o = optionsBuilder().reconnectDelayHandler(rdh).build(); + Options o = new Options.Builder().reconnectDelayHandler(rdh).build(); ReconnectDelayHandler rdhO = o.getReconnectDelayHandler(); assertNotNull(rdhO); @@ -1153,39 +1151,43 @@ public void testReconnectDelayHandler() { @Test public void testInboxPrefixCoverage() { - Options o = optionsBuilder().inboxPrefix("foo").build(); + Options o = new Options.Builder().inboxPrefix("foo").build(); assertEquals("foo.", o.getInboxPrefix()); - o = optionsBuilder().inboxPrefix("foo.").build(); + o = new Options.Builder().inboxPrefix("foo.").build(); assertEquals("foo.", o.getInboxPrefix()); } @Test public void testSslContextIsProvided() { - Options o = options("localhost"); + Options o = new Options.Builder().server("localhost").build(); assertNull(o.getSslContext()); - o = options("ws://localhost"); + o = new Options.Builder().server("ws://localhost").build(); assertNull(o.getSslContext()); - o = options("localhost"); + o = new Options.Builder().server("localhost").build(); assertNull(o.getSslContext()); - o = options("tls://localhost"); + o = new Options.Builder().server("tls://localhost").build(); assertNotNull(o.getSslContext()); - o = options("wss://localhost"); + o = new Options.Builder().server("wss://localhost").build(); assertNotNull(o.getSslContext()); - o = options("opentls://localhost"); + o = new Options.Builder().server("opentls://localhost").build(); assertNotNull(o.getSslContext()); - o = optionsBuilder().server("nats://localhost,tls://localhost").build(); + o = new Options.Builder().server("nats://localhost,tls://localhost").build(); assertNotNull(o.getSslContext()); } @SuppressWarnings("deprecation") @Test public void coverageForDeprecated() { - Options o = optionsBuilder().token("deprecated").build(); + Options o = new Options.Builder() + .token("deprecated") + .build(); assertEquals("deprecated", o.getToken()); assertNull(o.getUsername()); assertNull(o.getPassword()); - o = optionsBuilder().userInfo("user", "pass").build(); + o = new Options.Builder() + .userInfo("user", "pass") + .build(); assertEquals("user", o.getUsername()); assertEquals("pass", o.getPassword()); assertNull(o.getToken()); @@ -1193,7 +1195,7 @@ public void coverageForDeprecated() { @Test public void testFastFallback() { - Options options = optionsBuilder().enableFastFallback().build(); + Options options = new Options.Builder().enableFastFallback().build(); assertTrue(options.isEnableFastFallback()); } @@ -1206,7 +1208,7 @@ public void testThrowOnBadContextForSecure() throws Exception { try { System.setProperty("javax.net.ssl.keyStore", "foo"); System.setProperty("javax.net.ssl.trustStore", "bar"); - optionsBuilder().secure().build(); + new Options.Builder().secure().build(); assertFalse(true); } finally { @@ -1220,7 +1222,7 @@ public void testThrowOnBadContextForTLSUrl() throws Exception { try { System.setProperty("javax.net.ssl.keyStore", "foo"); System.setProperty("javax.net.ssl.trustStore", "bar"); - optionsBuilder("tls://localhost:4242").build(); + new Options.Builder().server("tls://localhost:4242").build(); assertFalse(true); } finally { From e94dd1185b6c251b500da80e869978c1c8d9ec40 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 24 Nov 2025 06:14:44 -0500 Subject: [PATCH 14/51] putting options test back --- src/test/java/io/nats/client/AuthTests.java | 5 +++-- src/test/java/io/nats/client/utils/TestBase.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 08b928b5a..a73c9dee7 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -40,6 +40,7 @@ import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.NOOP_EL; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.jwtResource; import static org.junit.jupiter.api.Assertions.*; @@ -222,8 +223,8 @@ public void testUserPassInURLOnReconnect() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs)) { port = ts.getPort(); // See config file for user/pass - Options options = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())) - .maxReconnects(-1).connectionListener(listener).build(); + Options options = new Options.Builder().server(userPassInUrl("uuu", "ppp", ts.getPort())) + .maxReconnects(-1).connectionListener(listener).errorListener(NOOP_EL).build(); nc = standardConnectionWait(options); sub = nc.subscribe("test"); diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 847e06f53..bd2b93a81 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -179,11 +179,11 @@ public static void runInOwnJsServer(VersionCheck vc, InJetStreamTest inJetStream } public static void runInConfiguredServer(String configFilePath, InServerTest inServerTest) throws Exception { - _runInOwnServer(null, null, null, inServerTest, null); + _runInOwnServer(null, null, configFilePath, inServerTest, null); } public static void runInConfiguredJsServer(String configFilePath, InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, null, null, null, inJetStreamTest); + _runInOwnServer(null, null, configFilePath, null, inJetStreamTest); } // ---------------------------------------------------------------------------------------------------- From e4e3ca61eeda9d22911e687ffc03ddcc5ec871d7 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 24 Nov 2025 18:21:12 -0500 Subject: [PATCH 15/51] more --- .../java/io/nats/client/ConnectTests.java | 5 +- src/test/java/io/nats/client/EchoTests.java | 4 +- .../java/io/nats/client/PublishTests.java | 142 ++-- .../client/api/StreamConfigurationTests.java | 6 +- .../client/impl/ConnectionListenerTests.java | 2 +- .../nats/client/impl/ErrorListenerTests.java | 10 +- .../client/impl/JetStreamConsumerTests.java | 106 +-- .../client/impl/JetStreamGeneralTests.java | 448 +++++------ .../client/impl/JetStreamManagementTests.java | 626 ++++++++-------- .../JetStreamManagementWithConfTests.java | 2 +- .../impl/JetStreamMirrorAndSourcesTests.java | 129 ++-- .../nats/client/impl/JetStreamPubTests.java | 505 +++++++------ .../nats/client/impl/JetStreamPullTests.java | 703 +++++++++--------- .../client/impl/JetStreamPushAsyncTests.java | 79 +- .../client/impl/JetStreamPushQueueTests.java | 10 +- .../nats/client/impl/JetStreamPushTests.java | 170 ++--- .../client/impl/JetStreamTestingContext.java | 110 ++- .../io/nats/client/impl/KeyValueTests.java | 406 ++++------ .../nats/client/impl/MessageManagerTests.java | 10 +- .../nats/client/impl/NatsStatisticsTests.java | 4 +- .../io/nats/client/impl/ObjectStoreTests.java | 101 +-- .../java/io/nats/client/impl/PingTests.java | 2 +- .../io/nats/client/impl/ReconnectTests.java | 17 +- .../io/nats/client/impl/RequestTests.java | 4 +- .../nats/client/impl/SimplificationTests.java | 393 +++++----- .../io/nats/client/impl/TLSConnectTests.java | 4 +- .../client/support/ScheduledTaskTests.java | 4 +- .../java/io/nats/client/utils/TestBase.java | 226 +++--- .../io/nats/client/utils/VersionUtils.java | 8 +- .../java/io/nats/service/ServiceTests.java | 6 +- 30 files changed, 2039 insertions(+), 2203 deletions(-) diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index d59b93776..b3087b9ee 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -18,7 +18,6 @@ import io.nats.client.api.ServerInfo; import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.SimulateSocketDataPortException; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -638,7 +637,7 @@ void testConnectWithFastFallback() throws Exception { @Test void testConnectPendingCountCoverage() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { AtomicLong outgoingPendingMessageCount = new AtomicLong(); AtomicLong outgoingPendingBytes = new AtomicLong(); @@ -652,7 +651,7 @@ void testConnectPendingCountCoverage() throws Exception { }); t.start(); - String subject = TestBase.random(); + String subject = random(); byte[] data = new byte[8 * 1024]; for (int x = 0; x < 5000; x++) { nc.publish(subject, data); diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 3c63d18e2..ea1609e76 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -65,7 +65,7 @@ public void testWithEcho() throws Exception { runInSharedOwnNc(nc1 -> { try (Connection nc2 = longConnectionWait(optionsBuilder(nc1.getConnectedUrl()).build())) { // Echo is on so both sub should get messages from both pub - String subject = TestBase.random(); + String subject = random(); Subscription sub1 = nc1.subscribe(subject); nc1.flush(Duration.ofSeconds(1)); Subscription sub2 = nc2.subscribe(subject); @@ -93,7 +93,7 @@ public void testWithEcho() throws Exception { @Test public void testWithNoEcho() throws Exception { runInSharedOwnNc(optionsBuilder().noEcho().noReconnect(), nc -> { - String subject = TestBase.random(); + String subject = random(); // Echo is off so sub should get messages from pub from other connections Subscription sub1 = nc.subscribe(subject); nc.flush(Duration.ofSeconds(1)); diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 0e3ec0bbb..86e355036 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -13,9 +13,9 @@ package io.nats.client; -import io.nats.client.api.StorageType; -import io.nats.client.api.StreamConfiguration; import io.nats.client.impl.Headers; +import io.nats.client.impl.JetStreamTestingContext; +import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.NatsMessage; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -32,6 +32,7 @@ import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class PublishTests extends TestBase { @@ -227,39 +228,43 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header @Test public void testMaxPayload() throws Exception { - runInSharedOwnNc(standardOptionsBuilder().noReconnect(), nc -> { + runInSharedOwnNc(optionsBuilder().noReconnect(), nc -> { int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - nc.publish("mptest", new byte[maxPayload-1]); - nc.publish("mptest", new byte[maxPayload]); + nc.publish(random(), new byte[maxPayload - 1]); + assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), new byte[maxPayload + 1])); }); + } - try { - runInSharedOwnNc(standardOptionsBuilder().noReconnect().clientSideLimitChecks(false), nc -> { - int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - for (int x = 1; x < 1000; x++) { - nc.publish("mptest", new byte[maxPayload + x]); - } - }); - fail("Expecting IllegalStateException"); - } - catch (IllegalStateException ignore) {} + @Test + public void testMaxPayloadNoClientSideLimitChecks() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + Options.Builder builder = optionsBuilder().noReconnect().clientSideLimitChecks(false) + .connectionListener(listener); - try { - runInSharedOwnNc(standardOptionsBuilder().noReconnect(), nc -> { - int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - for (int x = 1; x < 1000; x++) { - nc.publish("mptest", new byte[maxPayload + x]); + runInSharedOwnNc(builder, nc -> { + IllegalStateException check = null; + int maxPayload = (int)nc.getServerInfo().getMaxPayload(); + for (int x = 1; x < 100; x++) { + try { + nc.publish(random(), new byte[maxPayload + x]); } - }); - fail("Expecting IllegalArgumentException"); - } - catch (IllegalArgumentException ignore) {} + catch (IllegalStateException e) { + check = e; + break; + } + } + if (check == null) { + fail("Expecting IllegalStateException"); + } + sleep(100); // make sure events has time to get there + assertTrue(listener.getConnectionEvents().contains(ConnectionListener.Events.DISCONNECTED)); + }); } @Test public void testUtf8Subjects() throws Exception { - String subject = dataAsLines("utf8-test-strings.txt").get(0); - String jsSubject = random() + "-" + subject; // just to have a different; + String utfSubject = dataAsLines("utf8-test-strings.txt").get(0); + String jsSubject = random() + "-" + utfSubject; // just to have a different; AtomicReference coreReceivedSubjectNotSupported = new AtomicReference<>(); AtomicReference coreReceivedSubjectWhenSupported = new AtomicReference<>(); @@ -274,50 +279,47 @@ public void testUtf8Subjects() throws Exception { runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { Options ncSupportedOptions = optionsBuilder(ncNotSupported.getConnectedUrl()).supportUTF8Subjects().build(); try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { - ncNotSupported.jetStreamManagement().addStream( - StreamConfiguration.builder() - .name(random()) - .storageType(StorageType.Memory) - .subjects(jsSubject) - .build()); - JetStream jsNotSupported = ncNotSupported.jetStream(); - JetStream jsSupported = ncNotSupported.jetStream(); - - Dispatcher dNotSupported = ncNotSupported.createDispatcher(); - Dispatcher dSupported = ncSupported.createDispatcher(); - - dNotSupported.subscribe(subject, m -> { - coreReceivedSubjectNotSupported.set(m.getSubject()); - coreReceivedLatchNotSupported.countDown(); - }); - - dSupported.subscribe(subject, m -> { - coreReceivedSubjectWhenSupported.set(m.getSubject()); - coreReceivedLatchWhenSupported.countDown(); - }); - - jsNotSupported.subscribe(jsSubject, dNotSupported, m -> { - jsReceivedSubjectNotSupported.set(m.getSubject()); - jsReceivedLatchNotSupported.countDown(); - }, false); - - jsSupported.subscribe(jsSubject, dSupported, m -> { - jsReceivedSubjectWhenSupported.set(m.getSubject()); - jsReceivedLatchWhenSupported.countDown(); - }, false); - - ncNotSupported.publish(subject, null); // demonstrates that publishing always does utf8 - jsSupported.publish(jsSubject, null); - - assertTrue(coreReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); - assertTrue(coreReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); - assertTrue(jsReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); - assertTrue(jsReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); - - assertNotEquals(subject, coreReceivedSubjectNotSupported.get()); - assertEquals(subject, coreReceivedSubjectWhenSupported.get()); - assertNotEquals(jsSubject, jsReceivedSubjectNotSupported.get()); - assertEquals(jsSubject, jsReceivedSubjectWhenSupported.get()); + try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { + ctxNotSupported.createStream(jsSubject); + JetStream jsNotSupported = ncNotSupported.jetStream(); + JetStream jsSupported = ncNotSupported.jetStream(); + + Dispatcher dNotSupported = ncNotSupported.createDispatcher(); + Dispatcher dSupported = ncSupported.createDispatcher(); + + dNotSupported.subscribe(utfSubject, m -> { + coreReceivedSubjectNotSupported.set(m.getSubject()); + coreReceivedLatchNotSupported.countDown(); + }); + + dSupported.subscribe(utfSubject, m -> { + coreReceivedSubjectWhenSupported.set(m.getSubject()); + coreReceivedLatchWhenSupported.countDown(); + }); + + jsNotSupported.subscribe(jsSubject, dNotSupported, m -> { + jsReceivedSubjectNotSupported.set(m.getSubject()); + jsReceivedLatchNotSupported.countDown(); + }, false); + + jsSupported.subscribe(jsSubject, dSupported, m -> { + jsReceivedSubjectWhenSupported.set(m.getSubject()); + jsReceivedLatchWhenSupported.countDown(); + }, false); + + ncNotSupported.publish(utfSubject, null); // demonstrates that publishing always does utf8 + jsSupported.publish(jsSubject, null); + + assertTrue(coreReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); + assertTrue(coreReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); + assertTrue(jsReceivedLatchNotSupported.await(1, TimeUnit.SECONDS)); + assertTrue(jsReceivedLatchWhenSupported.await(1, TimeUnit.SECONDS)); + + assertNotEquals(utfSubject, coreReceivedSubjectNotSupported.get()); + assertEquals(utfSubject, coreReceivedSubjectWhenSupported.get()); + assertNotEquals(jsSubject, jsReceivedSubjectNotSupported.get()); + assertEquals(jsSubject, jsReceivedSubjectWhenSupported.get()); + } } }); } diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java index 06659b4ba..2021c14d8 100644 --- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java +++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java @@ -54,10 +54,10 @@ private StreamConfiguration getTestConfiguration() { @Test public void testRoundTrip() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { CompressionOption compressionOption = atLeast2_10() ? S2 : None; StreamConfiguration sc = StreamConfiguration.builder(getTestConfiguration()) - .name(jstc.stream) + .name(ctx.stream) .mirror(null) .sources() .replicas(1) @@ -70,7 +70,7 @@ public void testRoundTrip() throws Exception { .allowMessageCounter(false) .persistMode(null) .build(); - validateTestStreamConfiguration(jstc.jsm.addStream(sc).getConfiguration(), true, jstc.stream); + validateTestStreamConfiguration(ctx.jsm.addStream(sc).getConfiguration(), true, ctx.stream); }); } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 4e11188c8..9c65d7e1c 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -102,7 +102,7 @@ public void testDisconnectReconnectCount() throws Exception { public void testExceptionInConnectionListener() throws Exception { BadHandler listener = new BadHandler(); Options.Builder builder = optionsBuilder().connectionListener(listener); - runInOwnServer(builder, nc -> { + runInServer(builder, nc -> { standardCloseConnection(nc); assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); }); diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 3bec29f34..49f3ef309 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -44,10 +44,7 @@ public void testLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = optionsBuilder() - .server(ts.getLocalhostUri()) - .server(ts2.getLocalhostUri()) - .server(ts3.getLocalhostUri()) + Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri(), ts3.getLocalhostUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) @@ -88,10 +85,7 @@ public void testClearLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = optionsBuilder() - .server(ts.getLocalhostUri()) - .server(ts2.getLocalhostUri()) - .server(ts3.getLocalhostUri()) + Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri(), ts3.getLocalhostUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index a40cc4f08..6f8211e58 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -59,28 +59,28 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedConsumerSync() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // Get this in place before any subscriptions are made - jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; + ctx.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; // Test queue exception IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(jstc.subject(), random(), PushSubscribeOptions.builder().ordered(true).build())); + () -> ctx.js.subscribe(ctx.subject(), random(), PushSubscribeOptions.builder().ordered(true).build())); assertTrue(iae.getMessage().contains(JsSubOrderedNotAllowOnQueues.id())); // Setup sync subscription - _testOrderedConsumerSync(jstc, null, PushSubscribeOptions.builder().ordered(true).build()); + _testOrderedConsumerSync(ctx, null, PushSubscribeOptions.builder().ordered(true).build()); - _testOrderedConsumerSync(jstc, jstc.consumerName(), PushSubscribeOptions.builder().name(jstc.consumerName()).ordered(true).build()); + _testOrderedConsumerSync(ctx, ctx.consumerName(), PushSubscribeOptions.builder().name(ctx.consumerName()).ordered(true).build()); }); } - private static void _testOrderedConsumerSync(JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, InterruptedException { - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + private static void _testOrderedConsumerSync(JetStreamTestingContext ctx, String consumerNamePrefix, PushSubscribeOptions pso) throws IOException, JetStreamApiException, InterruptedException { + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); String firstConsumerName = validateOrderedConsumerNamePrefix(sub, consumerNamePrefix); // Published messages will be intercepted by the OrderedTestDropSimulator - jsPublish(jstc.js, jstc.subject(), 101, 6); + jsPublish(ctx.js, ctx.subject(), 101, 6); // Loop through the messages to make sure I get stream sequence 1 to 6 int expectedStreamSeq = 1; @@ -116,31 +116,31 @@ private static void reValidateOrderedConsumerNamePrefix(JetStreamSubscription su @Test public void testOrderedConsumerAsyncNoName() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // without name (prefix) - _testOrderedConsumerAsync(nc, jstc, null, + _testOrderedConsumerAsync(nc, ctx, null, PushSubscribeOptions.builder().ordered(true).build()); }); } @Test public void testOrderedConsumerAsyncWithName() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // with name (prefix) - _testOrderedConsumerAsync(nc, jstc, jstc.consumerName(), - PushSubscribeOptions.builder().name(jstc.consumerName()).ordered(true).build()); + _testOrderedConsumerAsync(nc, ctx, ctx.consumerName(), + PushSubscribeOptions.builder().name(ctx.consumerName()).ordered(true).build()); }); } - private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingContext jstc, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, InterruptedException { + private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingContext ctx, String consumerNamePrefix, PushSubscribeOptions pso) throws JetStreamApiException, IOException, InterruptedException { // Get this in place before any subscriptions are made - jstc.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; + ctx.js._pushOrderedMessageManagerFactory = OrderedTestDropSimulator::new; // We'll need a dispatcher Dispatcher d = nc.createDispatcher(); // Test queue exception - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), random(), d, m -> {}, false, pso)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), random(), d, m -> {}, false, pso)); assertTrue(iae.getMessage().contains(JsSubOrderedNotAllowOnQueues.id())); // Set up an async subscription @@ -155,11 +155,11 @@ private static void _testOrderedConsumerAsync(Connection nc, JetStreamTestingCon msgLatch.countDown(); }; - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, handler, false, pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, handler, false, pso); String firstConsumerName = validateOrderedConsumerNamePrefix(sub, consumerNamePrefix); // publish after sub b/c interceptor is set during sub, so before messages come in - jsPublish(jstc.js, jstc.subject(), 201, 6); + jsPublish(ctx.js, ctx.subject(), 201, 6); // wait for the messages awaitAndAssert(msgLatch); @@ -255,30 +255,30 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testHeartbeatError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); - JetStream js = jstc.js; + JetStream js = ctx.js; PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); SimulatorState state = setupFactory(js); - JetStreamSubscription sub = js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = js.subscribe(ctx.subject(), pso); validate(sub, listener, state, null); state = setupFactory(js); - sub = js.subscribe(jstc.subject(), d, m -> {}, false, pso); + sub = js.subscribe(ctx.subject(), d, m -> {}, false, pso); validate(sub, listener, state, d); pso = PushSubscribeOptions.builder().ordered(true).configuration(cc).build(); state = setupOrderedFactory(js); - sub = js.subscribe(jstc.subject(), pso); + sub = js.subscribe(ctx.subject(), pso); validate(sub, listener, state, null); state = setupOrderedFactory(js); - sub = js.subscribe(jstc.subject(), d, m -> {}, false, pso); + sub = js.subscribe(ctx.subject(), d, m -> {}, false, pso); validate(sub, listener, state, d); state = setupPullFactory(js); - sub = js.subscribe(jstc.subject(), PullSubscribeOptions.DEFAULT_PULL_OPTS); + sub = js.subscribe(ctx.subject(), PullSubscribeOptions.DEFAULT_PULL_OPTS); sub.pull(PullRequestOptions.builder(1).idleHeartbeat(100).expiresIn(2000).build()); validate(sub, listener, state, null); }); @@ -333,48 +333,48 @@ private static SimulatorState setupPullFactory(JetStream js) { @Test public void testMultipleSubjectFilters() throws Exception { - runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { - jstc.createStream(2); - jsPublish(jstc.js, jstc.subject(0), 10); - jsPublish(jstc.js, jstc.subject(1), 5); + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { + ctx.createStream(2); + jsPublish(ctx.js, ctx.subject(0), 10); + jsPublish(ctx.js, ctx.subject(1), 5); // push ephemeral - ConsumerConfiguration cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).build(); - JetStreamSubscription sub = jstc.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + ConsumerConfiguration cc = ConsumerConfiguration.builder().filterSubjects(ctx.subject(0), ctx.subject(1)).build(); + JetStreamSubscription sub = ctx.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); // pull ephemeral - sub = jstc.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); + sub = ctx.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); // push named String name = random(); - cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).deliverSubject(random()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - sub = jstc.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + cc = ConsumerConfiguration.builder().filterSubjects(ctx.subject(0), ctx.subject(1)).name(name).deliverSubject(random()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + sub = ctx.js.subscribe(null, PushSubscribeOptions.builder().configuration(cc).build()); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); name = random(); - cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).deliverSubject(random()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - sub = jstc.js.subscribe(null, PushSubscribeOptions.bind(jstc.stream, name)); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + cc = ConsumerConfiguration.builder().filterSubjects(ctx.subject(0), ctx.subject(1)).name(name).deliverSubject(random()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + sub = ctx.js.subscribe(null, PushSubscribeOptions.bind(ctx.stream, name)); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); // pull named name = random(); - cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - sub = jstc.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); + cc = ConsumerConfiguration.builder().filterSubjects(ctx.subject(0), ctx.subject(1)).name(name).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + sub = ctx.js.subscribe(null, PullSubscribeOptions.builder().configuration(cc).build()); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); name = random(); - cc = ConsumerConfiguration.builder().filterSubjects(jstc.subject(0), jstc.subject(1)).name(name).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - sub = jstc.js.subscribe(null, PullSubscribeOptions.bind(jstc.stream, name)); + cc = ConsumerConfiguration.builder().filterSubjects(ctx.subject(0), ctx.subject(1)).name(name).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + sub = ctx.js.subscribe(null, PullSubscribeOptions.bind(ctx.stream, name)); sub.pullExpiresIn(15, 1000); - validateMultipleSubjectFilterSub(sub, jstc.subject(0)); + validateMultipleSubjectFilterSub(sub, ctx.subject(0)); }); } @@ -399,12 +399,12 @@ private static void validateMultipleSubjectFilterSub(JetStreamSubscription sub, @Test public void testRaiseStatusWarnings1194() throws Exception { ListenerForTesting listener = new ListenerForTesting(false, false); - runInSharedOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, ctx) -> { // Setup - StreamContext streamContext = nc.getStreamContext(jstc.stream); + StreamContext streamContext = nc.getStreamContext(ctx.stream); // Setting maxBatch=1, so we shouldn't allow fetching more messages at once. - ConsumerConfiguration consumerConfig = ConsumerConfiguration.builder().filterSubject(jstc.subject()).maxBatch(1).build(); + ConsumerConfiguration consumerConfig = ConsumerConfiguration.builder().filterSubject(ctx.subject()).maxBatch(1).build(); ConsumerContext consumerContext = streamContext.createOrUpdateConsumer(consumerConfig); int count = 0; diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 042b85233..5c2da4d85 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -42,15 +42,15 @@ public class JetStreamGeneralTests extends JetStreamTestBase { @Test public void testJetStreamContextCreate() throws Exception { - runInShared((nc, jstc) -> { - jstc.jsm.getAccountStatistics(); // another management - jstc.js.publish(jstc.subject(), dataBytes(1)); + runInShared((nc, ctx) -> { + ctx.jsm.getAccountStatistics(); // another management + ctx.js.publish(ctx.subject(), dataBytes(1)); }); } @Test public void testJetNotEnabled() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { // get normal context, try to do an operation JetStream js = nc.jetStream(); assertThrows(IOException.class, () -> js.subscribe(random())); @@ -75,8 +75,8 @@ public void testJetEnabledGoodAccount() throws Exception { @Test public void testJetStreamPublishDefaultOptions() throws Exception { - runInShared((nc, jstc) -> { - PublishAck ack = jsPublish(jstc.js, jstc.subject()); + runInShared((nc, ctx) -> { + PublishAck ack = jsPublish(ctx.js, ctx.subject()); assertEquals(1, ack.getSeqno()); }); } @@ -106,82 +106,82 @@ public void testMiscMetaDataCoverage() { @Test public void testJetStreamSubscribe() throws Exception { - runInShared((nc, jstc) -> { - jsPublish(jstc.js, jstc.subject()); + runInShared((nc, ctx) -> { + jsPublish(ctx.js, ctx.subject()); // default ephemeral subscription. - Subscription s = jstc.js.subscribe(jstc.subject()); + Subscription s = ctx.js.subscribe(ctx.subject()); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - List names = jstc.jsm.getConsumerNames(jstc.stream); + List names = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(1, names.size()); // default subscribe options // ephemeral subscription. - s = jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().build()); + s = ctx.js.subscribe(ctx.subject(), PushSubscribeOptions.builder().build()); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - names = jstc.jsm.getConsumerNames(jstc.stream); + names = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(2, names.size()); // set the stream String durable = random(); - PushSubscribeOptions pso = PushSubscribeOptions.builder().stream(jstc.stream).durable(durable).build(); - s = jstc.js.subscribe(jstc.subject(), pso); + PushSubscribeOptions pso = PushSubscribeOptions.builder().stream(ctx.stream).durable(durable).build(); + s = ctx.js.subscribe(ctx.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); - names = jstc.jsm.getConsumerNames(jstc.stream); + names = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(3, names.size()); // coverage Dispatcher dispatcher = nc.createDispatcher(); - jstc.js.subscribe(jstc.subject()); - jstc.js.subscribe(jstc.subject(), (PushSubscribeOptions)null); - jstc.js.subscribe(jstc.subject(), random(), null); - jstc.js.subscribe(jstc.subject(), dispatcher, mh -> {}, false); - jstc.js.subscribe(jstc.subject(), dispatcher, mh -> {}, false, null); - jstc.js.subscribe(jstc.subject(), random(), dispatcher, mh -> {}, false, null); + ctx.js.subscribe(ctx.subject()); + ctx.js.subscribe(ctx.subject(), (PushSubscribeOptions)null); + ctx.js.subscribe(ctx.subject(), random(), null); + ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {}, false); + ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {}, false, null); + ctx.js.subscribe(ctx.subject(), random(), dispatcher, mh -> {}, false, null); // bind with w/o subject durable = random(); String deliver = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder() .durable(durable) .deliverSubject(deliver) .build()); - PushSubscribeOptions psoBind = PushSubscribeOptions.bind(jstc.stream, durable); - unsubscribeEnsureNotBound(jstc.js.subscribe(null, psoBind)); - unsubscribeEnsureNotBound(jstc.js.subscribe("", psoBind)); - JetStreamSubscription sub = jstc.js.subscribe(null, dispatcher, mh -> {}, false, psoBind); + PushSubscribeOptions psoBind = PushSubscribeOptions.bind(ctx.stream, durable); + unsubscribeEnsureNotBound(ctx.js.subscribe(null, psoBind)); + unsubscribeEnsureNotBound(ctx.js.subscribe("", psoBind)); + JetStreamSubscription sub = ctx.js.subscribe(null, dispatcher, mh -> {}, false, psoBind); unsubscribeEnsureNotBound(dispatcher, sub); - jstc.js.subscribe("", dispatcher, mh -> {}, false, psoBind); + ctx.js.subscribe("", dispatcher, mh -> {}, false, psoBind); durable = random(); deliver = random(); String queue = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder() .durable(durable) .deliverSubject(deliver) .deliverGroup(queue) .build()); - psoBind = PushSubscribeOptions.bind(jstc.stream, durable); - unsubscribeEnsureNotBound(jstc.js.subscribe(null, queue, psoBind)); - unsubscribeEnsureNotBound(jstc.js.subscribe("", queue, psoBind)); - sub = jstc.js.subscribe(null, queue, dispatcher, mh -> {}, false, psoBind); + psoBind = PushSubscribeOptions.bind(ctx.stream, durable); + unsubscribeEnsureNotBound(ctx.js.subscribe(null, queue, psoBind)); + unsubscribeEnsureNotBound(ctx.js.subscribe("", queue, psoBind)); + sub = ctx.js.subscribe(null, queue, dispatcher, mh -> {}, false, psoBind); unsubscribeEnsureNotBound(dispatcher, sub); - jstc.js.subscribe("", queue, dispatcher, mh -> {}, false, psoBind); + ctx.js.subscribe("", queue, dispatcher, mh -> {}, false, psoBind); - if (atLeast2_9_0(nc)) { + if (atLeast2_9_0()) { String name = random(); ConsumerConfiguration cc = builder().name(name).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = jstc.js.subscribe(jstc.subject(), pso); + sub = ctx.js.subscribe(ctx.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); @@ -193,7 +193,7 @@ public void testJetStreamSubscribe() throws Exception { durable = random(); cc = builder().durable(durable).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = jstc.js.subscribe(jstc.subject(), pso); + sub = ctx.js.subscribe(ctx.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); @@ -205,7 +205,7 @@ public void testJetStreamSubscribe() throws Exception { String durName = random(); cc = builder().durable(durName).name(durName).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = jstc.js.subscribe(jstc.subject(), pso); + sub = ctx.js.subscribe(ctx.subject(), pso); m = sub.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(DATA, new String(m.getData())); @@ -219,127 +219,127 @@ public void testJetStreamSubscribe() throws Exception { JetStream jsOptOut = nc.jetStream(jso); ConsumerConfiguration ccOptOut = builder().name(random()).build(); PushSubscribeOptions psoOptOut = PushSubscribeOptions.builder().configuration(ccOptOut).build(); - assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(jstc.subject(), psoOptOut)); + assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(ctx.subject(), psoOptOut)); } }); } @Test public void testJetStreamSubscribeLenientSubject() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { Dispatcher d = nc.createDispatcher(); - jstc.js.subscribe(jstc.subject(), (PushSubscribeOptions)null); - jstc.js.subscribe(jstc.subject(), null, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api - jstc.js.subscribe(jstc.subject(), d, m -> {}, false, (PushSubscribeOptions)null); - jstc.js.subscribe(jstc.subject(), null, d, m -> {}, false, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api + ctx.js.subscribe(ctx.subject(), (PushSubscribeOptions)null); + ctx.js.subscribe(ctx.subject(), null, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api + ctx.js.subscribe(ctx.subject(), d, m -> {}, false, (PushSubscribeOptions)null); + ctx.js.subscribe(ctx.subject(), null, d, m -> {}, false, (PushSubscribeOptions)null); // queue name is not required, just a weird way to call this api - PushSubscribeOptions pso = ConsumerConfiguration.builder().filterSubject(jstc.subject()).buildPushSubscribeOptions(); - jstc.js.subscribe(null, pso); - jstc.js.subscribe(null, null, pso); - jstc.js.subscribe(null, d, m -> {}, false, pso); - jstc.js.subscribe(null, null, d, m -> {}, false, pso); + PushSubscribeOptions pso = ConsumerConfiguration.builder().filterSubject(ctx.subject()).buildPushSubscribeOptions(); + ctx.js.subscribe(null, pso); + ctx.js.subscribe(null, null, pso); + ctx.js.subscribe(null, d, m -> {}, false, pso); + ctx.js.subscribe(null, null, d, m -> {}, false, pso); PushSubscribeOptions psoF = ConsumerConfiguration.builder().buildPushSubscribeOptions(); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, psoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, psoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, psoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, false, psoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, d, m -> {}, false, psoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, psoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, psoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, null, psoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, d, m -> {}, false, psoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, null, d, m -> {}, false, psoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PushSubscribeOptions)null)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, (PushSubscribeOptions)null)); //noinspection RedundantCast - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, null, (PushSubscribeOptions)null)); //noinspection RedundantCast - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, false, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, d, m -> {}, false, (PushSubscribeOptions)null)); //noinspection RedundantCast - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, null, d, m -> {}, false, (PushSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, null, d, m -> {}, false, (PushSubscribeOptions)null)); - PullSubscribeOptions lso = ConsumerConfiguration.builder().filterSubject(jstc.subject()).buildPullSubscribeOptions(); - jstc.js.subscribe(null, lso); - jstc.js.subscribe(null, d, m -> {}, lso); + PullSubscribeOptions lso = ConsumerConfiguration.builder().filterSubject(ctx.subject()).buildPullSubscribeOptions(); + ctx.js.subscribe(null, lso); + ctx.js.subscribe(null, d, m -> {}, lso); PullSubscribeOptions lsoF = ConsumerConfiguration.builder().buildPullSubscribeOptions(); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, lsoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, lsoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, lsoF)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, d, m -> {}, lsoF)); - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, (PullSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, (PullSubscribeOptions)null)); //noinspection RedundantCast - assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(null, d, m -> {}, (PullSubscribeOptions)null)); + assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(null, d, m -> {}, (PullSubscribeOptions)null)); }); } @Test public void testJetStreamSubscribeErrors() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { String stream = random(); // stream not found PushSubscribeOptions psoInvalidStream = PushSubscribeOptions.builder().stream(stream).build(); - assertThrows(JetStreamApiException.class, () -> jstc.js.subscribe(random(), psoInvalidStream)); + assertThrows(JetStreamApiException.class, () -> ctx.js.subscribe(random(), psoInvalidStream)); Dispatcher d = nc.createDispatcher(); for (String bad : BAD_SUBJECTS_OR_QUEUES) { if (bad == null || bad.isEmpty()) { // subject - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(bad)); assertTrue(iae.getMessage().startsWith("Subject")); - assertClientError(JsSubSubjectNeededToLookupStream, () -> jstc.js.subscribe(bad, (PushSubscribeOptions)null)); + assertClientError(JsSubSubjectNeededToLookupStream, () -> ctx.js.subscribe(bad, (PushSubscribeOptions)null)); } else { // subject - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(bad)); assertTrue(iae.getMessage().startsWith("Subject")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(bad, (PushSubscribeOptions)null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(bad, (PushSubscribeOptions)null)); assertTrue(iae.getMessage().startsWith("Subject")); // queue - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), bad, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), bad, null)); assertTrue(iae.getMessage().startsWith("Queue")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), bad, d, m -> {}, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), bad, d, m -> {}, false, null)); assertTrue(iae.getMessage().startsWith("Queue")); } } // dispatcher - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), null, null, false)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), null, null, false)); assertTrue(iae.getMessage().startsWith("Dispatcher")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), null, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), null, null, false, null)); assertTrue(iae.getMessage().startsWith("Dispatcher")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), random(), null, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), random(), null, null, false, null)); assertTrue(iae.getMessage().startsWith("Dispatcher")); // handler Dispatcher dispatcher = nc.createDispatcher(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), dispatcher, null, false)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), dispatcher, null, false)); assertTrue(iae.getMessage().startsWith("Handler")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), dispatcher, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), dispatcher, null, false, null)); assertTrue(iae.getMessage().startsWith("Handler")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(random(), random(), dispatcher, null, false, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(random(), random(), dispatcher, null, false, null)); assertTrue(iae.getMessage().startsWith("Handler")); }); } @Test public void testFilterSubjectEphemeral() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { String subject = random(); String subjectWild = subject + ".*"; String subjectA = subject + ".A"; String subjectB = subject + ".B"; - jstc.createStream(subjectWild); + ctx.createStream(subjectWild); - jsPublish(jstc.js, subjectA, 1); - jsPublish(jstc.js, subjectB, 1); - jsPublish(jstc.js, subjectA, 1); - jsPublish(jstc.js, subjectB, 1); + jsPublish(ctx.js, subjectA, 1); + jsPublish(ctx.js, subjectB, 1); + jsPublish(ctx.js, subjectA, 1); + jsPublish(ctx.js, subjectB, 1); // subscribe to the wildcard ConsumerConfiguration cc = builder().ackPolicy(AckPolicy.None).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = jstc.js.subscribe(subjectWild, pso); + JetStreamSubscription sub = ctx.js.subscribe(subjectWild, pso); nc.flush(Duration.ofSeconds(1)); Message m = sub.nextMessage(Duration.ofSeconds(1)); @@ -358,7 +358,7 @@ public void testFilterSubjectEphemeral() throws Exception { // subscribe to A cc = builder().filterSubject(subjectA).ackPolicy(AckPolicy.None).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); nc.flush(Duration.ofSeconds(1)); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -373,7 +373,7 @@ public void testFilterSubjectEphemeral() throws Exception { // subscribe to B cc = builder().filterSubject(subjectB).ackPolicy(AckPolicy.None).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - sub = jstc.js.subscribe(subjectB, pso); + sub = ctx.js.subscribe(subjectB, pso); nc.flush(Duration.ofSeconds(1)); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -459,61 +459,61 @@ private void readPrefixMessages(Connection nc, JetStream js, String subject, Str @Test public void testBindPush() throws Exception { - runInShared((nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 1, 1); + runInShared((nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 1, 1); PushSubscribeOptions pso = PushSubscribeOptions.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .build(); - JetStreamSubscription s = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription s = ctx.js.subscribe(ctx.subject(), pso); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(1), new String(m.getData())); m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(jstc.js, jstc.subject(), 2, 1); + jsPublish(ctx.js, ctx.subject(), 2, 1); pso = PushSubscribeOptions.builder() - .stream(jstc.stream) - .durable(jstc.consumerName()) + .stream(ctx.stream) + .durable(ctx.consumerName()) .bind(true) .build(); - s = jstc.js.subscribe(jstc.subject(), pso); + s = ctx.js.subscribe(ctx.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(2), new String(m.getData())); m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(jstc.js, jstc.subject(), 3, 1); - pso = PushSubscribeOptions.bind(jstc.stream, jstc.consumerName()); - s = jstc.js.subscribe(jstc.subject(), pso); + jsPublish(ctx.js, ctx.subject(), 3, 1); + pso = PushSubscribeOptions.bind(ctx.stream, ctx.consumerName()); + s = ctx.js.subscribe(ctx.subject(), pso); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); assertEquals(data(3), new String(m.getData())); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().stream(jstc.stream).bind(true).build()); + () -> PushSubscribeOptions.builder().stream(ctx.stream).bind(true).build()); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().durable(jstc.consumerName()).bind(true).build()); + () -> PushSubscribeOptions.builder().durable(ctx.consumerName()).bind(true).build()); assertThrows(IllegalArgumentException.class, () -> PushSubscribeOptions.builder().stream(EMPTY).bind(true).build()); assertThrows(IllegalArgumentException.class, - () -> PushSubscribeOptions.builder().stream(jstc.stream).durable(EMPTY).bind(true).build()); + () -> PushSubscribeOptions.builder().stream(ctx.stream).durable(EMPTY).bind(true).build()); }); } @Test public void testBindPull() throws Exception { - runInShared((nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 1, 1); + runInShared((nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 1, 1); PullSubscribeOptions pso = PullSubscribeOptions.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .build(); - JetStreamSubscription s = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription s = ctx.js.subscribe(ctx.subject(), pso); s.pull(1); Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -521,13 +521,13 @@ public void testBindPull() throws Exception { m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(jstc.js, jstc.subject(), 2, 1); + jsPublish(ctx.js, ctx.subject(), 2, 1); pso = PullSubscribeOptions.builder() - .stream(jstc.stream) - .durable(jstc.consumerName()) + .stream(ctx.stream) + .durable(ctx.consumerName()) .bind(true) .build(); - s = jstc.js.subscribe(jstc.subject(), pso); + s = ctx.js.subscribe(ctx.subject(), pso); s.pull(1); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -535,9 +535,9 @@ public void testBindPull() throws Exception { m.ack(); unsubscribeEnsureNotBound(s); - jsPublish(jstc.js, jstc.subject(), 3, 1); - pso = PullSubscribeOptions.bind(jstc.stream, jstc.consumerName()); - s = jstc.js.subscribe(jstc.subject(), pso); + jsPublish(ctx.js, ctx.subject(), 3, 1); + pso = PullSubscribeOptions.bind(ctx.stream, ctx.consumerName()); + s = ctx.js.subscribe(ctx.subject(), pso); s.pull(1); m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -547,25 +547,25 @@ public void testBindPull() throws Exception { @Test public void testBindErrors() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // bind errors - PushSubscribeOptions pushbinderr = PushSubscribeOptions.bind(jstc.stream, "binddur"); - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushbinderr)); + PushSubscribeOptions pushbinderr = PushSubscribeOptions.bind(ctx.stream, "binddur"); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pushbinderr)); assertTrue(iae.getMessage().contains(JsSubConsumerNotFoundRequiredInBind.id())); - PullSubscribeOptions pullbinderr = PullSubscribeOptions.bind(jstc.stream, "binddur"); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullbinderr)); + PullSubscribeOptions pullbinderr = PullSubscribeOptions.bind(ctx.stream, "binddur"); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pullbinderr)); assertTrue(iae.getMessage().contains(JsSubConsumerNotFoundRequiredInBind.id())); }); } @Test public void testFilterMismatchErrors() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { + runInJsServer((nc, jsm, js) -> { String stream = random(); String subject = random(); - createMemoryStream(nc, stream, subject); + createMemoryStream(jsm, stream, subject); // will work as SubscribeSubject equals Filter Subject filterMatchSubscribeOk(js, jsm, stream, subject, subject); @@ -646,7 +646,7 @@ private void filterMatchSetupConsumer(JetStreamManagement jsm, String deliver, S @Test public void testBindDurableDeliverSubject() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // create a durable push subscriber - has a deliver subject String dur1 = random(); String dur2 = random(); @@ -654,49 +654,49 @@ public void testBindDurableDeliverSubject() throws Exception { ConsumerConfiguration ccDurPush = builder() .durable(dur1) .deliverSubject(deliver) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ccDurPush); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ccDurPush); // create a durable pull subscriber - notice no deliver subject ConsumerConfiguration ccDurPull = builder() .durable(dur2) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ccDurPull); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ccDurPull); // try to pull subscribe against a push durable IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(dur1).build()) + () -> ctx.js.subscribe(ctx.subject(), PullSubscribeOptions.builder().durable(dur1).build()) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPush.id())); // try to pull bind against a push durable iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.bind(jstc.stream, dur1)) + () -> ctx.js.subscribe(ctx.subject(), PullSubscribeOptions.bind(ctx.stream, dur1)) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPush.id())); // try to push subscribe against a pull durable iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().durable(dur2).build()) + () -> ctx.js.subscribe(ctx.subject(), PushSubscribeOptions.builder().durable(dur2).build()) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPull.id())); // try to push bind against a pull durable iae = assertThrows(IllegalArgumentException.class, - () -> jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.bind(jstc.stream, dur2)) + () -> ctx.js.subscribe(ctx.subject(), PushSubscribeOptions.bind(ctx.stream, dur2)) ); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyConfiguredAsPull.id())); // this one is okay - jstc.js.subscribe(jstc.subject(), PushSubscribeOptions.builder().durable(dur1).build()); + ctx.js.subscribe(ctx.subject(), PushSubscribeOptions.builder().durable(dur1).build()); }); } @Test public void testConsumerIsNotModified() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // test with config in issue 105 String dur = random(); String q = random(); @@ -712,12 +712,12 @@ public void testConsumerIsNotModified() throws Exception { .maxBatch(10) .maxBytes(11) .replayPolicy(ReplayPolicy.Instant) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - PushSubscribeOptions pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), q, pushOpts); // should not throw an error + PushSubscribeOptions pushOpts = PushSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), q, pushOpts); // should not throw an error // testing numerics dur = random(); @@ -731,23 +731,23 @@ public void testConsumerIsNotModified() throws Exception { .maxBytes(48) .rateLimit(44) .maxAckPending(45) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), pushOpts); // should not throw an error dur = random(); cc = builder() .durable(dur) .maxPullWaiting(46) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - PullSubscribeOptions pullOpts = PullSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), pullOpts); // should not throw an error + PullSubscribeOptions pullOpts = PullSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), pullOpts); // should not throw an error // testing DateTime dur = random(); @@ -756,12 +756,12 @@ public void testConsumerIsNotModified() throws Exception { .deliverSubject(random()) .durable(dur) .startTime(ZonedDateTime.now().plusHours(1)) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), pushOpts); // should not throw an error // testing boolean and duration dur = random(); @@ -772,12 +772,12 @@ public void testConsumerIsNotModified() throws Exception { .headersOnly(true) .maxExpires(30000) .ackWait(2000) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), pushOpts); // should not throw an error // testing enums dur = random(); @@ -787,83 +787,83 @@ public void testConsumerIsNotModified() throws Exception { .deliverPolicy(DeliverPolicy.Last) .ackPolicy(AckPolicy.None) .replayPolicy(ReplayPolicy.Original) - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - pushOpts = PushSubscribeOptions.bind(jstc.stream, dur); - jstc.js.subscribe(jstc.subject(), pushOpts); // should not throw an error + pushOpts = PushSubscribeOptions.bind(ctx.stream, dur); + ctx.js.subscribe(ctx.subject(), pushOpts); // should not throw an error }); } @Test public void testSubscribeDurableConsumerMustMatch() throws Exception { - runInShared((nc, jstc) -> { - String stream = jstc.stream; - String subject = jstc.subject(); + runInShared((nc, ctx) -> { + String stream = ctx.stream; + String subject = ctx.subject(); // push String uname = random(); String deliver = random(); nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).build()); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.Last), "deliverPolicy"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.New), "deliverPolicy"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.None), "ackPolicy"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.All), "ackPolicy"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).replayPolicy(ReplayPolicy.Original), "replayPolicy"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.Last), "deliverPolicy"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).deliverPolicy(DeliverPolicy.New), "deliverPolicy"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.None), "ackPolicy"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackPolicy(AckPolicy.All), "ackPolicy"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).replayPolicy(ReplayPolicy.Original), "replayPolicy"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).flowControl(10000), "flowControl"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).headersOnly(true), "headersOnly"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).flowControl(10000), "flowControl"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).headersOnly(true), "headersOnly"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startTime(ZonedDateTime.now()), "startTime"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(Duration.ofMillis(1)), "ackWait"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).description("x"), "description"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).sampleFrequency("x"), "sampleFrequency"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).idleHeartbeat(Duration.ofMillis(1000)), "idleHeartbeat"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxExpires(Duration.ofMillis(1000)), "maxExpires"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).inactiveThreshold(Duration.ofMillis(1000)), "inactiveThreshold"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).startTime(ZonedDateTime.now()), "startTime"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(Duration.ofMillis(1)), "ackWait"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).description("x"), "description"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).sampleFrequency("x"), "sampleFrequency"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).idleHeartbeat(Duration.ofMillis(1000)), "idleHeartbeat"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxExpires(Duration.ofMillis(1000)), "maxExpires"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).inactiveThreshold(Duration.ofMillis(1000)), "inactiveThreshold"); // value - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(MAX_DELIVER_MIN), "maxDeliver"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(MAX_DELIVER_MIN), "maxDeliver"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); // value unsigned - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(1), "startSequence"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(1), "rateLimit"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(1), "startSequence"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(1), "rateLimit"); // unset doesn't fail because the server provides a value equal to the unset - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(INTEGER_UNSET)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxDeliver(INTEGER_UNSET)); // unset doesn't fail because the server does not provide a value // negatives are considered the unset - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(ULONG_UNSET)); - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(-1)); - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(ULONG_UNSET)); - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(-1)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(ULONG_UNSET)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).startSequence(-1)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(ULONG_UNSET)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).rateLimit(-1)); // unset fail b/c the server does set a value that is not equal to the unset or the minimum - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(LONG_UNSET), "maxAckPending"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(LONG_UNSET), "ackWait"); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(LONG_UNSET), "maxAckPending"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).maxAckPending(0), "maxAckPending"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(LONG_UNSET), "ackWait"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).ackWait(0), "ackWait"); // pull String lname = random(); nc.jetStreamManagement().addOrUpdateConsumer(stream, pullDurableBuilder(subject, lname).build()); // value - changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(0), "maxPullWaiting"); - changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBatch(0), "maxBatch"); - changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBytes(0), "maxBytes"); + changeExPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(0), "maxPullWaiting"); + changeExPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxBatch(0), "maxBatch"); + changeExPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxBytes(0), "maxBytes"); // unsets fail b/c the server does set a value - changeExPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(-1), "maxPullWaiting"); + changeExPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxPullWaiting(-1), "maxPullWaiting"); // unset - changeOkPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBatch(-1)); - changeOkPull(jstc.js, subject, pullDurableBuilder(subject, lname).maxBytes(-1)); + changeOkPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxBatch(-1)); + changeOkPull(ctx.js, subject, pullDurableBuilder(subject, lname).maxBytes(-1)); // metadata Map metadataA = new HashMap<>(); metadataA.put("a", "A"); @@ -872,18 +872,18 @@ public void testSubscribeDurableConsumerMustMatch() throws Exception { if (atLeast2_10()) { // metadata server null versus new not null nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).build()); - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA), "metadata"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA), "metadata"); // metadata server not null versus new null nc.jetStreamManagement().addOrUpdateConsumer(stream, pushDurableBuilder(subject, uname, deliver).metadata(metadataA).build()); - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver)); // metadata server not null versus new not null but different - changeExPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataB), "metadata"); + changeExPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataB), "metadata"); if (before2_11()) { // metadata server not null versus new not null and same - changeOkPush(jstc.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA)); + changeOkPush(ctx.js, subject, pushDurableBuilder(subject, uname, deliver).metadata(metadataA)); } } }); @@ -925,24 +925,24 @@ private Builder pullDurableBuilder(String subject, String durable) { @Test public void testGetConsumerInfoFromSubscription() throws Exception { - runInShared((nc, jstc) -> { - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); + runInShared((nc, ctx) -> { + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server ConsumerInfo ci = sub.getConsumerInfo(); - assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(ctx.stream, ci.getStreamName()); }); } @Test public void testInternalLookupConsumerInfoCoverage() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // - consumer not found // - stream does not exist - jstc.js.subscribe(jstc.subject()); - assertNull(jstc.js.lookupConsumerInfo(jstc.stream, random())); + ctx.js.subscribe(ctx.subject()); + assertNull(ctx.js.lookupConsumerInfo(ctx.stream, random())); assertThrows(JetStreamApiException.class, - () -> jstc.js.lookupConsumerInfo(random(), random())); + () -> ctx.js.lookupConsumerInfo(random(), random())); }); } @@ -1005,8 +1005,8 @@ public void testNatsConnectionTimeCheckLogic() { @Test public void testMoreCreateSubscriptionErrors() throws Exception { - runInShared((nc, jstc) -> { - IllegalStateException ise = assertThrows(IllegalStateException.class, () -> jstc.js.subscribe(random())); + runInShared((nc, ctx) -> { + IllegalStateException ise = assertThrows(IllegalStateException.class, () -> ctx.js.subscribe(random())); assertTrue(ise.getMessage().contains(JsSubNoMatchingStreamForSubject.id())); // general pull push validation @@ -1015,27 +1015,27 @@ public void testMoreCreateSubscriptionErrors() throws Exception { String dgCantHave = random(); ConsumerConfiguration ccCantHave = builder().durable(pulldur).deliverGroup(dgCantHave).build(); PullSubscribeOptions pullCantHaveDlvrGrp = PullSubscribeOptions.builder().configuration(ccCantHave).build(); - IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullCantHaveDlvrGrp)); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pullCantHaveDlvrGrp)); assertTrue(iae.getMessage().contains(JsSubPullCantHaveDeliverGroup.id())); ccCantHave = builder().durable(pulldur).deliverSubject(dgCantHave).build(); PullSubscribeOptions pullCantHaveDlvrSub = PullSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pullCantHaveDlvrSub)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pullCantHaveDlvrSub)); assertTrue(iae.getMessage().contains(JsSubPullCantHaveDeliverSubject.id())); ccCantHave = builder().maxPullWaiting(1L).build(); PushSubscribeOptions pushCantHaveMpw = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMpw)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pushCantHaveMpw)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxPullWaiting.id())); ccCantHave = builder().maxBatch(1L).build(); PushSubscribeOptions pushCantHaveMb = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMb)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pushCantHaveMb)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxBatch.id())); ccCantHave = builder().maxBytes(1L).build(); PushSubscribeOptions pushCantHaveMby = PushSubscribeOptions.builder().configuration(ccCantHave).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), pushCantHaveMby)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), pushCantHaveMby)); assertTrue(iae.getMessage().contains(JsSubPushCantHaveMaxBytes.id())); // create some consumers @@ -1043,32 +1043,32 @@ public void testMoreCreateSubscriptionErrors() throws Exception { String durYesQ = random(); PushSubscribeOptions psoDurNoQ = PushSubscribeOptions.builder().durable(durNoQ).build(); - jstc.js.subscribe(jstc.subject(), psoDurNoQ); + ctx.js.subscribe(ctx.subject(), psoDurNoQ); PushSubscribeOptions psoDurYesQ = PushSubscribeOptions.builder().durable(durYesQ).build(); - jstc.js.subscribe(jstc.subject(), "yesQ", psoDurYesQ); + ctx.js.subscribe(ctx.subject(), "yesQ", psoDurYesQ); // already bound - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoDurNoQ)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), psoDurNoQ)); assertTrue(iae.getMessage().contains(JsSubConsumerAlreadyBound.id())); // queue match String qmatchdur = random(); String qmatchq = random(); PushSubscribeOptions qmatch = PushSubscribeOptions.builder().durable(qmatchdur).deliverGroup(qmatchq).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "qnotmatch", qmatch)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), "qnotmatch", qmatch)); assertTrue(iae.getMessage().contains(JsSubQueueDeliverGroupMismatch.id())); // queue vs config - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "notConfigured", psoDurNoQ)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), "notConfigured", psoDurNoQ)); assertTrue(iae.getMessage().contains(JsSubExistingConsumerNotQueue.id())); PushSubscribeOptions psoNoVsYes = PushSubscribeOptions.builder().durable(durYesQ).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoNoVsYes)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), psoNoVsYes)); assertTrue(iae.getMessage().contains(JsSubExistingConsumerIsQueue.id())); PushSubscribeOptions psoYesVsNo = PushSubscribeOptions.builder().durable(durYesQ).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), "qnotmatch", psoYesVsNo)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), "qnotmatch", psoYesVsNo)); assertTrue(iae.getMessage().contains(JsSubExistingQueueDoesNotMatchRequestedQueue.id())); // flow control heartbeat push / pull @@ -1078,20 +1078,20 @@ public void testMoreCreateSubscriptionErrors() throws Exception { ConsumerConfiguration ccHb = builder().durable(ccHbDur).idleHeartbeat(1000).build(); PullSubscribeOptions psoPullCcFc = PullSubscribeOptions.builder().configuration(ccFc).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoPullCcFc)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), psoPullCcFc)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidPull.id())); PullSubscribeOptions psoPullCcHb = PullSubscribeOptions.builder().configuration(ccHb).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), psoPullCcHb)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), psoPullCcHb)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidPull.id())); PushSubscribeOptions psoPushCcFc = PushSubscribeOptions.builder().configuration(ccFc).build(); String cantHaveQ = random(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), cantHaveQ, psoPushCcFc)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), cantHaveQ, psoPushCcFc)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidQueue.id())); PushSubscribeOptions psoPushCcHb = PushSubscribeOptions.builder().configuration(ccHb).build(); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.js.subscribe(jstc.subject(), cantHaveQ, psoPushCcHb)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.js.subscribe(ctx.subject(), cantHaveQ, psoPushCcHb)); assertTrue(iae.getMessage().contains(JsSubFcHbNotValidQueue.id())); }); } @@ -1106,7 +1106,7 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { - runInSharedCustomStream((ncCancel, jstc) -> { + runInSharedCustom((ncCancel, ctx) -> { Options optReport = optionsBuilder(ncCancel.getConnectedUrl()).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); @@ -1115,9 +1115,9 @@ public void testRequestNoResponder() throws Exception { assertTrue(ee.getMessage().contains("503 No Responders Available For Request")); String subject = random(); - jstc.jsm.addStream( + ctx.jsm.addStream( StreamConfiguration.builder() - .name(jstc.stream).subjects(subject).storageType(StorageType.Memory) + .name(ctx.stream).subjects(subject).storageType(StorageType.Memory) .build()); JetStream jsCancel = ncCancel.jetStream(); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index 696e77c07..4d150f2c2 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -43,18 +43,18 @@ public class JetStreamManagementTests extends JetStreamTestBase { public void testStreamCreate() throws Exception { long now = ZonedDateTime.now().toEpochSecond(); - runInSharedCustomStream((nc, jstc) -> { - StreamConfiguration sc = jstc.scBuilder(2).build(); - String subject0 = jstc.subject(0); - String subject1 = jstc.subject(1); + runInSharedCustom((nc, ctx) -> { + StreamConfiguration sc = ctx.scBuilder(2).build(); + String subject0 = ctx.subject(0); + String subject1 = ctx.subject(1); - StreamInfo si = jstc.addStream(sc); + StreamInfo si = ctx.addStream(sc); assertNotNull(si.getStreamState().toString()); // coverage assertTrue(now <= si.getCreateTime().toEpochSecond()); assertNotNull(si.getConfiguration()); sc = si.getConfiguration(); - assertEquals(jstc.stream, sc.getName()); + assertEquals(ctx.stream, sc.getName()); assertEquals(2, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -90,23 +90,23 @@ public void testStreamCreate() throws Exception { @Test public void testStreamCreate210() throws Exception { - runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { - StreamConfiguration sc = jstc.scBuilder(1) + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { + StreamConfiguration sc = ctx.scBuilder(1) .firstSequence(42).build(); - StreamInfo si = jstc.addStream(sc); + StreamInfo si = ctx.addStream(sc); assertNotNull(si.getTimestamp()); assertEquals(42, si.getConfiguration().getFirstSequence()); - PublishAck pa = jstc.js.publish(jstc.subject(), null); + PublishAck pa = ctx.js.publish(ctx.subject(), null); assertEquals(42, pa.getSeqno()); }); } @Test public void testStreamMetadata() throws Exception { - runInSharedCustomStream(VersionUtils::atLeast2_9_0, (nc, jstc) -> { + runInSharedCustom(VersionUtils::atLeast2_9_0, (nc, ctx) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); - StreamConfiguration sc = jstc.scBuilder(1).metadata(metaData).build(); - StreamInfo si = jstc.addStream(sc); + StreamConfiguration sc = ctx.scBuilder(1).metadata(metaData).build(); + StreamInfo si = ctx.addStream(sc); assertNotNull(si.getConfiguration()); assertMetaData(si.getConfiguration().getMetadata()); }); @@ -115,16 +115,16 @@ public void testStreamMetadata() throws Exception { @Test public void testStreamCreateWithNoSubject() throws Exception { long now = ZonedDateTime.now().toEpochSecond(); - runInSharedCustomStream((nc, jstc) -> { - StreamConfiguration sc = jstc.scBuilder(0).build(); - StreamInfo si = jstc.addStream(sc); + runInSharedCustom((nc, ctx) -> { + StreamConfiguration sc = ctx.scBuilder().build(); + StreamInfo si = ctx.addStream(sc); assertTrue(now <= si.getCreateTime().toEpochSecond()); sc = si.getConfiguration(); - assertEquals(jstc.stream, sc.getName()); + assertEquals(ctx.stream, sc.getName()); assertEquals(1, sc.getSubjects().size()); - assertEquals(jstc.stream, sc.getSubjects().get(0)); + assertEquals(ctx.stream, sc.getSubjects().get(0)); assertEquals(RetentionPolicy.Limits, sc.getRetentionPolicy()); assertEquals(DiscardPolicy.Old, sc.getDiscardPolicy()); @@ -154,14 +154,14 @@ public void testStreamCreateWithNoSubject() throws Exception { @Test public void testUpdateStream() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - jstc.createStream(2); - String subject0 = jstc.subject(0); - String subject1 = jstc.subject(1); + runInSharedCustom((nc, ctx) -> { + ctx.createStream(2); + String subject0 = ctx.subject(0); + String subject1 = ctx.subject(1); - StreamConfiguration sc = jstc.si.getConfiguration(); + StreamConfiguration sc = ctx.si.getConfiguration(); assertNotNull(sc); - assertEquals(jstc.stream, sc.getName()); + assertEquals(ctx.stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(2, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -177,7 +177,7 @@ public void testUpdateStream() throws Exception { assertEquals(Duration.ofMinutes(2), sc.getDuplicateWindow()); assertNull(sc.getTemplateOwner()); - sc = jstc.scBuilder(3) + sc = ctx.scBuilder(3) .maxMessages(42) .maxBytes(43) .maximumMessageSize(44) @@ -187,13 +187,13 @@ public void testUpdateStream() throws Exception { .duplicateWindow(Duration.ofMinutes(3)) .maxMessagesPerSubject(45) .build(); - StreamInfo si = jstc.jsm.updateStream(sc); + StreamInfo si = ctx.jsm.updateStream(sc); assertNotNull(si); - String subject2 = jstc.subject(2); + String subject2 = ctx.subject(2); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(jstc.stream, sc.getName()); + assertEquals(ctx.stream, sc.getName()); assertNotNull(sc.getSubjects()); assertEquals(3, sc.getSubjects().size()); assertEquals(subject0, sc.getSubjects().get(0)); @@ -212,48 +212,48 @@ public void testUpdateStream() throws Exception { assertNull(sc.getTemplateOwner()); // allowed to change Allow Direct - jstc.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(true).build()); - jstc.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(false).build()); + ctx.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(true).build()); + ctx.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(false).build()); // allowed to change Mirror Direct - jstc.replaceStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); - jstc.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(true).build()); - jstc.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); + ctx.replaceStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); + ctx.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(true).build()); + ctx.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); }); } @Test public void testAddStreamInvalids() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addStream(null)); + runInSharedCustom((nc, ctx) -> { + assertThrows(IllegalArgumentException.class, () -> ctx.jsm.addStream(null)); - StreamConfiguration sc = jstc.scBuilder(1) + StreamConfiguration sc = ctx.scBuilder(1) .description(random()) .build(); - jstc.addStream(sc); - - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).description(random()).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); + ctx.addStream(sc); + + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).description(random()).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); //noinspection deprecation - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); - - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).noAck(true).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).allowRollup(true).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).allowDirect(true).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).denyDelete(true).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).denyPurge(true).build())); - assert10058(() -> jstc.addStream(StreamConfiguration.builder(sc).firstSequence(100).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); + + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).noAck(true).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).allowRollup(true).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).allowDirect(true).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).denyDelete(true).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).denyPurge(true).build())); + assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).firstSequence(100).build())); }); } @@ -264,45 +264,45 @@ private void assert10058(Executable executable) { @Test public void testUpdateStreamInvalids() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - assertThrows(IllegalArgumentException.class, () -> jstc.jsm.updateStream(null)); + runInSharedCustom((nc, ctx) -> { + assertThrows(IllegalArgumentException.class, () -> ctx.jsm.updateStream(null)); - StreamConfiguration sc = jstc.scBuilder(2).build(); + StreamConfiguration sc = ctx.scBuilder(2).build(); // cannot update non existent stream - assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(sc)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.updateStream(sc)); // add the stream - jstc.addStream(sc); + ctx.addStream(sc); // cannot change storage type - StreamConfiguration scMemToFile = jstc.scBuilder(2) + StreamConfiguration scMemToFile = ctx.scBuilder(2) .storageType(StorageType.File) .build(); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scMemToFile)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.updateStream(scMemToFile)); // cannot change MaxConsumers - StreamConfiguration scMaxCon = jstc.scBuilder(2) + StreamConfiguration scMaxCon = ctx.scBuilder(2) .maxConsumers(2) .build(); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scMaxCon)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.updateStream(scMaxCon)); - StreamConfiguration scReten = jstc.scBuilder(2) + StreamConfiguration scReten = ctx.scBuilder(2) .retentionPolicy(RetentionPolicy.Interest) .build(); if (nc.getServerInfo().isOlderThanVersion("2.10")) { // cannot change RetentionPolicy - assertThrows(JetStreamApiException.class, () -> jstc.jsm.updateStream(scReten)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.updateStream(scReten)); } else { - jstc.jsm.updateStream(scReten); + ctx.jsm.updateStream(scReten); } }); } @Test public void testGetStreamInfo() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getStreamInfo(jstc.stream)); + runInSharedCustom((nc, ctx) -> { + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getStreamInfo(ctx.stream)); String[] subjects = new String[6]; String subjectIx5 = random(); @@ -311,10 +311,10 @@ public void testGetStreamInfo() throws Exception { } subjects[5] = subjectIx5 + ".>"; - jstc.createStream(subjects); + ctx.createStream(subjects); - StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); - assertEquals(jstc.stream, si.getConfiguration().getName()); + StreamInfo si = ctx.jsm.getStreamInfo(ctx.stream); + assertEquals(ctx.stream, si.getConfiguration().getName()); assertEquals(0, si.getStreamState().getSubjectCount()); assertEquals(0, si.getStreamState().getSubjects().size()); assertEquals(0, si.getStreamState().getDeletedCount()); @@ -331,23 +331,23 @@ public void testGetStreamInfo() throws Exception { List packs = new ArrayList<>(); for (int x = 0; x < 5; x++) { - jsPublish(jstc.js, subjects[x], x + 1); - PublishAck pa = jsPublish(jstc.js, subjects[x], data(x + 2)); + jsPublish(ctx.js, subjects[x], x + 1); + PublishAck pa = jsPublish(ctx.js, subjects[x], data(x + 2)); packs.add(pa); - jstc.jsm.deleteMessage(jstc.stream, pa.getSeqno()); + ctx.jsm.deleteMessage(ctx.stream, pa.getSeqno()); } - jsPublish(jstc.js, subjectIx5 + ".bar", 6); + jsPublish(ctx.js, subjectIx5 + ".bar", 6); - si = jstc.jsm.getStreamInfo(jstc.stream); - assertEquals(jstc.stream, si.getConfiguration().getName()); + si = ctx.jsm.getStreamInfo(ctx.stream); + assertEquals(ctx.stream, si.getConfiguration().getName()); assertEquals(6, si.getStreamState().getSubjectCount()); assertEquals(0, si.getStreamState().getSubjects().size()); assertEquals(5, si.getStreamState().getDeletedCount()); assertEquals(0, si.getStreamState().getDeleted().size()); assertTrue(si.getStreamState().getSubjectMap().isEmpty()); - si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().allSubjects().deletedDetails().build()); - assertEquals(jstc.stream, si.getConfiguration().getName()); + si = ctx.jsm.getStreamInfo(ctx.stream, StreamInfoOptions.builder().allSubjects().deletedDetails().build()); + assertEquals(ctx.stream, si.getConfiguration().getName()); assertEquals(6, si.getStreamState().getSubjectCount()); List list = si.getStreamState().getSubjects(); assertNotNull(list); @@ -372,10 +372,10 @@ public void testGetStreamInfo() throws Exception { assertTrue(si.getStreamState().getDeleted().contains(pa.getSeqno())); } - jsPublish(jstc.js, subjectIx5 + ".baz", 2); + jsPublish(ctx.js, subjectIx5 + ".baz", 2); sleep(100); - si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().filterSubjects(subjectIx5 + ".>").deletedDetails().build()); + si = ctx.jsm.getStreamInfo(ctx.stream, StreamInfoOptions.builder().filterSubjects(subjectIx5 + ".>").deletedDetails().build()); assertEquals(7, si.getStreamState().getSubjectCount()); list = si.getStreamState().getSubjects(); assertNotNull(list); @@ -391,7 +391,7 @@ public void testGetStreamInfo() throws Exception { assertNotNull(s); assertEquals(2, s.getCount()); - si = jstc.jsm.getStreamInfo(jstc.stream, StreamInfoOptions.builder().filterSubjects(subjects[4]).build()); + si = ctx.jsm.getStreamInfo(ctx.stream, StreamInfoOptions.builder().filterSubjects(subjects[4]).build()); list = si.getStreamState().getSubjects(); assertNotNull(list); assertEquals(1, list.size()); @@ -403,7 +403,7 @@ public void testGetStreamInfo() throws Exception { @Test public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { + runInJsServer((nc, jsm, js) -> { // getStreams pages at 256 // getStreamNames pages at 1024 String prefix = random(); @@ -445,7 +445,7 @@ private void addStreams(JetStreamManagement jsm, String prefix, int count, int a @Test public void testGetStreamNamesBySubjectFilter() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { + runInJsServer((nc, jsm, js) -> { String stream1 = random(); String stream2 = random(); String stream3 = random(); @@ -491,98 +491,98 @@ private void assertStreamNameList(List list, String... streams) { @Test public void testDeleteStream() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { JetStreamApiException jsapiEx = - assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteStream(random())); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.deleteStream(random())); assertEquals(10059, jsapiEx.getApiErrorCode()); - assertNotNull(jstc.jsm.getStreamInfo(jstc.stream)); - assertTrue(jstc.deleteStream()); + assertNotNull(ctx.jsm.getStreamInfo(ctx.stream)); + assertTrue(ctx.deleteStream()); - jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.jsm.getStreamInfo(jstc.stream)); + jsapiEx = assertThrows(JetStreamApiException.class, () -> ctx.jsm.getStreamInfo(ctx.stream)); assertEquals(10059, jsapiEx.getApiErrorCode()); - jsapiEx = assertThrows(JetStreamApiException.class, () -> jstc.deleteStream()); + jsapiEx = assertThrows(JetStreamApiException.class, () -> ctx.deleteStream()); assertEquals(10059, jsapiEx.getApiErrorCode()); }); } @Test public void testPurgeStreamAndOptions() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { // invalid to have both keep and seq assertThrows(IllegalArgumentException.class, () -> PurgeOptions.builder().keep(1).sequence(1).build()); // error to purge a stream that does not exist - assertThrows(JetStreamApiException.class, () -> jstc.jsm.purgeStream(random())); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.purgeStream(random())); - jstc.createStream(2); - StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); + ctx.createStream(2); + StreamInfo si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(0, si.getStreamState().getMsgCount()); - jsPublish(nc, jstc.subject(0), 10); - si = jstc.jsm.getStreamInfo(jstc.stream); + jsPublish(nc, ctx.subject(0), 10); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(10, si.getStreamState().getMsgCount()); PurgeOptions options = PurgeOptions.builder().keep(7).build(); - PurgeResponse pr = jstc.jsm.purgeStream(jstc.stream, options); + PurgeResponse pr = ctx.jsm.purgeStream(ctx.stream, options); assertTrue(pr.isSuccess()); assertEquals(3, pr.getPurged()); options = PurgeOptions.builder().sequence(9).build(); - pr = jstc.jsm.purgeStream(jstc.stream, options); + pr = ctx.jsm.purgeStream(ctx.stream, options); assertTrue(pr.isSuccess()); assertEquals(5, pr.getPurged()); - si = jstc.jsm.getStreamInfo(jstc.stream); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(2, si.getStreamState().getMsgCount()); - pr = jstc.jsm.purgeStream(jstc.stream); + pr = ctx.jsm.purgeStream(ctx.stream); assertTrue(pr.isSuccess()); assertEquals(2, pr.getPurged()); - si = jstc.jsm.getStreamInfo(jstc.stream); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(0, si.getStreamState().getMsgCount()); - jsPublish(nc, jstc.subject(0), 10); - jsPublish(nc, jstc.subject(1), 10); - si = jstc.jsm.getStreamInfo(jstc.stream); + jsPublish(nc, ctx.subject(0), 10); + jsPublish(nc, ctx.subject(1), 10); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(20, si.getStreamState().getMsgCount()); - jstc.jsm.purgeStream(jstc.stream, PurgeOptions.subject(jstc.subject(0))); - si = jstc.jsm.getStreamInfo(jstc.stream); + ctx.jsm.purgeStream(ctx.stream, PurgeOptions.subject(ctx.subject(0))); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(10, si.getStreamState().getMsgCount()); - options = PurgeOptions.builder().subject(jstc.subject(0)).sequence(1).build(); - assertEquals(jstc.subject(0), options.getSubject()); + options = PurgeOptions.builder().subject(ctx.subject(0)).sequence(1).build(); + assertEquals(ctx.subject(0), options.getSubject()); assertEquals(1, options.getSequence()); - options = PurgeOptions.builder().subject(jstc.subject(0)).keep(2).build(); + options = PurgeOptions.builder().subject(ctx.subject(0)).keep(2).build(); assertEquals(2, options.getKeep()); }); } @Test public void testAddDeleteConsumerPart1() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { String subject = random(); - jstc.createStream(subjectGt(subject)); + ctx.createStream(subjectGt(subject)); - List list = jstc.jsm.getConsumers(jstc.stream); + List list = ctx.jsm.getConsumers(ctx.stream); assertEquals(0, list.size()); final ConsumerConfiguration cc = ConsumerConfiguration.builder().build(); IllegalArgumentException iae = - assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addOrUpdateConsumer(null, cc)); + assertThrows(IllegalArgumentException.class, () -> ctx.jsm.addOrUpdateConsumer(null, cc)); assertTrue(iae.getMessage().contains("Stream cannot be null or empty")); - iae = assertThrows(IllegalArgumentException.class, () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, null)); + iae = assertThrows(IllegalArgumentException.class, () -> ctx.jsm.addOrUpdateConsumer(ctx.stream, null)); assertTrue(iae.getMessage().contains("Config cannot be null")); // durable and name can both be null - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); assertNotNull(ci.getName()); // threshold can be set for durable final ConsumerConfiguration cc2 = ConsumerConfiguration.builder().durable(random()).inactiveThreshold(10000).build(); - ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc2); + ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc2); assertNotNull(ci.getName()); ConsumerConfiguration cc2cc = ci.getConsumerConfiguration(); assertNotNull(cc2cc); @@ -594,62 +594,62 @@ public void testAddDeleteConsumerPart1() throws Exception { @Test public void testAddDeleteConsumerPart2() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { boolean atLeast2dot9 = nc.getServerInfo().isSameOrNewerThanVersion("2.9"); String subject = random(); - jstc.createStream(subjectGt(subject)); + ctx.createStream(subjectGt(subject)); // with and w/o deliver subject for push/pull String dur0 = random(); - addConsumer(jstc.jsm, jstc.stream, atLeast2dot9, dur0, null, null, ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, atLeast2dot9, dur0, null, null, ConsumerConfiguration.builder() .durable(dur0) .build()); String dur = random(); String deliver = random(); - addConsumer(jstc.jsm, jstc.stream, atLeast2dot9, dur, deliver, null, ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, atLeast2dot9, dur, deliver, null, ConsumerConfiguration.builder() .durable(dur) .deliverSubject(deliver) .build()); // test delete here - List consumers = jstc.jsm.getConsumerNames(jstc.stream); + List consumers = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(2, consumers.size()); - assertTrue(jstc.jsm.deleteConsumer(jstc.stream, dur0)); - consumers = jstc.jsm.getConsumerNames(jstc.stream); + assertTrue(ctx.jsm.deleteConsumer(ctx.stream, dur0)); + consumers = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(1, consumers.size()); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteConsumer(jstc.stream, dur0)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.deleteConsumer(ctx.stream, dur0)); // some testing of new name if (atLeast2dot9) { dur = random(); - addConsumer(jstc.jsm, jstc.stream, true, dur, null, null, ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, true, dur, null, null, ConsumerConfiguration.builder() .durable(dur) .name(dur) .build()); dur = random(); deliver = random(); - addConsumer(jstc.jsm, jstc.stream, true, dur, deliver, null, ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, true, dur, deliver, null, ConsumerConfiguration.builder() .durable(dur) .name(dur) .deliverSubject(deliver) .build()); dur = random(); - addConsumer(jstc.jsm, jstc.stream, true, dur, null, ">", ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, true, dur, null, ">", ConsumerConfiguration.builder() .durable(dur) .filterSubject(">") .build()); dur = random(); - addConsumer(jstc.jsm, jstc.stream, true, dur, null, subjectGt(subject), ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, true, dur, null, subjectGt(subject), ConsumerConfiguration.builder() .durable(dur) .filterSubject(subjectGt(subject)) .build()); dur = random(); - addConsumer(jstc.jsm, jstc.stream, true, dur, null, subjectDot(subject, "foo"), ConsumerConfiguration.builder() + addConsumer(ctx.jsm, ctx.stream, true, dur, null, subjectDot(subject, "foo"), ConsumerConfiguration.builder() .durable(dur) .filterSubject(subjectDot(subject, "foo")) .build()); @@ -659,18 +659,18 @@ public void testAddDeleteConsumerPart2() throws Exception { @Test public void testAddPausedConsumer() throws Exception { - runInShared(VersionUtils::atLeast2_11, (nc, jstc) -> { - List list = jstc.jsm.getConsumers(jstc.stream); + runInShared(VersionUtils::atLeast2_11, (nc, ctx) -> { + List list = ctx.jsm.getConsumers(ctx.stream); assertEquals(0, list.size()); ZonedDateTime pauseUntil = ZonedDateTime.now(ZONE_ID_GMT).plusMinutes(2); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .pauseUntil(pauseUntil) .build(); // Consumer should be paused on creation. - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); assertTrue(ci.getPaused()); assertNotNull(ci.getPauseRemaining()); assertTrue(ci.getPauseRemaining().toMillis() > 60_000); @@ -680,53 +680,53 @@ public void testAddPausedConsumer() throws Exception { @Test public void testPauseResumeConsumer() throws Exception { - runInShared(VersionUtils::atLeast2_11, (nc, jstc) -> { - List list = jstc.jsm.getConsumers(jstc.stream); + runInShared(VersionUtils::atLeast2_11, (nc, ctx) -> { + List list = ctx.jsm.getConsumers(ctx.stream); assertEquals(0, list.size()); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .build(); // durable and name can both be null - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); assertNotNull(ci.getName()); // pause consumer ZonedDateTime pauseUntil = ZonedDateTime.now(ZONE_ID_GMT).plusMinutes(2); - ConsumerPauseResponse pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), pauseUntil); + ConsumerPauseResponse pauseResponse = ctx.jsm.pauseConsumer(ctx.stream, ci.getName(), pauseUntil); assertTrue(pauseResponse.isPaused()); assertEquals(pauseUntil, pauseResponse.getPauseUntil()); - ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); + ci = ctx.jsm.getConsumerInfo(ctx.stream, ci.getName()); assertTrue(ci.getPaused()); assertNotNull(ci.getPauseRemaining()); assertTrue(ci.getPauseRemaining().toMillis() > 60_000); // resume consumer - boolean isResumed = jstc.jsm.resumeConsumer(jstc.stream, ci.getName()); + boolean isResumed = ctx.jsm.resumeConsumer(ctx.stream, ci.getName()); assertTrue(isResumed); - ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); + ci = ctx.jsm.getConsumerInfo(ctx.stream, ci.getName()); assertFalse(ci.getPaused()); // pause again - pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), pauseUntil); + pauseResponse = ctx.jsm.pauseConsumer(ctx.stream, ci.getName(), pauseUntil); assertTrue(pauseResponse.isPaused()); assertEquals(pauseUntil, pauseResponse.getPauseUntil()); // resume via pause with no date - pauseResponse = jstc.jsm.pauseConsumer(jstc.stream, ci.getName(), null); + pauseResponse = ctx.jsm.pauseConsumer(ctx.stream, ci.getName(), null); assertFalse(pauseResponse.isPaused()); assertEquals(DEFAULT_TIME, pauseResponse.getPauseUntil()); - ci = jstc.jsm.getConsumerInfo(jstc.stream, ci.getName()); + ci = ctx.jsm.getConsumerInfo(ctx.stream, ci.getName()); assertFalse(ci.getPaused()); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.pauseConsumer(random(), jstc.consumerName(), pauseUntil)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.pauseConsumer(jstc.stream, random(), pauseUntil)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.resumeConsumer(random(), jstc.consumerName())); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.resumeConsumer(jstc.stream, random())); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.pauseConsumer(random(), ctx.consumerName(), pauseUntil)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.pauseConsumer(ctx.stream, random(), pauseUntil)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.resumeConsumer(random(), ctx.consumerName())); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.resumeConsumer(ctx.stream, random())); }); } @@ -747,51 +747,51 @@ private static void addConsumer(JetStreamManagement jsm, String stream, boolean @Test public void testValidConsumerUpdates() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { String subject = random(); String subjectGt = subjectGt(subject); - jstc.createStream(subjectGt); + ctx.createStream(subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, null); + ConsumerConfiguration cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverSubject(random()).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).ackWait(Duration.ofSeconds(5)).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).rateLimit(100).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxAckPending(100).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).maxDeliver(4).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).filterSubject(subjectStar(subject)).build(); - assertValidAddOrUpdate(jstc.jsm, cc, jstc.stream); + assertValidAddOrUpdate(ctx.jsm, cc, ctx.stream); }); } @Test public void testInvalidConsumerUpdates() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { String subject = random(); String subjectGt = subjectGt(subject); - jstc.createStream(subjectGt); + ctx.createStream(subjectGt); - ConsumerConfiguration cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, null); + ConsumerConfiguration cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverPolicy(DeliverPolicy.New).build(); - assertInvalidConsumerUpdate(jstc.jsm, cc, jstc.stream); + assertInvalidConsumerUpdate(ctx.jsm, cc, ctx.stream); - cc = prepForUpdateTest(jstc.jsm, jstc.stream, subjectGt, cc.getDurable()); + cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, cc.getDurable()); cc = ConsumerConfiguration.builder(cc).idleHeartbeat(Duration.ofMillis(111)).build(); - assertInvalidConsumerUpdate(jstc.jsm, cc, jstc.stream); + assertInvalidConsumerUpdate(ctx.jsm, cc, ctx.stream); }); } @@ -835,7 +835,7 @@ private void assertValidAddOrUpdate(JetStreamManagement jsm, ConsumerConfigurati @Test public void testConsumerMetadata() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); ConsumerConfiguration cc = ConsumerConfiguration.builder() @@ -843,62 +843,62 @@ public void testConsumerMetadata() throws Exception { .metadata(metaData) .build(); - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); assertMetaData(ci.getConsumerConfiguration().getMetadata()); }); } @Test public void testCreateConsumersWithFilters() throws Exception { - runInShared((nc, jstc) -> { - String subject = jstc.subject(); + runInShared((nc, ctx) -> { + String subject = ctx.subject(); // plain subject ConsumerConfiguration.Builder builder = ConsumerConfiguration.builder().durable(random()); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subject).build()); - List cis = jstc.jsm.getConsumers(jstc.stream); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subject).build()); + List cis = ctx.jsm.getConsumers(ctx.stream); assertEquals(subject, cis.get(0).getConsumerConfiguration().getFilterSubject()); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { // 2.10 and later you can set the filter to something that does not match - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectDot(subject, "two-ten-allows-not-matching")).build()); - cis = jstc.jsm.getConsumers(jstc.stream); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectDot(subject, "two-ten-allows-not-matching")).build()); + cis = ctx.jsm.getConsumers(ctx.stream); assertEquals(subjectDot(subject, "two-ten-allows-not-matching"), cis.get(0).getConsumerConfiguration().getFilterSubject()); } else { assertThrows(JetStreamApiException.class, - () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectDot(subject, "not-match")).build())); + () -> ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectDot(subject, "not-match")).build())); } // wildcard subject - jstc.replaceStream(subjectStar(subject)); + ctx.replaceStream(subjectStar(subject)); String subjectA = subjectDot(subject, "A"); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectA).build()); - cis = jstc.jsm.getConsumers(jstc.stream); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectA).build()); + cis = ctx.jsm.getConsumers(ctx.stream); assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); // gt subject - jstc.replaceStream(subjectGt(subject)); + ctx.replaceStream(subjectGt(subject)); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder.filterSubject(subjectA).build()); - cis = jstc.jsm.getConsumers(jstc.stream); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectA).build()); + cis = ctx.jsm.getConsumers(ctx.stream); assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); }); } @Test public void testGetConsumerInfo() throws Exception { - runInShared((nc, jstc) -> { - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getConsumerInfo(jstc.stream, jstc.consumerName())); - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - assertEquals(jstc.stream, ci.getStreamName()); - assertEquals(jstc.consumerName(), ci.getName()); - ci = jstc.jsm.getConsumerInfo(jstc.stream, jstc.consumerName()); - assertEquals(jstc.stream, ci.getStreamName()); - assertEquals(jstc.consumerName(), ci.getName()); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getConsumerInfo(jstc.stream, random())); + runInShared((nc, ctx) -> { + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getConsumerInfo(ctx.stream, ctx.consumerName())); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(ctx.consumerName()).build(); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + assertEquals(ctx.stream, ci.getStreamName()); + assertEquals(ctx.consumerName(), ci.getName()); + ci = ctx.jsm.getConsumerInfo(ctx.stream, ctx.consumerName()); + assertEquals(ctx.stream, ci.getStreamName()); + assertEquals(ctx.consumerName(), ci.getName()); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getConsumerInfo(ctx.stream, random())); if (nc.getServerInfo().isSameOrNewerThanVersion("2.10")) { assertNotNull(ci.getTimestamp()); } @@ -910,14 +910,14 @@ public void testGetConsumerInfo() throws Exception { @Test public void testGetConsumers() throws Exception { - runInShared((nc, jstc) -> { - addConsumers(jstc.jsm, jstc.stream, 600); // getConsumers pages at 256 + runInShared((nc, ctx) -> { + addConsumers(ctx.jsm, ctx.stream, 600); // getConsumers pages at 256 - List list = jstc.jsm.getConsumers(jstc.stream); + List list = ctx.jsm.getConsumers(ctx.stream); assertEquals(600, list.size()); - addConsumers(jstc.jsm, jstc.stream, 500); // getConsumerNames pages at 1024 - List names = jstc.jsm.getConsumerNames(jstc.stream); + addConsumers(ctx.jsm, ctx.stream, 500); // getConsumerNames pages at 1024 + List names = ctx.jsm.getConsumerNames(ctx.stream); assertEquals(1100, names.size()); }); } @@ -950,17 +950,17 @@ public void testDeleteMessage() throws Exception { assertFalse(mdr.isErase()); assertTrue(mdr.isNoErase()); - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { Headers h = new Headers(); h.add("foo", "bar"); ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); - jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).headers(h).data(dataBytes(1)).build()); - jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).build()); + ctx.js.publish(NatsMessage.builder().subject(ctx.subject()).headers(h).data(dataBytes(1)).build()); + ctx.js.publish(NatsMessage.builder().subject(ctx.subject()).build()); - MessageInfo mi = jstc.jsm.getMessage(jstc.stream, 1); + MessageInfo mi = ctx.jsm.getMessage(ctx.stream, 1); assertNotNull(mi.toString()); - assertEquals(jstc.subject(), mi.getSubject()); + assertEquals(ctx.subject(), mi.getSubject()); assertNotNull(mi.getData()); assertEquals(data(1), new String(mi.getData())); assertEquals(1, mi.getSeq()); @@ -971,38 +971,38 @@ public void testDeleteMessage() throws Exception { assertNotNull(foos); assertEquals("bar", foos.get(0)); - mi = jstc.jsm.getMessage(jstc.stream, 2); + mi = ctx.jsm.getMessage(ctx.stream, 2); assertNotNull(mi.toString()); - assertEquals(jstc.subject(), mi.getSubject()); + assertEquals(ctx.subject(), mi.getSubject()); assertNull(mi.getData()); assertEquals(2, mi.getSeq()); assertNotNull(mi.getTime()); assertTrue(mi.getTime().toEpochSecond() >= timeBeforeCreated.toEpochSecond()); assertTrue(mi.getHeaders() == null || mi.getHeaders().isEmpty()); - assertTrue(jstc.jsm.deleteMessage(jstc.stream, 1, false)); // added coverage for use of erase (no_erase) flag. - assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteMessage(jstc.stream, 1)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 3)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.deleteMessage(random(), 1)); - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(random(), 1)); + assertTrue(ctx.jsm.deleteMessage(ctx.stream, 1, false)); // added coverage for use of erase (no_erase) flag. + assertThrows(JetStreamApiException.class, () -> ctx.jsm.deleteMessage(ctx.stream, 1)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 3)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.deleteMessage(random(), 1)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(random(), 1)); }); } @Test public void testSealed() throws Exception { - runInShared((nc, jstc) -> { - assertFalse(jstc.si.getConfiguration().getSealed()); + runInShared((nc, ctx) -> { + assertFalse(ctx.si.getConfiguration().getSealed()); - jstc.js.publish(jstc.subject(), "data1".getBytes()); + ctx.js.publish(ctx.subject(), "data1".getBytes()); - StreamConfiguration sc = new StreamConfiguration.Builder(jstc.si.getConfiguration()) + StreamConfiguration sc = new StreamConfiguration.Builder(ctx.si.getConfiguration()) .seal() .build(); - StreamInfo si = jstc.jsm.updateStream(sc); + StreamInfo si = ctx.jsm.updateStream(sc); assertTrue(si.getConfiguration().getSealed()); - assertThrows(JetStreamApiException.class, () -> jstc.js.publish(jstc.subject(), "data2".getBytes())); + assertThrows(JetStreamApiException.class, () -> ctx.js.publish(ctx.subject(), "data2".getBytes())); }); } @@ -1017,99 +1017,99 @@ public void testStorageTypeCoverage() { @Test public void testConsumerReplica() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { final ConsumerConfiguration cc0 = ConsumerConfiguration.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .build(); - ConsumerInfo ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc0); + ConsumerInfo ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc0); // server returns 0 when value is not set assertEquals(0, ci.getConsumerConfiguration().getNumReplicas()); final ConsumerConfiguration cc1 = ConsumerConfiguration.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .numReplicas(1) .build(); - ci = jstc.jsm.addOrUpdateConsumer(jstc.stream, cc1); + ci = ctx.jsm.addOrUpdateConsumer(ctx.stream, cc1); assertEquals(1, ci.getConsumerConfiguration().getNumReplicas()); }); } @Test public void testGetMessage() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - jstc.createStream(2); - assertFalse(jstc.si.getConfiguration().getAllowDirect()); + runInSharedCustom((nc, ctx) -> { + ctx.createStream(2); + assertFalse(ctx.si.getConfiguration().getAllowDirect()); ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); sleep(100); - jstc.js.publish(buildTestGetMessage(jstc, 0, 1)); - jstc.js.publish(buildTestGetMessage(jstc, 1, 2)); - jstc.js.publish(buildTestGetMessage(jstc, 0, 3)); - jstc.js.publish(buildTestGetMessage(jstc, 1, 4)); - jstc.js.publish(buildTestGetMessage(jstc, 0, 5)); - jstc.js.publish(buildTestGetMessage(jstc, 1, 6)); + ctx.js.publish(buildTestGetMessage(ctx, 0, 1)); + ctx.js.publish(buildTestGetMessage(ctx, 1, 2)); + ctx.js.publish(buildTestGetMessage(ctx, 0, 3)); + ctx.js.publish(buildTestGetMessage(ctx, 1, 4)); + ctx.js.publish(buildTestGetMessage(ctx, 0, 5)); + ctx.js.publish(buildTestGetMessage(ctx, 1, 6)); - validateGetMessage(jstc.jsm, jstc, timeBeforeCreated); + validateGetMessage(ctx.jsm, ctx, timeBeforeCreated); - StreamConfiguration sc = StreamConfiguration.builder(jstc.si.getConfiguration()).allowDirect(true).build(); - StreamInfo si = jstc.jsm.updateStream(sc); + StreamConfiguration sc = StreamConfiguration.builder(ctx.si.getConfiguration()).allowDirect(true).build(); + StreamInfo si = ctx.jsm.updateStream(sc); assertTrue(si.getConfiguration().getAllowDirect()); - validateGetMessage(jstc.jsm, jstc, timeBeforeCreated); + validateGetMessage(ctx.jsm, ctx, timeBeforeCreated); // error case stream doesn't exist - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(random(), 1)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(random(), 1)); }); } - private static NatsMessage buildTestGetMessage(JetStreamTestingContext jstc, int n, int q) { + private static NatsMessage buildTestGetMessage(JetStreamTestingContext ctx, int n, int q) { String data = "s" + n + "-q" + q; return NatsMessage.builder() - .subject(jstc.subject(n)) + .subject(ctx.subject(n)) .data("d-" + data) .headers(new Headers().put("h", "h-" + data)) .build(); } - private void validateGetMessage(JetStreamManagement jsm, JetStreamTestingContext jstc, ZonedDateTime timeBeforeCreated) throws IOException, JetStreamApiException { - assertMessageInfo(jstc, 0, 1, jsm.getMessage(jstc.stream, 1), timeBeforeCreated); - assertMessageInfo(jstc, 0, 5, jsm.getLastMessage(jstc.stream, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 6, jsm.getLastMessage(jstc.stream, jstc.subject(1)), timeBeforeCreated); - - assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, -1, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, -1, jstc.subject(1)), timeBeforeCreated); - assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, 0, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 0, jstc.subject(1)), timeBeforeCreated); - assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getFirstMessage(jstc.stream, jstc.subject(1)), timeBeforeCreated); - assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, timeBeforeCreated), timeBeforeCreated); - assertMessageInfo(jstc, 0, 1, jsm.getFirstMessage(jstc.stream, timeBeforeCreated, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getFirstMessage(jstc.stream, timeBeforeCreated, jstc.subject(1)), timeBeforeCreated); - - assertMessageInfo(jstc, 0, 1, jsm.getNextMessage(jstc.stream, 1, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 1, jstc.subject(1)), timeBeforeCreated); - - assertMessageInfo(jstc, 0, 3, jsm.getNextMessage(jstc.stream, 2, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 2, jsm.getNextMessage(jstc.stream, 2, jstc.subject(1)), timeBeforeCreated); - - assertMessageInfo(jstc, 0, 5, jsm.getNextMessage(jstc.stream, 5, jstc.subject(0)), timeBeforeCreated); - assertMessageInfo(jstc, 1, 6, jsm.getNextMessage(jstc.stream, 5, jstc.subject(1)), timeBeforeCreated); - - assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, -1))); - assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, 0))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(jstc.stream, 9))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getLastMessage(jstc.stream, "not-a-subject"))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getFirstMessage(jstc.stream, "not-a-subject"))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(jstc.stream, 9, jstc.subject(0)))); - assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(jstc.stream, 1, "not-a-subject"))); + private void validateGetMessage(JetStreamManagement jsm, JetStreamTestingContext ctx, ZonedDateTime timeBeforeCreated) throws IOException, JetStreamApiException { + assertMessageInfo(ctx, 0, 1, jsm.getMessage(ctx.stream, 1), timeBeforeCreated); + assertMessageInfo(ctx, 0, 5, jsm.getLastMessage(ctx.stream, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 6, jsm.getLastMessage(ctx.stream, ctx.subject(1)), timeBeforeCreated); + + assertMessageInfo(ctx, 0, 1, jsm.getNextMessage(ctx.stream, -1, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getNextMessage(ctx.stream, -1, ctx.subject(1)), timeBeforeCreated); + assertMessageInfo(ctx, 0, 1, jsm.getNextMessage(ctx.stream, 0, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getNextMessage(ctx.stream, 0, ctx.subject(1)), timeBeforeCreated); + assertMessageInfo(ctx, 0, 1, jsm.getFirstMessage(ctx.stream, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getFirstMessage(ctx.stream, ctx.subject(1)), timeBeforeCreated); + assertMessageInfo(ctx, 0, 1, jsm.getFirstMessage(ctx.stream, timeBeforeCreated), timeBeforeCreated); + assertMessageInfo(ctx, 0, 1, jsm.getFirstMessage(ctx.stream, timeBeforeCreated, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getFirstMessage(ctx.stream, timeBeforeCreated, ctx.subject(1)), timeBeforeCreated); + + assertMessageInfo(ctx, 0, 1, jsm.getNextMessage(ctx.stream, 1, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getNextMessage(ctx.stream, 1, ctx.subject(1)), timeBeforeCreated); + + assertMessageInfo(ctx, 0, 3, jsm.getNextMessage(ctx.stream, 2, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 2, jsm.getNextMessage(ctx.stream, 2, ctx.subject(1)), timeBeforeCreated); + + assertMessageInfo(ctx, 0, 5, jsm.getNextMessage(ctx.stream, 5, ctx.subject(0)), timeBeforeCreated); + assertMessageInfo(ctx, 1, 6, jsm.getNextMessage(ctx.stream, 5, ctx.subject(1)), timeBeforeCreated); + + assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(ctx.stream, -1))); + assertStatus(10003, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(ctx.stream, 0))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getMessage(ctx.stream, 9))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getLastMessage(ctx.stream, "not-a-subject"))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getFirstMessage(ctx.stream, "not-a-subject"))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(ctx.stream, 9, ctx.subject(0)))); + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> jsm.getNextMessage(ctx.stream, 1, "not-a-subject"))); } private void assertStatus(int apiErrorCode, JetStreamApiException jsae) { assertEquals(apiErrorCode, jsae.getApiErrorCode()); } - private void assertMessageInfo(JetStreamTestingContext jstc, int subj, long seq, MessageInfo mi, ZonedDateTime timeBeforeCreated) { - assertEquals(jstc.stream, mi.getStream()); - assertEquals(jstc.subject(subj), mi.getSubject()); + private void assertMessageInfo(JetStreamTestingContext ctx, int subj, long seq, MessageInfo mi, ZonedDateTime timeBeforeCreated) { + assertEquals(ctx.stream, mi.getStream()); + assertEquals(ctx.subject(subj), mi.getSubject()); assertEquals(seq, mi.getSeq()); assertNotNull(mi.getTime()); assertTrue(mi.getTime().toEpochSecond() >= timeBeforeCreated.toEpochSecond()); @@ -1183,54 +1183,51 @@ public void testMessageGetRequestObjectDeprecatedMethods() { @Test public void testDirectMessageRepublishedSubject() throws Exception { - runInSharedCustomStream(VersionUtils::atLeast2_9_0, (nc, jstc) -> { - String streamBucketName = "sb-" + random(); + runInSharedCustom(VersionUtils::atLeast2_9_0, (nc, ctx) -> { + String streamName = random(); + String bucketName = random(); String subject = random(); String streamSubject = subject + ".>"; String publishSubject1 = subject + ".one"; String publishSubject2 = subject + ".two"; String publishSubject3 = subject + ".three"; - String republishDest = "$KV." + streamBucketName + ".>"; + String republishDest = "$KV." + bucketName + ".>"; - StreamConfiguration sc = jstc.scBuilder(0) - .name(streamBucketName) - .subjects(streamSubject) - .republish(Republish.builder().source(">").destination(republishDest).build()) + StreamConfiguration sc = ctx.scBuilder(streamSubject) + .republish(Republish.builder() + .source(">") + .destination(republishDest) + .build()) .build(); - jstc.addStream(sc); + ctx.addStream(sc); - KeyValueConfiguration kvc = KeyValueConfiguration.builder().name(streamBucketName).build(); - KeyValueManagement kvm = nc.keyValueManagement(); - kvm.create(kvc); - KeyValue kv = nc.keyValue(streamBucketName); + ctx.kvCreate(bucketName); + KeyValue kv = nc.keyValue(bucketName); nc.publish(publishSubject1, "uno".getBytes()); nc.jetStream().publish(publishSubject2, "dos".getBytes()); kv.put(publishSubject3, "tres"); KeyValueEntry kve1 = kv.get(publishSubject1); - assertEquals(streamBucketName, kve1.getBucket()); + assertEquals(bucketName, kve1.getBucket()); assertEquals(publishSubject1, kve1.getKey()); assertEquals("uno", kve1.getValueAsString()); KeyValueEntry kve2 = kv.get(publishSubject2); - assertEquals(streamBucketName, kve2.getBucket()); + assertEquals(bucketName, kve2.getBucket()); assertEquals(publishSubject2, kve2.getKey()); assertEquals("dos", kve2.getValueAsString()); KeyValueEntry kve3 = kv.get(publishSubject3); - assertEquals(streamBucketName, kve3.getBucket()); + assertEquals(bucketName, kve3.getBucket()); assertEquals(publishSubject3, kve3.getKey()); assertEquals("tres", kve3.getValueAsString()); - - // cleanup - kvm.delete(streamBucketName); }); } @Test public void testCreateConsumerUpdateConsumer() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { + runInJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { String streamPrefix = random(); JetStreamManagement jsmNew = nc.jetStreamManagement(); JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build()); @@ -1355,60 +1352,59 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, ctx) -> { // stream isn't even created yet - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1)); - jstc.createStream(); + ctx.createStream(); // no messages yet - assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(jstc.stream, 1)); - - String subject = jstc.subject(); + assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1)); + String subject = ctx.subject(); for (int x = 0; x < 5; x++) { - jstc.js.publish(subject, null); + ctx.js.publish(subject, null); } - String consumer = create1026Consumer(jstc.jsm, jstc.stream, subject); - PullSubscribeOptions so = PullSubscribeOptions.fastBind(jstc.stream, consumer); - JetStreamSubscription sub = jstc.js.subscribe(null, so); - jstc.jsm.deleteConsumer(jstc.stream, consumer); + String consumer = create1026Consumer(ctx.jsm, ctx.stream, subject); + PullSubscribeOptions so = PullSubscribeOptions.fastBind(ctx.stream, consumer); + JetStreamSubscription sub = ctx.js.subscribe(null, so); + ctx.jsm.deleteConsumer(ctx.stream, consumer); sub.pull(5); validate1026(sub.nextMessage(500), listener, false); - ConsumerContext context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + ConsumerContext context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); validate1026(context.next(1000), listener, true); // simplification next never raises warnings, so empty = true - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); //noinspection resource FetchConsumer fc = context.fetch(FetchConsumeOptions.builder().maxMessages(1).raiseStatusWarnings(false).build()); validate1026(fc.nextMessage(), listener, true); // we said not to raise status warnings in the FetchConsumeOptions - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); //noinspection resource fc = context.fetch(FetchConsumeOptions.builder().maxMessages(1).raiseStatusWarnings().build()); validate1026(fc.nextMessage(), listener, false); // we said raise status warnings in the FetchConsumeOptions - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); IterableConsumer ic = context.iterate(ConsumeOptions.builder().raiseStatusWarnings(false).build()); validate1026(ic.nextMessage(1000), listener, true); // we said not to raise status warnings in the ConsumeOptions - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); ic = context.iterate(ConsumeOptions.builder().raiseStatusWarnings().build()); validate1026(ic.nextMessage(1000), listener, false); // we said raise status warnings in the ConsumeOptions AtomicInteger count = new AtomicInteger(); MessageHandler handler = m -> count.incrementAndGet(); - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); //noinspection resource context.consume(ConsumeOptions.builder().raiseStatusWarnings(false).build(), handler); Thread.sleep(100); // give time to get a message assertEquals(0, count.get()); validate1026(null, listener, true); - context = setupFor1026Simplification(nc, jstc.jsm, listener, jstc.stream, subject); + context = setupFor1026Simplification(nc, ctx.jsm, listener, ctx.stream, subject); //noinspection resource context.consume(ConsumeOptions.builder().raiseStatusWarnings().build(), handler); Thread.sleep(100); // give time to get a message @@ -1487,7 +1483,7 @@ public void testMessageDeleteRequest() { @Test public void testStreamPersistMode() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() .name(random()) .storageType(StorageType.File) diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 8c771c43c..c007cfd22 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -31,7 +31,7 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { - runInConfiguredJsServer("pagination.conf", (nc, jsm, js) -> { + runInJsServer("pagination.conf", (nc, jsm, js) -> { String stream1 = random(); String stream2 = random(); long rounds = 101; diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index 4fe44f23b..d271d3e21 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -42,70 +42,67 @@ public void testMirrorBasics() throws Exception { String U3 = random(); String M1 = random(); - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { Mirror mirror = Mirror.builder().sourceName(S1).build(); // Create source stream - StreamConfiguration sc = jstc.scBuilder(0) - .name(S1) - .subjects(U1, U2, U3) - .build(); - StreamInfo si = jstc.addStream(sc); + StreamConfiguration sc = ctx.scBuilder(U1, U2, U3).name(S1).build(); + StreamInfo si = ctx.addStream(sc); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(S1, sc.getName()); // Now create our mirror stream. - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(M1) .mirror(mirror) .build(); - jstc.addStream(sc); - assertMirror(jstc.jsm, M1, S1, null, null); + ctx.addStream(sc); + assertMirror(ctx.jsm, M1, S1, null, null); // Send 100 messages. - jsPublish(jstc.js, U2, 100); + jsPublish(ctx.js, U2, 100); // Check the state - assertMirror(jstc.jsm, M1, S1, 100L, null); + assertMirror(ctx.jsm, M1, S1, 100L, null); // Purge the source stream. - jstc.jsm.purgeStream(S1); + ctx.jsm.purgeStream(S1); - jsPublish(jstc.js, U2, 50); + jsPublish(ctx.js, U2, 50); // Create second mirror - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(S2) .mirror(mirror) .build(); - jstc.addStream(sc); + ctx.addStream(sc); // Check the state - assertMirror(jstc.jsm, S2, S1, 50L, 101L); + assertMirror(ctx.jsm, S2, S1, 50L, 101L); - jsPublish(jstc.js, U3, 100); + jsPublish(ctx.js, U3, 100); // third mirror checks start seq - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(S3) .mirror(Mirror.builder().sourceName(S1).startSeq(150).build()) .build(); - jstc.addStream(sc); + ctx.addStream(sc); // Check the state - assertMirror(jstc.jsm, S3, S1, 101L, 150L); + assertMirror(ctx.jsm, S3, S1, 101L, 150L); // third mirror checks start seq ZonedDateTime zdt = DateTimeUtils.fromNow(Duration.ofHours(-2)); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(S4) .mirror(Mirror.builder().sourceName(S1).startTime(zdt).build()) .build(); - jstc.addStream(sc); + ctx.addStream(sc); // Check the state - assertMirror(jstc.jsm, S4, S1, 150L, 101L); + assertMirror(ctx.jsm, S4, S1, 150L, 101L); }); } @@ -116,13 +113,12 @@ public void testMirrorReading() throws Exception { String U2 = random(); String M1 = random(); - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { // Create source stream - StreamConfiguration sc = jstc.scBuilder(0) + StreamConfiguration sc = ctx.scBuilder(U1, U2) .name(S1) - .subjects(U1, U2) .build(); - StreamInfo si = jstc.addStream(sc); + StreamInfo si = ctx.addStream(sc); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(S1, sc.getName()); @@ -130,27 +126,27 @@ public void testMirrorReading() throws Exception { Mirror mirror = Mirror.builder().sourceName(S1).build(); // Now create our mirror stream. - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(M1) .mirror(mirror) .build(); - jstc.addStream(sc); - assertMirror(jstc.jsm, M1, S1, null, null); + ctx.addStream(sc); + assertMirror(ctx.jsm, M1, S1, null, null); // Send messages. - jsPublish(jstc.js, U1, 10); - jsPublish(jstc.js, U2, 20); + jsPublish(ctx.js, U1, 10); + jsPublish(ctx.js, U2, 20); - assertMirror(jstc.jsm, M1, S1, 30L, null); + assertMirror(ctx.jsm, M1, S1, 30L, null); - JetStreamSubscription sub = jstc.js.subscribe(U1); + JetStreamSubscription sub = ctx.js.subscribe(U1); List list = readMessagesAck(sub); assertEquals(10, list.size()); for (Message m : list) { assertEquals(S1, m.metaData().getStream()); } - sub = jstc.js.subscribe(U2); + sub = ctx.js.subscribe(U2); list = readMessagesAck(sub); assertEquals(20, list.size()); for (Message m : list) { @@ -160,14 +156,14 @@ public void testMirrorReading() throws Exception { //noinspection deprecation PushSubscribeOptions.bind(M1); // coverage for deprecated PushSubscribeOptions pso = PushSubscribeOptions.stream(M1); - sub = jstc.js.subscribe(U1, pso); + sub = ctx.js.subscribe(U1, pso); list = readMessagesAck(sub); assertEquals(10, list.size()); for (Message m : list) { assertEquals(M1, m.metaData().getStream()); } - sub = jstc.js.subscribe(U2, pso); + sub = ctx.js.subscribe(U2, pso); list = readMessagesAck(sub); assertEquals(20, list.size()); for (Message m : list) { @@ -178,14 +174,14 @@ public void testMirrorReading() throws Exception { @Test public void testMirrorExceptions() throws Exception { - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { Mirror mirror = Mirror.builder().sourceName(random()).build(); StreamConfiguration scEx = StreamConfiguration.builder() .name(random()) .subjects(random()) .mirror(mirror) .build(); - assertThrows(JetStreamApiException.class, () -> jstc.addStream(scEx)); + assertThrows(JetStreamApiException.class, () -> ctx.addStream(scEx)); }); } @@ -201,75 +197,74 @@ public void testSourceBasics() throws Exception { String R1 = random(); String R2 = random(); - runInSharedCustomStream((nc, jstc) -> { + runInSharedCustom((nc, ctx) -> { // Create streams - StreamInfo si = jstc.addStream(jstc.scBuilder(0).name(N1).build()); + StreamInfo si = ctx.addStream(ctx.scBuilder().name(N1).build()); StreamConfiguration sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N1, sc.getName()); - si = jstc.addStream(jstc.scBuilder(0).name(N2).build()); + si = ctx.addStream(ctx.scBuilder().name(N2).build()); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N2, sc.getName()); - si = jstc.addStream(jstc.scBuilder(0).name(N3).build()); + si = ctx.addStream(ctx.scBuilder().name(N3).build()); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(N3, sc.getName()); // Populate each one. - jsPublish(jstc.js, N1, 10); - jsPublish(jstc.js, N2, 15); - jsPublish(jstc.js, N3, 25); + jsPublish(ctx.js, N1, 10); + jsPublish(ctx.js, N2, 15); + jsPublish(ctx.js, N3, 25); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(R1) .sources(Source.builder().sourceName(N1).build(), Source.builder().sourceName(N2).build(), Source.builder().sourceName(N3).build()) .build(); - jstc.addStream(sc); + ctx.addStream(sc); - assertSource(jstc.jsm, R1, 50L, null); + assertSource(ctx.jsm, R1, 50L, null); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(R1) .sources(Source.builder().sourceName(N1).build(), Source.builder().sourceName(N2).build(), Source.builder().sourceName(N4).build()) .build(); - jstc.jsm.updateStream(sc); + ctx.jsm.updateStream(sc); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder(N4, U1) .name(N5) - .subjects(N4, U1) .build(); - jstc.addStream(sc); + ctx.addStream(sc); - jsPublish(jstc.js, N4, 20); - jsPublish(jstc.js, U1, 20); - jsPublish(jstc.js, N4, 10); + jsPublish(ctx.js, N4, 20); + jsPublish(ctx.js, U1, 20); + jsPublish(ctx.js, N4, 10); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(R2) .sources(Source.builder().sourceName(N5).startSeq(26).build()) .build(); - jstc.addStream(sc); - assertSource(jstc.jsm, R2, 25L, null); + ctx.addStream(sc); + assertSource(ctx.jsm, R2, 25L, null); - MessageInfo info = jstc.jsm.getMessage(R2, 1); + MessageInfo info = ctx.jsm.getMessage(R2, 1); assertStreamSource(info, N5, 26); - sc = jstc.scBuilder(0) + sc = ctx.scBuilder() .name(N6) .sources(Source.builder().sourceName(N5).startSeq(11).filterSubject(N4).build()) .build(); - jstc.addStream(sc); - assertSource(jstc.jsm, N6, 20L, null); + ctx.addStream(sc); + assertSource(ctx.jsm, N6, 20L, null); - info = jstc.jsm.getMessage(N6, 1); + info = ctx.jsm.getMessage(N6, 1); assertStreamSource(info, N5, 11); }); } @@ -277,7 +272,7 @@ public void testSourceBasics() throws Exception { @Test @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); @@ -319,7 +314,7 @@ public void testSourceAndTransformsRoundTrips() throws Exception { @Test public void testMirror() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scMirror = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationMirrorSubjectTransform.json"); diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index c242dc0c5..bddc6f2af 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -37,45 +37,45 @@ public class JetStreamPubTests extends JetStreamTestBase { @Test public void testPublishVarieties() throws Exception { - runInShared((nc, jstc) -> { - PublishAck pa = jstc.js.publish(jstc.subject(), dataBytes(1)); - assertPublishAck(pa, jstc.stream, 1); + runInShared((nc, ctx) -> { + PublishAck pa = ctx.js.publish(ctx.subject(), dataBytes(1)); + assertPublishAck(pa, ctx.stream, 1); - Message msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(2)).build(); - pa = jstc.js.publish(msg); - assertPublishAck(pa, jstc.stream, 2); + Message msg = NatsMessage.builder().subject(ctx.subject()).data(dataBytes(2)).build(); + pa = ctx.js.publish(msg); + assertPublishAck(pa, ctx.stream, 2); PublishOptions po = PublishOptions.builder().build(); - pa = jstc.js.publish(jstc.subject(), dataBytes(3), po); - assertPublishAck(pa, jstc.stream, 3); + pa = ctx.js.publish(ctx.subject(), dataBytes(3), po); + assertPublishAck(pa, ctx.stream, 3); - msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(4)).build(); - pa = jstc.js.publish(msg, po); - assertPublishAck(pa, jstc.stream, 4); + msg = NatsMessage.builder().subject(ctx.subject()).data(dataBytes(4)).build(); + pa = ctx.js.publish(msg, po); + assertPublishAck(pa, ctx.stream, 4); - pa = jstc.js.publish(jstc.subject(), null); - assertPublishAck(pa, jstc.stream, 5); + pa = ctx.js.publish(ctx.subject(), null); + assertPublishAck(pa, ctx.stream, 5); - msg = NatsMessage.builder().subject(jstc.subject()).build(); - pa = jstc.js.publish(msg); - assertPublishAck(pa, jstc.stream, 6); + msg = NatsMessage.builder().subject(ctx.subject()).build(); + pa = ctx.js.publish(msg); + assertPublishAck(pa, ctx.stream, 6); - pa = jstc.js.publish(jstc.subject(), null, po); - assertPublishAck(pa, jstc.stream, 7); + pa = ctx.js.publish(ctx.subject(), null, po); + assertPublishAck(pa, ctx.stream, 7); - msg = NatsMessage.builder().subject(jstc.subject()).build(); - pa = jstc.js.publish(msg, po); - assertPublishAck(pa, jstc.stream, 8); + msg = NatsMessage.builder().subject(ctx.subject()).build(); + pa = ctx.js.publish(msg, po); + assertPublishAck(pa, ctx.stream, 8); Headers h = new Headers().put("foo", "bar9"); - pa = jstc.js.publish(jstc.subject(), h, dataBytes(9)); - assertPublishAck(pa, jstc.stream, 9); + pa = ctx.js.publish(ctx.subject(), h, dataBytes(9)); + assertPublishAck(pa, ctx.stream, 9); h = new Headers().put("foo", "bar10"); - pa = jstc.js.publish(jstc.subject(), h, dataBytes(10), po); - assertPublishAck(pa, jstc.stream, 10); + pa = ctx.js.publish(ctx.subject(), h, dataBytes(10), po); + assertPublishAck(pa, ctx.stream, 10); - Subscription s = jstc.js.subscribe(jstc.subject()); + Subscription s = ctx.js.subscribe(ctx.subject()); assertNextMessage(s, data(1), null); assertNextMessage(s, data(2), null); assertNextMessage(s, data(3), null); @@ -88,7 +88,7 @@ public void testPublishVarieties() throws Exception { assertNextMessage(s, data(10), "bar10"); // 503 - assertThrows(IOException.class, () -> jstc.js.publish(random(), null)); + assertThrows(IOException.class, () -> ctx.js.publish(random(), null)); }); } @@ -118,37 +118,37 @@ private void assertPublishAck(PublishAck pa, String stream, long seqno) { @Test public void testPublishAsyncVarieties() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { List> futures = new ArrayList<>(); - futures.add(jstc.js.publishAsync(jstc.subject(), dataBytes(1))); + futures.add(ctx.js.publishAsync(ctx.subject(), dataBytes(1))); - Message msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(2)).build(); - futures.add(jstc.js.publishAsync(msg)); + Message msg = NatsMessage.builder().subject(ctx.subject()).data(dataBytes(2)).build(); + futures.add(ctx.js.publishAsync(msg)); PublishOptions po = PublishOptions.builder().build(); - futures.add(jstc.js.publishAsync(jstc.subject(), dataBytes(3), po)); + futures.add(ctx.js.publishAsync(ctx.subject(), dataBytes(3), po)); - msg = NatsMessage.builder().subject(jstc.subject()).data(dataBytes(4)).build(); - futures.add(jstc.js.publishAsync(msg, po)); + msg = NatsMessage.builder().subject(ctx.subject()).data(dataBytes(4)).build(); + futures.add(ctx.js.publishAsync(msg, po)); Headers h = new Headers().put("foo", "bar5"); - futures.add(jstc.js.publishAsync(jstc.subject(), h, dataBytes(5))); + futures.add(ctx.js.publishAsync(ctx.subject(), h, dataBytes(5))); h = new Headers().put("foo", "bar6"); - futures.add(jstc.js.publishAsync(jstc.subject(), h, dataBytes(6), po)); + futures.add(ctx.js.publishAsync(ctx.subject(), h, dataBytes(6), po)); sleep(100); // just make sure all the publish complete for (int i = 1; i <= 6; i++) { CompletableFuture future = futures.get(i-1); PublishAck pa = future.get(); - assertEquals(jstc.stream, pa.getStream()); + assertEquals(ctx.stream, pa.getStream()); assertFalse(pa.isDuplicate()); assertEquals(i, pa.getSeqno()); } - Subscription s = jstc.js.subscribe(jstc.subject()); + Subscription s = ctx.js.subscribe(ctx.subject()); for (int x = 1; x <= 6; x++) { Message m = s.nextMessage(DEFAULT_TIMEOUT); assertNotNull(m); @@ -160,24 +160,24 @@ public void testPublishAsyncVarieties() throws Exception { } } - assertFutureIOException(jstc.js.publishAsync(random(), null)); + assertFutureIOException(ctx.js.publishAsync(random(), null)); msg = NatsMessage.builder().subject(random()).build(); - assertFutureIOException(jstc.js.publishAsync(msg)); + assertFutureIOException(ctx.js.publishAsync(msg)); PublishOptions pox1 = PublishOptions.builder().build(); - assertFutureIOException(jstc.js.publishAsync(random(), null, pox1)); + assertFutureIOException(ctx.js.publishAsync(random(), null, pox1)); msg = NatsMessage.builder().subject(random()).build(); - assertFutureIOException(jstc.js.publishAsync(msg, pox1)); + assertFutureIOException(ctx.js.publishAsync(msg, pox1)); PublishOptions pox2 = PublishOptions.builder().expectedLastMsgId(random()).build(); - assertFutureJetStreamApiException(jstc.js.publishAsync(jstc.subject(), null, pox2)); + assertFutureJetStreamApiException(ctx.js.publishAsync(ctx.subject(), null, pox2)); - msg = NatsMessage.builder().subject(jstc.subject()).build(); - assertFutureJetStreamApiException(jstc.js.publishAsync(msg, pox2)); + msg = NatsMessage.builder().subject(ctx.subject()).build(); + assertFutureJetStreamApiException(ctx.js.publishAsync(msg, pox2)); }); } @@ -186,7 +186,7 @@ public void testMultithreadedPublishAsync() throws Exception { //noinspection resource final ExecutorService executorService = Executors.newFixedThreadPool(3); try { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { final int messagesToPublish = 6; // create a new connection that does not have the inbox dispatcher set try (NatsConnection nc2 = new NatsConnection(nc.getOptions())){ @@ -196,14 +196,14 @@ public void testMultithreadedPublishAsync() throws Exception { List>> futures = new ArrayList<>(); for (int i = 0; i < messagesToPublish; i++) { final Future> submitFuture = executorService.submit(() -> - js2.publishAsync(jstc.subject(), dataBytes(1))); + js2.publishAsync(ctx.subject(), dataBytes(1))); futures.add(submitFuture); } // verify all messages were published for (int i = 0; i < messagesToPublish; i++) { CompletableFuture future = futures.get(i).get(200, TimeUnit.MILLISECONDS); PublishAck pa = future.get(200, TimeUnit.MILLISECONDS); - assertEquals(jstc.stream, pa.getStream()); + assertEquals(ctx.stream, pa.getStream()); assertFalse(pa.isDuplicate()); } } @@ -227,201 +227,200 @@ private void assertFutureJetStreamApiException(CompletableFuture fut @Test public void testPublishExpectations() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - String stream1 = random(); - String subjectPrefix = random(); - String streamSubject = subjectPrefix + ".>"; - String sub1 = subjectPrefix + ".foo.1"; - String sub2 = subjectPrefix + ".foo.2"; - String sub3 = subjectPrefix + ".bar.3"; - - createMemoryStream(jsm, stream1, streamSubject); - - String mid = random(); - PublishOptions po = PublishOptions.builder() - .expectedStream(stream1) - .messageId(mid) - .build(); - PublishAck pa = js.publish(sub1, dataBytes(1), po); - assertPublishAck(pa, stream1, 1); - - String lastId = mid; - mid = random(); - po = PublishOptions.builder() - .expectedLastMsgId(lastId) - .messageId(mid) - .build(); - pa = js.publish(sub1, dataBytes(2), po); - assertPublishAck(pa, stream1, 2); - - mid = random(); - po = PublishOptions.builder() - .expectedLastSequence(2) - .messageId(mid) - .build(); - pa = js.publish(sub1, dataBytes(3), po); - assertPublishAck(pa, stream1, 3); - - mid = random(); - po = PublishOptions.builder() - .expectedLastSequence(3) - .messageId(mid) - .build(); - pa = js.publish(sub2, dataBytes(4), po); - assertPublishAck(pa, stream1, 4); - - mid = random(); - po = PublishOptions.builder() - .expectedLastSubjectSequence(3) - .messageId(mid) - .build(); - pa = js.publish(sub1, dataBytes(5), po); - assertPublishAck(pa, stream1, 5); - - mid = random(); - po = PublishOptions.builder() - .expectedLastSubjectSequence(4) - .messageId(mid) - .build(); - pa = js.publish(sub2, dataBytes(6), po); - assertPublishAck(pa, stream1, 6); - - PublishOptions po1 = PublishOptions.builder().expectedStream(random()).build(); - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po1)); - assertEquals(10060, e.getApiErrorCode()); - - PublishOptions po2 = PublishOptions.builder().expectedLastMsgId(random()).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po2)); - assertEquals(10070, e.getApiErrorCode()); - - PublishOptions po3 = PublishOptions.builder().expectedLastSequence(999).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po3)); - assertEquals(10071, e.getApiErrorCode()); - - PublishOptions po4 = PublishOptions.builder().expectedLastSubjectSequence(999).build(); - e = assertThrows(JetStreamApiException.class, () -> js.publish(sub1, dataBytes(), po4)); - assertEquals(10071, e.getApiErrorCode()); - - // 0 has meaning to expectedLastSubjectSequence - JetStreamTestingContext tsc2 = new JetStreamTestingContext(nc); - createMemoryStream(jsm, tsc2.stream, tsc2.subject()); - PublishOptions poLss = PublishOptions.builder().expectedLastSubjectSequence(0).build(); - pa = tsc2.js.publish(tsc2.subject(), dataBytes(22), poLss); - assertPublishAck(pa, tsc2.stream, 1); - - final String fSubject = tsc2.subject(); - e = assertThrows(JetStreamApiException.class, () -> tsc2.js.publish(fSubject, dataBytes(), poLss)); - assertEquals(10071, e.getApiErrorCode()); - - // 0 has meaning - JetStreamTestingContext tsc3 = new JetStreamTestingContext(nc); - PublishOptions poLs = PublishOptions.builder().expectedLastSequence(0).build(); - pa = tsc3.js.publish(tsc3.subject(), dataBytes(331), poLs); - assertPublishAck(pa, tsc3.stream, 1); - - JetStreamTestingContext tsc4 = new JetStreamTestingContext(nc); - poLs = PublishOptions.builder().expectedLastSubjectSequence(0).build(); - pa = tsc4.js.publish(tsc4.subject(), dataBytes(441), poLs); - assertPublishAck(pa, tsc4.stream, 1); - - // expectedLastSubjectSequenceSubject - - pa = tsc4.js.publish(sub3, dataBytes(500)); - assertPublishAck(pa, stream1, 7); - - PublishOptions poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(5) - .build(); - pa = tsc4.js.publish(sub1, dataBytes(501), poLsss); - assertPublishAck(pa, stream1, 8); - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(6) - .build(); - pa = tsc4.js.publish(sub2, dataBytes(502), poLsss); - assertPublishAck(pa, stream1, 9); - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(9) - .expectedLastSubjectSequenceSubject(streamSubject) - .build(); - pa = tsc4.js.publish(sub2, dataBytes(503), poLsss); - assertPublishAck(pa, stream1, 10); - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(10) - .expectedLastSubjectSequenceSubject(subjectPrefix + ".foo.*") - .build(); - pa = tsc4.js.publish(sub2, dataBytes(504), poLsss); - assertPublishAck(pa, stream1, 11); - - PublishOptions final1 = poLsss; - assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub2, dataBytes(505), final1)); - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(7) - .expectedLastSubjectSequenceSubject(subjectPrefix + ".bar.*") - .build(); - pa = tsc4.js.publish(sub3, dataBytes(506), poLsss); - assertPublishAck(pa, stream1, 12); - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(12) - .expectedLastSubjectSequenceSubject(streamSubject) - .build(); - pa = tsc4.js.publish(sub3, dataBytes(507), poLsss); - assertPublishAck(pa, stream1, 13); + runInSharedCustom((nc, jstc1) -> { + try (JetStreamTestingContext ctx2 = new JetStreamTestingContext(nc, 1); + JetStreamTestingContext ctx3 = new JetStreamTestingContext(nc, 1); + JetStreamTestingContext ctx4 = new JetStreamTestingContext(nc, 1) + ) { + String stream1 = jstc1.stream; + String subjectPrefix = random(); + String streamSubject = subjectPrefix + ".>"; + String sub1 = subjectPrefix + ".foo.1"; + String sub2 = subjectPrefix + ".foo.2"; + String sub3 = subjectPrefix + ".bar.3"; + jstc1.createStream(streamSubject); + + String mid = random(); + PublishOptions po = PublishOptions.builder() + .expectedStream(stream1) + .messageId(mid) + .build(); + PublishAck pa = jstc1.js.publish(sub1, dataBytes(1), po); + assertPublishAck(pa, stream1, 1); + + String lastId = mid; + mid = random(); + po = PublishOptions.builder() + .expectedLastMsgId(lastId) + .messageId(mid) + .build(); + pa = jstc1.js.publish(sub1, dataBytes(2), po); + assertPublishAck(pa, stream1, 2); + + mid = random(); + po = PublishOptions.builder() + .expectedLastSequence(2) + .messageId(mid) + .build(); + pa = jstc1.js.publish(sub1, dataBytes(3), po); + assertPublishAck(pa, stream1, 3); + + mid = random(); + po = PublishOptions.builder() + .expectedLastSequence(3) + .messageId(mid) + .build(); + pa = jstc1.js.publish(sub2, dataBytes(4), po); + assertPublishAck(pa, stream1, 4); + + mid = random(); + po = PublishOptions.builder() + .expectedLastSubjectSequence(3) + .messageId(mid) + .build(); + pa = jstc1.js.publish(sub1, dataBytes(5), po); + assertPublishAck(pa, stream1, 5); + + mid = random(); + po = PublishOptions.builder() + .expectedLastSubjectSequence(4) + .messageId(mid) + .build(); + pa = jstc1.js.publish(sub2, dataBytes(6), po); + assertPublishAck(pa, stream1, 6); + + PublishOptions po1 = PublishOptions.builder().expectedStream(random()).build(); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jstc1.js.publish(sub1, dataBytes(), po1)); + assertEquals(10060, e.getApiErrorCode()); + + PublishOptions po2 = PublishOptions.builder().expectedLastMsgId(random()).build(); + e = assertThrows(JetStreamApiException.class, () -> jstc1.js.publish(sub1, dataBytes(), po2)); + assertEquals(10070, e.getApiErrorCode()); + + PublishOptions po3 = PublishOptions.builder().expectedLastSequence(999).build(); + e = assertThrows(JetStreamApiException.class, () -> jstc1.js.publish(sub1, dataBytes(), po3)); + assertEquals(10071, e.getApiErrorCode()); + + PublishOptions po4 = PublishOptions.builder().expectedLastSubjectSequence(999).build(); + e = assertThrows(JetStreamApiException.class, () -> jstc1.js.publish(sub1, dataBytes(), po4)); + assertEquals(10071, e.getApiErrorCode()); + + // 0 has meaning to expectedLastSubjectSequence + PublishOptions poLss = PublishOptions.builder().expectedLastSubjectSequence(0).build(); + pa = ctx2.js.publish(ctx2.subject(), dataBytes(22), poLss); + assertPublishAck(pa, ctx2.stream, 1); + + final String fSubject = ctx2.subject(); + e = assertThrows(JetStreamApiException.class, () -> ctx2.js.publish(fSubject, dataBytes(), poLss)); + assertEquals(10071, e.getApiErrorCode()); + + // 0 has meaning + PublishOptions poLs = PublishOptions.builder().expectedLastSequence(0).build(); + pa = ctx3.js.publish(ctx3.subject(), dataBytes(331), poLs); + assertPublishAck(pa, ctx3.stream, 1); + + poLs = PublishOptions.builder().expectedLastSubjectSequence(0).build(); + pa = ctx4.js.publish(ctx4.subject(), dataBytes(441), poLs); + assertPublishAck(pa, ctx4.stream, 1); + + // expectedLastSubjectSequenceSubject + pa = ctx4.js.publish(sub3, dataBytes(500)); + assertPublishAck(pa, stream1, 7); + + PublishOptions poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(5) + .build(); + pa = ctx4.js.publish(sub1, dataBytes(501), poLsss); + assertPublishAck(pa, stream1, 8); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(6) + .build(); + pa = ctx4.js.publish(sub2, dataBytes(502), poLsss); + assertPublishAck(pa, stream1, 9); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(9) + .expectedLastSubjectSequenceSubject(streamSubject) + .build(); + pa = ctx4.js.publish(sub2, dataBytes(503), poLsss); + assertPublishAck(pa, stream1, 10); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(10) + .expectedLastSubjectSequenceSubject(subjectPrefix + ".foo.*") + .build(); + pa = ctx4.js.publish(sub2, dataBytes(504), poLsss); + assertPublishAck(pa, stream1, 11); + + PublishOptions final1 = poLsss; + assertThrows(JetStreamApiException.class, () -> ctx4.js.publish(sub2, dataBytes(505), final1)); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(7) + .expectedLastSubjectSequenceSubject(subjectPrefix + ".bar.*") + .build(); + pa = ctx4.js.publish(sub3, dataBytes(506), poLsss); + assertPublishAck(pa, stream1, 12); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(12) + .expectedLastSubjectSequenceSubject(streamSubject) + .build(); + pa = ctx4.js.publish(sub3, dataBytes(507), poLsss); + assertPublishAck(pa, stream1, 13); + + poLsss = PublishOptions.builder() + .expectedLastSubjectSequenceSubject("not-even-a-subject") + .build(); + if (atLeast2_12()) { + PublishOptions fpoLsss = poLsss; + assertThrows(JetStreamApiException.class, () -> ctx4.js.publish(sub3, dataBytes(508), fpoLsss)); + } + else { + pa = ctx4.js.publish(sub3, dataBytes(508), poLsss); + assertPublishAck(pa, stream1, 14); + } - poLsss = PublishOptions.builder() - .expectedLastSubjectSequenceSubject("not-even-a-subject") - .build(); - if (atLeast2_12()) { - PublishOptions fpoLsss = poLsss; - assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(508), fpoLsss)); - } - else { - pa = tsc4.js.publish(sub3, dataBytes(508), poLsss); - assertPublishAck(pa, stream1, 14); - } + poLsss = PublishOptions.builder() + .expectedLastSequence(14) + .expectedLastSubjectSequenceSubject("not-even-a-subject") + .build(); + if (atLeast2_12()) { + PublishOptions fpoLsss = poLsss; + assertThrows(JetStreamApiException.class, () -> ctx4.js.publish(sub3, dataBytes(509), fpoLsss)); + } + else { + pa = ctx4.js.publish(sub3, dataBytes(509), poLsss); + assertPublishAck(pa, stream1, 15); + } - poLsss = PublishOptions.builder() - .expectedLastSequence(14) - .expectedLastSubjectSequenceSubject("not-even-a-subject") - .build(); - if (atLeast2_12()) { - PublishOptions fpoLsss = poLsss; - assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(509), fpoLsss)); - } - else { - pa = tsc4.js.publish(sub3, dataBytes(509), poLsss); - assertPublishAck(pa, stream1, 15); + poLsss = PublishOptions.builder() + .expectedLastSubjectSequence(15) + .expectedLastSubjectSequenceSubject("not-even-a-subject") + .build(); + PublishOptions final2 = poLsss; + // JetStreamApiException: wrong last sequence: 0 [10071] + assertThrows(JetStreamApiException.class, () -> ctx4.js.publish(sub3, dataBytes(510), final2)); } - - poLsss = PublishOptions.builder() - .expectedLastSubjectSequence(15) - .expectedLastSubjectSequenceSubject("not-even-a-subject") - .build(); - PublishOptions final2 = poLsss; - // JetStreamApiException: wrong last sequence: 0 [10071] - assertThrows(JetStreamApiException.class, () -> tsc4.js.publish(sub3, dataBytes(510), final2)); }); } @Test public void testPublishMiscExceptions() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // stream supplied and matches //noinspection deprecation - PublishOptions po = PublishOptions.builder().stream(jstc.stream).build(); - jstc.js.publish(jstc.subject(), dataBytes(9), po); + PublishOptions po = PublishOptions.builder().stream(ctx.stream).build(); + ctx.js.publish(ctx.subject(), dataBytes(9), po); // mismatch stream to PO stream //noinspection deprecation PublishOptions pox = PublishOptions.builder().stream(random()).build(); - assertThrows(IOException.class, () -> jstc.js.publish(jstc.subject(), dataBytes(), pox)); + assertThrows(IOException.class, () -> ctx.js.publish(ctx.subject(), dataBytes(), pox)); // invalid subject - assertThrows(IOException.class, () -> jstc.js.publish(random(), dataBytes())); + assertThrows(IOException.class, () -> ctx.js.publish(random(), dataBytes())); }); } @@ -437,20 +436,20 @@ public void testPublishAckJson() throws IOException, JetStreamApiException { @Test public void testPublishNoAck() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { JetStreamOptions jso = JetStreamOptions.builder().publishNoAck(true).build(); JetStream customJs = nc.jetStream(jso); String data1 = "noackdata1"; String data2 = "noackdata2"; - PublishAck pa = customJs.publish(jstc.subject(), data1.getBytes()); + PublishAck pa = customJs.publish(ctx.subject(), data1.getBytes()); assertNull(pa); - CompletableFuture f = customJs.publishAsync(jstc.subject(), data2.getBytes()); + CompletableFuture f = customJs.publishAsync(ctx.subject(), data2.getBytes()); assertNull(f); - JetStreamSubscription sub = customJs.subscribe(jstc.subject()); + JetStreamSubscription sub = customJs.subscribe(ctx.subject()); Message m = sub.nextMessage(Duration.ofSeconds(2)); assertNotNull(m); assertEquals(data1, new String(m.getData())); @@ -462,27 +461,27 @@ public void testPublishNoAck() throws Exception { @Test public void testMaxPayloadJs() throws Exception { - runInSharedCustomStream(optionsBuilder().noReconnect(), (nc, jstc) -> { + runInSharedCustom(optionsBuilder().noReconnect(), (nc, ctx) -> { long expectedSeq = 0; - jstc.addStream(jstc.scBuilder(1).maximumMessageSize(1000)); - String subject0 = jstc.subject(0); + ctx.addStream(ctx.scBuilder(1).maximumMessageSize(1000)); + String subject0 = ctx.subject(0); for (int x = 1; x <= 3; x++) { int size = 1000 + x - 2; if (size > 1000) { - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jstc.js.publish(subject0, new byte[size])); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> ctx.js.publish(subject0, new byte[size])); assertEquals(10054, e.getApiErrorCode()); } else { - PublishAck pa = jstc.js.publish(subject0, new byte[size]); + PublishAck pa = ctx.js.publish(subject0, new byte[size]); assertEquals(++expectedSeq, pa.getSeqno()); } } for (int x = 1; x <= 3; x++) { int size = 1000 + x - 2; - CompletableFuture paFuture = jstc.js.publishAsync(subject0, new byte[size]); + CompletableFuture paFuture = ctx.js.publishAsync(subject0, new byte[size]); if (size > 1000) { ExecutionException e = assertThrows(ExecutionException.class, () -> paFuture.get(1000, TimeUnit.MILLISECONDS)); @@ -500,7 +499,7 @@ public void testMaxPayloadJs() throws Exception { @Test public void testPublishWithTTL() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { String stream = random(); String subject = random(); StreamConfiguration sc = StreamConfiguration.builder() @@ -509,67 +508,67 @@ public void testPublishWithTTL() throws Exception { .allowMessageTtl() .subjects(subject).build(); - jstc.jsm.addStream(sc); + ctx.jsm.addStream(sc); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); - PublishAck pa1 = jstc.js.publish(subject, null, opts); + PublishAck pa1 = ctx.js.publish(subject, null, opts); assertNotNull(pa1); opts = PublishOptions.builder().messageTtlNever().build(); - PublishAck paNever = jstc.js.publish(subject, null, opts); + PublishAck paNever = ctx.js.publish(subject, null, opts); assertNotNull(paNever); - MessageInfo mi1 = jstc.jsm.getMessage(stream, pa1.getSeqno()); + MessageInfo mi1 = ctx.jsm.getMessage(stream, pa1.getSeqno()); Headers h = mi1.getHeaders(); assertNotNull(h); assertEquals("1s",h.getFirst(MSG_TTL_HDR)); - MessageInfo miNever = jstc.jsm.getMessage(stream, paNever.getSeqno()); + MessageInfo miNever = ctx.jsm.getMessage(stream, paNever.getSeqno()); h = miNever.getHeaders(); assertNotNull(h); assertEquals("never",h.getFirst(MSG_TTL_HDR)); sleep(1200); - JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> jstc.jsm.getMessage(stream, pa1.getSeqno())); + JetStreamApiException e = assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(stream, pa1.getSeqno())); assertEquals(10037, e.getApiErrorCode()); - assertNotNull((jstc.jsm.getMessage(stream, paNever.getSeqno()))); + assertNotNull((ctx.jsm.getMessage(stream, paNever.getSeqno()))); }); } @Test public void testMsgDeleteMarkerMaxAge() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - StreamConfiguration sc = jstc.scBuilder(1) + runInSharedCustom((nc, ctx) -> { + StreamConfiguration sc = ctx.scBuilder(1) .allowMessageTtl() .subjectDeleteMarkerTtl(Duration.ofSeconds(50)) .maxAge(1000) .build(); - jstc.addStream(sc); - String subject = jstc.subject(); + ctx.addStream(sc); + String subject = ctx.subject(); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); - PublishAck pa = jstc.js.publish(subject, null, opts); + PublishAck pa = ctx.js.publish(subject, null, opts); assertNotNull(pa); sleep(1200); - MessageInfo mi = jstc.jsm.getLastMessage(jstc.stream, subject); + MessageInfo mi = ctx.jsm.getLastMessage(ctx.stream, subject); Headers h = mi.getHeaders(); assertNotNull(h); assertEquals("MaxAge", h.getFirst(NATS_MARKER_REASON_HDR)); assertEquals("50s", h.getFirst(MSG_TTL_HDR)); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.builder() - .name(jstc.stream) + .name(ctx.stream) .storageType(StorageType.Memory) .allowMessageTtl() .subjectDeleteMarkerTtl(Duration.ofMillis(999)) .subjects(subject).build()); assertThrows(IllegalArgumentException.class, () -> StreamConfiguration.builder() - .name(jstc.stream) + .name(ctx.stream) .storageType(StorageType.Memory) .allowMessageTtl() .subjectDeleteMarkerTtl(999) diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index ededc2c1b..5cfd09054 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -18,8 +18,8 @@ import io.nats.client.api.ConsumerConfiguration; import io.nats.client.api.PriorityPolicy; import io.nats.client.support.JsonUtils; -import io.nats.client.support.Status; import io.nats.client.utils.VersionUtils; +import io.nats.client.utils.VersionUtils.VersionCheck; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -41,24 +41,14 @@ import static io.nats.client.support.ApiConstants.*; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPullTests extends JetStreamTestBase { - static class ErrorListenerPullImpl extends ErrorListenerLoggerImpl { - @Override - public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) {} - } - - private Options.Builder noPullWarnings() { - return optionsBuilder().errorListener(new ErrorListenerPullImpl()); - } - @Test public void testFetch() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { long fetchMs = 3000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -68,12 +58,12 @@ public void testFetch() throws Exception { .build(); PullSubscribeOptions options = PullSubscribeOptions.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub, ctx.stream, ctx.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server List messages = sub.fetch(10, fetchDur); @@ -81,12 +71,12 @@ public void testFetch() throws Exception { messages.forEach(Message::ack); sleep(ackWaitDur.toMillis()); // let the pull expire - jsPublish(jstc.js, jstc.subject(), "A", 10); + jsPublish(ctx.js, ctx.subject(), "A", 10); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "B", 20); + jsPublish(ctx.js, ctx.subject(), "B", 20); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); @@ -95,13 +85,13 @@ public void testFetch() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "C", 5); + jsPublish(ctx.js, ctx.subject(), "C", 5); messages = sub.fetch(10, fetchDur); validateRead(5, messages.size()); messages.forEach(Message::ack); sleep(fetchMs); // let the pull expire - jsPublish(jstc.js, jstc.subject(), "D", 15); + jsPublish(ctx.js, ctx.subject(), "D", 15); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); messages.forEach(Message::ack); @@ -110,7 +100,7 @@ public void testFetch() throws Exception { validateRead(5, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "E", 10); + jsPublish(ctx.js, ctx.subject(), "E", 10); messages = sub.fetch(10, fetchDur); validateRead(10, messages.size()); sleep(ackWaitDur.toMillis()); // let the acks wait expire, pull will also expire it's shorter @@ -127,7 +117,7 @@ public void testFetch() throws Exception { @Test public void testIterate() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { long fetchMs = 5000; Duration fetchDur = Duration.ofMillis(fetchMs); Duration ackWaitDur = Duration.ofMillis(fetchMs * 2); @@ -137,12 +127,12 @@ public void testIterate() throws Exception { .build(); PullSubscribeOptions options = PullSubscribeOptions.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub, ctx.stream, ctx.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server Iterator iterator = sub.iterate(10, fetchDur); @@ -150,13 +140,13 @@ public void testIterate() throws Exception { validateRead(0, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "A", 10); + jsPublish(ctx.js, ctx.subject(), "A", 10); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "B", 20); + jsPublish(ctx.js, ctx.subject(), "B", 20); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -167,14 +157,14 @@ public void testIterate() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "C", 5); + jsPublish(ctx.js, ctx.subject(), "C", 5); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(5, messages.size()); messages.forEach(Message::ack); sleep(fetchMs); // give time for the pull to expire - jsPublish(jstc.js, jstc.subject(), "D", 15); + jsPublish(ctx.js, ctx.subject(), "D", 15); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -186,7 +176,7 @@ public void testIterate() throws Exception { messages.forEach(Message::ack); sleep(fetchMs); // give time for the pull to expire - jsPublish(jstc.js, jstc.subject(), "E", 10); + jsPublish(ctx.js, ctx.subject(), "E", 10); iterator = sub.iterate(10, fetchDur); messages = readMessages(iterator); validateRead(10, messages.size()); @@ -197,7 +187,7 @@ public void testIterate() throws Exception { validateRead(10, messages.size()); messages.forEach(Message::ack); - jsPublish(jstc.js, jstc.subject(), "F", 1); + jsPublish(ctx.js, ctx.subject(), "F", 1); iterator = sub.iterate(1, fetchDur); //noinspection ResultOfMethodCallIgnored iterator.hasNext(); // calling hasNext twice in a row is for coverage @@ -208,17 +198,17 @@ public void testIterate() throws Exception { @Test public void testBasic() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(ctx.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub, ctx.stream, ctx.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // publish some amount of messages, but not entire pull size - jsPublish(jstc.js, jstc.subject(), "A", 4); + jsPublish(ctx.js, ctx.subject(), "A", 4); // start the pull sub.pull(10); @@ -229,7 +219,7 @@ public void testBasic() throws Exception { validateRedAndTotal(4, messages.size(), 4, total); // publish some more covering our initial pull and more - jsPublish(jstc.js, jstc.subject(), "B", 10); + jsPublish(ctx.js, ctx.subject(), "B", 10); // read what is available, expect 6 more messages = readMessagesAck(sub); @@ -250,7 +240,7 @@ public void testBasic() throws Exception { validateRedAndTotal(4, messages.size(), 14, total); // publish some more - jsPublish(jstc.js, jstc.subject(), "C", 10); + jsPublish(ctx.js, ctx.subject(), "C", 10); // read what is available, should be 6 since we didn't finish the last batch messages = readMessagesAck(sub); @@ -282,16 +272,16 @@ public void testBasic() throws Exception { validateRedAndTotal(0, messages.size(), 24, total); // publish some more to test null timeout - jsPublish(jstc.js, jstc.subject(), "D", 10); - sub = jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(random()).build()); + jsPublish(ctx.js, ctx.subject(), "D", 10); + sub = ctx.js.subscribe(ctx.subject(), PullSubscribeOptions.builder().durable(random()).build()); sub.pull(10); sleep(500); messages = readMessagesAck(sub, null); validateRedAndTotal(10, messages.size(), 10, messages.size()); // publish some more to test never timeout - jsPublish(jstc.js, jstc.subject(), "E", 10); - sub = jstc.js.subscribe(jstc.subject(), PullSubscribeOptions.builder().durable(random()).build()); + jsPublish(ctx.js, ctx.subject(), "E", 10); + sub = ctx.js.subscribe(ctx.subject(), PullSubscribeOptions.builder().durable(random()).build()); sub.pull(10); sleep(500); messages = readMessagesAck(sub, Duration.ZERO, 10); @@ -301,18 +291,18 @@ public void testBasic() throws Exception { @Test public void testNoWait() throws Exception { - runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { + runInShared((nc, ctx) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(ctx.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub, ctx.stream, ctx.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // publish 10 messages // no wait, batch size 10, there are 10 messages, we will read them all and not trip nowait - jsPublish(jstc.js, jstc.subject(), "A", 10); + jsPublish(ctx.js, ctx.subject(), "A", 10); sub.pullNoWait(10); List messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -320,7 +310,7 @@ public void testNoWait() throws Exception { // publish 20 messages // no wait, batch size 10, there are 20 messages, we will read 10 - jsPublish(jstc.js, jstc.subject(), "B", 20); + jsPublish(ctx.js, ctx.subject(), "B", 20); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -333,14 +323,14 @@ public void testNoWait() throws Exception { // publish 5 messages // no wait, batch size 10, there are 5 messages, we WILL trip nowait - jsPublish(jstc.js, jstc.subject(), "C", 5); + jsPublish(ctx.js, ctx.subject(), "C", 5); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(5, messages.size()); // publish 12 messages // no wait, batch size 10, there are more than batch messages we will read 10 - jsPublish(jstc.js, jstc.subject(), "D", 12); + jsPublish(ctx.js, ctx.subject(), "D", 12); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -354,7 +344,7 @@ public void testNoWait() throws Exception { // this is just coverage of the pullNoWait api + expires, not really validating server functionality // publish 12 messages // no wait, batch size 10, there are more than batch messages we will read 10 - jsPublish(jstc.js, jstc.subject(), "E", 12); + jsPublish(ctx.js, ctx.subject(), "E", 12); sub.pullNoWait(10, 10000); messages = readMessagesAck(sub); assertEquals(10, messages.size()); @@ -369,75 +359,75 @@ public void testNoWait() throws Exception { @Test public void testPullExpires() throws Exception { - runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { + runInShared((nc, ctx) -> { // Build our subscription options. - PullSubscribeOptions options = PullSubscribeOptions.builder().durable(jstc.consumerName()).build(); + PullSubscribeOptions options = PullSubscribeOptions.builder().durable(ctx.consumerName()).build(); // Subscribe synchronously. - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub, jstc.stream, jstc.consumerName(), null, true); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub, ctx.stream, ctx.consumerName(), null, true); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server long expires = 500; // millis // publish 10 messages - jsPublish(jstc.js, jstc.subject(), "A", 5); + jsPublish(ctx.js, ctx.subject(), "A", 5); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here List messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "B", 10); + jsPublish(ctx.js, ctx.subject(), "B", 10); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here messages = readMessagesAck(sub); assertEquals(10, messages.size()); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "C", 5); + jsPublish(ctx.js, ctx.subject(), "C", 5); sub.pullExpiresIn(10, Duration.ofMillis(expires)); // using Duration version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "D", 10); + jsPublish(ctx.js, ctx.subject(), "D", 10); sub.pull(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); - jsPublish(jstc.js, jstc.subject(), "E", 5); + jsPublish(ctx.js, ctx.subject(), "E", 5); sub.pullExpiresIn(10, expires); // using millis version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "F", 10); + jsPublish(ctx.js, ctx.subject(), "F", 10); sub.pullNoWait(10); messages = readMessagesAck(sub); assertEquals(10, messages.size()); - jsPublish(jstc.js, jstc.subject(), "G", 5); + jsPublish(ctx.js, ctx.subject(), "G", 5); sub.pullExpiresIn(10, expires); // using millis version here messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "H", 10); + jsPublish(ctx.js, ctx.subject(), "H", 10); messages = sub.fetch(10, expires); assertEquals(10, messages.size()); assertAllJetStream(messages); - jsPublish(jstc.js, jstc.subject(), "I", 5); + jsPublish(ctx.js, ctx.subject(), "I", 5); sub.pullExpiresIn(10, expires); messages = readMessagesAck(sub); assertEquals(5, messages.size()); assertAllJetStream(messages); sleep(expires); // make sure the pull actually expires - jsPublish(jstc.js, jstc.subject(), "J", 10); + jsPublish(ctx.js, ctx.subject(), "J", 10); Iterator i = sub.iterate(10, expires); int count = 0; while (i.hasNext()) { @@ -454,13 +444,13 @@ public void testPullExpires() throws Exception { @Test public void testAckNak() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // NAK - jsPublish(jstc.js, jstc.subject(), "NAK", 1); + jsPublish(ctx.js, ctx.subject(), "NAK", 1); sub.pull(1); @@ -484,13 +474,13 @@ public void testAckNak() throws Exception { @Test public void testAckTerm() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { PullSubscribeOptions pso = PullSubscribeOptions.builder().durable(random()).build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // TERM - jsPublish(jstc.js, jstc.subject(), "TERM", 1); + jsPublish(ctx.js, ctx.subject(), "TERM", 1); sub.pull(1); Message message = sub.nextMessage(Duration.ofSeconds(1)); @@ -506,11 +496,11 @@ public void testAckTerm() throws Exception { @Test public void testAckReplySyncCoverage() throws Exception { - runInShared((nc, jstc) -> { - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); + runInShared((nc, ctx) -> { + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject()); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server - jsPublish(jstc.js, jstc.subject(), "COVERAGE", 1); + jsPublish(ctx.js, ctx.subject(), "COVERAGE", 1); Message message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -525,20 +515,20 @@ public void testAckReplySyncCoverage() throws Exception { @Test public void testAckWaitTimeout() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder() .ackWait(1500) .build(); PullSubscribeOptions pso = PullSubscribeOptions.builder() - .durable(jstc.consumerName()) + .durable(ctx.consumerName()) .configuration(cc) .build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // Ack Wait timeout - jsPublish(jstc.js, jstc.subject(), "WAIT", 2); + jsPublish(ctx.js, ctx.subject(), "WAIT", 2); sub.pull(2); Message m = sub.nextMessage(1000); @@ -570,72 +560,72 @@ public void testAckWaitTimeout() throws Exception { @Test public void testDurable() throws Exception { - runInSharedOwnNc(noPullWarnings(), (nc, jstc) -> { + runInShared((nc, ctx) -> { String durable = random(); // Build our subscription options normally PullSubscribeOptions options1 = PullSubscribeOptions.builder().durable(durable).build(); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(jstc.subject(), options1)); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(ctx.subject(), options1)); // bind long form PullSubscribeOptions options2 = PullSubscribeOptions.builder() - .stream(jstc.stream) + .stream(ctx.stream) .durable(durable) .bind(true) .build(); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options2)); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options2)); // fast bind long form PullSubscribeOptions options3 = PullSubscribeOptions.builder() - .stream(jstc.stream) + .stream(ctx.stream) .durable(durable) .fastBind(true) .build(); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options3)); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options3)); // bind short form - PullSubscribeOptions options4 = PullSubscribeOptions.bind(jstc.stream, durable); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options4)); + PullSubscribeOptions options4 = PullSubscribeOptions.bind(ctx.stream, durable); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options4)); // fast bind short form - PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(jstc.stream, durable); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options5)); + PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(ctx.stream, durable); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options5)); }); } @Test public void testNamed() throws Exception { - runInSharedOwnNc(noPullWarnings(), VersionUtils::atLeast2_9_0, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_0, (nc, ctx) -> { String name = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder() .name(name) .inactiveThreshold(10_000) .build()); // bind long form PullSubscribeOptions options2 = PullSubscribeOptions.builder() - .stream(jstc.stream) + .stream(ctx.stream) .name(name) .bind(true) .build(); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options2)); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options2)); // fast bind long form PullSubscribeOptions options3 = PullSubscribeOptions.builder() - .stream(jstc.stream) + .stream(ctx.stream) .name(name) .fastBind(true) .build(); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options3)); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options3)); // bind short form - PullSubscribeOptions options4 = PullSubscribeOptions.bind(jstc.stream, name); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options4)); + PullSubscribeOptions options4 = PullSubscribeOptions.bind(ctx.stream, name); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options4)); // fast bind short form - PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(jstc.stream, name); - _testDurableOrNamed(jstc.js, jstc.subject(), () -> jstc.js.subscribe(null, options5)); + PullSubscribeOptions options5 = PullSubscribeOptions.fastBind(ctx.stream, name); + _testDurableOrNamed(ctx.js, ctx.subject(), () -> ctx.js.subscribe(null, options5)); }); } @@ -716,11 +706,7 @@ public void testPullRequestOptionsBuilder() { } interface ConflictSetup { - JetStreamSubscription setup(Connection nc, JetStreamManagement jsm, JetStream js, JetStreamTestingContext jstc, ListenerForTesting listener) throws Exception; - } - - private boolean versionIsBefore(Connection nc, String targetVersion) { - return targetVersion != null && nc.getServerInfo().isOlderThanVersion(targetVersion); + JetStreamSubscription setup(Connection nc, JetStreamManagement jsm, JetStream js, JetStreamTestingContext ctx, ListenerForTesting listener) throws Exception; } interface BuilderCustomizer { @@ -737,28 +723,26 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { static final int TYPE_ERROR = 1; static final int TYPE_WARNING = 2; static final int TYPE_NONE = 0; - private void testConflictStatus(int statusCode, String statusText, int type, String targetVersion, ConflictSetup setup) throws Exception { + private void _testConflictStatuses(int statusCode, String statusText, int type, VersionCheck vc, ConflictSetup... setups) throws Exception { ListenerForTesting listener = new ListenerForTesting(); - AtomicBoolean skip = new AtomicBoolean(false); - runInSharedOwnNc(listener, (nc, jstc) -> { - skip.set(versionIsBefore(nc, targetVersion)); - if (skip.get()) { - return; - } - JetStreamSubscription sub = setup.setup(nc, jstc.jsm, jstc.js, jstc, listener); - if (sub.getDispatcher() == null) { - if (type == TYPE_ERROR) { - JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE)); - assertEquals(statusCode, jsse.getStatus().getCode()); - assertEquals(sub.hashCode(), jsse.getSubscription().hashCode()); - //noinspection deprecation - assertTrue(jsse.getDescription().contains(statusText)); // coverage - } - else { - sub.nextMessage(NEXT_MESSAGE); + runInSharedOwnNc(listener, vc, (nc, ctx) -> { + for (ConflictSetup setup : setups) { + listener.reset(); + JetStreamSubscription sub = setup.setup(nc, ctx.jsm, ctx.js, ctx, listener); + if (sub.getDispatcher() == null) { + if (type == TYPE_ERROR) { + JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE)); + assertEquals(statusCode, jsse.getStatus().getCode()); + assertEquals(sub.hashCode(), jsse.getSubscription().hashCode()); + //noinspection deprecation + assertTrue(jsse.getDescription().contains(statusText)); // coverage + } + else { + sub.nextMessage(NEXT_MESSAGE); + } } + checkHandler(statusText, type, listener, WAIT_FOR_MESSAGES); } - checkHandler(statusText, type, listener, WAIT_FOR_MESSAGES); }); } @@ -772,155 +756,220 @@ else if (type == TYPE_WARNING) { } @Test - public void testExceedsMaxWaitingSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pull(1); - sub.pull(1); - return sub; - }); - } - - @Test - public void testExceedsMaxWaitingAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pull(1); - sub.pull(1); - return sub; - }); - } - - @Test - public void testExceedsMaxRequestBatchSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pull(2); - return sub; - }); - } - - @Test - public void testExceedsMaxRequestBatchAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pull(2); - return sub; - }); + public void testExceededMaxWaiting() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pull(1); + sub.pull(1); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pull(1); + sub.pull(1); + return sub; + }); } @Test - public void testMessageSizeExceedsMaxBytesSyncSub() throws Exception { - testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b); - jstc.js.publish(jstc.subject(), new byte[1000]); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); - return sub; - }); + public void testExceedsMaxRequestBatch() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pull(2); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pull(2); + return sub; + } + ); } @Test - public void testMessageSizeExceedsMaxBytesAsyncSub() throws Exception { - testConflictStatus(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b); - jstc.js.publish(jstc.subject(), new byte[1000]); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); - return sub; - }); + public void testMessageSizeExceedsMaxBytes() throws Exception { + _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b); + ctx.js.publish(ctx.subject(), new byte[1000]); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b); + ctx.js.publish(ctx.subject(), new byte[1000]); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); + return sub; + } + ); } @Test - public void testExceedsMaxRequestExpiresSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pullExpiresIn(1, 2000); - return sub; - }); + public void testExceedsMaxRequestExpires() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pullExpiresIn(1, 2000); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pullExpiresIn(1, 2000); + return sub; + } + ); } @Test - public void testExceedsMaxRequestExpiresAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pullExpiresIn(1, 2000); - return sub; - }); + public void testConsumerIsPushBased() throws Exception { + _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + String dur = random(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); + JetStreamSubscription sub = ctx.js.subscribe(null, so); + ctx.jsm.deleteConsumer(ctx.stream, dur); + // consumer with same name but is push now + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).deliverSubject(dur).build()); + sub.pull(1); + return sub; + }, + // Async + (nc, jsm, js, ctx, handler) -> { + String dur = random(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); + JetStreamSubscription sub = ctx.js.subscribe(null, d, m -> {}, so); + ctx.jsm.deleteConsumer(ctx.stream, dur); + // consumer with same name but is push now + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).deliverSubject(dur).build()); + sub.pull(1); + return sub; + } + ); } + // This just flaps. It's a timing thing? Already spent too much time, IWOMM and it should work as is. @Test - public void testConsumerIsPushBasedSyncSub() throws Exception { - testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { - String dur = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); - JetStreamSubscription sub = jstc.js.subscribe(null, so); - jstc.jsm.deleteConsumer(jstc.stream, dur); - // consumer with same name but is push now - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).deliverSubject(dur).build()); - sub.pull(1); - return sub; - }); + @Disabled + public void testConsumerDeletedSyncSub() throws Exception { + _testConflictStatuses(409, CONSUMER_DELETED, TYPE_ERROR, VersionUtils::atLeast2_9_6, + // Sync + (nc, jsm, js, ctx, handler) -> { + String dur = random(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); + JetStreamSubscription sub = ctx.js.subscribe(null, so); + sub.pullExpiresIn(1, 30000); + ctx.jsm.deleteConsumer(ctx.stream, dur); + ctx.js.publish(ctx.subject(), null); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + String dur = random(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); + JetStreamSubscription sub = ctx.js.subscribe(null, d, m -> {}, so); + sub.pullExpiresIn(1, 30000); + ctx.jsm.deleteConsumer(ctx.stream, dur); + ctx.js.publish(ctx.subject(), null); + return sub; + } + ); } @Test - public void testConsumerIsPushBasedAsyncSub() throws Exception { - testConflictStatus(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { - String dur = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); - JetStreamSubscription sub = jstc.js.subscribe(null, d, m -> {}, so); - jstc.jsm.deleteConsumer(jstc.stream, dur); - // consumer with same name but is push now - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).deliverSubject(dur).build()); - sub.pull(1); - return sub; - }); + public void testBadRequest() throws Exception { + _testConflictStatuses(400, BAD_REQUEST, TYPE_ERROR, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pull(new BadPullRequestOptions()); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pull(new BadPullRequestOptions()); + return sub; + }); } - // This just flaps. It's a timing thing? Already spent too much time, IWOMM and it should work as is. @Test - @Disabled - public void testConsumerDeletedSyncSub() throws Exception { - testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, jstc, handler) -> { - String dur = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); - JetStreamSubscription sub = jstc.js.subscribe(null, so); - sub.pullExpiresIn(1, 30000); - jstc.jsm.deleteConsumer(jstc.stream, dur); - jstc.js.publish(jstc.subject(), null); - return sub; - }); + public void testNotFound() throws Exception { + _testConflictStatuses(404, NO_MESSAGES, TYPE_NONE, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pullNoWait(1); + return sub; + }, + + // Async + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pullNoWait(1); + return sub; + }); } - // This just flaps. It's a timing thing? Already spent too much time, IWOMM and it should work as is. @Test - @Disabled - public void testConsumerDeletedAsyncSub() throws Exception { - testConflictStatus(409, CONSUMER_DELETED, TYPE_ERROR, "2.9.6", (nc, jsm, js, jstc, handler) -> { - String dur = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); - JetStreamSubscription sub = jstc.js.subscribe(null, d, m -> {}, so); - sub.pullExpiresIn(1, 30000); - jstc.jsm.deleteConsumer(jstc.stream, dur); - jstc.js.publish(jstc.subject(), null); - return sub; - }); + public void testExceedsMaxRequestBytes1stMessage() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, VersionUtils::atLeast2_9_0, + // Sync + (nc, jsm, js, ctx, handler) -> { + PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); + sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); + return sub; + }, + // Async + + (nc, jsm, js, ctx, handler) -> { + Dispatcher d = nc.createDispatcher(); + PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); + sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); + return sub; + }); } static class BadPullRequestOptions extends PullRequestOptions { @@ -939,85 +988,22 @@ public String toJson() { } } - @Test - public void testBadRequestSyncSub() throws Exception { - testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pull(new BadPullRequestOptions()); - return sub; - }); - } - - @Test - public void testBadRequestAsyncSub() throws Exception { - testConflictStatus(400, BAD_REQUEST, TYPE_ERROR, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pull(new BadPullRequestOptions()); - return sub; - }); - } - - @Test - public void testNotFoundSyncSub() throws Exception { - testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pullNoWait(1); - return sub; - }); - } - - @Test - public void testNotFoundAsyncSub() throws Exception { - testConflictStatus(404, NO_MESSAGES, TYPE_NONE, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pullNoWait(1); - return sub; - }); - } - - @Test - public void testExceedsMaxRequestBytes1stMessageSyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); - sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); - return sub; - }); - } - - @Test - public void testExceedsMaxRequestBytes1stMessageAsyncSub() throws Exception { - testConflictStatus(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, "2.9.0", (nc, jsm, js, jstc, handler) -> { - Dispatcher d = nc.createDispatcher(); - PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), d, m -> {}, so); - sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); - return sub; - }); - } - @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { String dur = random(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(jstc.subject()).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, dur); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(ctx.subject()).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); // subject 7 + reply 52 + bytes 100 = 159 // subject 7 + reply 52 + bytes 100 + headers 21 = 180 - jstc.js.publish(jstc.subject(), new byte[100]); - jstc.js.publish(jstc.subject(), new Headers().add("foo", "bar"), new byte[100]); + ctx.js.publish(ctx.subject(), new byte[100]); + ctx.js.publish(ctx.subject(), new Headers().add("foo", "bar"), new byte[100]); // 1000 - 159 - 180 = 661 // subject 7 + reply 52 + bytes 610 = 669 > 661 - jstc.js.publish(jstc.subject(), new byte[610]); + ctx.js.publish(ctx.subject(), new byte[610]); sub.pull(PullRequestOptions.builder(10).maxBytes(1000).expiresIn(1000).build()); assertNotNull(sub.nextMessage(500)); @@ -1030,22 +1016,22 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testExceedsMaxRequestBytesExactBytes() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, jstc) -> { - String stream = randomWide(6); // six letters so I can count + runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { + ctx.stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes - createMemoryStream(nc, stream, subject); - jstc.jsm.addOrUpdateConsumer(stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); - PullSubscribeOptions so = PullSubscribeOptions.bind(stream, durable); - JetStreamSubscription sub = jstc.js.subscribe(subject, so); + ctx.createStream(subject); + ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, durable); + JetStreamSubscription sub = ctx.js.subscribe(subject, so); // 159 + 180 + 661 = 1000 // subject includes crlf // subject 7 + reply 52 + bytes 100 = 159 // subject 7 + reply 52 + bytes 100 + headers 21 = 180 // subject 7 + reply 52 + bytes 602 = 661 - jstc.js.publish(subject, new byte[100]); - jstc.js.publish(subject, new Headers().add("foo", "bar"), new byte[100]); - jstc.js.publish(subject, new byte[602]); + ctx.js.publish(subject, new byte[100]); + ctx.js.publish(subject, new Headers().add("foo", "bar"), new byte[100]); + ctx.js.publish(subject, new byte[602]); sub.pull(PullRequestOptions.builder(10).maxBytes(1000).expiresIn(1000).build()); assertNotNull(sub.nextMessage(500)); @@ -1058,13 +1044,13 @@ public void testExceedsMaxRequestBytesExactBytes() throws Exception { @Test public void testReader() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(ctx.consumerName()).filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - PullSubscribeOptions so = PullSubscribeOptions.bind(jstc.stream, jstc.consumerName()); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), so); + PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, ctx.consumerName()); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); JetStreamReader reader = sub.reader(500, 125); int stopCount = 500; @@ -1073,7 +1059,7 @@ public void testReader() throws Exception { AtomicInteger count = new AtomicInteger(); Thread readerThread = getReaderThread(count, stopCount, reader); - Publisher publisher = new Publisher(jstc.js, jstc.subject(), 25); + Publisher publisher = new Publisher(ctx.js, ctx.subject(), 25); Thread pubThread = new Thread(publisher); pubThread.start(); @@ -1116,16 +1102,15 @@ private static Thread getReaderThread(AtomicInteger count, int stopCount, JetStr @Test public void testOverflow() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 100); + runInShared(VersionUtils::atLeast2_11, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 100); // Setting PriorityPolicy requires at least one PriorityGroup to be set ConsumerConfiguration ccNoGroup = ConsumerConfiguration.builder() .priorityPolicy(PriorityPolicy.Overflow) .build(); JetStreamApiException jsae = assertThrows(JetStreamApiException.class, - () -> jstc.jsm.addOrUpdateConsumer(jstc.stream, ccNoGroup)); + () -> ctx.jsm.addOrUpdateConsumer(ctx.stream, ccNoGroup)); assertEquals(10159, jsae.getApiErrorCode()); // Testing errors @@ -1136,11 +1121,11 @@ public void testOverflow() throws Exception { .name(consumer) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - PullSubscribeOptions so = PullSubscribeOptions.fastBind(jstc.stream, consumer); - JetStreamSubscription sub = jstc.js.subscribe(null, so); + PullSubscribeOptions so = PullSubscribeOptions.fastBind(ctx.stream, consumer); + JetStreamSubscription sub = ctx.js.subscribe(null, so); // 400 Bad Request - Priority Group missing sub.pull(1); @@ -1159,12 +1144,12 @@ public void testOverflow() throws Exception { .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(60_000) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - so = PullSubscribeOptions.fastBind(jstc.stream, consumer); - JetStreamSubscription subPrime = jstc.js.subscribe(null, so); - JetStreamSubscription subOver = jstc.js.subscribe(null, so); + so = PullSubscribeOptions.fastBind(ctx.stream, consumer); + JetStreamSubscription subPrime = ctx.js.subscribe(null, so); + JetStreamSubscription subOver = ctx.js.subscribe(null, so); PullRequestOptions proNoMin = PullRequestOptions.builder(5) .group(group) @@ -1195,12 +1180,12 @@ public void testOverflow() throws Exception { .name(consumer) .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - so = PullSubscribeOptions.fastBind(jstc.stream, consumer); - subPrime = jstc.js.subscribe(null, so); - subOver = jstc.js.subscribe(null, so); + so = PullSubscribeOptions.fastBind(ctx.stream, consumer); + subPrime = ctx.js.subscribe(null, so); + subOver = ctx.js.subscribe(null, so); proNoMin = PullRequestOptions.builder(5) .group(group) @@ -1242,19 +1227,18 @@ public void testPrioritized() throws Exception { // start a priority 1 (#1) and a priority 2 (#2) consumer, #1 should get messages, #2 should get none // close the #1, #2 should get messages // start another priority 1 (#3), #2 should stop getting messages #3 should get messages - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String consumer = random(); String group = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .name(consumer) .priorityGroups(group) .priorityPolicy(PriorityPolicy.Prioritized) .build(); - StreamContext streamContext = nc.getStreamContext(jstc.stream); + StreamContext streamContext = nc.getStreamContext(ctx.stream); ConsumerContext consumerContext1 = streamContext.createOrUpdateConsumer(cc); ConsumerContext consumerContext2 = streamContext.getConsumerContext(consumer); @@ -1300,7 +1284,7 @@ public void testPrioritized() throws Exception { while (pub.get()) { ++count; try { - jstc.js.publish(jstc.subject(), ("x" + count).getBytes()); + ctx.js.publish(ctx.subject(), ("x" + count).getBytes()); sleep(20); } catch (Exception e) { @@ -1339,19 +1323,18 @@ public void testPinnedClient() throws Exception { // have 3 consumers in the same group all PriorityPolicy.PinnedClient // start consuming, tracking pin ids and counts // unpin 10 times and make sure that new pins are made - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_12, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String consumer = random(); String group = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .name(consumer) .priorityGroups(group) .priorityPolicy(PriorityPolicy.PinnedClient) .build(); - StreamContext streamContext = nc.getStreamContext(jstc.stream); + StreamContext streamContext = nc.getStreamContext(ctx.stream); ConsumerContext consumerContext1 = streamContext.createOrUpdateConsumer(cc); ConsumerContext consumerContext2 = streamContext.getConsumerContext(consumer); ConsumerContext consumerContext3 = streamContext.getConsumerContext(consumer); @@ -1404,7 +1387,7 @@ public void testPinnedClient() throws Exception { while (pub.get()) { ++count; try { - jstc.js.publish(jstc.subject(), ("x" + count).getBytes()); + ctx.js.publish(ctx.subject(), ("x" + count).getBytes()); sleep(20); } catch (Exception e) { @@ -1429,7 +1412,7 @@ public void testPinnedClient() throws Exception { assertTrue(consumerContext3.unpin(group)); break; case 3: - assertTrue(jstc.jsm.unpinConsumer(jstc.stream, consumer, group)); + assertTrue(ctx.jsm.unpinConsumer(ctx.stream, consumer, group)); break; } assertTrue(consumerContext1.unpin(group)); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index 33fa24b69..0c294e5b6 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -32,9 +32,9 @@ public class JetStreamPushAsyncTests extends JetStreamTestBase { @Test public void testHandlerSub() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // publish some messages - jsPublish(jstc.js, jstc.subject(), 10); + jsPublish(ctx.js, ctx.subject(), 10); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -50,7 +50,7 @@ public void testHandlerSub() throws Exception { }; // Subscribe using the handler - jstc.js.subscribe(jstc.subject(), dispatcher, handler, false); + ctx.js.subscribe(ctx.subject(), dispatcher, handler, false); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -62,9 +62,9 @@ public void testHandlerSub() throws Exception { @Test public void testHandlerAutoAck() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // publish some messages - jsPublish(jstc.js, jstc.subject(), 10); + jsPublish(ctx.js, ctx.subject(), 10); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -81,7 +81,7 @@ public void testHandlerAutoAck() throws Exception { // subscribe using the handler, auto ack true PushSubscribeOptions pso1 = PushSubscribeOptions.builder().durable(random()).build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), dispatcher, handler1, true, pso1); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), dispatcher, handler1, true, pso1); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -91,7 +91,7 @@ public void testHandlerAutoAck() throws Exception { // check that all the messages were read by the durable dispatcher.unsubscribe(sub); - sub = jstc.js.subscribe(jstc.subject(), pso1); + sub = ctx.js.subscribe(ctx.subject(), pso1); assertNull(sub.nextMessage(Duration.ofSeconds(1))); // 2. auto ack false @@ -107,7 +107,7 @@ public void testHandlerAutoAck() throws Exception { // subscribe using the handler, auto ack false ConsumerConfiguration cc = ConsumerConfiguration.builder().ackWait(Duration.ofMillis(500)).build(); PushSubscribeOptions pso2 = PushSubscribeOptions.builder().durable(random()).configuration(cc).build(); - sub = jstc.js.subscribe(jstc.subject(), dispatcher, handler2, false, pso2); + sub = ctx.js.subscribe(ctx.subject(), dispatcher, handler2, false, pso2); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -120,7 +120,7 @@ public void testHandlerAutoAck() throws Exception { sleep(1000); // just give it time for the server to realize the messages are not ack'ed dispatcher.unsubscribe(sub); - sub = jstc.js.subscribe(jstc.subject(), pso2); + sub = ctx.js.subscribe(ctx.subject(), pso2); List list = readMessagesAck(sub, false); assertEquals(10, list.size()); }); @@ -128,8 +128,8 @@ public void testHandlerAutoAck() throws Exception { @Test public void testCantNextMessageOnAsyncPushSub() throws Exception { - runInShared((nc, jstc) -> { - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), nc.createDispatcher(), msg -> {}, false); + runInShared((nc, ctx) -> { + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), nc.createDispatcher(), msg -> {}, false); // this should exception, can't next message on an async push sub assertThrows(IllegalStateException.class, () -> sub.nextMessage(Duration.ofMillis(1000))); @@ -140,7 +140,7 @@ public void testCantNextMessageOnAsyncPushSub() throws Exception { @Test public void testPushAsyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, ctx) -> { byte[] data = new byte[8192]; int MSG_COUNT = 1000; @@ -149,7 +149,7 @@ public void testPushAsyncFlowControl() throws Exception { for (int x = 100_000; x < MSG_COUNT + 100_000; x++) { byte[] fill = (""+ x).getBytes(); System.arraycopy(fill, 0, data, 0, 6); - jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).data(data).build()); + ctx.js.publish(NatsMessage.builder().subject(ctx.subject()).data(data).build()); } // create a dispatcher without a default handler. @@ -172,7 +172,7 @@ public void testPushAsyncFlowControl() throws Exception { ConsumerConfiguration cc = ConsumerConfiguration.builder().flowControl(1000).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - jstc.js.subscribe(jstc.subject(), dispatcher, handler, false, pso); + ctx.js.subscribe(ctx.subject(), dispatcher, handler, false, pso); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -187,14 +187,14 @@ public void testPushAsyncFlowControl() throws Exception { public void testDoNotAutoAckSituations() throws Exception { String mockAckReply = random(); // "mock-ack-reply."; - runInSharedCustomStream((nc, jstc) -> { - String subject = jstc.subject(); - jstc.createStream(subject, subjectStar(mockAckReply)); + runInSharedCustom((nc, ctx) -> { + String subject = ctx.subject(); + ctx.createStream(subject, subjectStar(mockAckReply)); int pubCount = 5; // publish a message - jsPublish(jstc.js, subject, pubCount); + jsPublish(ctx.js, subject, pubCount); // create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -235,7 +235,7 @@ else if (f == 4) { }; // subscribe using the handler, auto ack true - JetStreamSubscription async = jstc.js.subscribe(subject, dispatcher, handler, true); + JetStreamSubscription async = ctx.js.subscribe(subject, dispatcher, handler, true); // Wait for messages to arrive using the countdown latch. // make sure we don't wait forever @@ -243,7 +243,7 @@ else if (f == 4) { assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); - JetStreamSubscription mockAckReplySub = jstc.js.subscribe(subjectStar(mockAckReply)); + JetStreamSubscription mockAckReplySub = ctx.js.subscribe(subjectStar(mockAckReply)); Message msg = mockAckReplySub.nextMessage(2000); assertEquals(subjectDot(mockAckReply, "ack"), msg.getSubject()); assertEquals("+ACK", new String(msg.getData())); @@ -272,7 +272,7 @@ else if (f == 4) { // coverage explicit no ack flag msgLatchRef.set(new CountDownLatch(pubCount)); PushSubscribeOptions pso = ConsumerConfiguration.builder().ackWait(Duration.ofMinutes(2)).buildPushSubscribeOptions(); - async = jstc.js.subscribe(subject, dispatcher, handler, false, pso); + async = ctx.js.subscribe(subject, dispatcher, handler, false, pso); awaitAndAssert(msgLatchRef.get()); assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); @@ -283,7 +283,7 @@ else if (f == 4) { // coverage explicit AckPolicyNone msgLatchRef.set(new CountDownLatch(pubCount)); pso = ConsumerConfiguration.builder().ackPolicy(AckPolicy.None).buildPushSubscribeOptions(); - async = jstc.js.subscribe(subject, dispatcher, handler, true, pso); + async = ctx.js.subscribe(subject, dispatcher, handler, true, pso); awaitAndAssert(msgLatchRef.get()); assertEquals(0, msgLatchRef.get().getCount()); dispatcher.unsubscribe(async); @@ -316,14 +316,13 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .put(KV_OPERATION_HEADER_KEY, KeyValueOperation.PURGE.name()) .put(ROLLUP_HDR, ROLLUP_HDR_SUBJECT); - runInSharedCustomStream((nc, jstc) -> { - StreamConfiguration sc = jstc.scBuilder(0) - .subjects(sub) + runInSharedCustom((nc, ctx) -> { + StreamConfiguration sc = ctx.scBuilder(sub) .allowRollup(true) .denyDelete(true) .build(); - jstc.jsm.addStream(sc); + ctx.jsm.addStream(sc); MemStorBugHandler fullHandler = new MemStorBugHandler(); MemStorBugHandler onlyHandler = new MemStorBugHandler(); @@ -345,8 +344,8 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .buildPushSubscribeOptions(); Dispatcher d = nc.createDispatcher(); - jstc.js.subscribe(sub, d, fullHandler, false, psoFull); - jstc.js.subscribe(sub, d, onlyHandler, false, psoOnly); + ctx.js.subscribe(sub, d, fullHandler, false, psoFull); + ctx.js.subscribe(sub, d, onlyHandler, false, psoOnly); Object[] expecteds = new Object[] { "a", "aa", "z", "zz", @@ -356,22 +355,22 @@ public void testMemoryStorageServerBugPR2719() throws Exception { KeyValueOperation.PURGE, KeyValueOperation.PURGE, }; - jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[0]).build()); - jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[1]).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[2]).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[3]).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[0]).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[1]).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[2]).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[3]).build()); - jstc.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); - jstc.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[6]).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[7]).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).data((String)expecteds[6]).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).data((String)expecteds[7]).build()); - jstc.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).headers(deleteHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).headers(deleteHeaders).build()); - jstc.js.publish(NatsMessage.builder().subject(key1).headers(purgeHeaders).build()); - jstc.js.publish(NatsMessage.builder().subject(key2).headers(purgeHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key1).headers(purgeHeaders).build()); + ctx.js.publish(NatsMessage.builder().subject(key2).headers(purgeHeaders).build()); sleep(2000); // give time for the handler to get messages diff --git a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java index ffbc944af..590013735 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushQueueTests.java @@ -32,21 +32,21 @@ public class JetStreamPushQueueTests extends JetStreamTestBase { @Test public void testQueueSubWorkflow() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // Set up the subscribers // - the PushSubscribeOptions can be re-used since all the subscribers are the same // - use a concurrent integer to track all the messages received // - have a list of subscribers and threads so I can track them - PushSubscribeOptions pso = PushSubscribeOptions.builder().durable(jstc.consumerName()).build(); + PushSubscribeOptions pso = PushSubscribeOptions.builder().durable(ctx.consumerName()).build(); AtomicInteger allReceived = new AtomicInteger(); List subscribers = new ArrayList<>(); String queue = random(); List subThreads = new ArrayList<>(); for (int id = 1; id <= 3; id++) { // set up the subscription - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), queue, pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), queue, pso); // create and track the runnable - JsQueueSubscriber qs = new JsQueueSubscriber(100, jstc.js, sub, allReceived); + JsQueueSubscriber qs = new JsQueueSubscriber(100, ctx.js, sub, allReceived); subscribers.add(qs); // create, track and start the thread Thread t = new Thread(qs); @@ -56,7 +56,7 @@ public void testQueueSubWorkflow() throws Exception { nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // create and start the publishing - Thread pubThread = new Thread(new JsPublisher(jstc.js, jstc.subject(), 100)); + Thread pubThread = new Thread(new JsPublisher(ctx.js, ctx.subject(), 100)); pubThread.start(); // wait for all threads to finish diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index 2f7b8897c..1389895a6 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -46,16 +46,16 @@ public void testPushEphemeralWithDeliver() throws Exception { } private void _testPushEphemeral(String deliverSubject) throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // publish some messages - jsPublish(jstc.js, jstc.subject(), 1, 5); + jsPublish(ctx.js, ctx.subject(), 1, 5); // Build our subscription options. PushSubscribeOptions options = PushSubscribeOptions.builder().deliverSubject(deliverSubject).build(); // Subscription 1 - JetStreamSubscription sub1 = jstc.js.subscribe(jstc.subject(), options); - assertSubscription(sub1, jstc.stream, null, deliverSubject, false); + JetStreamSubscription sub1 = ctx.js.subscribe(ctx.subject(), options); + assertSubscription(sub1, ctx.stream, null, deliverSubject, false); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // read what is available @@ -74,7 +74,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { unsubscribeEnsureNotBound(sub1); // Subscription 2 - JetStreamSubscription sub2 = jstc.js.subscribe(jstc.subject(), options); + JetStreamSubscription sub2 = ctx.js.subscribe(ctx.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // read what is available, same messages @@ -92,7 +92,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { unsubscribeEnsureNotBound(sub2); // Subscription 3 testing null timeout - JetStreamSubscription sub3 = jstc.js.subscribe(jstc.subject(), options); + JetStreamSubscription sub3 = ctx.js.subscribe(ctx.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server sleep(1000); // give time to make sure the messages get to the client @@ -100,7 +100,7 @@ private void _testPushEphemeral(String deliverSubject) throws Exception { validateRedAndTotal(5, messages0.size(), 5, 5); // Subscription 4 testing timeout <= 0 duration / millis - JetStreamSubscription sub4 = jstc.js.subscribe(jstc.subject(), options); + JetStreamSubscription sub4 = ctx.js.subscribe(ctx.subject(), options); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server sleep(1000); // give time to make sure the messages get to the client assertNotNull(sub4.nextMessage(Duration.ZERO)); @@ -123,64 +123,64 @@ public void testPushDurableWithDeliver() throws Exception { } private void _testPushDurable(boolean useDeliverSubject) throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { // create the stream. String stream = random(); String subjectDotGt = random() + ".>"; - createMemoryStream(nc, stream, subjectDotGt); + createMemoryStream(ctx.jsm, stream, subjectDotGt); // For async, create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); // normal, no bind - _testPushDurableSubSync(jstc, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { + _testPushDurableSubSync(ctx, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder() .durable(cc.getDurable()) .deliverSubject(cc.getDeliverSubject()) .build(); - return jstc.js.subscribe(s, options); + return ctx.js.subscribe(s, options); }); - _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { + _testPushDurableSubAsync(ctx, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder() .durable(cc.getDurable()) .deliverSubject(cc.getDeliverSubject()) .build(); - return jstc.js.subscribe(s, d, h, false, options); + return ctx.js.subscribe(s, d, h, false, options); }); // use configuration, no bind - _testPushDurableSubSync(jstc, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { + _testPushDurableSubSync(ctx, stream, subjectDotGt, useDeliverSubject, false, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().configuration(cc).build(); - return jstc.js.subscribe(s, options); + return ctx.js.subscribe(s, options); }); - _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { + _testPushDurableSubAsync(ctx, dispatcher, stream, subjectDotGt, useDeliverSubject, false, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().configuration(cc).build(); - return jstc.js.subscribe(s, d, h, false, options); + return ctx.js.subscribe(s, d, h, false, options); }); if (useDeliverSubject) { // bind long form - _testPushDurableSubSync(jstc, stream, subjectDotGt, true, true, (s, cc) -> { + _testPushDurableSubSync(ctx, stream, subjectDotGt, true, true, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().stream(stream).durable(cc.getDurable()).bind(true).build(); - return jstc.js.subscribe(s, options); + return ctx.js.subscribe(s, options); }); - _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { + _testPushDurableSubAsync(ctx, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.builder().stream(stream).durable(cc.getDurable()).bind(true).build(); - return jstc.js.subscribe(s, d, h, false, options); + return ctx.js.subscribe(s, d, h, false, options); }); // bind short form - _testPushDurableSubSync(jstc, stream, subjectDotGt, true, true, (s, cc) -> { + _testPushDurableSubSync(ctx, stream, subjectDotGt, true, true, (s, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.bind(stream, cc.getDurable()); - return jstc.js.subscribe(s, options); + return ctx.js.subscribe(s, options); }); - _testPushDurableSubAsync(jstc, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { + _testPushDurableSubAsync(ctx, dispatcher, stream, subjectDotGt, true, true, (s, d, h, cc) -> { PushSubscribeOptions options = PushSubscribeOptions.bind(stream, cc.getDurable()); - return jstc.js.subscribe(s, d, h, false, options); + return ctx.js.subscribe(s, d, h, false, options); }); } }); @@ -194,7 +194,7 @@ private interface SubscriptionSupplierAsync { JetStreamSubscription get(String subject, Dispatcher dispatcher, MessageHandler handler, ConsumerConfiguration cc) throws IOException, JetStreamApiException; } - private void _testPushDurableSubSync(JetStreamTestingContext jstc, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplier supplier) throws Exception { + private void _testPushDurableSubSync(JetStreamTestingContext ctx, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplier supplier) throws Exception { String subject = subjectDotGt.replace(">", random()); String durable = random(); String deliverSubject = useDeliverSubject ? random() : null; @@ -205,11 +205,11 @@ private void _testPushDurableSubSync(JetStreamTestingContext jstc, String stream .build(); if (bind) { - jstc.jsm.addOrUpdateConsumer(stream, cc); + ctx.jsm.addOrUpdateConsumer(stream, cc); } // publish some messages - jsPublish(jstc.js, subject, 1, 5); + jsPublish(ctx.js, subject, 1, 5); JetStreamSubscription sub = supplier.get(subject, cc); assertSubscription(sub, stream, durable, deliverSubject, false); @@ -237,7 +237,7 @@ private void _testPushDurableSubSync(JetStreamTestingContext jstc, String stream unsubscribeEnsureNotBound(sub); } - private void _testPushDurableSubAsync(JetStreamTestingContext jstc, Dispatcher dispatcher, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplierAsync supplier) throws IOException, JetStreamApiException, InterruptedException { + private void _testPushDurableSubAsync(JetStreamTestingContext ctx, Dispatcher dispatcher, String stream, String subjectDotGt, boolean useDeliverSubject, boolean bind, SubscriptionSupplierAsync supplier) throws IOException, JetStreamApiException, InterruptedException { String subject = subjectDotGt.replace(">", random()); String deliverSubject = useDeliverSubject ? random() : null; ConsumerConfiguration cc = ConsumerConfiguration.builder() @@ -246,11 +246,11 @@ private void _testPushDurableSubAsync(JetStreamTestingContext jstc, Dispatcher d .filterSubject(subject) .build(); if (bind) { - jstc.jsm.addOrUpdateConsumer(stream, cc); + ctx.jsm.addOrUpdateConsumer(stream, cc); } // publish some messages - jsPublish(jstc.js, subject, 5); + jsPublish(ctx.js, subject, 5); CountDownLatch msgLatch = new CountDownLatch(5); AtomicInteger received = new AtomicInteger(); @@ -274,16 +274,16 @@ private void _testPushDurableSubAsync(JetStreamTestingContext jstc, Dispatcher d @Test public void testCantPullOnPushSub() throws Exception { - runInShared((nc, jstc) -> { - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); - assertSubscription(sub, jstc.stream, null, null, false); + runInShared((nc, ctx) -> { + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject()); + assertSubscription(sub, ctx.stream, null, null, false); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server assertCantPullOnPushSub(sub); unsubscribeEnsureNotBound(sub); PushSubscribeOptions pso = PushSubscribeOptions.builder().ordered(true).build(); - sub = jstc.js.subscribe(jstc.subject(), pso); + sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server assertCantPullOnPushSub(sub); @@ -307,12 +307,12 @@ private void assertCantPullOnPushSub(JetStreamSubscription sub) { @Test public void testHeadersOnly() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { PushSubscribeOptions pso = ConsumerConfiguration.builder().headersOnly(true).buildPushSubscribeOptions(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server - jsPublish(jstc.js, jstc.subject(), 5); + jsPublish(ctx.js, ctx.subject(), 5); List messages = readMessagesAck(sub, Duration.ZERO, 5); assertEquals(5, messages.size()); @@ -324,14 +324,14 @@ public void testHeadersOnly() throws Exception { @Test public void testAcks() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { ConsumerConfiguration cc = ConsumerConfiguration.builder().ackWait(Duration.ofMillis(1500)).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); nc.flush(Duration.ofSeconds(1)); // flush outgoing communication with/to the server // TERM - jsPublish(jstc.js, jstc.subject(), "TERM", 1); + jsPublish(ctx.js, ctx.subject(), "TERM", 1); Message message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -343,7 +343,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // Ack Wait timeout - jsPublish(jstc.js, jstc.subject(), "WAIT", 1); + jsPublish(ctx.js, ctx.subject(), "WAIT", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -359,7 +359,7 @@ public void testAcks() throws Exception { assertEquals("WAIT1", data); // In Progress - jsPublish(jstc.js, jstc.subject(), "PRO", 1); + jsPublish(ctx.js, ctx.subject(), "PRO", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -383,7 +383,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // ACK Sync - jsPublish(jstc.js, jstc.subject(), "ACKSYNC", 1); + jsPublish(ctx.js, ctx.subject(), "ACKSYNC", 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -395,7 +395,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); // NAK - jsPublish(jstc.js, jstc.subject(), "NAK", 1, 1); + jsPublish(ctx.js, ctx.subject(), "NAK", 1, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -413,7 +413,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); - jsPublish(jstc.js, jstc.subject(), "NAK", 2, 1); + jsPublish(ctx.js, ctx.subject(), "NAK", 2, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -433,7 +433,7 @@ public void testAcks() throws Exception { assertNull(sub.nextMessage(Duration.ofMillis(500))); - jsPublish(jstc.js, jstc.subject(), "NAK", 3, 1); + jsPublish(ctx.js, ctx.subject(), "NAK", 3, 1); message = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(message); @@ -457,28 +457,28 @@ public void testAcks() throws Exception { @Test public void testDeliveryPolicy() throws Exception { - runInSharedCustomStream((nc, jstc) -> { - String subject = jstc.subject(); + runInSharedCustom((nc, ctx) -> { + String subject = ctx.subject(); String subjectStar = subjectStar(subject); - jstc.createStream(subjectStar); + ctx.createStream(subjectStar); String subjectA = subjectDot(subject, "A"); String subjectB = subjectDot(subject, "B"); - jstc.js.publish(subjectA, dataBytes(1)); - jstc.js.publish(subjectA, dataBytes(2)); + ctx.js.publish(subjectA, dataBytes(1)); + ctx.js.publish(subjectA, dataBytes(2)); sleep(1500); - jstc.js.publish(subjectA, dataBytes(3)); - jstc.js.publish(subjectB, dataBytes(91)); - jstc.js.publish(subjectB, dataBytes(92)); + ctx.js.publish(subjectA, dataBytes(3)); + ctx.js.publish(subjectB, dataBytes(91)); + ctx.js.publish(subjectB, dataBytes(92)); - jstc.jsm.deleteMessage(jstc.stream, 4); + ctx.jsm.deleteMessage(ctx.stream, 4); // DeliverPolicy.All PushSubscribeOptions pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.All).build()) .build(); - JetStreamSubscription sub = jstc.js.subscribe(subjectA, pso); + JetStreamSubscription sub = ctx.js.subscribe(subjectA, pso); Message m1 = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m1, 1); Message m2 = sub.nextMessage(Duration.ofSeconds(1)); @@ -490,7 +490,7 @@ public void testDeliveryPolicy() throws Exception { pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.Last).build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); Message m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); assertNull(sub.nextMessage(Duration.ofMillis(200))); @@ -499,12 +499,12 @@ public void testDeliveryPolicy() throws Exception { pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder().deliverPolicy(DeliverPolicy.New).build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); assertNull(sub.nextMessage(Duration.ofSeconds(1))); // DeliverPolicy.New - New message between subscribe and next message - sub = jstc.js.subscribe(subjectA, pso); - jstc.js.publish(subjectA, dataBytes(4)); + sub = ctx.js.subscribe(subjectA, pso); + ctx.js.publish(subjectA, dataBytes(4)); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 4); @@ -515,7 +515,7 @@ public void testDeliveryPolicy() throws Exception { .startSequence(3) .build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -528,7 +528,7 @@ public void testDeliveryPolicy() throws Exception { .startTime(m3.metaData().timestamp().minusSeconds(1)) .build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 3); m = sub.nextMessage(Duration.ofSeconds(1)); @@ -541,16 +541,16 @@ public void testDeliveryPolicy() throws Exception { .filterSubject(subjectA) .build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 4); // DeliverPolicy.ByStartSequence with a deleted record - PublishAck pa4 = jstc.js.publish(subjectA, dataBytes(4)); - PublishAck pa5 = jstc.js.publish(subjectA, dataBytes(5)); - jstc.js.publish(subjectA, dataBytes(6)); - jstc.jsm.deleteMessage(jstc.stream, pa4.getSeqno()); - jstc.jsm.deleteMessage(jstc.stream, pa5.getSeqno()); + PublishAck pa4 = ctx.js.publish(subjectA, dataBytes(4)); + PublishAck pa5 = ctx.js.publish(subjectA, dataBytes(5)); + ctx.js.publish(subjectA, dataBytes(6)); + ctx.jsm.deleteMessage(ctx.stream, pa4.getSeqno()); + ctx.jsm.deleteMessage(ctx.stream, pa5.getSeqno()); pso = PushSubscribeOptions.builder() .configuration(ConsumerConfiguration.builder() @@ -558,7 +558,7 @@ public void testDeliveryPolicy() throws Exception { .startSequence(pa4.getSeqno()) .build()) .build(); - sub = jstc.js.subscribe(subjectA, pso); + sub = ctx.js.subscribe(subjectA, pso); m = sub.nextMessage(Duration.ofSeconds(1)); assertMessage(m, 6); }); @@ -572,7 +572,7 @@ private void assertMessage(Message m, int i) { @Test public void testPushSyncFlowControl() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, ctx) -> { byte[] data = new byte[1024*10]; int MSG_COUNT = 1000; @@ -581,7 +581,7 @@ public void testPushSyncFlowControl() throws Exception { for (int x = 100_000; x < MSG_COUNT + 100_000; x++) { byte[] fill = ("" + x).getBytes(); System.arraycopy(fill, 0, data, 0, 6); - jstc.js.publish(NatsMessage.builder().subject(jstc.subject()).data(data).build()); + ctx.js.publish(NatsMessage.builder().subject(ctx.subject()).data(data).build()); } // reset the counters @@ -589,7 +589,7 @@ public void testPushSyncFlowControl() throws Exception { ConsumerConfiguration cc = ConsumerConfiguration.builder().flowControl(1000).build(); PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(cc).build(); - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject(), pso); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), pso); for (int x = 0; x < MSG_COUNT; x++) { Message msg = sub.nextMessage(1000); set.add(new String(Arrays.copyOf(msg.getData(), 6))); @@ -603,13 +603,13 @@ public void testPushSyncFlowControl() throws Exception { // coverage for subscribe options heartbeat directly cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); pso = PushSubscribeOptions.builder().configuration(cc).build(); - jstc.js.subscribe(jstc.subject(), pso); + ctx.js.subscribe(ctx.subject(), pso); }); } @Test public void testPendingLimits() throws Exception { - runInShared((nc, jstc) -> { + runInShared((nc, ctx) -> { int customMessageLimit = 1000; int customByteLimit = 1024 * 1024; @@ -631,19 +631,19 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(-1) .build(); - JetStreamSubscription syncSub = jstc.js.subscribe(jstc.subject(), psoDefaultSync); + JetStreamSubscription syncSub = ctx.js.subscribe(ctx.subject(), psoDefaultSync); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, syncSub.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, syncSub.getPendingByteLimit()); - syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSync); + syncSub = ctx.js.subscribe(ctx.subject(), psoCustomSync); assertEquals(customMessageLimit, syncSub.getPendingMessageLimit()); assertEquals(customByteLimit, syncSub.getPendingByteLimit()); - syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSyncUnlimited0); + syncSub = ctx.js.subscribe(ctx.subject(), psoCustomSyncUnlimited0); assertEquals(0, syncSub.getPendingMessageLimit()); assertEquals(0, syncSub.getPendingByteLimit()); - syncSub = jstc.js.subscribe(jstc.subject(), psoCustomSyncUnlimitedUnlimitedNegative); + syncSub = ctx.js.subscribe(ctx.subject(), psoCustomSyncUnlimitedUnlimitedNegative); assertEquals(0, syncSub.getPendingMessageLimit()); assertEquals(0, syncSub.getPendingByteLimit()); @@ -658,11 +658,11 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(Consumer.DEFAULT_MAX_BYTES) .build(); - JetStreamSubscription subAsync = jstc.js.subscribe(jstc.subject(), d, m -> {}, false, psoAsyncDefault); + JetStreamSubscription subAsync = ctx.js.subscribe(ctx.subject(), d, m -> {}, false, psoAsyncDefault); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, subAsync.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, subAsync.getPendingByteLimit()); - subAsync = jstc.js.subscribe(jstc.subject(), d, m -> {}, false, psoAsyncNonDefaultValid); + subAsync = ctx.js.subscribe(ctx.subject(), d, m -> {}, false, psoAsyncNonDefaultValid); assertEquals(Consumer.DEFAULT_MAX_MESSAGES, subAsync.getPendingMessageLimit()); assertEquals(Consumer.DEFAULT_MAX_BYTES, subAsync.getPendingByteLimit()); @@ -682,10 +682,10 @@ public void testPendingLimits() throws Exception { .pendingByteLimit(0) .build(); - assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeMessages)); - assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeBytes)); - assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Messages)); - assertClientError(JsSubPushAsyncCantSetPending, () -> jstc.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Bytes)); + assertClientError(JsSubPushAsyncCantSetPending, () -> ctx.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeMessages)); + assertClientError(JsSubPushAsyncCantSetPending, () -> ctx.js.subscribe(random(), d, m ->{}, false, psoAsyncNopeBytes)); + assertClientError(JsSubPushAsyncCantSetPending, () -> ctx.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Messages)); + assertClientError(JsSubPushAsyncCantSetPending, () -> ctx.js.subscribe(random(), d, m ->{}, false, psoAsyncNope2Bytes)); }); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java index 9929e34f0..bfc549ab0 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java @@ -15,47 +15,56 @@ import io.nats.client.Connection; import io.nats.client.JetStreamApiException; -import io.nats.client.api.StorageType; -import io.nats.client.api.StreamConfiguration; -import io.nats.client.api.StreamInfo; +import io.nats.client.api.*; import io.nats.client.utils.TestBase; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; public class JetStreamTestingContext implements AutoCloseable { public final NatsJetStreamManagement jsm; public final NatsJetStream js; - public final String stream; - public StreamInfo si; + public final NatsKeyValueManagement kvm; + public final NatsObjectStoreManagement osm; private final String subjectBase; private final Map subjects; private final String consumerNameBase; private final Map consumerNames; + public String stream; + public StreamInfo si; - public JetStreamTestingContext(Connection nc) throws JetStreamApiException, IOException { - this(nc, 1); - } + private final List kvBuckets; + private final List osBuckets; public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStreamApiException, IOException { - this.jsm = (NatsJetStreamManagement)nc.jetStreamManagement(); - this.js = (NatsJetStream)nc.jetStream(); + jsm = (NatsJetStreamManagement)nc.jetStreamManagement(); + js = (NatsJetStream)jsm.jetStream(); + kvm = (NatsKeyValueManagement)jsm.keyValueManagement(); + osm = (NatsObjectStoreManagement)jsm.objectStoreManagement(); + stream = TestBase.random(); subjectBase = TestBase.random(); - this.subjects = new HashMap<>(); + subjects = new HashMap<>(); consumerNameBase = TestBase.random(); - this.consumerNames = new HashMap<>(); + consumerNames = new HashMap<>(); if (subjectCount > 0) { - this.si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); + si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); } else { - this.si = null; + si = null; } + kvBuckets = new ArrayList<>(); + osBuckets = new ArrayList<>(); } + // ---------------------------------------------------------------------------------------------------- + // JetStream + // ---------------------------------------------------------------------------------------------------- public String[] getSubjects(int subjectCount) { String[] subjects = new String[subjectCount]; for (int x = 0; x < subjectCount; x++) { @@ -86,6 +95,13 @@ public StreamConfiguration.Builder scBuilder(int subjectCount) { return b; } + public StreamConfiguration.Builder scBuilder(String... subjects) { + return StreamConfiguration.builder() + .name(stream) + .storageType(StorageType.Memory) + .subjects(subjects); + } + public StreamInfo addStream(StreamConfiguration.Builder builder) throws JetStreamApiException, IOException { si = jsm.addStream(builder.name(stream).storageType(StorageType.Memory).build()); return si; @@ -101,20 +117,15 @@ public void replaceStream(String... newSubjects) throws JetStreamApiException, I createStream(newSubjects); } - public StreamInfo replaceStream(StreamConfiguration newSc) throws JetStreamApiException, IOException { + public void replaceStream(StreamConfiguration newSc) throws JetStreamApiException, IOException { jsm.deleteStream(stream); - return addStream(newSc); + addStream(newSc); } public boolean deleteStream() throws JetStreamApiException, IOException { return jsm.deleteStream(stream); } - @Override - public void close() throws Exception { - try { jsm.deleteStream(stream); } catch (Exception ignore) {} - } - public String subject() { return subject(0); } @@ -130,4 +141,61 @@ public String consumerName() { public String consumerName(Object variant) { return consumerNames.computeIfAbsent(variant, v -> consumerNameBase + "-" + v); } + + // ---------------------------------------------------------------------------------------------------- + // KeyValue + // ---------------------------------------------------------------------------------------------------- + public KeyValueConfiguration.Builder kvBuilder(String bucketName) { + return KeyValueConfiguration.builder() + .name(bucketName) + .storageType(StorageType.Memory); + } + + public KeyValueStatus kvCreate(String bucketName) throws JetStreamApiException, IOException { + return kvCreate(kvBuilder(bucketName).build()); + } + + public KeyValueStatus kvCreate(KeyValueConfiguration.Builder builder) throws JetStreamApiException, IOException { + return kvCreate(builder.build()); + } + + public KeyValueStatus kvCreate(KeyValueConfiguration kvc) throws JetStreamApiException, IOException { + kvBuckets.add(kvc.getBucketName()); + return kvm.create(kvc); + } + + // ---------------------------------------------------------------------------------------------------- + // ObjectStore + // ---------------------------------------------------------------------------------------------------- + public ObjectStoreConfiguration.Builder osBuilder(String bucketName) { + return ObjectStoreConfiguration.builder() + .name(bucketName) + .storageType(StorageType.Memory); + } + + public ObjectStoreStatus osCreate(String bucketName) throws JetStreamApiException, IOException { + return osCreate(osBuilder(bucketName).build()); + } + + public ObjectStoreStatus osCreate(ObjectStoreConfiguration.Builder builder) throws JetStreamApiException, IOException { + return osCreate(builder.build()); + } + + public ObjectStoreStatus osCreate(ObjectStoreConfiguration osc) throws JetStreamApiException, IOException { + osBuckets.add(osc.getBucketName()); + return osm.create(osc); + } + + @Override + public void close() throws Exception { + try { jsm.deleteStream(stream); } catch (Exception ignore) {} + + for (String bucket : kvBuckets) { + try { kvm.delete(bucket); } catch (Exception ignore) {} + } + + for (String bucket : osBuckets) { + try { osm.delete(bucket); } catch (Exception ignore) {} + } + } } diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index e128becfa..504919e0a 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -37,7 +37,6 @@ import static io.nats.client.support.NatsJetStreamConstants.SERVER_DEFAULT_DUPLICATE_WINDOW_MS; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; -import static io.nats.client.utils.VersionUtils.atLeast2_10; import static org.junit.jupiter.api.Assertions.*; public class KeyValueTests extends JetStreamTestBase { @@ -45,7 +44,6 @@ public class KeyValueTests extends JetStreamTestBase { @Test public void testWorkflow() throws Exception { long now = ZonedDateTime.now().toEpochSecond(); - String byteKey = "key.byte" + random(); String stringKey = "key.string" + random(); String longKey = "key.long" + random(); @@ -55,9 +53,7 @@ public void testWorkflow() throws Exception { String stringValue1 = "String Value 1"; String stringValue2 = "String Value 2"; - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - // get the kv management context - KeyValueManagement kvm = jsm.keyValueManagement(); + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { nc.keyValueManagement(KeyValueOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage Map metadata = new HashMap<>(); @@ -66,15 +62,10 @@ public void testWorkflow() throws Exception { // create the bucket String bucket = random(); String desc = random(); - KeyValueConfiguration kvc = KeyValueConfiguration.builder() - .name(bucket) - .description(desc) - .maxHistoryPerKey(3) - .storageType(StorageType.Memory) - .metadata(metadata) - .build(); - - KeyValueStatus status = kvm.create(kvc); + KeyValueStatus status = ctx.kvCreate(ctx.kvBuilder(bucket) + .description(desc) + .maxHistoryPerKey(3) + .metadata(metadata)); assertInitialStatus(status, bucket, desc); // get the kv context for the specific bucket @@ -143,10 +134,9 @@ public void testWorkflow() throws Exception { assertHistory(longHistory, kv.history(longKey)); // let's check the bucket info - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 3, 3); - //noinspection deprecation - status = kvm.getBucketInfo(bucket); // coverage for deprecated + status = ctx.kvm.getBucketInfo(bucket); assertState(status, 3, 3); // delete a key. Its entry will still exist, but its value is null @@ -160,7 +150,7 @@ public void testWorkflow() throws Exception { assertNotEquals(byteHistory.get(0).hashCode(), byteHistory.get(1).hashCode()); // let's check the bucket info - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 4, 4); // if the key has been deleted no entry is returned @@ -196,7 +186,7 @@ public void testWorkflow() throws Exception { assertHistory(longHistory, kv.history(longKey)); // let's check the bucket info - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 7, 7); // make sure it only keeps the correct amount of history @@ -207,7 +197,7 @@ public void testWorkflow() throws Exception { assertEntry(bucket, longKey, KeyValueOperation.PUT, 8, "3", now, kv.get(longKey))); assertHistory(longHistory, kv.history(longKey)); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 8, 8); // this would be the 4th entry for the longKey @@ -222,7 +212,7 @@ public void testWorkflow() throws Exception { assertHistory(longHistory, kv.history(longKey)); // record count does not increase - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 8, 9); assertKeys(kv.keys(), byteKey, stringKey, longKey); @@ -242,7 +232,7 @@ public void testWorkflow() throws Exception { longHistory.add(KeyValueOperation.PURGE); assertHistory(longHistory, kv.history(longKey)); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 6, 10); // only 2 keys now @@ -255,7 +245,7 @@ public void testWorkflow() throws Exception { byteHistory.add(KeyValueOperation.PURGE); assertHistory(byteHistory, kv.history(byteKey)); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 4, 11); // only 1 key now @@ -268,7 +258,7 @@ public void testWorkflow() throws Exception { stringHistory.add(KeyValueOperation.PURGE); assertHistory(stringHistory, kv.history(stringKey)); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 3, 12); // no more keys left @@ -278,7 +268,7 @@ public void testWorkflow() throws Exception { // clear things KeyValuePurgeOptions kvpo = KeyValuePurgeOptions.builder().deleteMarkersNoThreshold().build(); kv.purgeDeletes(kvpo); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 0, 12); longHistory.clear(); @@ -311,15 +301,15 @@ public void testWorkflow() throws Exception { assertHistory(longHistory, kv.history(longKey)); assertHistory(stringHistory, kv.history(stringKey)); - status = kvm.getStatus(bucket); + status = ctx.kvm.getStatus(bucket); assertState(status, 5, 17); // delete the bucket - kvm.delete(bucket); - assertThrows(JetStreamApiException.class, () -> kvm.delete(bucket)); - assertThrows(JetStreamApiException.class, () -> kvm.getStatus(bucket)); + ctx.kvm.delete(bucket); + assertThrows(JetStreamApiException.class, () -> ctx.kvm.delete(bucket)); + assertThrows(JetStreamApiException.class, () -> ctx.kvm.getStatus(bucket)); - assertEquals(0, kvm.getBucketNames().size()); + assertEquals(0, ctx.kvm.getBucketNames().size()); }); } @@ -367,15 +357,9 @@ private void assertInitialStatus(KeyValueStatus status, String bucket, String de @Test public void testGetRevision() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .maxHistoryPerKey(2) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(2)); String key = random(); KeyValue kv = nc.keyValue(bucket); @@ -405,15 +389,9 @@ public void testGetRevision() throws Exception { @Test public void testKeys() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - - // create bucket + runInSharedCustom((nc, ctx) -> { String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(bucket); KeyValue kv = nc.keyValue(bucket); for (int x = 1; x <= 10; x++) { @@ -495,17 +473,12 @@ private static List getKeysFromQueue(LinkedBlockingQueue q) { @Test public void testMaxHistoryPerKey() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { String bucket1 = random(); String bucket2 = random(); - // default maxHistoryPerKey is 1 - kvm.create(KeyValueConfiguration.builder() - .name(bucket1) - .storageType(StorageType.Memory) - .build()); + // default maxHistoryPerKey is 1 + ctx.kvCreate(bucket1); KeyValue kv = nc.keyValue(bucket1); String key = random(); kv.put(key, 1); @@ -515,11 +488,7 @@ public void testMaxHistoryPerKey() throws Exception { assertEquals(1, history.size()); assertEquals(2, history.get(0).getValueAsLong()); - kvm.create(KeyValueConfiguration.builder() - .name(bucket2) - .maxHistoryPerKey(2) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket2).maxHistoryPerKey(2)); key = random(); kv = nc.keyValue(bucket2); @@ -536,18 +505,13 @@ public void testMaxHistoryPerKey() throws Exception { @Test public void testCreateUpdate() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { String bucket = random(); // doesn't exist yet - assertThrows(JetStreamApiException.class, () -> kvm.getStatus(bucket)); + assertThrows(JetStreamApiException.class, () -> ctx.kvm.getStatus(bucket)); - KeyValueStatus kvs = kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build()); + KeyValueStatus kvs = ctx.kvCreate(bucket); assertEquals(bucket, kvs.getBucketName()); assertNull(kvs.getDescription()); @@ -569,7 +533,7 @@ public void testCreateUpdate() throws Exception { assertEquals(1, history.size()); assertEquals(2, history.get(0).getValueAsLong()); - boolean compression = atLeast2_10(); + boolean compression = VersionUtils.atLeast2_10(); String desc = random(); KeyValueConfiguration kvc = KeyValueConfiguration.builder(kvs.getConfiguration()) .description(desc) @@ -580,7 +544,7 @@ public void testCreateUpdate() throws Exception { .compression(compression) .build(); - kvs = kvm.update(kvc); + kvs = ctx.kvm.update(kvc); assertEquals(bucket, kvs.getBucketName()); assertEquals(desc, kvs.getDescription()); @@ -603,22 +567,16 @@ public void testCreateUpdate() throws Exception { KeyValueConfiguration kvcStor = KeyValueConfiguration.builder(kvs.getConfiguration()) .storageType(StorageType.File) .build(); - assertThrows(JetStreamApiException.class, () -> kvm.update(kvcStor)); + assertThrows(JetStreamApiException.class, () -> ctx.kvm.update(kvcStor)); }); } @Test public void testHistoryDeletePurge() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { // create bucket String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .maxHistoryPerKey(64) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(64)); KeyValue kv = nc.keyValue(bucket); String key = random(); @@ -640,16 +598,10 @@ public void testHistoryDeletePurge() throws Exception { @Test public void testAtomicDeleteAtomicPurge() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { // create bucket String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .maxHistoryPerKey(64) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(64)); KeyValue kv = nc.keyValue(bucket); String key = random(); @@ -697,16 +649,10 @@ public void testAtomicDeleteAtomicPurge() throws Exception { @Test public void testPurgeDeletes() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { // create bucket String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .maxHistoryPerKey(64) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(64)); KeyValue kv = nc.keyValue(bucket); String keyA = random(); @@ -718,21 +664,21 @@ public void testPurgeDeletes() throws Exception { kv.put(keyD, "d"); kv.purge(keyD); - assertPurgeDeleteEntries(js, bucket, new String[]{"a", null, "b", "c", null}); + assertPurgeDeleteEntries(ctx.js, bucket, new String[]{"a", null, "b", "c", null}); // default purge deletes uses the default threshold // so no markers will be deleted kv.purgeDeletes(); - assertPurgeDeleteEntries(js, bucket, new String[]{null, "b", "c", null}); + assertPurgeDeleteEntries(ctx.js, bucket, new String[]{null, "b", "c", null}); // deleteMarkersThreshold of 0 the default threshold // so no markers will be deleted kv.purgeDeletes(KeyValuePurgeOptions.builder().deleteMarkersThreshold(0).build()); - assertPurgeDeleteEntries(js, bucket, new String[]{null, "b", "c", null}); + assertPurgeDeleteEntries(ctx.js, bucket, new String[]{null, "b", "c", null}); // no threshold causes all to be removed kv.purgeDeletes(KeyValuePurgeOptions.builder().deleteMarkersNoThreshold().build()); - assertPurgeDeleteEntries(js, bucket, new String[]{"b", "c"}); + assertPurgeDeleteEntries(ctx.js, bucket, new String[]{"b", "c"}); }); } @@ -757,16 +703,10 @@ private void assertPurgeDeleteEntries(JetStream js, String bucket, String[] expe @Test public void testCreateAndUpdate() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInSharedCustom((nc, ctx) -> { // create bucket String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .maxHistoryPerKey(64) - .build()); + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(64)); KeyValue kv = nc.keyValue(bucket); @@ -865,37 +805,24 @@ private void assertKvEquals(KeyValueEntry kv1, KeyValueEntry kv2) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - - // create bucket 1 + runInSharedCustom((nc, ctx) -> { String bucket1 = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket1) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(bucket1); - // create bucket 2 String bucket2 = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket2) - .storageType(StorageType.Memory) - .build()); - - createMemoryStream(nc, random()); - createMemoryStream(nc, random()); + ctx.kvCreate(bucket2); - List infos = kvm.getStatuses(); - assertEquals(2, infos.size()); + List statuses = ctx.kvm.getStatuses(); + assertEquals(2, statuses.size()); List buckets = new ArrayList<>(); - for (KeyValueStatus status : infos) { - buckets.add(status.getBucketName()); + for (KeyValueStatus s : statuses) { + buckets.add(s.getBucketName()); } assertEquals(2, buckets.size()); assertTrue(buckets.contains(bucket1)); assertTrue(buckets.contains(bucket2)); - buckets = kvm.getBucketNames(); + buckets = ctx.kvm.getBucketNames(); assertTrue(buckets.contains(bucket1)); assertTrue(buckets.contains(bucket2)); }); @@ -1024,51 +951,45 @@ public void testWatch() throws Exception { List allKeys = Arrays.asList(TEST_WATCH_KEY_1, TEST_WATCH_KEY_2, TEST_WATCH_KEY_NULL); - runInOwnJsServer((nc, jsm, js) -> { - _testWatch(jsm, key1FullWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1FullWatcher, key1FullWatcher.watchOptions)); - _testWatch(jsm, key1MetaWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1MetaWatcher, key1MetaWatcher.watchOptions)); - _testWatch(jsm, key1StartNewWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartNewWatcher, key1StartNewWatcher.watchOptions)); - _testWatch(jsm, key1StartAllWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartAllWatcher, key1StartAllWatcher.watchOptions)); - _testWatch(jsm, key2FullWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2FullWatcher, key2FullWatcher.watchOptions)); - _testWatch(jsm, key2MetaWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2MetaWatcher, key2MetaWatcher.watchOptions)); - _testWatch(jsm, allAllFullWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllFullWatcher, allAllFullWatcher.watchOptions)); - _testWatch(jsm, allAllMetaWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllMetaWatcher, allAllMetaWatcher.watchOptions)); - _testWatch(jsm, allIgDelFullWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelFullWatcher, allIgDelFullWatcher.watchOptions)); - _testWatch(jsm, allIgDelMetaWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelMetaWatcher, allIgDelMetaWatcher.watchOptions)); - _testWatch(jsm, starFullWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starFullWatcher, starFullWatcher.watchOptions)); - _testWatch(jsm, starMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starMetaWatcher, starMetaWatcher.watchOptions)); - _testWatch(jsm, gtFullWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtFullWatcher, gtFullWatcher.watchOptions)); - _testWatch(jsm, gtMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtMetaWatcher, gtMetaWatcher.watchOptions)); - _testWatch(jsm, key1AfterWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterWatcher, key1AfterWatcher.watchOptions)); - _testWatch(jsm, key1AfterIgDelWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterIgDelWatcher, key1AfterIgDelWatcher.watchOptions)); - _testWatch(jsm, key1AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartNewWatcher, key1AfterStartNewWatcher.watchOptions)); - _testWatch(jsm, key1AfterStartFirstWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartFirstWatcher, key1AfterStartFirstWatcher.watchOptions)); - _testWatch(jsm, key2AfterWatcher, key2AfterExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterWatcher, key2AfterWatcher.watchOptions)); - _testWatch(jsm, key2AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartNewWatcher, key2AfterStartNewWatcher.watchOptions)); - _testWatch(jsm, key2AfterStartFirstWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartFirstWatcher, key2AfterStartFirstWatcher.watchOptions)); - _testWatch(jsm, key1FromRevisionAfterWatcher, key1FromRevisionExpecteds, 2, kv -> kv.watch(TEST_WATCH_KEY_1, key1FromRevisionAfterWatcher, 2, key1FromRevisionAfterWatcher.watchOptions)); - _testWatch(jsm, allFromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watchAll(allFromRevisionAfterWatcher, 2, allFromRevisionAfterWatcher.watchOptions)); + runInSharedCustom((nc, ctx) -> { + _testWatch(ctx, key1FullWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1FullWatcher, key1FullWatcher.watchOptions)); + _testWatch(ctx, key1MetaWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1MetaWatcher, key1MetaWatcher.watchOptions)); + _testWatch(ctx, key1StartNewWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartNewWatcher, key1StartNewWatcher.watchOptions)); + _testWatch(ctx, key1StartAllWatcher, key1AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1StartAllWatcher, key1StartAllWatcher.watchOptions)); + _testWatch(ctx, key2FullWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2FullWatcher, key2FullWatcher.watchOptions)); + _testWatch(ctx, key2MetaWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2MetaWatcher, key2MetaWatcher.watchOptions)); + _testWatch(ctx, allAllFullWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllFullWatcher, allAllFullWatcher.watchOptions)); + _testWatch(ctx, allAllMetaWatcher, allExpecteds, -1, kv -> kv.watchAll(allAllMetaWatcher, allAllMetaWatcher.watchOptions)); + _testWatch(ctx, allIgDelFullWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelFullWatcher, allIgDelFullWatcher.watchOptions)); + _testWatch(ctx, allIgDelMetaWatcher, allPutsExpecteds, -1, kv -> kv.watchAll(allIgDelMetaWatcher, allIgDelMetaWatcher.watchOptions)); + _testWatch(ctx, starFullWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starFullWatcher, starFullWatcher.watchOptions)); + _testWatch(ctx, starMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.*", starMetaWatcher, starMetaWatcher.watchOptions)); + _testWatch(ctx, gtFullWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtFullWatcher, gtFullWatcher.watchOptions)); + _testWatch(ctx, gtMetaWatcher, allExpecteds, -1, kv -> kv.watch("key.>", gtMetaWatcher, gtMetaWatcher.watchOptions)); + _testWatch(ctx, key1AfterWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterWatcher, key1AfterWatcher.watchOptions)); + _testWatch(ctx, key1AfterIgDelWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterIgDelWatcher, key1AfterIgDelWatcher.watchOptions)); + _testWatch(ctx, key1AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartNewWatcher, key1AfterStartNewWatcher.watchOptions)); + _testWatch(ctx, key1AfterStartFirstWatcher, purgeOnlyExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_1, key1AfterStartFirstWatcher, key1AfterStartFirstWatcher.watchOptions)); + _testWatch(ctx, key2AfterWatcher, key2AfterExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterWatcher, key2AfterWatcher.watchOptions)); + _testWatch(ctx, key2AfterStartNewWatcher, noExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartNewWatcher, key2AfterStartNewWatcher.watchOptions)); + _testWatch(ctx, key2AfterStartFirstWatcher, key2AllExpecteds, -1, kv -> kv.watch(TEST_WATCH_KEY_2, key2AfterStartFirstWatcher, key2AfterStartFirstWatcher.watchOptions)); + _testWatch(ctx, key1FromRevisionAfterWatcher, key1FromRevisionExpecteds, 2, kv -> kv.watch(TEST_WATCH_KEY_1, key1FromRevisionAfterWatcher, 2, key1FromRevisionAfterWatcher.watchOptions)); + _testWatch(ctx, allFromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watchAll(allFromRevisionAfterWatcher, 2, allFromRevisionAfterWatcher.watchOptions)); List keys = Arrays.asList(TEST_WATCH_KEY_1, TEST_WATCH_KEY_2); - _testWatch(jsm, key1Key2FromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watch(keys, key1Key2FromRevisionAfterWatcher, 2, key1Key2FromRevisionAfterWatcher.watchOptions)); + _testWatch(ctx, key1Key2FromRevisionAfterWatcher, allFromRevisionExpecteds, 2, kv -> kv.watch(keys, key1Key2FromRevisionAfterWatcher, 2, key1Key2FromRevisionAfterWatcher.watchOptions)); - if (atLeast2_10()) { - _testWatch(jsm, multipleFullWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleFullWatcher, multipleFullWatcher.watchOptions)); - _testWatch(jsm, multipleMetaWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleMetaWatcher, multipleMetaWatcher.watchOptions)); + if (VersionUtils.atLeast2_10()) { + _testWatch(ctx, multipleFullWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleFullWatcher, multipleFullWatcher.watchOptions)); + _testWatch(ctx, multipleMetaWatcher, allExpecteds, -1, kv -> kv.watch(allKeys, multipleMetaWatcher, multipleMetaWatcher.watchOptions)); } }); } - private void _testWatch(JetStreamManagement jsm, TestKeyValueWatcher watcher, Object[] expectedKves, long fromRevision, TestWatchSubSupplier supplier) throws Exception { - KeyValueManagement kvm = jsm.keyValueManagement(); - - String bucket = random() + watcher.name + "Bucket"; - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .maxHistoryPerKey(10) - .storageType(StorageType.Memory) - .build()); + private void _testWatch(JetStreamTestingContext ctx, TestKeyValueWatcher watcher, Object[] expectedKves, long fromRevision, TestWatchSubSupplier supplier) throws Exception { + String bucket = random() + watcher.name; + ctx.kvCreate(ctx.kvBuilder(bucket).maxHistoryPerKey(10)); - KeyValue kv = jsm.keyValue(bucket); + KeyValue kv = ctx.jsm.keyValue(bucket); NatsKeyValueWatchSubscription sub = null; @@ -1107,7 +1028,7 @@ private void _testWatch(JetStreamManagement jsm, TestKeyValueWatcher watcher, Ob // only testing this consumer name prefix on not meta only tests // this way there is coverage on working with and without a prefix if (!watcher.metaOnly) { - List names = jsm.getConsumerNames("KV_" + bucket); + List names = ctx.jsm.getConsumerNames("KV_" + bucket); assertEquals(1, names.size()); assertNotNull(watcher.getConsumerNamePrefix()); assertTrue(names.get(0).startsWith(watcher.getConsumerNamePrefix())); @@ -1118,7 +1039,6 @@ private void _testWatch(JetStreamManagement jsm, TestKeyValueWatcher watcher, Ob validateWatcher(expectedKves, watcher); //noinspection ConstantConditions sub.unsubscribe(); - kvm.delete(bucket); } private void validateWatcher(Object[] expectedKves, TestKeyValueWatcher watcher) { @@ -1173,8 +1093,9 @@ public void testWithAccount() throws Exception { Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); - try (Connection connUserA = Nats.connect(acctA); Connection connUserI = Nats.connect(acctI)) { - + try (Connection connUserA = Nats.connect(acctA); + Connection connUserI = Nats.connect(acctI)) + { // some prep KeyValueOptions jsOpt_UserI_BucketA_WithPrefix = KeyValueOptions.builder().jsPrefix("FromA").build(); @@ -1361,22 +1282,14 @@ public void testCoverPrefix() { @Test public void testKeyValueEntryEqualsImpl() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInShared((nc, ctx) -> { // create bucket 1 String bucket1 = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket1) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(bucket1); // create bucket 2 String bucket2 = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket2) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(bucket2); KeyValue kv1 = nc.keyValue(bucket1); KeyValue kv2 = nc.keyValue(bucket2); @@ -1485,15 +1398,10 @@ public void testKeyValuePurgeOptionsBuilderCoverage() { @Test public void testCreateDiscardPolicy() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInShared((nc, ctx) -> { // create bucket String bucket1 = random(); - KeyValueStatus status = kvm.create(KeyValueConfiguration.builder() - .name(bucket1) - .storageType(StorageType.Memory) - .build()); + KeyValueStatus status = ctx.kvCreate(bucket1); DiscardPolicy dp = status.getConfiguration().getBackingConfig().getDiscardPolicy(); if (nc.getServerInfo().isSameOrNewerThanVersion("2.7.2")) { @@ -1507,15 +1415,10 @@ public void testCreateDiscardPolicy() throws Exception { @Test public void testEntryCoercion() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInShared((nc, ctx) -> { // create bucket String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build()); + KeyValueStatus status = ctx.kvCreate(bucket); KeyValue kv = nc.keyValue(bucket); kv.put("a", "a"); @@ -1717,19 +1620,14 @@ private void _testMirror(KeyValue okv, KeyValue mkv, int num) throws Exception { @Test public void testKeyValueTransform() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10_3, (nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInShared(VersionUtils::atLeast2_10_3, (nc, ctx) -> { String kvName1 = random(); String kvName2 = kvName1 + "-mir"; String mirrorSegment = "MirrorMe"; String dontMirrorSegment = "DontMirrorMe"; String generic = "foo"; - kvm.create(KeyValueConfiguration.builder() - .name(kvName1) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(kvName1); SubjectTransform transform = SubjectTransform.builder() .source("$KV." + kvName1 + "." + mirrorSegment + ".*") @@ -1741,11 +1639,7 @@ public void testKeyValueTransform() throws Exception { .subjectTransforms(transform) .build(); - kvm.create(KeyValueConfiguration.builder() - .name(kvName2) - .mirror(mirr) - .storageType(StorageType.Memory) - .build()); + ctx.kvCreate(ctx.kvBuilder(kvName2).mirror(mirr)); KeyValue kv1 = nc.keyValue(kvName1); @@ -1775,15 +1669,9 @@ public void testKeyValueTransform() throws Exception { @Test public void testSubjectFiltersAgainst209OptOut() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); - + runInShared(VersionUtils::atLeast2_10, (nc, ctx) -> { String bucket = random(); - kvm.create(KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build()); - + ctx.kvCreate(bucket); JetStreamOptions jso = JetStreamOptions.builder().optOut290ConsumerCreate(true).build(); KeyValueOptions kvo = KeyValueOptions.builder().jetStreamOptions(jso).build(); KeyValue kv = nc.keyValue(bucket, kvo); @@ -1795,14 +1683,10 @@ public void testSubjectFiltersAgainst209OptOut() throws Exception { @Test public void testTtlAndDuplicateWindowRoundTrip() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); + runInShared(VersionUtils::atLeast2_10, (nc, ctx) -> { String bucket = random(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build(); - KeyValueStatus status = kvm.create(config); + KeyValueConfiguration config = ctx.kvBuilder(bucket).build(); + KeyValueStatus status = ctx.kvCreate(config); StreamConfiguration sc = status.getBackingStreamInfo().getConfiguration(); assertEquals(0, sc.getMaxAge().toMillis()); @@ -1810,19 +1694,15 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { assertEquals(SERVER_DEFAULT_DUPLICATE_WINDOW_MS, sc.getDuplicateWindow().toMillis()); config = KeyValueConfiguration.builder(status.getConfiguration()).ttl(Duration.ofSeconds(10)).build(); - status = kvm.update(config); + status = ctx.kvm.update(config); sc = status.getBackingStreamInfo().getConfiguration(); assertEquals(10_000, sc.getMaxAge().toMillis()); assertNotNull(sc.getDuplicateWindow()); assertEquals(10_000, sc.getDuplicateWindow().toMillis()); bucket = random(); - config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .ttl(Duration.ofMinutes(30)) - .build(); - status = kvm.create(config); + config = ctx.kvBuilder(bucket).ttl(Duration.ofMinutes(30)).build(); + status = ctx.kvCreate(config); sc = status.getBackingStreamInfo().getConfiguration(); assertEquals(30, sc.getMaxAge().toMinutes()); @@ -1834,14 +1714,9 @@ public void testTtlAndDuplicateWindowRoundTrip() throws Exception { @Test public void testConsumeKeys() throws Exception { int count = 10000; - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); + runInShared(VersionUtils::atLeast2_10, (nc, ctx) -> { String bucket = random(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .build(); - kvm.create(config); + ctx.kvCreate(bucket); // put a bunch of keys so consume takes some time. KeyValue kv = nc.keyValue(bucket); @@ -1869,15 +1744,10 @@ public void testConsumeKeys() throws Exception { @Test public void testLimitMarkerCoverage() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { - KeyValueManagement kvm = jsm.keyValueManagement(); + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String bucket = random(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .limitMarker(1000) - .build(); - KeyValueStatus status = kvm.create(config); + KeyValueConfiguration config = ctx.kvBuilder(bucket).limitMarker(1000).build(); + KeyValueStatus status = ctx.kvCreate(config); assertNotNull(status.getLimitMarkerTtl()); assertEquals(1000, status.getLimitMarkerTtl().toMillis()); @@ -1898,7 +1768,7 @@ public void testLimitMarkerCoverage() throws Exception { .storageType(StorageType.Memory) .limitMarker(Duration.ofSeconds(2)) // coverage of duration api vs ms api .build(); - status = kvm.create(config); + status = ctx.kvCreate(config); assertNotNull(status.getLimitMarkerTtl()); assertEquals(2000, status.getLimitMarkerTtl().toMillis()); @@ -1918,19 +1788,13 @@ public void testLimitMarkerCoverage() throws Exception { @Test public void testLimitMarkerBehavior() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String bucket = random(); String key1 = random(); String key2 = random(); String key3 = random(); - KeyValueManagement kvm = jsm.keyValueManagement(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .limitMarker(Duration.ofSeconds(5)) - .build(); - kvm.create(config); + ctx.kvCreate(ctx.kvBuilder(bucket).limitMarker(Duration.ofSeconds(5))); KeyValue kv = nc.keyValue(bucket); @@ -2035,18 +1899,12 @@ public void endOfData() { @Test public void testJustLimitMarkerCreatePurge() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); - KeyValueManagement kvm = jsm.keyValueManagement(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .limitMarker(Duration.ofSeconds(1)) - .build(); - kvm.create(config); + ctx.kvCreate(ctx.kvBuilder(bucket).limitMarker(Duration.ofSeconds(1))); KeyValue kv = nc.keyValue(bucket); @@ -2099,13 +1957,13 @@ else if (mcount == 4) { long mark = System.currentTimeMillis(); kv.create(key, dataBytes(), MessageTtl.seconds(1)); - StreamInfo si = jsm.getStreamInfo(rawStream); + StreamInfo si = ctx.jsm.getStreamInfo(rawStream); assertEquals(1, si.getStreamState().getMsgCount()); long safety = 0; long gotZero = -1; while (++safety < 10000 && errorLatch.getCount() > 0) { - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); if (si.getStreamState().getMsgCount() == 0) { gotZero = System.currentTimeMillis(); break; @@ -2118,17 +1976,17 @@ else if (mcount == 4) { assertEquals("MaxAge", ops.get(1)); kv.create(key, dataBytes()); - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); assertEquals(1, si.getStreamState().getMsgCount()); kv.purge(key, MessageTtl.seconds(1)); - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); assertEquals(1, si.getStreamState().getMsgCount()); safety = 0; gotZero = -1; while (++safety < 10000 && errorLatch.getCount() > 0) { - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); if (si.getStreamState().getMsgCount() == 0) { gotZero = System.currentTimeMillis(); break; @@ -2144,18 +2002,12 @@ else if (mcount == 4) { @Test public void testJustTtlForDeletePurge() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> { String bucket = random(); String rawStream = "KV_" + bucket; String key = random(); - KeyValueManagement kvm = jsm.keyValueManagement(); - KeyValueConfiguration config = KeyValueConfiguration.builder() - .name(bucket) - .storageType(StorageType.Memory) - .ttl(Duration.ofSeconds(1)) - .build(); - kvm.create(config); + ctx.kvCreate(ctx.kvBuilder(bucket).ttl(Duration.ofSeconds(1))); KeyValue kv = nc.keyValue(bucket); @@ -2204,18 +2056,18 @@ else if (mcount == 4) { .build()); kv.create(key, dataBytes()); - StreamInfo si = jsm.getStreamInfo(rawStream); + StreamInfo si = ctx.jsm.getStreamInfo(rawStream); assertEquals(1, si.getStreamState().getMsgCount()); kv.delete(key); long mark = System.currentTimeMillis(); - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); assertEquals(1, si.getStreamState().getMsgCount()); long safety = 0; long gotZero = -1; while (++safety < 10000 && errorLatch.getCount() > 0) { - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); if (si.getStreamState().getMsgCount() == 0) { gotZero = System.currentTimeMillis(); break; @@ -2234,7 +2086,7 @@ else if (mcount == 4) { safety = 0; gotZero = -1; while (++safety < 10000 && errorLatch.getCount() > 0) { - si = jsm.getStreamInfo(rawStream); + si = ctx.jsm.getStreamInfo(rawStream); if (si.getStreamState().getMsgCount() == 0) { gotZero = System.currentTimeMillis(); break; diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 3c7afc131..48d2070ed 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -389,10 +389,10 @@ private void _push_xfc(SubscribeOptions so) { @Test public void test_received_time() throws Exception { - runInShared((nc, jstc) -> { - _received_time_yes(push_hb_fc(), jstc.js, jstc.subject()); - _received_time_yes(push_hb_xfc(), jstc.js, jstc.subject()); - _received_time_no(jstc.js, jstc.jsm, jstc.stream, jstc.subject(), jstc.js.subscribe(jstc.subject(), push_xhb_xfc())); + runInShared((nc, ctx) -> { + _received_time_yes(push_hb_fc(), ctx.js, ctx.subject()); + _received_time_yes(push_hb_xfc(), ctx.js, ctx.subject()); + _received_time_no(ctx.js, ctx.jsm, ctx.stream, ctx.subject(), ctx.js.subscribe(ctx.subject(), push_xhb_xfc())); }); } @@ -606,7 +606,7 @@ private static String genericSub(Connection nc) throws IOException, JetStreamApi String id = "-" + ID.incrementAndGet() + "-" + System.currentTimeMillis(); String stream = random() + id; String subject = random() + id; - createMemoryStream(nc, stream, subject); + createMemoryStream(nc.jetStreamManagement(), stream, subject); return subject; } diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index 0cb79d968..d62ccf9a0 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -190,7 +190,7 @@ public void testOrphanDuplicateRepliesAdvancedStatsEnabled() throws Exception { sleep(5000); handler.onMessage(msg); }); - String subject = TestBase.random(); + String subject = random(); d1.subscribe(subject); d2.subscribe(subject); d3.subscribe(subject); @@ -233,7 +233,7 @@ public void testOrphanDuplicateRepliesAdvancedStatsDisabled() throws Exception { sleep(5000); handler.onMessage(msg); }); - String subject = TestBase.random(); + String subject = random(); d1.subscribe(subject); d2.subscribe(subject); d3.subscribe(subject); diff --git a/src/test/java/io/nats/client/impl/ObjectStoreTests.java b/src/test/java/io/nats/client/impl/ObjectStoreTests.java index d3e17e01f..6042f1d8f 100644 --- a/src/test/java/io/nats/client/impl/ObjectStoreTests.java +++ b/src/test/java/io/nats/client/impl/ObjectStoreTests.java @@ -37,8 +37,7 @@ public class ObjectStoreTests extends JetStreamTestBase { @Test public void testWorkflow() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - ObjectStoreManagement osm = jsm.objectStoreManagement(); + runInSharedCustom((nc, ctx) -> { nc.objectStoreManagement(ObjectStoreOptions.builder(DEFAULT_JS_OPTIONS).build()); // coverage Map metadata = new HashMap<>(); @@ -46,21 +45,18 @@ public void testWorkflow() throws Exception { String bucket = random(); String objectDesc = random(); - // create the bucket - ObjectStoreConfiguration osc = ObjectStoreConfiguration.builder(bucket) + + ObjectStoreStatus status = ctx.osCreate(ctx.osBuilder(bucket) .description(objectDesc) .ttl(Duration.ofHours(24)) - .storageType(StorageType.Memory) - .metadata(metadata) - .build(); + .metadata(metadata)); - ObjectStoreStatus status = osm.create(osc); validateStatus(status, bucket, objectDesc); - validateStatus(osm.getStatus(bucket), bucket, objectDesc); + validateStatus(ctx.osm.getStatus(bucket), bucket, objectDesc); - assertNotNull(jsm.getStreamInfo("OBJ_" + bucket)); + assertNotNull(ctx.jsm.getStreamInfo("OBJ_" + bucket)); - List names = osm.getBucketNames(); + List names = ctx.osm.getBucketNames(); assertTrue(names.contains(bucket)); // put some objects into the stores @@ -249,23 +245,16 @@ private static Object[] getInput(int size) { @Test public void testManageGetBucketNamesStatuses() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - ObjectStoreManagement osm = jsm.objectStoreManagement(); - + runInSharedCustom((nc, ctx) -> { // create bucket 1 String bucket1 = random(); - osm.create(ObjectStoreConfiguration.builder() - .name(bucket1) // constructor variety - .storageType(StorageType.Memory) - .build()); + ctx.osCreate(bucket1); // create bucket 2 String bucket2 = random(); - osm.create(ObjectStoreConfiguration.builder(bucket2) - .storageType(StorageType.Memory) - .build()); + ctx.osCreate(bucket2); - List infos = osm.getStatuses(); + List infos = ctx.osm.getStatuses(); assertEquals(2, infos.size()); List buckets = new ArrayList<>(); for (ObjectStoreStatus status : infos) { @@ -275,7 +264,7 @@ public void testManageGetBucketNamesStatuses() throws Exception { assertTrue(buckets.contains(bucket1)); assertTrue(buckets.contains(bucket2)); - buckets = osm.getBucketNames(); + buckets = ctx.osm.getBucketNames(); assertTrue(buckets.contains(bucket1)); assertTrue(buckets.contains(bucket2)); }); @@ -311,16 +300,13 @@ private void assertOso(ObjectStoreOptions oso) { @Test public void testObjectLinks() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - ObjectStoreManagement osm = jsm.objectStoreManagement(); - - String bucket1 = "b1"; // bucket(); - String bucket2 = "b2"; // bucket(); + runInSharedCustom((nc, ctx) -> { + String bucket1 = random(); + String bucket2 = random(); + ctx.osCreate(bucket1); + ctx.osCreate(bucket2); - osm.create(ObjectStoreConfiguration.builder(bucket1).storageType(StorageType.Memory).build()); ObjectStore os1 = nc.objectStore(bucket1); - - osm.create(ObjectStoreConfiguration.builder(bucket2).storageType(StorageType.Memory).build()); ObjectStore os2 = nc.objectStore(bucket2); String name1 = "name1"; // name(); @@ -432,12 +418,9 @@ private void validateLink(ObjectInfo oiLink, String linkName, ObjectInfo targetI @Test public void testList() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { - ObjectStoreManagement osm = jsm.objectStoreManagement(); - + runInSharedCustom((nc, ctx) -> { String bucket = random(); - osm.create(ObjectStoreConfiguration.builder(bucket).storageType(StorageType.Memory).build()); - + ctx.osCreate(bucket); ObjectStore os = nc.objectStore(bucket); String[] names = new String[] {random(), random(), random(), random(), random()}; @@ -467,36 +450,30 @@ public void testList() throws Exception { @Test public void testSeal() throws Exception { - runInOwnJsServer((nc, jsm, js) -> { + runInSharedCustom((nc, ctx) -> { String bucket = random(); - ObjectStoreManagement osm = jsm.objectStoreManagement(); - osm.create(ObjectStoreConfiguration.builder(bucket) - .storageType(StorageType.Memory) - .build()); + ctx.osCreate(bucket); ObjectStore os = nc.objectStore(bucket); - os.put("name", "data".getBytes()); + String objectName = random(); + os.put(objectName, "data".getBytes()); ObjectStoreStatus status = os.seal(); assertTrue(status.isSealed()); - assertThrows(JetStreamApiException.class, () -> os.put("another", "data".getBytes())); + assertThrows(JetStreamApiException.class, () -> os.put(random(), "data".getBytes())); - ObjectMeta meta = ObjectMeta.builder("change").build(); - assertThrows(JetStreamApiException.class, () -> os.updateMeta("name", meta)); + ObjectMeta meta = ObjectMeta.builder(random()).build(); + assertThrows(JetStreamApiException.class, () -> os.updateMeta(objectName, meta)); }); } @Test public void testCompression() throws Exception { - runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { String bucket = random(); - ObjectStoreManagement osm = jsm.objectStoreManagement(); - osm.create(ObjectStoreConfiguration.builder(bucket) - .storageType(StorageType.Memory) - .compression(true) - .build()); + ctx.osCreate(ctx.osBuilder(bucket).compression(true).build()); ObjectStore os = nc.objectStore(bucket); ObjectStoreStatus oss = os.getStatus(); assertTrue(oss.isCompressed()); @@ -555,21 +532,19 @@ public void testWatch() throws Exception { TestObjectStoreWatcher fullAfterWatcher = new TestObjectStoreWatcher("fullAfterWatcher", false); TestObjectStoreWatcher delAfterWatcher = new TestObjectStoreWatcher("delAfterWatcher", false, IGNORE_DELETE); - runInOwnJsServer((nc, jsm, js) -> { - _testWatch(jsm, fullB4Watcher, new Object[]{"A", "B", null}, os -> os.watch(fullB4Watcher, fullB4Watcher.watchOptions)); - _testWatch(jsm, delB4Watcher, new Object[]{"A", "B"}, os -> os.watch(delB4Watcher, delB4Watcher.watchOptions)); - _testWatch(jsm, fullAfterWatcher, new Object[]{"B", null}, os -> os.watch(fullAfterWatcher, fullAfterWatcher.watchOptions)); - _testWatch(jsm, delAfterWatcher, new Object[]{"B"}, os -> os.watch(delAfterWatcher, delAfterWatcher.watchOptions)); + runInSharedCustom((nc, ctx) -> { + _testWatch(ctx, fullB4Watcher, new Object[]{"A", "B", null}, os -> os.watch(fullB4Watcher, fullB4Watcher.watchOptions)); + _testWatch(ctx, delB4Watcher, new Object[]{"A", "B"}, os -> os.watch(delB4Watcher, delB4Watcher.watchOptions)); + _testWatch(ctx, fullAfterWatcher, new Object[]{"B", null}, os -> os.watch(fullAfterWatcher, fullAfterWatcher.watchOptions)); + _testWatch(ctx, delAfterWatcher, new Object[]{"B"}, os -> os.watch(delAfterWatcher, delAfterWatcher.watchOptions)); }); } - private void _testWatch(JetStreamManagement jsm, TestObjectStoreWatcher watcher, Object[] expecteds, TestWatchSubSupplier supplier) throws Exception { - ObjectStoreManagement osm = jsm.objectStoreManagement(); + private void _testWatch(JetStreamTestingContext ctx, TestObjectStoreWatcher watcher, Object[] expecteds, TestWatchSubSupplier supplier) throws Exception { + String bucket = random() + watcher.name; + ctx.osCreate(bucket); - String bucket = watcher.name + "Bucket"; - osm.create(ObjectStoreConfiguration.builder(bucket).storageType(StorageType.Memory).build()); - - ObjectStore os = jsm.objectStore(bucket); + ObjectStore os = ctx.jsm.objectStore(bucket); NatsObjectStoreWatchSubscription sub = null; @@ -594,8 +569,6 @@ private void _testWatch(JetStreamManagement jsm, TestObjectStoreWatcher watcher, //noinspection ConstantConditions sub.unsubscribe(); - - osm.delete(bucket); } private void validateWatcher(Object[] expecteds, TestObjectStoreWatcher watcher) { diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 0a30e0bca..e5d25ada9 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -236,7 +236,7 @@ public void testMessagesDelayPings() throws Exception, ExecutionException, Timeo @Test public void testRtt() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { assertTrue(nc.RTT().toMillis() < 10); nc.close(); assertThrows(IOException.class, nc::RTT); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index dc613ada6..3b76beb8e 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -17,7 +17,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.api.ServerInfo; -import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -42,6 +41,7 @@ import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.atLeast2_9_0; +import static io.nats.client.utils.VersionUtils.initVersionServerInfo; import static org.junit.jupiter.api.Assertions.*; @Isolated @@ -793,7 +793,8 @@ public boolean includeAllServers() { @Test public void testForceReconnectQueueBehaviorCheck() throws Exception { runInCluster((nc0, nc1, nc2) -> { - if (atLeast2_9_0(nc0)) { + initVersionServerInfo(nc0); + if (atLeast2_9_0()) { int pubCount = 100_000; int subscribeTime = 5000; int flushWait = 2500; @@ -801,19 +802,19 @@ public void testForceReconnectQueueBehaviorCheck() throws Exception { ForceReconnectQueueCheckDataPort.DELAY = 75; - String subject = TestBase.random(); + String subject = random(); ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject); _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, 0); - subject = TestBase.random(); + subject = random(); ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject); _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, flushWait); - subject = TestBase.random(); + subject = random(); ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject); _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, 0); - subject = TestBase.random(); + subject = random(); ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject); _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, flushWait); } @@ -939,7 +940,7 @@ public void testSocketDataPortTimeout() throws Exception { .errorListener(listener); AtomicBoolean gotOutputQueueIsFull = new AtomicBoolean(); - runInOwnServer(nc1 -> runInOwnServer(nc2 -> { + runInServer(nc1 -> runInServer(nc2 -> { int port1 = nc1.getServerInfo().getPort(); int port2 = nc2.getServerInfo().getPort(); @@ -948,7 +949,7 @@ public void testSocketDataPortTimeout() throws Exception { getLocalhostUri(port2) }; Connection nc = standardConnectionWait(builder.servers(servers).build()); - String subject = TestBase.random(); + String subject = random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); while (pubId.get() < 50000) { diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index df9833dfc..41b5d7c7b 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -70,7 +70,7 @@ public void testSimpleRequest() throws Exception { @Test public void testRequestVarieties() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { Dispatcher d = nc.createDispatcher(msg -> { if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), msg.getData()); @@ -183,7 +183,7 @@ public void testMultipleRequest() throws Exception { @Test public void testMultipleReplies() throws Exception { Options.Builder builder = optionsBuilder().turnOnAdvancedStats(); - runInOwnServer(builder, nc -> { + runInServer(builder, nc -> { AtomicInteger requests = new AtomicInteger(); MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; Dispatcher d1 = nc.createDispatcher(handler); diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 88643a6d3..6369bd893 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -54,23 +54,23 @@ public void testStreamContextErrors() throws Exception { @Test public void testStreamContextFromConnection() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext streamContext = nc.getStreamContext(jstc.stream); - assertEquals(jstc.stream, streamContext.getStreamName()); - _testStreamContext(jstc, streamContext); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext streamContext = nc.getStreamContext(ctx.stream); + assertEquals(ctx.stream, streamContext.getStreamName()); + _testStreamContext(ctx, streamContext); }); } @Test public void testStreamContextFromContext() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext streamContext = jstc.js.getStreamContext(jstc.stream); - assertEquals(jstc.stream, streamContext.getStreamName()); - _testStreamContext(jstc, streamContext); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext streamContext = ctx.js.getStreamContext(ctx.stream); + assertEquals(ctx.stream, streamContext.getStreamName()); + _testStreamContext(ctx, streamContext); }); } - private void _testStreamContext(JetStreamTestingContext jstc, StreamContext streamContext) throws IOException, JetStreamApiException { + private void _testStreamContext(JetStreamTestingContext ctx, StreamContext streamContext) throws IOException, JetStreamApiException { String durable = random(); assertThrows(JetStreamApiException.class, () -> streamContext.getConsumerContext(durable)); assertThrows(JetStreamApiException.class, () -> streamContext.deleteConsumer(durable)); @@ -78,12 +78,12 @@ private void _testStreamContext(JetStreamTestingContext jstc, StreamContext stre ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(durable).build(); ConsumerContext consumerContext = streamContext.createOrUpdateConsumer(cc); ConsumerInfo ci = consumerContext.getConsumerInfo(); - assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(ctx.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); ci = streamContext.getConsumerInfo(durable); assertNotNull(ci); - assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(ctx.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); assertEquals(1, streamContext.getConsumerNames().size()); @@ -95,12 +95,12 @@ private void _testStreamContext(JetStreamTestingContext jstc, StreamContext stre ci = consumerContext.getConsumerInfo(); assertNotNull(ci); - assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(ctx.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); ci = consumerContext.getCachedConsumerInfo(); assertNotNull(ci); - assertEquals(jstc.stream, ci.getStreamName()); + assertEquals(ctx.stream, ci.getStreamName()); assertEquals(durable, ci.getName()); streamContext.deleteConsumer(durable); @@ -109,12 +109,12 @@ private void _testStreamContext(JetStreamTestingContext jstc, StreamContext stre assertThrows(JetStreamApiException.class, () -> streamContext.deleteConsumer(durable)); // coverage - jstc.js.publish(jstc.subject(), "one".getBytes()); - jstc.js.publish(jstc.subject(), "two".getBytes()); - jstc.js.publish(jstc.subject(), "three".getBytes()); - jstc.js.publish(jstc.subject(), "four".getBytes()); - jstc.js.publish(jstc.subject(), "five".getBytes()); - jstc.js.publish(jstc.subject(), "six".getBytes()); + ctx.js.publish(ctx.subject(), "one".getBytes()); + ctx.js.publish(ctx.subject(), "two".getBytes()); + ctx.js.publish(ctx.subject(), "three".getBytes()); + ctx.js.publish(ctx.subject(), "four".getBytes()); + ctx.js.publish(ctx.subject(), "five".getBytes()); + ctx.js.publish(ctx.subject(), "six".getBytes()); assertTrue(streamContext.deleteMessage(3)); assertTrue(streamContext.deleteMessage(4, true)); @@ -122,13 +122,13 @@ private void _testStreamContext(JetStreamTestingContext jstc, StreamContext stre MessageInfo mi = streamContext.getMessage(1); assertEquals(1, mi.getSeq()); - mi = streamContext.getFirstMessage(jstc.subject()); + mi = streamContext.getFirstMessage(ctx.subject()); assertEquals(1, mi.getSeq()); - mi = streamContext.getLastMessage(jstc.subject()); + mi = streamContext.getLastMessage(ctx.subject()); assertEquals(6, mi.getSeq()); - mi = streamContext.getNextMessage(3, jstc.subject()); + mi = streamContext.getNextMessage(3, ctx.subject()); assertEquals(5, mi.getSeq()); assertNotNull(streamContext.getStreamInfo()); @@ -137,25 +137,25 @@ private void _testStreamContext(JetStreamTestingContext jstc, StreamContext stre streamContext.purge(PurgeOptions.builder().sequence(5).build()); assertThrows(JetStreamApiException.class, () -> streamContext.getMessage(1)); - StreamInfo si = jstc.jsm.getStreamInfo(jstc.stream); + StreamInfo si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(2, si.getStreamState().getMsgCount()); assertEquals(5, si.getStreamState().getFirstSequence()); assertEquals(6, si.getStreamState().getLastSequence()); - jstc.js.publish(jstc.subject(), "aone".getBytes()); - jstc.js.publish(jstc.subject(), "btwo".getBytes()); - jstc.js.publish(jstc.subject(), "cthree".getBytes()); - jstc.js.publish(jstc.subject(), "dfour".getBytes()); - jstc.js.publish(jstc.subject(), "efive".getBytes()); - jstc.js.publish(jstc.subject(), "fsix".getBytes()); + ctx.js.publish(ctx.subject(), "aone".getBytes()); + ctx.js.publish(ctx.subject(), "btwo".getBytes()); + ctx.js.publish(ctx.subject(), "cthree".getBytes()); + ctx.js.publish(ctx.subject(), "dfour".getBytes()); + ctx.js.publish(ctx.subject(), "efive".getBytes()); + ctx.js.publish(ctx.subject(), "fsix".getBytes()); - si = jstc.jsm.getStreamInfo(jstc.stream); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(8, si.getStreamState().getMsgCount()); assertEquals(12, si.getStreamState().getLastSequence()); streamContext.purge(); - si = jstc.jsm.getStreamInfo(jstc.stream); + si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(0, si.getStreamState().getMsgCount()); assertEquals(12, si.getStreamState().getLastSequence()); } @@ -194,52 +194,52 @@ private String validateConsumerNameForOrdered(BaseConsumerContext bcc, MessageCo static int FETCH_ORDERED = 3; @Test public void testFetch() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { for (int x = 1; x <= 20; x++) { - jstc.js.publish(jstc.subject(), ("test-fetch-msg-" + x).getBytes()); + ctx.js.publish(ctx.subject(), ("test-fetch-msg-" + x).getBytes()); } for (int f = FETCH_EPHEMERAL; f <= FETCH_ORDERED; f++) { // 1. Different fetch sizes demonstrate expiration behavior // 1A. equal number of messages to the fetch size - _testFetch("1A", jstc, 20, 0, 20, f, false); + _testFetch("1A", ctx, 20, 0, 20, f, false); // 1B. more messages than the fetch size - _testFetch("1B", jstc, 10, 0, 10, f, false); + _testFetch("1B", ctx, 10, 0, 10, f, false); // 1C. fewer messages than the fetch size - _testFetch("1C", jstc, 40, 0, 40, f, false); + _testFetch("1C", ctx, 40, 0, 40, f, false); // 1D. simple-consumer-40msgs was created in 1C and has no messages available - _testFetch("1D", jstc, 40, 0, 40, f, false); + _testFetch("1D", ctx, 40, 0, 40, f, false); // 2. Different max bytes sizes demonstrate expiration behavior // - each test message is approximately 100 bytes // 2A. max bytes are reached before message count - _testFetch("2A", jstc, 0, 750, 20, f, false); + _testFetch("2A", ctx, 0, 750, 20, f, false); // 2B. fetch size is reached before byte count - _testFetch("2B", jstc, 10, 1500, 10, f, false); + _testFetch("2B", ctx, 10, 1500, 10, f, false); if (f == FETCH_DURABLE) { // this is long-running, so don't want to test every time // 2C. fewer bytes than the byte count - _testFetch("2C", jstc, 0, 3000, 40, f, false); + _testFetch("2C", ctx, 0, 3000, 40, f, false); } else if (f == FETCH_ORDERED) { // just to get coverage of testing with a consumer name prefix - _testFetch("1A", jstc, 20, 0, 20, f, true); - _testFetch("2A", jstc, 0, 750, 20, f, true); + _testFetch("1A", ctx, 20, 0, 20, f, true); + _testFetch("2A", ctx, 0, 750, 20, f, true); } } }); } - private void _testFetch(String label, JetStreamTestingContext jstc, int maxMessages, int maxBytes, int testAmount, int fetchType, boolean useConsumerPrefix) throws Exception { - StreamContext ctx = jstc.js.getStreamContext(jstc.stream); + private void _testFetch(String label, JetStreamTestingContext ctx, int maxMessages, int maxBytes, int testAmount, int fetchType, boolean useConsumerPrefix) throws Exception { + StreamContext streamCtx = ctx.js.getStreamContext(ctx.stream); String consumerName = null; String consumerNamePrefix = null; @@ -250,7 +250,7 @@ private void _testFetch(String label, JetStreamTestingContext jstc, int maxMessa consumerNamePrefix = random(); occ.consumerNamePrefix(consumerNamePrefix); } - consumerContext = ctx.createOrderedConsumer(occ); + consumerContext = streamCtx.createOrderedConsumer(occ); assertNull(consumerContext.getConsumerName()); } else { @@ -266,8 +266,8 @@ private void _testFetch(String label, JetStreamTestingContext jstc, int maxMessa consumerName = consumerName + "E"; cc = builder.name(consumerName).inactiveThreshold(10_000).build(); } - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); - consumerContext = ctx.getConsumerContext(consumerName); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); + consumerContext = streamCtx.getConsumerContext(consumerName); assertEquals(consumerName, consumerContext.getConsumerName()); } @@ -333,14 +333,14 @@ private String generateConsumerName(int maxMessages, int maxBytes) { @Test public void testFetchNoWaitPlusExpires() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder() - .name(jstc.consumerName()) + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder() + .name(ctx.consumerName()) .inactiveThreshold(100000) // I could have used a durable, but this is long enough for the test - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .build()); - ConsumerContext cc = nc.getConsumerContext(jstc.stream, jstc.consumerName()); + ConsumerContext cc = nc.getConsumerContext(ctx.stream, ctx.consumerName()); FetchConsumeOptions fco = FetchConsumeOptions.builder().maxMessages(10).noWait().build(); // No Wait, No Messages @@ -349,14 +349,14 @@ public void testFetchNoWaitPlusExpires() throws Exception { assertEquals(0, count); // no messages // No Wait, One Message - jstc.js.publish(jstc.subject(), "DATA-A".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-A".getBytes()); fc = cc.fetch(fco); count = readMessages(fc); assertEquals(1, count); // 1 message // No Wait, Two Messages - jstc.js.publish(jstc.subject(), "DATA-B".getBytes()); - jstc.js.publish(jstc.subject(), "DATA-C".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-B".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-C".getBytes()); fc = cc.fetch(fco); count = readMessages(fc); assertEquals(2, count); // 2 messages @@ -370,9 +370,9 @@ public void testFetchNoWaitPlusExpires() throws Exception { // With Expires, One to Three Message fco = FetchConsumeOptions.builder().maxMessages(10).noWaitExpiresIn(1000).build(); fc = cc.fetch(fco); - jstc.js.publish(jstc.subject(), "DATA-D".getBytes()); - jstc.js.publish(jstc.subject(), "DATA-E".getBytes()); - jstc.js.publish(jstc.subject(), "DATA-F".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-D".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-E".getBytes()); + ctx.js.publish(ctx.subject(), "DATA-F".getBytes()); count = readMessages(fc); // With Long (Default) Expires, Leftovers @@ -397,25 +397,25 @@ private int readMessages(FetchConsumer fc) throws InterruptedException, JetStrea @Test public void testIterableConsumer() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(ctx.consumerName()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName()); - validateConsumerName(consumerContext, null, jstc.consumerName()); + ConsumerContext consumerContext = ctx.js.getConsumerContext(ctx.stream, ctx.consumerName()); + validateConsumerName(consumerContext, null, ctx.consumerName()); int stopCount = 500; // create the consumer then use it try (IterableConsumer consumer = consumerContext.iterate()) { - validateConsumerName(consumerContext, consumer, jstc.consumerName()); - _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); + validateConsumerName(consumerContext, consumer, ctx.consumerName()); + _testIterableBasic(ctx.js, stopCount, consumer, ctx.subject()); } // coverage IterableConsumer consumer = consumerContext.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS); - validateConsumerName(consumerContext, consumer, jstc.consumerName()); + validateConsumerName(consumerContext, consumer, ctx.consumerName()); consumer.close(); //noinspection DataFlowIssue assertThrows(IllegalArgumentException.class, () -> consumerContext.iterate(null)); @@ -424,15 +424,15 @@ public void testIterableConsumer() throws Exception { @Test public void testOrderedConsumerDeliverPolices() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 101, 3, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(jstc); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 101, 3, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(ctx); - StreamContext sctx = nc.getStreamContext(jstc.stream); + StreamContext sctx = nc.getStreamContext(ctx.stream); // test a start time OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartTime) .startTime(startTime); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); @@ -443,7 +443,7 @@ public void testOrderedConsumerDeliverPolices() throws Exception { // test a start sequence occ = new OrderedConsumerConfiguration() - .filterSubject(jstc.subject()) + .filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence) .startSequence(2); occtx = sctx.createOrderedConsumer(occ); @@ -479,25 +479,25 @@ public void testOrderedConsumerCoverage() { @Test public void testOrderedIterableConsumerBasic() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext sctx = nc.getStreamContext(jstc.stream); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext sctx = nc.getStreamContext(ctx.stream); int stopCount = 500; - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(ctx.subject()); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); assertNull(occtx.getConsumerName()); try (IterableConsumer consumer = occtx.iterate()) { validateConsumerNameForOrdered(occtx, consumer, null); - _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); + _testIterableBasic(ctx.js, stopCount, consumer, ctx.subject()); } String consumerNamePrefix = random(); - occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()).consumerNamePrefix(consumerNamePrefix); + occ = new OrderedConsumerConfiguration().filterSubject(ctx.subject()).consumerNamePrefix(consumerNamePrefix); occtx = sctx.createOrderedConsumer(occ); assertNull(occtx.getConsumerName()); try (IterableConsumer consumer = occtx.iterate()) { validateConsumerNameForOrdered(occtx, consumer, consumerNamePrefix); - _testIterableBasic(jstc.js, stopCount, consumer, jstc.subject()); + _testIterableBasic(ctx.js, stopCount, consumer, ctx.subject()); } }); } @@ -543,16 +543,16 @@ private void _testIterableBasic(JetStream js, int stopCount, IterableConsumer co @Test public void testConsumeWithHandler() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 2500); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 2500); // Pre define a consumer - ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(jstc.consumerName()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(ctx.consumerName()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName()); - validateConsumerName(consumerContext, null, jstc.consumerName()); + ConsumerContext consumerContext = ctx.js.getConsumerContext(ctx.stream, ctx.consumerName()); + validateConsumerName(consumerContext, null, ctx.consumerName()); int stopCount = 500; @@ -566,16 +566,16 @@ public void testConsumeWithHandler() throws Exception { }; try (MessageConsumer mcon = consumerContext.consume(handler)) { - validateConsumerName(consumerContext, mcon, jstc.consumerName()); + validateConsumerName(consumerContext, mcon, ctx.consumerName()); latch.await(); stopAndWaitForFinished(mcon); assertTrue(atomicCount.get() > 500); } - StreamContext sctx = nc.getStreamContext(jstc.stream); + StreamContext sctx = nc.getStreamContext(ctx.stream); OrderedConsumerContext orderedConsumerContext = - sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(jstc.subject())); + sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(ctx.subject())); assertNull(orderedConsumerContext.getConsumerName()); CountDownLatch orderedLatch = new CountDownLatch(1); @@ -596,7 +596,7 @@ public void testConsumeWithHandler() throws Exception { String prefix = random(); OrderedConsumerContext orderedConsumerContextPrefixed = - sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(jstc.subject()).consumerNamePrefix(prefix)); + sctx.createOrderedConsumer(new OrderedConsumerConfiguration().filterSubject(ctx.subject()).consumerNamePrefix(prefix)); assertNull(orderedConsumerContextPrefixed.getConsumerName()); CountDownLatch orderedLatchPrefixed = new CountDownLatch(1); @@ -631,17 +631,17 @@ private static void stopAndWaitForFinished(MessageConsumer mcon) throws Interrup @Test public void testNext() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 4); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 4); String name = random(); // Pre define a consumer ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(name).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); // Consumer[Context] - ConsumerContext consumerContext = jstc.js.getConsumerContext(jstc.stream, name); + ConsumerContext consumerContext = ctx.js.getConsumerContext(ctx.stream, name); validateConsumerName(consumerContext, null, name); assertThrows(IllegalArgumentException.class, () -> consumerContext.next(1)); // max wait too small @@ -651,7 +651,7 @@ public void testNext() throws Exception { assertNotNull(consumerContext.next()); assertNull(consumerContext.next(1000)); - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); OrderedConsumerContext occtx = sctx.createOrderedConsumer(new OrderedConsumerConfiguration()); assertNull(occtx.getConsumerName()); assertThrows(IllegalArgumentException.class, () -> occtx.next(1)); // max wait too small @@ -703,32 +703,32 @@ public void testNext() throws Exception { @Test public void testCoverage() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { // Pre define a consumer - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(1)).build()); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(2)).build()); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(3)).build()); - jstc.jsm.addOrUpdateConsumer(jstc.stream, ConsumerConfiguration.builder().durable(jstc.consumerName(4)).build()); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(1)).build()); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(2)).build()); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(3)).build()); + ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(4)).build()); // Stream[Context] - StreamContext sctx1 = nc.getStreamContext(jstc.stream); - nc.getStreamContext(jstc.stream, JetStreamOptions.DEFAULT_JS_OPTIONS); - jstc.js.getStreamContext(jstc.stream); + StreamContext sctx1 = nc.getStreamContext(ctx.stream); + nc.getStreamContext(ctx.stream, JetStreamOptions.DEFAULT_JS_OPTIONS); + ctx.js.getStreamContext(ctx.stream); // Consumer[Context] - ConsumerContext cctx1 = nc.getConsumerContext(jstc.stream, jstc.consumerName(1)); - ConsumerContext cctx2 = nc.getConsumerContext(jstc.stream, jstc.consumerName(2), JetStreamOptions.DEFAULT_JS_OPTIONS); - ConsumerContext cctx3 = jstc.js.getConsumerContext(jstc.stream, jstc.consumerName(3)); - ConsumerContext cctx4 = sctx1.getConsumerContext(jstc.consumerName(4)); - ConsumerContext cctx5 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(jstc.consumerName(5)).build()); - ConsumerContext cctx6 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(jstc.consumerName(6)).build()); - - after(cctx1.iterate(), jstc.consumerName(1), true); - after(cctx2.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS), jstc.consumerName(2), true); - after(cctx3.consume(m -> {}), jstc.consumerName(3), true); - after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {}), jstc.consumerName(4), true); - after(cctx5.fetchMessages(1), jstc.consumerName(5), false); - after(cctx6.fetchBytes(1000), jstc.consumerName(6), false); + ConsumerContext cctx1 = nc.getConsumerContext(ctx.stream, ctx.consumerName(1)); + ConsumerContext cctx2 = nc.getConsumerContext(ctx.stream, ctx.consumerName(2), JetStreamOptions.DEFAULT_JS_OPTIONS); + ConsumerContext cctx3 = ctx.js.getConsumerContext(ctx.stream, ctx.consumerName(3)); + ConsumerContext cctx4 = sctx1.getConsumerContext(ctx.consumerName(4)); + ConsumerContext cctx5 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(ctx.consumerName(5)).build()); + ConsumerContext cctx6 = sctx1.createOrUpdateConsumer(ConsumerConfiguration.builder().durable(ctx.consumerName(6)).build()); + + after(cctx1.iterate(), ctx.consumerName(1), true); + after(cctx2.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS), ctx.consumerName(2), true); + after(cctx3.consume(m -> {}), ctx.consumerName(3), true); + after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {}), ctx.consumerName(4), true); + after(cctx5.fetchMessages(1), ctx.consumerName(5), false); + after(cctx6.fetchBytes(1000), ctx.consumerName(6), false); }); } @@ -925,41 +925,41 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorNext() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); - jsPublish(jstc.js, jstc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(jstc); + jsPublish(ctx.js, ctx.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(ctx); // New pomm factory in place before each subscription is made // test with and without a consumer name prefix - jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + ctx.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; _testOrderedNext(sctx, 1, new OrderedConsumerConfiguration() - .filterSubject(jstc.subject())); + .filterSubject(ctx.subject())); _testOrderedNext(sctx, 1, new OrderedConsumerConfiguration() .consumerNamePrefix(random()) - .filterSubject(jstc.subject())); + .filterSubject(ctx.subject())); - jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + ctx.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - jstc.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + ctx.js._pullOrderedMessageManagerFactory = PullOrderedNextTestDropSimulator::new; + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedNext(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); } - private ZonedDateTime getStartTimeFirstMessage(JetStreamTestingContext jstc) throws IOException, JetStreamApiException, InterruptedException { + private ZonedDateTime getStartTimeFirstMessage(JetStreamTestingContext ctx) throws IOException, JetStreamApiException, InterruptedException { ZonedDateTime startTime; - JetStreamSubscription sub = jstc.js.subscribe(jstc.subject()); + JetStreamSubscription sub = ctx.js.subscribe(ctx.subject()); Message mt = sub.nextMessage(1000); startTime = mt.metaData().timestamp().plus(30, ChronoUnit.MILLIS); sub.unsubscribe(); @@ -1006,33 +1006,33 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testOrderedBehaviorFetch() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); - jsPublish(jstc.js, jstc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(jstc); + jsPublish(ctx.js, ctx.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(ctx); // New pomm factory in place before subscriptions are made - jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; // Set the Consumer Sequence For Stream Sequence 3 statically for ease CS_FOR_SS_3 = 3; - _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration().filterSubject(jstc.subject())); + _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration().filterSubject(ctx.subject())); _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration() .consumerNamePrefix(random()) - .filterSubject(jstc.subject())); + .filterSubject(ctx.subject())); CS_FOR_SS_3 = 2; - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); CS_FOR_SS_3 = 2; - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); @@ -1075,34 +1075,34 @@ private void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq, Ordere @Test public void testOrderedBehaviorIterable() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); - jsPublish(jstc.js, jstc.subject(), 101, 6, 100); - ZonedDateTime startTime = getStartTimeFirstMessage(jstc); + jsPublish(ctx.js, ctx.subject(), 101, 6, 100); + ZonedDateTime startTime = getStartTimeFirstMessage(ctx); // New pomm factory in place before each subscription is made // Set the Consumer Sequence For Stream Sequence 3 statically for ease CS_FOR_SS_3 = 3; - jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration().filterSubject(jstc.subject())); + ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration().filterSubject(ctx.subject())); _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration() .consumerNamePrefix(random()) - .filterSubject(jstc.subject())); + .filterSubject(ctx.subject())); CS_FOR_SS_3 = 2; - jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime)); CS_FOR_SS_3 = 2; - jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); - _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(jstc.subject()) + _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject()) .consumerNamePrefix(random()) .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2)); }); @@ -1158,28 +1158,28 @@ public void testOrderedConsumeConstruction() { @Test public void testOrderedConsume() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() - .filterSubject(jstc.subject()); - _testOrderedConsume(jstc, occ); + .filterSubject(ctx.subject()); + _testOrderedConsume(ctx, occ); }); } @Test public void testOrderedConsumeWithPrefix() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration() .consumerNamePrefix(random()) - .filterSubject(jstc.subject()); - _testOrderedConsume(jstc, occ); + .filterSubject(ctx.subject()); + _testOrderedConsume(ctx, occ); }); } - private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerConfiguration occ) throws Exception { - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + private void _testOrderedConsume(JetStreamTestingContext ctx, OrderedConsumerConfiguration occ) throws Exception { + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); // Get this in place before subscriptions are made - jstc.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; + ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new; CountDownLatch msgLatch = new CountDownLatch(6); AtomicInteger received = new AtomicInteger(); @@ -1193,7 +1193,7 @@ private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerCo assertNull(occtx.getConsumerName()); try (MessageConsumer mcon = occtx.consume(handler)) { validateConsumerNameForOrdered(occtx, mcon, occ.getConsumerNamePrefix()); - jsPublish(jstc.js, jstc.subject(), 201, 6); + jsPublish(ctx.js, ctx.subject(), 201, 6); // wait for the messages awaitAndAssert(msgLatch); @@ -1209,14 +1209,14 @@ private void _testOrderedConsume(JetStreamTestingContext jstc, OrderedConsumerCo @Test public void testOrderedConsumeMultipleSubjects() throws Exception { - runInSharedCustomStream(VersionUtils::atLeast2_10, (nc, jstc) -> { - jstc.createStream(2); - jsPublish(jstc.js, jstc.subject(0), 10); - jsPublish(jstc.js, jstc.subject(1), 5); + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { + ctx.createStream(2); + jsPublish(ctx.js, ctx.subject(0), 10); + jsPublish(ctx.js, ctx.subject(1), 5); - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubjects(jstc.subject(0), jstc.subject(1)); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubjects(ctx.subject(0), ctx.subject(1)); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); int count0 = 0; @@ -1224,7 +1224,7 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { try (FetchConsumer fc = occtx.fetch(FetchConsumeOptions.builder().maxMessages(20).expiresIn(2000).build())) { Message m = fc.nextMessage(); while (m != null) { - if (m.getSubject().equals(jstc.subject(0))) { + if (m.getSubject().equals(ctx.subject(0))) { count0++; } else { @@ -1242,10 +1242,10 @@ public void testOrderedConsumeMultipleSubjects() throws Exception { @Test public void testOrderedMultipleWays() throws Exception { - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - StreamContext sctx = jstc.js.getStreamContext(jstc.stream); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + StreamContext sctx = ctx.js.getStreamContext(ctx.stream); - OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(jstc.subject()); + OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(ctx.subject()); OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ); // can't do others while doing next @@ -1270,7 +1270,7 @@ public void testOrderedMultipleWays() throws Exception { latch.await(3000, TimeUnit.MILLISECONDS); for (int x = 0; x < 10_000; x++) { - jstc.js.publish(jstc.subject(), ("multiple" + x).getBytes()); + ctx.js.publish(ctx.subject(), ("multiple" + x).getBytes()); } // can do others now @@ -1458,9 +1458,8 @@ private Object roundTripSerialize(Serializable s) throws IOException, ClassNotFo @Test public void testOverflowFetch() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInShared(VersionUtils::atLeast2_9_1, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 100); + runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 100); // Testing min ack pending String group = random(); @@ -1471,11 +1470,11 @@ public void testOverflowFetch() throws Exception { .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(10_000) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(ctx.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(ctx.stream, cname); FetchConsumeOptions fcoNoMin = FetchConsumeOptions.builder() .maxMessages(5).expiresIn(1000).group(group) @@ -1521,8 +1520,8 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 100); + runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 100); // Testing min ack pending String group = random(); @@ -1533,11 +1532,11 @@ public void testOverflowIterate() throws Exception { .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(30_000) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(ctx.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(ctx.stream, cname); validateConsumerName(ctxPrime, null, cname); validateConsumerName(ctxOver, null, cname); @@ -1607,8 +1606,8 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, jstc) -> { - jsPublish(jstc.js, jstc.subject(), 1000); + runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, ctx) -> { + jsPublish(ctx.js, ctx.subject(), 1000); // Testing min ack pending String group = random(); @@ -1619,11 +1618,11 @@ public void testOverflowConsume() throws Exception { .priorityPolicy(PriorityPolicy.Overflow) .priorityGroups(group) .ackWait(30_000) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - ConsumerContext ctxPrime = nc.getConsumerContext(jstc.stream, cname); - ConsumerContext ctxOver = nc.getConsumerContext(jstc.stream, cname); + ConsumerContext ctxPrime = nc.getConsumerContext(ctx.stream, cname); + ConsumerContext ctxOver = nc.getConsumerContext(ctx.stream, cname); validateConsumerName(ctxPrime, null, cname); validateConsumerName(ctxOver, null, cname); @@ -1673,14 +1672,14 @@ public void testOverflowConsume() throws Exception { @Test public void testFinishEmptyStream() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, (nc, jstc) -> { + runInSharedOwnNc(listener, (nc, ctx) -> { String name = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(name) - .filterSubjects(jstc.subject()).build(); - jstc.jsm.addOrUpdateConsumer(jstc.stream, cc); + .filterSubjects(ctx.subject()).build(); + ctx.jsm.addOrUpdateConsumer(ctx.stream, cc); - ConsumerContext cctx = nc.getConsumerContext(jstc.stream, name); + ConsumerContext cctx = nc.getConsumerContext(ctx.stream, name); MessageHandler handler = Message::ack; diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 8f26d4bab..95819e610 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -263,9 +263,7 @@ public void testTLSOnReconnect() throws Exception { // Use two server ports to avoid port release timing issues try (NatsTestServer ts = configFileServer("tlsverify.conf", port)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder() - .server(ts.getLocalhostUri()) - .server(NatsTestServer.getLocalhostUri(newPort)) + Options options = optionsBuilder(ts.getLocalhostUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) .sslContext(ctx) .connectionListener(listener) diff --git a/src/test/java/io/nats/client/support/ScheduledTaskTests.java b/src/test/java/io/nats/client/support/ScheduledTaskTests.java index cb77d0509..62105609c 100644 --- a/src/test/java/io/nats/client/support/ScheduledTaskTests.java +++ b/src/test/java/io/nats/client/support/ScheduledTaskTests.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -public class ScheduledTaskTests { +public class ScheduledTaskTests extends TestBase { @Test public void testScheduledTask() throws InterruptedException { @@ -30,7 +30,7 @@ public void testScheduledTask() throws InterruptedException { AtomicInteger counter100 = new AtomicInteger(); SttRunnable sttr100 = new SttRunnable(400, counter100); - String id = "100-" + TestBase.random(); + String id = "100-" + random(); ScheduledTask task100 = new ScheduledTask(id, stpe, 0, 100, TimeUnit.MILLISECONDS, sttr100); validateTaskPeriods(task100, 0, 100); assertEquals(id, task100.getId()); diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index bd2b93a81..371bba355 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -21,9 +21,6 @@ import io.nats.client.api.StreamInfo; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.function.Executable; import java.io.IOException; @@ -97,7 +94,7 @@ public static ServerInfo ensureVersionServerInfo() throws Exception { // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- - public interface InServerTest { + public interface ServerTest { void test(Connection nc) throws Exception; } @@ -116,23 +113,23 @@ default void append(int index, Options.Builder builder) {} default boolean jetStream() { return false; } } - public interface InJetStreamTest { + public interface JetStreamTest { void test(Connection nc, JetStreamManagement jsm, JetStream js) throws Exception; } - public interface InJetStreamTestingContextTest { - void test(Connection nc, JetStreamTestingContext jstc) throws Exception; + public interface JetStreamTestingContextTest { + void test(Connection nc, JetStreamTestingContext ctx) throws Exception; } // ---------------------------------------------------------------------------------------------------- // runners -> own server // ---------------------------------------------------------------------------------------------------- - private static void _runInOwnServer( + private static void _runInServer( Options.Builder optionsBuilder, VersionCheck vc, String configFilePath, - InServerTest inServerTest, - InJetStreamTest jsTest + ServerTest serverTest, + JetStreamTest jsTest ) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check @@ -150,7 +147,7 @@ private static void _runInOwnServer( initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { if (jsTest == null) { - inServerTest.test(nc); + serverTest.test(nc); } else { NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); @@ -162,113 +159,41 @@ private static void _runInOwnServer( } } - public static void runInOwnServer(InServerTest inServerTest) throws Exception { - _runInOwnServer(null, null, null, inServerTest, null); - } - - public static void runInOwnServer(Options.Builder builder, InServerTest inServerTest) throws Exception { - _runInOwnServer(builder, null, null, inServerTest, null); - } - - public static void runInOwnJsServer(InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, null, null, null, inJetStreamTest); - } - - public static void runInOwnJsServer(VersionCheck vc, InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, vc, null, null, inJetStreamTest); - } - - public static void runInConfiguredServer(String configFilePath, InServerTest inServerTest) throws Exception { - _runInOwnServer(null, null, configFilePath, inServerTest, null); - } - - public static void runInConfiguredJsServer(String configFilePath, InJetStreamTest inJetStreamTest) throws Exception { - _runInOwnServer(null, null, configFilePath, null, inJetStreamTest); - } - - // ---------------------------------------------------------------------------------------------------- - // runners -> long running server - // ---------------------------------------------------------------------------------------------------- - private static String classReusable; - - @BeforeAll - public static void beforeAll(TestInfo info) throws Exception { - classReusable = info.getDisplayName(); - } - - @AfterAll - public static void afterAll() throws Exception { - ReusableServer.shutdownInstance(classReusable); - } - - public static void runInShared(InServerTest test) throws Exception { - _runInShared(null, null, test, null, -1); - } - - public static void runInShared(VersionCheck vc, InServerTest test) throws Exception { - _runInShared(null, vc, test, null, -1); - } - - public static void runInSharedOwnNc(InServerTest test) throws Exception { - _runInShared(optionsBuilder(), null, test, null, -1); - } - - public static void runInSharedOwnNc(ErrorListener el, InServerTest test) throws Exception { - _runInShared(optionsBuilder(el), null, test, null, -1); - } - - public static void runInSharedOwnNc(Options.Builder builder, InServerTest test) throws Exception { - _runInShared(builder, null, test, null, -1); - } - // -------------------------------------------------- - // InJetStreamTestingContextTest custom stream create + // Not using JetStream // -------------------------------------------------- - public static void runInSharedCustomStream(InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { - _runInShared(null, null, null, customStreamCreateJstcTest, 0); + public static void runInServer(ServerTest serverTest) throws Exception { + _runInServer(null, null, null, serverTest, null); } - public static void runInSharedCustomStream(VersionCheck vc, InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { - _runInShared(null, vc, null, customStreamCreateJstcTest, 0); + public static void runInServer(Options.Builder builder, ServerTest serverTest) throws Exception { + _runInServer(builder, null, null, serverTest, null); } - public static void runInSharedCustomStream(Options.Builder builder, InJetStreamTestingContextTest customStreamCreateJstcTest) throws Exception { - _runInShared(builder, null, null, customStreamCreateJstcTest, -1); - } - - // ------------------------------------------------ - // InJetStreamTestingContextTest oneSubjectJstcTest - // ------------------------------------------------ - public static void runInShared(InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(null, null, null, oneSubjectJstcTest, 1); - } - - public static void runInShared(VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(null, vc, null, oneSubjectJstcTest, 1); - } - - public static void runInSharedOwnNc(ErrorListener el, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(optionsBuilder(el), null, null, oneSubjectJstcTest, 1); - } - - public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(optionsBuilder(el), vc, null, oneSubjectJstcTest, 1); + // -------------------------------------------------- + // JetStream needing isolation + // -------------------------------------------------- + public static void runInJsServer(JetStreamTest jetStreamTest) throws Exception { + _runInServer(null, null, null, null, jetStreamTest); } - public static void runInSharedOwnNc(Options.Builder builder, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(builder, null, null, oneSubjectJstcTest, 1); + public static void runInJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { + _runInServer(null, null, configFilePath, null, jetStreamTest); } - public static void runInSharedOwnNc(Options.Builder builder, VersionCheck vc, InJetStreamTestingContextTest oneSubjectJstcTest) throws Exception { - _runInShared(builder, vc, null, oneSubjectJstcTest, 1); + public static void runInJsServer(VersionCheck vc, JetStreamTest jetStreamTest) throws Exception { + _runInServer(null, vc, null, null, jetStreamTest); } + // ---------------------------------------------------------------------------------------------------- + // runners -> shared + // ---------------------------------------------------------------------------------------------------- private static void _runInShared( Options.Builder optionsBuilder, VersionCheck vc, - InServerTest test, - InJetStreamTestingContextTest jstcTest, - int jstcTestSubjectCount + ServerTest test, + int jstcTestSubjectCount, + JetStreamTestingContextTest ctxTest ) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check @@ -292,9 +217,9 @@ private static void _runInShared( initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { try { - if (jstcTest != null) { - try (JetStreamTestingContext jstc = new JetStreamTestingContext(nc, jstcTestSubjectCount)) { - jstcTest.test(nc, jstc); + if (ctxTest != null) { + try (JetStreamTestingContext ctx = new JetStreamTestingContext(nc, jstcTestSubjectCount)) { + ctxTest.test(nc, ctx); } } else { @@ -309,29 +234,87 @@ private static void _runInShared( } } - public static void deleteStreams(JetStreamManagement jsm) throws IOException, JetStreamApiException { - List streams = jsm.getStreamNames(); - for (String stream : streams) { - try { jsm.deleteStream(stream); } catch (Exception ignore) {} - } + // -------------------------------------------------- + // 1. Not using JetStream + // -or- + // 2. need something very custom -> + // please clean up your streams + // -or- + // 3. or need to do something special with the + // connection list close it + // -------------------------------------------------- + public static void runInShared(ServerTest test) throws Exception { + _runInShared(null, null, test, -1, null); } - public static void deleteStreams(JetStreamManagement jsm, String... streams) throws IOException, JetStreamApiException { - for (String stream : streams) { - try { jsm.deleteStream(stream); } catch (Exception ignore) {} - } + public static void runInShared(VersionCheck vc, ServerTest test) throws Exception { + _runInShared(null, vc, test, -1, null); + } + + public static void runInSharedOwnNc(ServerTest test) throws Exception { + _runInShared(optionsBuilder(), null, test, -1, null); + } + + public static void runInSharedOwnNc(ErrorListener el, ServerTest test) throws Exception { + _runInShared(optionsBuilder(el), null, test, -1, null); + } + + public static void runInSharedOwnNc(Options.Builder builder, ServerTest test) throws Exception { + _runInShared(builder, null, test, -1, null); + } + + // -------------------------------------------------- + // JetStream: 1 stream 1 subject + // -------------------------------------------------- + public static void runInShared(JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(null, null, null, 1, ctxTest); + } + + public static void runInShared(VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(null, vc, null, 1, ctxTest); + } + + public static void runInSharedOwnNc(ErrorListener el, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(optionsBuilder(el), null, null, 1, ctxTest); + } + + public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(optionsBuilder(el), vc, null, 1, ctxTest); + } + + public static void runInSharedOwnNc(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(builder, null, null, 1, ctxTest); + } + + public static void runInSharedOwnNc(Options.Builder builder, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(builder, vc, null, 1, ctxTest); + } + + // -------------------------------------------------- + // JetStream: 1 stream custom subjects, kv or os + // -------------------------------------------------- + public static void runInSharedCustom(JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(null, null, null, 0, ctxTest); + } + + public static void runInSharedCustom(VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(null, vc, null, 0, ctxTest); + } + + public static void runInSharedCustom(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { + _runInShared(builder, null, null, -1, ctxTest); } // ---------------------------------------------------------------------------------------------------- // runners / external // ---------------------------------------------------------------------------------------------------- - public static void runInExternalServer(InServerTest inServerTest) throws Exception { - runInExternalServer(Options.DEFAULT_URL, inServerTest); + public static void runInExternalServer(ServerTest serverTest) throws Exception { + runInExternalServer(Options.DEFAULT_URL, serverTest); } - public static void runInExternalServer(String url, InServerTest inServerTest) throws Exception { + public static void runInExternalServer(String url, ServerTest serverTest) throws Exception { try (Connection nc = Nats.connect(url)) { - inServerTest.test(nc); + serverTest.test(nc); } } @@ -649,9 +632,4 @@ public static StreamInfo createMemoryStream(JetStreamManagement jsm, String stre return jsm.addStream(sc); } - - public static StreamInfo createMemoryStream(Connection nc, String streamName, String... subjects) - throws IOException, JetStreamApiException { - return createMemoryStream(nc.jetStreamManagement(), streamName, subjects); - } } diff --git a/src/test/java/io/nats/client/utils/VersionUtils.java b/src/test/java/io/nats/client/utils/VersionUtils.java index ed8aa28bf..eba2215d5 100644 --- a/src/test/java/io/nats/client/utils/VersionUtils.java +++ b/src/test/java/io/nats/client/utils/VersionUtils.java @@ -33,14 +33,14 @@ public static boolean atLeast2_9_0() { return atLeast2_9_0(VERSION_SERVER_INFO); } - public static boolean atLeast2_9_0(Connection nc) { - return atLeast2_9_0(nc.getServerInfo()); - } - public static boolean atLeast2_9_0(ServerInfo si) { return si.isSameOrNewerThanVersion("2.9.0"); } + public static boolean atLeast2_9_6(ServerInfo si) { + return si.isSameOrNewerThanVersion("2.9.6"); + } + public static boolean atLeast2_10_26(ServerInfo si) { return si.isSameOrNewerThanVersion("2.10.26"); } diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 55e4371da..fa2430fa5 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -905,7 +905,7 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { @Test public void testHandlerException() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { ServiceEndpoint exServiceEndpoint = ServiceEndpoint.builder() .endpointName("exEndpoint") .endpointSubject("exSubject") @@ -936,7 +936,7 @@ public void testHandlerException() throws Exception { @Test public void testServiceMessage() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { AtomicInteger which = new AtomicInteger(); ServiceEndpoint se = ServiceEndpoint.builder() .endpointName("testServiceMessage") @@ -1575,7 +1575,7 @@ public String get() { @Test public void testInboxSupplier() throws Exception { - runInOwnServer(nc -> { + runInServer(nc -> { Discovery discovery = new Discovery(nc, 100, 1); TestInboxSupplier supplier = new TestInboxSupplier(); discovery.setInboxSupplier(supplier); From 43f568dfe781e5d00acf0eefaa0f6d8bb276b703 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 27 Nov 2025 12:48:33 -0500 Subject: [PATCH 16/51] more --- src/test/java/io/nats/client/AuthTests.java | 4 +- src/test/java/io/nats/client/BadHandler.java | 8 +- .../java/io/nats/client/ConnectTests.java | 2 +- src/test/java/io/nats/client/EchoTests.java | 32 +- .../java/io/nats/client/PublishTests.java | 37 +- .../java/io/nats/client/ReconnectCheck.java | 75 --- ...tionDuringReconnectOnFlushTimeoutTest.java | 31 +- .../client/impl/ConnectionListenerTests.java | 34 +- .../io/nats/client/impl/DispatcherTests.java | 1 - .../client/impl/JetStreamGeneralTests.java | 8 +- .../client/impl/JetStreamManagementTests.java | 8 +- .../JetStreamManagementWithConfTests.java | 2 +- .../impl/JetStreamMirrorAndSourcesTests.java | 4 +- .../nats/client/impl/ListenerByFutures.java | 180 +++++++ .../nats/client/impl/MessageManagerTests.java | 51 +- .../java/io/nats/client/impl/PingTests.java | 70 +-- .../io/nats/client/impl/ReconnectTests.java | 11 +- .../io/nats/client/impl/RequestTests.java | 50 +- .../nats/client/impl/SlowConsumerTests.java | 8 +- .../other}/ClientCompatibilityMain.java | 3 +- .../client/{ => other}/FlushBenchmark.java | 113 ++--- .../MessageProtocolCreationBenchmark.java | 13 +- .../MessageQueueBenchmark.java | 446 +++++++++--------- .../client/{ => other}/NUIDBenchmarks.java | 4 +- .../ParseBenchmark.java} | 4 +- .../PublishBenchmarkWithStats.java | 174 +++---- .../io/nats/client/other/ReconnectCheck.java | 77 +++ .../RequestBenchmarkWithStats.java | 306 ++++++------ .../io/nats/client/utils/OptionsUtils.java | 6 + ...{ReusableServer.java => SharedServer.java} | 117 ++--- .../java/io/nats/client/utils/TestBase.java | 86 ++-- .../java/io/nats/service/ServiceTests.java | 6 +- 32 files changed, 1116 insertions(+), 855 deletions(-) delete mode 100644 src/test/java/io/nats/client/ReconnectCheck.java create mode 100644 src/test/java/io/nats/client/impl/ListenerByFutures.java rename src/test/java/io/nats/{compatibility => client/other}/ClientCompatibilityMain.java (98%) rename src/test/java/io/nats/client/{ => other}/FlushBenchmark.java (94%) rename src/test/java/io/nats/client/{impl => other}/MessageProtocolCreationBenchmark.java (89%) rename src/test/java/io/nats/client/{impl => other}/MessageQueueBenchmark.java (96%) rename src/test/java/io/nats/client/{ => other}/NUIDBenchmarks.java (96%) rename src/test/java/io/nats/client/{impl/ParseTesting.java => other/ParseBenchmark.java} (99%) rename src/test/java/io/nats/client/{ => other}/PublishBenchmarkWithStats.java (96%) create mode 100644 src/test/java/io/nats/client/other/ReconnectCheck.java rename src/test/java/io/nats/client/{ => other}/RequestBenchmarkWithStats.java (97%) rename src/test/java/io/nats/client/utils/{ReusableServer.java => SharedServer.java} (53%) diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index a73c9dee7..8fbcac0b6 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -301,7 +301,7 @@ public void testUserPassInURLWithFallback() throws Exception { ts1.close(); listener.waitForStatusChange(10, TimeUnit.SECONDS); assertConnected(nc); - assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -358,7 +358,7 @@ public void testTokenInURLWithFallback() throws Exception { listener.waitForStatusChange(STANDARD_CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); listenerConnectionWait(nc, listener); - assertEquals(nc.getConnectedUrl(), ts2.getNatsLocalhostUri()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } diff --git a/src/test/java/io/nats/client/BadHandler.java b/src/test/java/io/nats/client/BadHandler.java index 351d81fd1..deb9f2777 100644 --- a/src/test/java/io/nats/client/BadHandler.java +++ b/src/test/java/io/nats/client/BadHandler.java @@ -15,18 +15,18 @@ public class BadHandler implements ErrorListener, ConnectionListener { public void exceptionOccurred(Connection conn, Exception exp) { - throw new IllegalStateException("Its good to be bad"); + throw new IllegalStateException("Intentional"); } public void errorOccurred(Connection conn, String type) { - throw new IllegalStateException("Its good to be bad"); + throw new IllegalStateException("Intentional"); } public void connectionEvent(Connection conn, Events type) { - throw new IllegalStateException("Its good to be bad"); + throw new IllegalStateException("Intentional"); } public void slowConsumerDetected(Connection conn, Consumer consumer) { - throw new IllegalStateException("Its good to be bad"); + throw new IllegalStateException("Intentional"); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index b3087b9ee..b98d450ee 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -637,7 +637,7 @@ void testConnectWithFastFallback() throws Exception { @Test void testConnectPendingCountCoverage() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { AtomicLong outgoingPendingMessageCount = new AtomicLong(); AtomicLong outgoingPendingBytes = new AtomicLong(); diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index ea1609e76..481221141 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -14,13 +14,14 @@ package io.nats.client; import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.utils.SharedServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; -import static io.nats.client.utils.ConnectionUtils.longConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -62,8 +63,8 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { - runInSharedOwnNc(nc1 -> { - try (Connection nc2 = longConnectionWait(optionsBuilder(nc1.getConnectedUrl()).build())) { + runInShared(nc1 -> { + try (Connection nc2 = standardConnectionWait(optionsBuilder(nc1).build())) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); @@ -92,17 +93,30 @@ public void testWithEcho() throws Exception { @Test public void testWithNoEcho() throws Exception { - runInSharedOwnNc(optionsBuilder().noEcho().noReconnect(), nc -> { + runInSharedOwnNc(optionsBuilder().noEcho().noReconnect(), nc1 -> { + Connection nc2 = SharedServer.sharedConnectionForSameServer(nc1); + String subject = random(); - // Echo is off so sub should get messages from pub from other connections - Subscription sub1 = nc.subscribe(subject); - nc.flush(Duration.ofSeconds(1)); + Subscription sub1 = nc1.subscribe(subject); + nc1.flush(Duration.ofSeconds(1)); + Subscription sub2 = nc2.subscribe(subject); + nc2.flush(Duration.ofSeconds(1)); // Pub from connect 1 - nc.publish(subject, null); - nc.flush(Duration.ofSeconds(1)); + nc1.publish(subject, null); + nc1.flush(Duration.ofSeconds(1)); Message msg = sub1.nextMessage(Duration.ofSeconds(1)); assertNull(msg); // no message for sub1 from pub 1 + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + + // Pub from connect 2 + nc2.publish(subject, null); + nc2.flush(Duration.ofSeconds(1)); + msg = sub1.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); + msg = sub2.nextMessage(Duration.ofSeconds(1)); + assertNotNull(msg); // nc2 is not no echo }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 86e355036..35374945f 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -13,13 +13,15 @@ package io.nats.client; +import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.Headers; import io.nats.client.impl.JetStreamTestingContext; -import io.nats.client.impl.ListenerForTesting; +import io.nats.client.impl.ListenerByFutures; import io.nats.client.impl.NatsMessage; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; +import java.io.IOException; import java.net.SocketException; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletableFuture; @@ -32,7 +34,6 @@ import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; -import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class PublishTests extends TestBase { @@ -45,6 +46,9 @@ public void throwsIfClosed() throws Exception { // flush after close always times out assertThrows(TimeoutException.class, () -> nc.flush(null)); + + // a normal api call after close + assertThrows(IOException.class, nc::RTT); }); } @@ -237,27 +241,20 @@ public void testMaxPayload() throws Exception { @Test public void testMaxPayloadNoClientSideLimitChecks() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - Options.Builder builder = optionsBuilder().noReconnect().clientSideLimitChecks(false) + ListenerByFutures listener = new ListenerByFutures(); + Options.Builder builder = optionsBuilder() + .noReconnect() + .clientSideLimitChecks(false) + .errorListener(listener) .connectionListener(listener); runInSharedOwnNc(builder, nc -> { - IllegalStateException check = null; + CompletableFuture fError = listener.prepForError("Maximum Payload Violation"); + CompletableFuture fEvent = listener.prepForEvent(Events.DISCONNECTED); int maxPayload = (int)nc.getServerInfo().getMaxPayload(); - for (int x = 1; x < 100; x++) { - try { - nc.publish(random(), new byte[maxPayload + x]); - } - catch (IllegalStateException e) { - check = e; - break; - } - } - if (check == null) { - fail("Expecting IllegalStateException"); - } - sleep(100); // make sure events has time to get there - assertTrue(listener.getConnectionEvents().contains(ConnectionListener.Events.DISCONNECTED)); + nc.publish(random(), new byte[maxPayload + 1]); + listener.validate(fError, 500, "Maximum Payload Violation"); + listener.validate(fEvent, 500, Events.DISCONNECTED); }); } @@ -277,7 +274,7 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { - Options ncSupportedOptions = optionsBuilder(ncNotSupported.getConnectedUrl()).supportUTF8Subjects().build(); + Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { ctxNotSupported.createStream(jsSubject); diff --git a/src/test/java/io/nats/client/ReconnectCheck.java b/src/test/java/io/nats/client/ReconnectCheck.java deleted file mode 100644 index 7f979b8e6..000000000 --- a/src/test/java/io/nats/client/ReconnectCheck.java +++ /dev/null @@ -1,75 +0,0 @@ -package io.nats.client; - -import java.io.IOException; -import java.time.Duration; - -/* Program to reproduce #231 */ -public class ReconnectCheck { - private static long received; - private static long published; - - private static long lastReceivedId; - - public static void main(String []args) throws IOException, InterruptedException { - Connection natsIn = Nats.connect(buildOptions("IN")); - Connection natsOut = Nats.connect(buildOptions("OUT")); - - Dispatcher natsDispatcher = natsIn.createDispatcher(m -> { - long receivedId = Long.parseLong(new String(m.getData())); - - if (receivedId < lastReceivedId) { - System.out.println(String.format("##### Tid: %d, Received stale data: got %d, last received %d", Thread.currentThread().getId(), receivedId, lastReceivedId)); - } - lastReceivedId = receivedId; - - if (received++ % 1_000_000 == 0) { - System.out.println(String.format("Tid: %d, Received %d messages", Thread.currentThread().getId(), received)); - } - }); - - natsDispatcher.subscribe("foo"); - - long id = 0; - - while (true) { - for (int i = 0; i < 100_000; i++) { - natsOut.publish("foo", ("" + id++).getBytes()); - if (published++ % 1_000_000 == 0) { - System.out.println(String.format("Tid: %d, Published %d messages.", Thread.currentThread().getId(), published)); - } - } - Thread.sleep(1); - } - } - - private static Options buildOptions(String name) { - Options.Builder natsOptions = new Options.Builder().servers(new String[]{"nats://127.0.0.1:4222"}) - .connectionName(name); - natsOptions.maxReconnects(-1).reconnectWait(Duration.ofSeconds(1)) - .connectionTimeout(Duration.ofSeconds(5)); - natsOptions.pingInterval(Duration.ofMillis(100)); - natsOptions.connectionListener((conn, e) -> - System.out.println(String.format("Tid: %d, %s, NATS: connection event - %s, connected url: %s. servers: %s ", Thread.currentThread().getId(), name, e, conn.getConnectedUrl(), conn.getServers()) - )); - natsOptions.errorListener(new ErrorListener() { - @Override - public void slowConsumerDetected(Connection conn, Consumer consumer) { - System.out.println(String.format("Tid: %d, %s, %s: Slow Consumer", Thread.currentThread().getId(), name, conn.getConnectedUrl())); - } - - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - System.out.println(String.format("Tid: %d, %s, Nats '%s' exception: %s", Thread.currentThread().getId(), name, conn.getConnectedUrl(), exp.toString())); - } - - @Override - public void errorOccurred(Connection conn, String error) { - System.out.println(String.format("Tid: %d, %s, Nats '%s': Error %s", Thread.currentThread().getId(), name, conn.getConnectedUrl(), error.toString())); - } - }); - - // Do not cache any messages when Nats connection is down. - natsOptions.reconnectBufferSize(-1); - return natsOptions.build(); - } -} diff --git a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java index 8a660e97f..3c7b938a2 100644 --- a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java +++ b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java @@ -2,6 +2,7 @@ import io.nats.client.*; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.time.Duration; @@ -14,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /* Test to reproduce #1426 */ +@Isolated public class AuthViolationDuringReconnectOnFlushTimeoutTest { private static final int NUMBER_OF_SUBS = 1_000_000; @@ -41,16 +43,15 @@ public void testAuthViolationDuringReconnect() throws Exception { ctx.port = NatsTestServer.nextPort(); startServer(ctx); - Options options = optionsBuilder("nats://" + "127.0.0.1:" + ctx.port) + Options options = optionsBuilder(ctx.port) .noRandomize() .token(new char[]{'1', '2', '3', '4'}) - .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) .reconnectBufferSize(NUMBER_OF_SUBS * 100) .connectionTimeout(Duration.ofMillis(10)) .reconnectWait(Duration.ofMillis(2000)) - .connectionListener((conn, e) -> - System.out.printf("Tid: %d, NATS: connection event - %s, connected url: %s. servers: %s %n", Thread.currentThread().getId(), e, conn.getConnectedUrl(), conn.getServers())) +// .connectionListener((conn, e) -> +// System.out.printf("Tid: %d, NATS: connection event - %s, connected url: %s. servers: %s %n", Thread.currentThread().getId(), e, conn.getConnectedUrl(), conn.getServers())) .errorListener(ctx.errorListener) .build(); @@ -93,20 +94,20 @@ static class Context implements AutoCloseable { AtomicBoolean violated = new AtomicBoolean(false); CountDownLatch restartsLeft = new CountDownLatch(1); ErrorListener errorListener = new ErrorListener() { - @Override - public void slowConsumerDetected(Connection conn, Consumer consumer) { - System.out.printf("Tid: %d, %s: Slow Consumer%n", Thread.currentThread().getId(), conn.getConnectedUrl()); - } - - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - exp.printStackTrace(); - System.out.printf("Tid: %d, Nats '%s' exception: %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), exp); - } +// @Override +// public void slowConsumerDetected(Connection conn, Consumer consumer) { +// System.out.printf("Tid: %d, %s: Slow Consumer%n", Thread.currentThread().getId(), conn.getConnectedUrl()); +// } +// +// @Override +// public void exceptionOccurred(Connection conn, Exception exp) { +// exp.printStackTrace(); +// System.out.printf("Tid: %d, Nats '%s' exception: %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), exp); +// } @Override public void errorOccurred(Connection conn, String error) { - System.out.printf("Tid: %d, Nats '%s': Error %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), error); +// System.out.printf("Tid: %d, Nats '%s': Error %s%n", Thread.currentThread().getId(), conn.getConnectedUrl(), error); if (error.contains("Authorization Violation")) { violated.set(true); } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 9c65d7e1c..eaaba6f94 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -22,11 +22,14 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class ConnectionListenerTests extends TestBase { @@ -37,14 +40,15 @@ public void testToString() { } @Test - public void testCloseCount() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + public void testCloseEvent() throws Exception { + ListenerByFutures listener = new ListenerByFutures(); + CompletableFuture fEvent = listener.prepForEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); - assertEquals(1, listener.getEventCount(Events.CLOSED)); }); + listener.validate(fEvent, 500, Events.CLOSED); } @Test @@ -100,20 +104,24 @@ public void testDisconnectReconnectCount() throws Exception { @Test public void testExceptionInConnectionListener() throws Exception { - BadHandler listener = new BadHandler(); - Options.Builder builder = optionsBuilder().connectionListener(listener); - runInServer(builder, nc -> { - standardCloseConnection(nc); - assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); - }); + BadHandler badHandler = new BadHandler(); + Options.Builder builder = optionsBuilder().connectionListener(badHandler); + AtomicReference stats = new AtomicReference<>(); + runInSharedOwnNc(builder, nc -> stats.set(nc.getStatistics())); + sleep(100); // it needs time here + assertTrue(stats.get().getExceptions() > 0); } @Test public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); - ListenerForTesting listener = new ListenerForTesting(); + ListenerByFutures listener = new ListenerByFutures(); + CompletableFuture fClosed = listener.prepForEvent(Events.CLOSED); + AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { + stats.set(nc.getStatistics()); + //noinspection DataFlowIssue // addConnectionListener parameter is annotated as @NonNull assertThrows(NullPointerException.class, () -> nc.addConnectionListener(null)); //noinspection DataFlowIssue // removeConnectionListener parameter is annotated as @NonNull @@ -130,10 +138,12 @@ public void testMultipleConnectionListeners() throws Exception { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); - assertEquals(1, listener.getEventCount(Events.CLOSED)); - assertTrue(((NatsConnection)nc).getStatisticsCollector().getExceptions() > 0); }); + sleep(100); // it needs time here + assertTrue(stats.get().getExceptions() > 0); + listener.validate(fClosed, 500, Events.CLOSED); + Set expectedEvents = new HashSet<>(Arrays.asList( "CL1-CLOSED", "CL2-CLOSED", diff --git a/src/test/java/io/nats/client/impl/DispatcherTests.java b/src/test/java/io/nats/client/impl/DispatcherTests.java index e5e482938..64b0478ec 100644 --- a/src/test/java/io/nats/client/impl/DispatcherTests.java +++ b/src/test/java/io/nats/client/impl/DispatcherTests.java @@ -866,7 +866,6 @@ public void testDoubleSubscribeWithUnsubscribeAfterWithCustomHandler() throws Ex @Test public void testDispatcherFactoryCoverage() throws Exception { - // custom connection since useDispatcherWithExecutor runInSharedOwnNc(optionsBuilder().useDispatcherWithExecutor(), nc -> { CountDownLatch latch = new CountDownLatch(1); Dispatcher d = nc.createDispatcher(msg -> latch.countDown()); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 5c2da4d85..05c0adfcd 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -50,7 +50,7 @@ public void testJetStreamContextCreate() throws Exception { @Test public void testJetNotEnabled() throws Exception { - runInServer(nc -> { + runInOwnServer(nc -> { // get normal context, try to do an operation JetStream js = nc.jetStream(); assertThrows(IOException.class, () -> js.subscribe(random())); @@ -561,7 +561,7 @@ public void testBindErrors() throws Exception { @Test public void testFilterMismatchErrors() throws Exception { - runInJsServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { String stream = random(); String subject = random(); @@ -949,11 +949,11 @@ public void testInternalLookupConsumerInfoCoverage() throws Exception { @Test public void testGetJetStreamValidatedConnectionCoverage() { NatsJetStreamMessage njsm = new NatsJetStreamMessage(null); - IllegalStateException ise = assertThrows(IllegalStateException.class, njsm::getJetStreamValidatedConnection); assertTrue(ise.getMessage().contains("subscription")); // make a dummy connection so we can make a subscription + // notice we never nc.connect(); Options options = Options.builder().build(); NatsConnection nc = new NatsConnection(options); njsm.subscription = new NatsSubscription("sid", "sub", "q", nc, null); @@ -1107,7 +1107,7 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { - Options optReport = optionsBuilder(ncCancel.getConnectedUrl()).reportNoResponders().build(); + Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index 4d150f2c2..b6cffb573 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -403,7 +403,7 @@ public void testGetStreamInfo() throws Exception { @Test public void testGetStreamInfoOrNamesPaginationFilter() throws Exception { - runInJsServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { // getStreams pages at 256 // getStreamNames pages at 1024 String prefix = random(); @@ -445,7 +445,7 @@ private void addStreams(JetStreamManagement jsm, String prefix, int count, int a @Test public void testGetStreamNamesBySubjectFilter() throws Exception { - runInJsServer((nc, jsm, js) -> { + runInOwnJsServer((nc, jsm, js) -> { String stream1 = random(); String stream2 = random(); String stream3 = random(); @@ -1227,7 +1227,7 @@ public void testDirectMessageRepublishedSubject() throws Exception { @Test public void testCreateConsumerUpdateConsumer() throws Exception { - runInJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> { String streamPrefix = random(); JetStreamManagement jsmNew = nc.jetStreamManagement(); JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build()); @@ -1483,7 +1483,7 @@ public void testMessageDeleteRequest() { @Test public void testStreamPersistMode() throws Exception { - runInJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_12, (nc, jsm, js) -> { StreamConfiguration sc = StreamConfiguration.builder() .name(random()) .storageType(StorageType.File) diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index c007cfd22..c010a169d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -31,7 +31,7 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { - runInJsServer("pagination.conf", (nc, jsm, js) -> { + runInOwnJsServer("pagination.conf", (nc, jsm, js) -> { String stream1 = random(); String stream2 = random(); long rounds = 101; diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index d271d3e21..97686a080 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -272,7 +272,7 @@ public void testSourceBasics() throws Exception { @Test @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { - runInJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); @@ -314,7 +314,7 @@ public void testSourceAndTransformsRoundTrips() throws Exception { @Test public void testMirror() throws Exception { - runInJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { + runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scMirror = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationMirrorSubjectTransform.json"); diff --git a/src/test/java/io/nats/client/impl/ListenerByFutures.java b/src/test/java/io/nats/client/impl/ListenerByFutures.java new file mode 100644 index 000000000..e9a3ad02f --- /dev/null +++ b/src/test/java/io/nats/client/impl/ListenerByFutures.java @@ -0,0 +1,180 @@ +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.*; +import io.nats.client.support.DateTimeUtils; +import io.nats.client.support.Status; +import org.junit.jupiter.api.Assertions; + +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.locks.ReentrantLock; + +@SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) +public class ListenerByFutures implements ErrorListener, ConnectionListener { + private final ReentrantLock lock = new ReentrantLock(); + + private final Map> eventsFutures = new HashMap<>(); + private final Map> textFutures = new HashMap<>(); + + private final boolean printExceptions; + private final boolean verbose; + + public ListenerByFutures() { + this(false, false); + } + + public ListenerByFutures(boolean verbose) { + this(false, verbose); + } + + public ListenerByFutures(boolean printExceptions, boolean verbose) { + this.printExceptions = printExceptions; + this.verbose = verbose; + } + + public void reset() { + for (CompletableFuture f : eventsFutures.values()) { + f.cancel(true); + } + for (CompletableFuture f : textFutures.values()) { + f.cancel(true); + } + eventsFutures.clear(); + textFutures.clear(); + } + + public void validate(CompletableFuture future, long waitInMillis, String failMessage) { + try { + future.get(waitInMillis, TimeUnit.MILLISECONDS); + } catch (TimeoutException | ExecutionException | InterruptedException e) { + Assertions.fail("Failed to get '" + failMessage + "' message.", e); + } + } + + public void validate(CompletableFuture future, long waitInMillis, Events type) { + try { + future.get(waitInMillis, TimeUnit.MILLISECONDS); + } catch (TimeoutException | ExecutionException | InterruptedException e) { + + Assertions.fail("Failed to get " + type.name() + " event.", e); + } + } + + private CompletableFuture prepFor(String label, Map> map, T key) { + lock.lock(); + try { + if (verbose) { + report(label, key.toString()); + } + return map.computeIfAbsent(key, k -> new CompletableFuture<>()); + } finally { + lock.unlock(); + } + } + + private void complete(String label, Map> map, T key) { + lock.lock(); + try { + if (verbose) { + report(label, key.toString()); + } + CompletableFuture f = map.get(key); + if (f != null) { + f.complete(null); + } + } finally { + lock.unlock(); + } + } + + @Override + public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) { + complete("connectionEvent", eventsFutures, type); + } + + public CompletableFuture prepForEvent(Events type) { + return prepFor("prepForEvent", eventsFutures, type); + } + + public CompletableFuture prepForError(String errorText) { + return prepFor("prepForError", textFutures, errorText); + } + + @Override + public void errorOccurred(Connection conn, String error) { + complete("errorOccurred", textFutures, error); + } + + @Override + public void exceptionOccurred(Connection conn, Exception exp) { + if (printExceptions) { + System.err.print("exceptionOccurred:"); + exp.printStackTrace(); + } + } + + @Override + public void slowConsumerDetected(Connection conn, Consumer consumer) { + } + + @Override + public void messageDiscarded(Connection conn, Message msg) { + } + + @Override + public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { + } + + @Override + public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status status) { + } + + @Override + public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { + } + + @Override + public void pullStatusError(Connection conn, JetStreamSubscription sub, Status status) { + } + + @Override + public void flowControlProcessed(Connection conn, JetStreamSubscription sub, String subject, FlowControlSource source) { + } + + @Override + public void socketWriteTimeout(Connection conn) { + } + + public static final DateTimeFormatter SIMPLE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); + + public static String simpleTime() { + return SIMPLE_TIME_FORMATTER.format(DateTimeUtils.gmtNow()); + } + + private void report(String func, Object message) { + System.out.println("[" + simpleTime() + " " + func + "] " + message); + } + + @Override + public void connectionEvent(Connection conn, Events type) { + // deprecated + } +} diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 48d2070ed..37aa66812 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -70,33 +70,66 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO } @Test - public void testPushBeforeQueueProcessorAndManage() throws Exception { + public void testPushBeforeQueueProcessorAndManageHbFcSync() throws Exception { ListenerForTesting listener = new ListenerForTesting(); runInSharedOwnNc(listener, nc -> { NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_hb_fc(), sub, false, true, false); testPushBqpAndManage(sub, listener, pushMgr); + }); + } - pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, true, false); + @Test + public void testPushBeforeQueueProcessorAndManageHbXfcSync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { + NatsJetStreamSubscription sub = genericPushSub(nc); + PushMessageManager pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, true, false); testPushBqpAndManage(sub, listener, pushMgr); + }); + } - pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, true, false); + @Test + public void testPushBeforeQueueProcessorAndManageXhbXfcSync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { + NatsJetStreamSubscription sub = genericPushSub(nc); + PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, true, false); testPushBqpAndManage(sub, listener, pushMgr); + }); + } - pushMgr = getPushManager(nc, push_hb_fc(), sub, false, false, false); + @Test + public void testPushBeforeQueueProcessorAndManageHbFcAsync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { + NatsJetStreamSubscription sub = genericPushSub(nc); + PushMessageManager pushMgr = getPushManager(nc, push_hb_fc(), sub, false, false, false); testPushBqpAndManage(sub, listener, pushMgr); + }); + } - pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, false, false); + @Test + public void testPushBeforeQueueProcessorAndManageHbXfcAsync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { + NatsJetStreamSubscription sub = genericPushSub(nc); + PushMessageManager pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, false, false); testPushBqpAndManage(sub, listener, pushMgr); + }); + } - pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, false, false); + @Test + public void testPushBeforeQueueProcessorAndManageXhbXfcAsync() throws Exception { + ListenerForTesting listener = new ListenerForTesting(); + runInSharedOwnNc(listener, nc -> { + NatsJetStreamSubscription sub = genericPushSub(nc); + PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, false, false); testPushBqpAndManage(sub, listener, pushMgr); }); } private void testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTesting listener, PushMessageManager manager) { - listener.reset(); String sid = sub.getSID(); assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); @@ -135,7 +168,7 @@ private void testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTest @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { + runInOwnJsServer(listener, (nc, jsm, js) -> { NatsJetStreamSubscription sub = genericPullSub(nc); String pullSubject = random(); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index e5d25ada9..eeb8e8ef0 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -19,9 +19,11 @@ import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; -import java.io.IOException; import java.time.Duration; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; import static io.nats.client.utils.OptionsUtils.optionsBuilder; @@ -30,18 +32,16 @@ public class PingTests extends TestBase { @Test - public void testHandlingPing() throws Exception,ExecutionException { + public void testHandlingPing() throws Exception { CompletableFuture gotPong = new CompletableFuture<>(); NatsServerProtocolMock.Customizer pingPongCustomizer = (ts, r,w) -> { - - System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); +// System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); w.write("PING\r\n"); w.flush(); - String pong = ""; - - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + String pong; +// System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); try { pong = r.readLine(); } catch(Exception e) { @@ -50,10 +50,10 @@ public void testHandlingPing() throws Exception,ExecutionException { } if (pong.startsWith("PONG")) { - System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); +// System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); gotPong.complete(Boolean.TRUE); } else { - System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); +// System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); gotPong.complete(Boolean.FALSE); } }; @@ -77,8 +77,8 @@ public void testPingTimer() throws Exception { .maxPingsOut(10000); // just don't want this to be what fails the test runInSharedOwnNc(builder, nc -> { Statistics stats = nc.getStatistics(); - try { Thread.sleep(200); } catch (Exception ignore) {} // 1200 / 100 ... should get 10+ pings - assertTrue(stats.getPings() > 10, "got pings"); + sleep(200); // 1200 / 100 ... should get 10+ pings + assertTrue(stats.getPings() > 1, "got pings"); }); } @@ -196,50 +196,4 @@ public void testPingTimerThroughReconnect() throws Exception { } } } - - - @Test - public void testMessagesDelayPings() throws Exception, ExecutionException, TimeoutException { - Options.Builder builder = optionsBuilder().pingInterval(Duration.ofMillis(200)); - runInSharedOwnNc(builder, nc -> { - Statistics stats = nc.getStatistics(); - final CompletableFuture done = new CompletableFuture<>(); - - Dispatcher d = nc.createDispatcher(msg -> { - if (msg.getSubject().equals("done")) { - done.complete(Boolean.TRUE); - } - }); - - d.subscribe("subject"); - d.subscribe("done"); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - - long b4 = stats.getPings(); - for (int i=0;i<10;i++) { - Thread.sleep(50); - nc.publish("subject", new byte[16]); - } - long after = stats.getPings(); - assertEquals(after, b4, "pings hidden"); - nc.publish("done", new byte[16]); - nc.flush(Duration.ofMillis(1000)); // wait for them to go through - done.get(500, TimeUnit.MILLISECONDS); - - // no more messages, pings should start to go through - b4 = stats.getPings(); - sleep(500); - after = stats.getPings(); - assertTrue(after > b4, "pings restarted"); - }); - } - - @Test - public void testRtt() throws Exception { - runInServer(nc -> { - assertTrue(nc.RTT().toMillis() < 10); - nc.close(); - assertThrows(IOException.class, nc::RTT); - }); - } } diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 3b76beb8e..6b6db7e7e 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -312,7 +312,7 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { .maxReconnects(-1) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts2.getLocalhostUri()); + assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -341,15 +341,14 @@ public void testReconnectToSecondServerFromInfo() throws Exception { .reconnectWait(Duration.ofSeconds(1)) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), mockTs2.getMockUri()); + assertEquals(mockTs2.getMockUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertNotNull(nc.getConnectedUrl()); - assertTrue(ts.getLocalhostUri().endsWith(nc.getConnectedUrl())); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -540,7 +539,7 @@ public void testReconnectNoIPTLSConnection() throws Exception { listener.prepForStatusChange(Events.DISCOVERED_SERVERS); nc = (NatsConnection) longConnectionWait(options); - assertEquals(nc.getConnectedUrl(), ts.getLocalhostUri()); + assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -940,7 +939,7 @@ public void testSocketDataPortTimeout() throws Exception { .errorListener(listener); AtomicBoolean gotOutputQueueIsFull = new AtomicBoolean(); - runInServer(nc1 -> runInServer(nc2 -> { + runInOwnServer(nc1 -> runInOwnServer(nc2 -> { int port1 = nc1.getServerInfo().getPort(); int port2 = nc2.getServerInfo().getPort(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index 41b5d7c7b..7a5f92586 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; @@ -33,11 +34,12 @@ public class RequestTests extends TestBase { @Test public void testSimpleRequest() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { + runInSharedOwnNc(optionsBuilder().maxReconnects(0), nc -> { assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - + + AtomicReference replyTo = new AtomicReference<>(); Dispatcher d = nc.createDispatcher(msg -> { + replyTo.set(msg.getReplyTo()); assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), null); @@ -62,15 +64,15 @@ public void testSimpleRequest() throws Exception { assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); - assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); + assertEquals(msg.getSubject(), replyTo.get()); assertTrue(msg.hasHeaders()); assertEquals("bar", msg.getHeaders().getFirst("foo")); - } + }); } @Test public void testRequestVarieties() throws Exception { - runInServer(nc -> { + runInSharedOwnNc(nc -> { Dispatcher d = nc.createDispatcher(msg -> { if (msg.hasHeaders()) { nc.publish(msg.getReplyTo(), msg.getHeaders(), msg.getData()); @@ -182,14 +184,19 @@ public void testMultipleRequest() throws Exception { @Test public void testMultipleReplies() throws Exception { - Options.Builder builder = optionsBuilder().turnOnAdvancedStats(); - runInServer(builder, nc -> { + Options.Builder builder = optionsBuilder().turnOnAdvancedStats().requestCleanupInterval(Duration.ofMillis(2500)); + runInSharedOwnNc(builder, nc -> { + CountDownLatch d4CanReply = new CountDownLatch(1); AtomicInteger requests = new AtomicInteger(); MessageHandler handler = msg -> { requests.incrementAndGet(); nc.publish(msg.getReplyTo(), null); }; Dispatcher d1 = nc.createDispatcher(handler); Dispatcher d2 = nc.createDispatcher(handler); Dispatcher d3 = nc.createDispatcher(handler); - Dispatcher d4 = nc.createDispatcher(msg -> { sleep(5000); handler.onMessage(msg); }); + Dispatcher d4 = nc.createDispatcher(msg -> { + requests.incrementAndGet(); + d4CanReply.await(5, TimeUnit.SECONDS); + nc.publish(msg.getReplyTo(), null); + }); String subject = random(); d1.subscribe(subject); @@ -199,15 +206,17 @@ public void testMultipleReplies() throws Exception { Message reply = nc.request(subject, null, Duration.ofSeconds(2)); assertNotNull(reply); - sleep(2000); - assertEquals(3, requests.get()); + sleep(2000); // less than the requestCleanupInterval but enough time + assertEquals(4, requests.get()); NatsStatistics stats = (NatsStatistics)nc.getStatistics(); assertEquals(1, stats.getRepliesReceived()); assertEquals(2, stats.getDuplicateRepliesReceived()); assertEquals(0, stats.getOrphanRepliesReceived()); - sleep(3100); - assertEquals(4, requests.get()); + sleep(1000); // easily over the requestCleanupInterval + d4CanReply.countDown(); // signals d4 to reply + + sleep(1000); // enough time for d4's reply to get processed stats = (NatsStatistics)nc.getStatistics(); assertEquals(1, stats.getRepliesReceived()); assertEquals(2, stats.getDuplicateRepliesReceived()); @@ -599,7 +608,11 @@ public void testDelayInPickingUpFuture() throws Exception { public void testOldStyleRequest() throws Exception { runInSharedOwnNc(Options.builder().oldRequestStyle(), nc -> { String subject = random(); - Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); + AtomicReference replyTo = new AtomicReference<>(); + Dispatcher d = nc.createDispatcher(msg -> { + replyTo.set(msg.getReplyTo()); + nc.publish(msg.getReplyTo(), null); + }); d.subscribe(subject); Future incoming = nc.request(subject, null); @@ -608,7 +621,7 @@ public void testOldStyleRequest() throws Exception { assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); assertEquals(0, msg.getData().length); - assertEquals(msg.getSubject().indexOf('.'), msg.getSubject().lastIndexOf('.')); + assertEquals(msg.getSubject(), replyTo.get()); }); } @@ -728,4 +741,11 @@ public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception { assertDoesNotThrow(() -> nc.cleanResponses(false)); } } + + @Test + public void testRtt() throws Exception { + runInShared(nc -> { + assertTrue(nc.RTT().toMillis() < 50); + }); + } } diff --git a/src/test/java/io/nats/client/impl/SlowConsumerTests.java b/src/test/java/io/nats/client/impl/SlowConsumerTests.java index aa7be3327..eebc0d036 100644 --- a/src/test/java/io/nats/client/impl/SlowConsumerTests.java +++ b/src/test/java/io/nats/client/impl/SlowConsumerTests.java @@ -208,7 +208,7 @@ public void testSlowSubscriberNotification() throws Exception { nc.flush(Duration.ofMillis(5000)); // Notification is in another thread, wait for it, or fail - waitForSlow.get(1000, TimeUnit.MILLISECONDS); + waitForSlow.get(3000, TimeUnit.MILLISECONDS); List slow = listener.getSlowConsumers(); assertEquals(1, slow.size()); // should only appear once @@ -218,10 +218,10 @@ public void testSlowSubscriberNotification() throws Exception { nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); - assertEquals(0, slow.size()); // no renotifiy + assertEquals(0, slow.size()); // no renotify waitForSlow = listener.waitForSlow(); - // Clear the queue, we shoudl become a non-slow consumer + // Clear the queue, we should become a non-slow consumer sub.nextMessage(Duration.ofMillis(1000)); // only 1 to get // Notification again on 2nd message @@ -229,7 +229,7 @@ public void testSlowSubscriberNotification() throws Exception { nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); - waitForSlow.get(1000, TimeUnit.MILLISECONDS); + waitForSlow.get(3000, TimeUnit.MILLISECONDS); assertEquals(1, slow.size()); // should only appear once assertEquals(sub, slow.get(0)); diff --git a/src/test/java/io/nats/compatibility/ClientCompatibilityMain.java b/src/test/java/io/nats/client/other/ClientCompatibilityMain.java similarity index 98% rename from src/test/java/io/nats/compatibility/ClientCompatibilityMain.java rename to src/test/java/io/nats/client/other/ClientCompatibilityMain.java index 0f61669b9..cfdd32798 100644 --- a/src/test/java/io/nats/compatibility/ClientCompatibilityMain.java +++ b/src/test/java/io/nats/client/other/ClientCompatibilityMain.java @@ -11,9 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.compatibility; +package io.nats.client.other; import io.nats.client.*; +import io.nats.compatibility.*; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/src/test/java/io/nats/client/FlushBenchmark.java b/src/test/java/io/nats/client/other/FlushBenchmark.java similarity index 94% rename from src/test/java/io/nats/client/FlushBenchmark.java rename to src/test/java/io/nats/client/other/FlushBenchmark.java index 0a991951a..16860fcac 100644 --- a/src/test/java/io/nats/client/FlushBenchmark.java +++ b/src/test/java/io/nats/client/other/FlushBenchmark.java @@ -1,56 +1,59 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import java.text.NumberFormat; - - -public class FlushBenchmark { - public static void main(String args[]) throws InterruptedException { - int flushes = 100_000; - - System.out.println("###"); - System.out.printf("### Running benchmark with %s flushes.\n", - NumberFormat.getInstance().format(flushes)); - System.out.println("###"); - - try { - Options options = new Options.Builder().turnOnAdvancedStats().build(); - Connection nc = Nats.connect(options); - - long start = System.nanoTime(); - for (int i=0; i 0) { // works for single thread, but not multi - accumulateQueue.accumulate(10_000, 100, Duration.ofMillis(500)); - } - end = System.nanoTime(); - - System.out.printf("\nTotal time to perform accumulate %s messages was %s ms, %s ns/op\n", - NumberFormat.getInstance().format(msgCount), - NumberFormat.getInstance().format((end - start) / 1_000_000L), - NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); - System.out.printf("\tor %s op/s\n", - NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); - - for (int j = 0; j < msgCount; j++) { - msgs[j].next = null; - } - final MessageQueue pushPopThreadQueue = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); - final Duration timeout = Duration.ofMillis(10); - final CompletableFuture go = new CompletableFuture<>(); - Thread pusher = new Thread(() -> { - try { - go.get(); - for (int i = 0; i < msgCount; i++) { - pushPopThreadQueue.push(msgs[i]); - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - pusher.start(); - - Thread popper = new Thread(() -> { - try { - go.get(); - for (int i = 0; i < msgCount; i++) { - pushPopThreadQueue.pop(timeout); - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - popper.start(); - - start = System.nanoTime(); - go.complete(null); - pusher.join(); - popper.join(); - end = System.nanoTime(); - - System.out.printf("\nTotal time to perform %s pushes in one thread and pop with timeout in another was %s ms, %s ns/op\n", - NumberFormat.getInstance().format(msgCount), - NumberFormat.getInstance().format((end - start) / 1_000_000L), - NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); - System.out.printf("\tor %s op/s\n", - NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); - - final CompletableFuture go2 = new CompletableFuture<>(); - for (int j = 0; j < msgCount; j++) { - msgs[j].next = null; - } - final MessageQueue pushPopNowThreadQueue = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); - pusher = new Thread(() -> { - try { - go2.get(); - for (int i = 0; i < msgCount; i++) { - pushPopNowThreadQueue.push(msgs[i]); - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - pusher.start(); - - popper = new Thread(() -> { - try { - go2.get(); - for (int i = 0; i < msgCount; i++) { - pushPopNowThreadQueue.popNow(); - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - popper.start(); - - start = System.nanoTime(); - go2.complete(null); - pusher.join(); - popper.join(); - end = System.nanoTime(); - - System.out.printf("\nTotal time to perform %s pushes in one thread and pop nows in another was %s ms, %s ns/op\n", - NumberFormat.getInstance().format(msgCount), - NumberFormat.getInstance().format((end - start) / 1_000_000L), - NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); - System.out.printf("\tor %s op/s\n", - NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); - - final CompletableFuture go3 = new CompletableFuture<>(); - for (int j = 0; j < msgCount; j++) { - msgs[j].next = null; - } - - final MessageQueue pushAccumulateThreadQueue = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); - pusher = new Thread(() -> { - try { - go3.get(); - for (int i = 0; i < msgCount; i++) { - pushAccumulateThreadQueue.push(msgs[i]); - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - pusher.start(); - - popper = new Thread(() -> { - try { - go3.get(); - int remaining = msgCount; - while (remaining > 0) { - NatsMessage cursor = pushAccumulateThreadQueue.accumulate(10_000, 100, Duration.ofMillis(500)); - while (cursor != null) { - remaining--; - cursor = cursor.next; - } - } - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - popper.start(); - - start = System.nanoTime(); - go3.complete(null); - pusher.join(); - popper.join(); - end = System.nanoTime(); - - System.out.printf("\nTotal time to perform %s pushes in one thread and accumlates in another was %s ms, %s ns/op\n", - NumberFormat.getInstance().format(msgCount), - NumberFormat.getInstance().format((end - start) / 1_000_000L), - NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); - System.out.printf("\tor %s op/s\n", - NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); - } +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.other; + +/* +import io.nats.client.impl.MessageQueue; +import io.nats.client.impl.NatsMessage; +import io.nats.client.impl.ProtocolMessage; + +import java.text.NumberFormat; +import java.time.Duration; +import java.util.concurrent.CompletableFuture; +*/ + +// This class is kept only for history. It can only run if it is moved to the +// io.nats.client.impl package since MessageQueue is package scoped +public class MessageQueueBenchmark { +/* + static final Duration REQUEST_CLEANUP_INTERVAL = Duration.ofSeconds(5); + + public static void main(String args[]) throws InterruptedException { + int msgCount = 10_000_000; + NatsMessage[] msgs = new NatsMessage[msgCount]; + long start, end; + + System.out.printf("Running benchmarks with %s messages.\n", NumberFormat.getInstance().format(msgCount)); + System.out.println("Warmed up ..."); + byte[] warmBytes = "a".getBytes(); + + MessageQueue warm = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); + for (int j = 0; j < msgCount; j++) { + msgs[j] = new ProtocolMessage(warmBytes); + warm.push(msgs[j]); + } + + System.out.println("Starting tests ..."); + MessageQueue push = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); + start = System.nanoTime(); + for (int i = 0; i < msgCount; i++) { + push.push(msgs[i]); + } + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform %s push operations was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + + start = System.nanoTime(); + for (int i = 0; i < msgCount; i++) { + push.popNow(); + } + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform %s popnow operations was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + + MessageQueue accumulateQueue = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); + for (int j = 0; j < msgCount; j++) { + msgs[j].next = null; + } + for (int i = 0; i < msgCount; i++) { + accumulateQueue.push(msgs[i]); + } + start = System.nanoTime(); + while(accumulateQueue.length() > 0) { // works for single thread, but not multi + accumulateQueue.accumulate(10_000, 100, Duration.ofMillis(500)); + } + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform accumulate %s messages was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + + for (int j = 0; j < msgCount; j++) { + msgs[j].next = null; + } + final MessageQueue pushPopThreadQueue = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); + final Duration timeout = Duration.ofMillis(10); + final CompletableFuture go = new CompletableFuture<>(); + Thread pusher = new Thread(() -> { + try { + go.get(); + for (int i = 0; i < msgCount; i++) { + pushPopThreadQueue.push(msgs[i]); + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + pusher.start(); + + Thread popper = new Thread(() -> { + try { + go.get(); + for (int i = 0; i < msgCount; i++) { + pushPopThreadQueue.pop(timeout); + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + popper.start(); + + start = System.nanoTime(); + go.complete(null); + pusher.join(); + popper.join(); + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform %s pushes in one thread and pop with timeout in another was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + + final CompletableFuture go2 = new CompletableFuture<>(); + for (int j = 0; j < msgCount; j++) { + msgs[j].next = null; + } + final MessageQueue pushPopNowThreadQueue = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); + pusher = new Thread(() -> { + try { + go2.get(); + for (int i = 0; i < msgCount; i++) { + pushPopNowThreadQueue.push(msgs[i]); + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + pusher.start(); + + popper = new Thread(() -> { + try { + go2.get(); + for (int i = 0; i < msgCount; i++) { + pushPopNowThreadQueue.popNow(); + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + popper.start(); + + start = System.nanoTime(); + go2.complete(null); + pusher.join(); + popper.join(); + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform %s pushes in one thread and pop nows in another was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + + final CompletableFuture go3 = new CompletableFuture<>(); + for (int j = 0; j < msgCount; j++) { + msgs[j].next = null; + } + + final MessageQueue pushAccumulateThreadQueue = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); + pusher = new Thread(() -> { + try { + go3.get(); + for (int i = 0; i < msgCount; i++) { + pushAccumulateThreadQueue.push(msgs[i]); + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + pusher.start(); + + popper = new Thread(() -> { + try { + go3.get(); + int remaining = msgCount; + while (remaining > 0) { + NatsMessage cursor = pushAccumulateThreadQueue.accumulate(10_000, 100, Duration.ofMillis(500)); + while (cursor != null) { + remaining--; + cursor = cursor.next; + } + } + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + popper.start(); + + start = System.nanoTime(); + go3.complete(null); + pusher.join(); + popper.join(); + end = System.nanoTime(); + + System.out.printf("\nTotal time to perform %s pushes in one thread and accumlates in another was %s ms, %s ns/op\n", + NumberFormat.getInstance().format(msgCount), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + NumberFormat.getInstance().format(((double) (end - start)) / ((double) (msgCount)))); + System.out.printf("\tor %s op/s\n", + NumberFormat.getInstance().format(1_000_000_000L * ((double) (msgCount))/((double) (end - start)))); + } +*/ } \ No newline at end of file diff --git a/src/test/java/io/nats/client/NUIDBenchmarks.java b/src/test/java/io/nats/client/other/NUIDBenchmarks.java similarity index 96% rename from src/test/java/io/nats/client/NUIDBenchmarks.java rename to src/test/java/io/nats/client/other/NUIDBenchmarks.java index 3077c829f..3c65d3524 100644 --- a/src/test/java/io/nats/client/NUIDBenchmarks.java +++ b/src/test/java/io/nats/client/other/NUIDBenchmarks.java @@ -11,7 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client; +package io.nats.client.other; + +import io.nats.client.NUID; import java.text.NumberFormat; diff --git a/src/test/java/io/nats/client/impl/ParseTesting.java b/src/test/java/io/nats/client/other/ParseBenchmark.java similarity index 99% rename from src/test/java/io/nats/client/impl/ParseTesting.java rename to src/test/java/io/nats/client/other/ParseBenchmark.java index f3eab53f2..bdd713650 100644 --- a/src/test/java/io/nats/client/impl/ParseTesting.java +++ b/src/test/java/io/nats/client/other/ParseBenchmark.java @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client.impl; +package io.nats.client.other; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -23,7 +23,7 @@ import static io.nats.client.support.NatsConstants.*; -public class ParseTesting { +public class ParseBenchmark { static String infoJson = "{" + "\"server_id\":\"myserver\"" + "," + "\"version\":\"1.1.1\"" + "," + "\"go\": \"go1.9\"" + "," + "\"host\": \"host\"" + "," + "\"tls_required\": true" + "," + "\"auth_required\":false" + "," + "\"port\": 7777" + "," + "\"max_payload\":100000000000" + "," diff --git a/src/test/java/io/nats/client/PublishBenchmarkWithStats.java b/src/test/java/io/nats/client/other/PublishBenchmarkWithStats.java similarity index 96% rename from src/test/java/io/nats/client/PublishBenchmarkWithStats.java rename to src/test/java/io/nats/client/other/PublishBenchmarkWithStats.java index 567a7f92b..8cdaa6ed8 100644 --- a/src/test/java/io/nats/client/PublishBenchmarkWithStats.java +++ b/src/test/java/io/nats/client/other/PublishBenchmarkWithStats.java @@ -1,86 +1,90 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import java.text.NumberFormat; -import java.time.Duration; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; - - -public class PublishBenchmarkWithStats { - public static void main(String args[]) throws InterruptedException { - int threads = 1; - int msgsPerThread = 5_000_000; - int messageSize = 256; - long totalMessages = threads * msgsPerThread; - CountDownLatch latch = new CountDownLatch(threads); - CompletableFuture starter = new CompletableFuture<>(); - - System.out.println("###"); - System.out.printf("### Running publish benchmark with %s %s byte messages across %s threads.\n", - NumberFormat.getInstance().format(totalMessages), - NumberFormat.getInstance().format(messageSize), - NumberFormat.getInstance().format(threads)); - System.out.println("###"); - byte[] body = new byte[messageSize]; - - for(int i=0; i { - try {starter.get();}catch(Exception e){} - for(int i = 0; i < msgsPerThread; i++) { - nc.publish("bench", body); - } - try {nc.flush(Duration.ZERO);}catch(Exception e){} - latch.countDown(); - }); - t.start(); - } - - long start = System.nanoTime(); - starter.complete(Boolean.TRUE); - latch.await(); - long end = System.nanoTime(); - - nc.close(); - - System.out.printf("### Total time to perform %s operations was %s ms, %f ns/op\n", - NumberFormat.getInstance().format(totalMessages), - NumberFormat.getInstance().format((end-start)/1_000_000L), - ((double)(end-start))/((double)(totalMessages))); - System.out.printf("### This is equivalent to %s msg/sec.\n", - NumberFormat.getInstance().format(1_000_000_000L * totalMessages/(end-start))); - System.out.printf("### Each operation consists of a publish of a msg of size %s.\n", - NumberFormat.getInstance().format(messageSize)); - System.out.printf("### %s thread(s) were used.\n", - NumberFormat.getInstance().format(threads)); - - System.out.println("###"); - System.out.println("### Overall Statistics"); - System.out.println(); - System.out.print(nc.getStatistics().toString()); - } catch (Exception ex) { - System.out.println("Exception running benchmark."); - ex.printStackTrace(); - } - } +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.other; + +import io.nats.client.Connection; +import io.nats.client.Nats; +import io.nats.client.Options; + +import java.text.NumberFormat; +import java.time.Duration; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; + + +public class PublishBenchmarkWithStats { + public static void main(String args[]) throws InterruptedException { + int threads = 1; + int msgsPerThread = 5_000_000; + int messageSize = 256; + long totalMessages = threads * msgsPerThread; + CountDownLatch latch = new CountDownLatch(threads); + CompletableFuture starter = new CompletableFuture<>(); + + System.out.println("###"); + System.out.printf("### Running publish benchmark with %s %s byte messages across %s threads.\n", + NumberFormat.getInstance().format(totalMessages), + NumberFormat.getInstance().format(messageSize), + NumberFormat.getInstance().format(threads)); + System.out.println("###"); + byte[] body = new byte[messageSize]; + + for(int i=0; i { + try {starter.get();}catch(Exception e){} + for(int i = 0; i < msgsPerThread; i++) { + nc.publish("bench", body); + } + try {nc.flush(Duration.ZERO);}catch(Exception e){} + latch.countDown(); + }); + t.start(); + } + + long start = System.nanoTime(); + starter.complete(Boolean.TRUE); + latch.await(); + long end = System.nanoTime(); + + nc.close(); + + System.out.printf("### Total time to perform %s operations was %s ms, %f ns/op\n", + NumberFormat.getInstance().format(totalMessages), + NumberFormat.getInstance().format((end-start)/1_000_000L), + ((double)(end-start))/((double)(totalMessages))); + System.out.printf("### This is equivalent to %s msg/sec.\n", + NumberFormat.getInstance().format(1_000_000_000L * totalMessages/(end-start))); + System.out.printf("### Each operation consists of a publish of a msg of size %s.\n", + NumberFormat.getInstance().format(messageSize)); + System.out.printf("### %s thread(s) were used.\n", + NumberFormat.getInstance().format(threads)); + + System.out.println("###"); + System.out.println("### Overall Statistics"); + System.out.println(); + System.out.print(nc.getStatistics().toString()); + } catch (Exception ex) { + System.out.println("Exception running benchmark."); + ex.printStackTrace(); + } + } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/other/ReconnectCheck.java b/src/test/java/io/nats/client/other/ReconnectCheck.java new file mode 100644 index 000000000..f43a51a04 --- /dev/null +++ b/src/test/java/io/nats/client/other/ReconnectCheck.java @@ -0,0 +1,77 @@ +package io.nats.client.other; + +import io.nats.client.*; + +import java.time.Duration; + +import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ThreadUtils.sleep; + +/* Program to reproduce #231 */ +public class ReconnectCheck { + private static long received; + private static long published; + + private static long lastReceivedId; + + public static void main(String []args) throws Exception { + try (NatsTestServer ts = new NatsTestServer()) { + Connection natsIn = Nats.connect(buildOptions("IN", ts)); + Connection natsOut = Nats.connect(buildOptions("OUT", ts)); + Dispatcher natsDispatcher = natsIn.createDispatcher(m -> { + long receivedId = Long.parseLong(new String(m.getData())); + + if (receivedId < lastReceivedId) { + System.out.printf("##### Tid: %d, Received stale data: got %d, last received %d%n", Thread.currentThread().getId(), receivedId, lastReceivedId); + } + lastReceivedId = receivedId; + if (received++ % 1_000_000 == 0) { + System.out.printf("Tid: %d, Received %d messages%n", Thread.currentThread().getId(), received); + } + }); + + natsDispatcher.subscribe("foo"); + + long id = 0; + + //noinspection InfiniteLoopStatement + while (true) { + for (int i = 0; i < 100_000; i++) { + natsOut.publish("foo", ("" + id++).getBytes()); + if (published++ % 1_000_000 == 0) { + System.out.printf("Tid: %d, Published %d messages.%n", Thread.currentThread().getId(), published); + } + } + sleep(1); + } + } + } + + private static Options buildOptions(String name, NatsTestServer ts) { + return optionsBuilder(ts) + .connectionName(name) + .reconnectWait(Duration.ofSeconds(1)) + .connectionTimeout(Duration.ofSeconds(5)) + .pingInterval(Duration.ofMillis(100)) + .reconnectBufferSize(-1) // Do not cache any messages when Nats connection is down.// Do not cache any messages when Nats connection is down. + .connectionListener((conn, e) -> + System.out.printf("Tid: %d, %s, NATS: connection event - %s, connected url: %s. servers: %s %n", Thread.currentThread().getId(), name, e, conn.getConnectedUrl(), conn.getServers())) + .errorListener(new ErrorListener() { + @Override + public void slowConsumerDetected(Connection conn, Consumer consumer) { + System.out.printf("Tid: %d, %s, %s: Slow Consumer%n", Thread.currentThread().getId(), name, conn.getConnectedUrl()); + } + + @Override + public void exceptionOccurred(Connection conn, Exception exp) { + System.out.printf("Tid: %d, %s, Nats '%s' exception: %s%n", Thread.currentThread().getId(), name, conn.getConnectedUrl(), exp.toString()); + } + + @Override + public void errorOccurred(Connection conn, String error) { + System.out.printf("Tid: %d, %s, Nats '%s': Error %s%n", Thread.currentThread().getId(), name, conn.getConnectedUrl(), error.toString()); + } + }) + .build(); + } +} diff --git a/src/test/java/io/nats/client/RequestBenchmarkWithStats.java b/src/test/java/io/nats/client/other/RequestBenchmarkWithStats.java similarity index 97% rename from src/test/java/io/nats/client/RequestBenchmarkWithStats.java rename to src/test/java/io/nats/client/other/RequestBenchmarkWithStats.java index eb9dd84d6..d986062a4 100644 --- a/src/test/java/io/nats/client/RequestBenchmarkWithStats.java +++ b/src/test/java/io/nats/client/other/RequestBenchmarkWithStats.java @@ -1,153 +1,155 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client; - -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; - - -public class RequestBenchmarkWithStats { - public static void main(String args[]) throws InterruptedException { - int threads = 1; - int msgsPerThread = 5_000_000; - int messageSize = 256; - long totalMessages = threads * msgsPerThread; - CountDownLatch latch = new CountDownLatch(threads); - CompletableFuture starter = new CompletableFuture<>(); - AtomicLong msgsHandled = new AtomicLong(); - AtomicLong futureExceptions = new AtomicLong(); - - System.out.println("###"); - System.out.printf("### Running request benchmark with %s %s byte messages across %s threads.\n", - NumberFormat.getInstance().format(totalMessages), - NumberFormat.getInstance().format(messageSize), - NumberFormat.getInstance().format(threads)); - System.out.println("###"); - - byte[] body = new byte[messageSize]; - for (int i = 0; i < messageSize; i++) { - body[i] = 1; - } - - try { - Options o = new Options.Builder(). - server(Options.DEFAULT_URL). - turnOnAdvancedStats(). - build(); - - Connection handlerC = Nats.connect(o); - Dispatcher d = handlerC.createDispatcher(msg -> { - try { - handlerC.publish(msg.getReplyTo(), msg.getData()); - msgsHandled.incrementAndGet(); - } catch (Exception exp) { - exp.printStackTrace(); - } - }); - d.subscribe("req"); - - Connection nc = Nats.connect(o); - - for (int k = 0; k < threads; k++) { - Thread t = new Thread(() -> { - - try { - starter.get(); - } catch (Exception e) { - } - - ArrayList> msgs = new ArrayList<>(); - for (int i = 0; i < msgsPerThread; i++) { - Future msg = nc.request("req", body); - msgs.add(msg); - - if (i!=0 && i%1_000==0) { - for (Future m : msgs) { - try { - m.get(100, TimeUnit.MILLISECONDS); - } catch (Exception e) { - futureExceptions.incrementAndGet(); - } - } - - msgs.clear(); - } - } - - try { - nc.flush(null); - handlerC.flush(null); - } catch (Exception e) { - e.printStackTrace(); - } - - for (Future m : msgs) { - try { - m.get(100, TimeUnit.MILLISECONDS); - } catch (Exception e) { - futureExceptions.incrementAndGet(); - } - } - msgs.clear(); - - latch.countDown(); - }); - t.start(); - } - - long start = System.nanoTime(); - starter.complete(Boolean.TRUE); - latch.await(); - long end = System.nanoTime(); - - nc.close(); - handlerC.close(); - - System.out.printf("### Total time to perform %s request-replies was %s ms, %f ns/op\n", - NumberFormat.getInstance().format(totalMessages), - NumberFormat.getInstance().format((end - start) / 1_000_000L), - ((double) (end - start)) / ((double) (totalMessages))); - System.out.printf("### This is equivalent to %s request-replies/sec.\n", - NumberFormat.getInstance().format(1_000_000_000L * totalMessages / (end - start))); - System.out.printf("### Messages were of size %s.\n", - NumberFormat.getInstance().format(messageSize)); - System.out.printf("### %s thread(s) were used. A single dispatcher handles all messages.\n", - NumberFormat.getInstance().format(threads)); - System.out.printf("### Dispatcher handled %s messages.\n", - NumberFormat.getInstance().format(msgsHandled.get())); - System.out.printf("### %s exceptions waiting on futures.\n", - NumberFormat.getInstance().format(futureExceptions.get())); - - System.out.println("#################################"); - System.out.println("### Request connection stats ####"); - System.out.println("#################################"); - System.out.println(); - System.out.print(nc.getStatistics().toString()); - System.out.println(); - System.out.println("####################################"); - System.out.println("### Dispatcher connection stats ####"); - System.out.println("####################################"); - System.out.println(""); - System.out.print(handlerC.getStatistics().toString()); - } catch (Exception ex) { - System.out.println("Exception running benchmark."); - ex.printStackTrace(); - } - } +// Copyright 2015-2018 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.other; + +import io.nats.client.*; + +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + + +public class RequestBenchmarkWithStats { + public static void main(String args[]) throws InterruptedException { + int threads = 1; + int msgsPerThread = 5_000_000; + int messageSize = 256; + long totalMessages = threads * msgsPerThread; + CountDownLatch latch = new CountDownLatch(threads); + CompletableFuture starter = new CompletableFuture<>(); + AtomicLong msgsHandled = new AtomicLong(); + AtomicLong futureExceptions = new AtomicLong(); + + System.out.println("###"); + System.out.printf("### Running request benchmark with %s %s byte messages across %s threads.\n", + NumberFormat.getInstance().format(totalMessages), + NumberFormat.getInstance().format(messageSize), + NumberFormat.getInstance().format(threads)); + System.out.println("###"); + + byte[] body = new byte[messageSize]; + for (int i = 0; i < messageSize; i++) { + body[i] = 1; + } + + try { + Options o = new Options.Builder(). + server(Options.DEFAULT_URL). + turnOnAdvancedStats(). + build(); + + Connection handlerC = Nats.connect(o); + Dispatcher d = handlerC.createDispatcher(msg -> { + try { + handlerC.publish(msg.getReplyTo(), msg.getData()); + msgsHandled.incrementAndGet(); + } catch (Exception exp) { + exp.printStackTrace(); + } + }); + d.subscribe("req"); + + Connection nc = Nats.connect(o); + + for (int k = 0; k < threads; k++) { + Thread t = new Thread(() -> { + + try { + starter.get(); + } catch (Exception e) { + } + + ArrayList> msgs = new ArrayList<>(); + for (int i = 0; i < msgsPerThread; i++) { + Future msg = nc.request("req", body); + msgs.add(msg); + + if (i!=0 && i%1_000==0) { + for (Future m : msgs) { + try { + m.get(100, TimeUnit.MILLISECONDS); + } catch (Exception e) { + futureExceptions.incrementAndGet(); + } + } + + msgs.clear(); + } + } + + try { + nc.flush(null); + handlerC.flush(null); + } catch (Exception e) { + e.printStackTrace(); + } + + for (Future m : msgs) { + try { + m.get(100, TimeUnit.MILLISECONDS); + } catch (Exception e) { + futureExceptions.incrementAndGet(); + } + } + msgs.clear(); + + latch.countDown(); + }); + t.start(); + } + + long start = System.nanoTime(); + starter.complete(Boolean.TRUE); + latch.await(); + long end = System.nanoTime(); + + nc.close(); + handlerC.close(); + + System.out.printf("### Total time to perform %s request-replies was %s ms, %f ns/op\n", + NumberFormat.getInstance().format(totalMessages), + NumberFormat.getInstance().format((end - start) / 1_000_000L), + ((double) (end - start)) / ((double) (totalMessages))); + System.out.printf("### This is equivalent to %s request-replies/sec.\n", + NumberFormat.getInstance().format(1_000_000_000L * totalMessages / (end - start))); + System.out.printf("### Messages were of size %s.\n", + NumberFormat.getInstance().format(messageSize)); + System.out.printf("### %s thread(s) were used. A single dispatcher handles all messages.\n", + NumberFormat.getInstance().format(threads)); + System.out.printf("### Dispatcher handled %s messages.\n", + NumberFormat.getInstance().format(msgsHandled.get())); + System.out.printf("### %s exceptions waiting on futures.\n", + NumberFormat.getInstance().format(futureExceptions.get())); + + System.out.println("#################################"); + System.out.println("### Request connection stats ####"); + System.out.println("#################################"); + System.out.println(); + System.out.print(nc.getStatistics().toString()); + System.out.println(); + System.out.println("####################################"); + System.out.println("### Dispatcher connection stats ####"); + System.out.println("####################################"); + System.out.println(""); + System.out.print(handlerC.getStatistics().toString()); + } catch (Exception ex) { + System.out.println("Exception running benchmark."); + ex.printStackTrace(); + } + } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index dc80c2c51..badf9ccd9 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -13,6 +13,7 @@ package io.nats.client.utils; +import io.nats.client.Connection; import io.nats.client.ErrorListener; import io.nats.client.NatsTestServer; import io.nats.client.Options; @@ -56,6 +57,11 @@ public static Options.Builder optionsBuilder(String... servers) { return optionsBuilder().servers(servers); } + public static Options.Builder optionsBuilder(Connection nc) { + //noinspection DataFlowIssue + return optionsBuilder().server(nc.getConnectedUrl()); + } + public static Options options(int port) { return optionsBuilder(port).build(); } diff --git a/src/test/java/io/nats/client/utils/ReusableServer.java b/src/test/java/io/nats/client/utils/SharedServer.java similarity index 53% rename from src/test/java/io/nats/client/utils/ReusableServer.java rename to src/test/java/io/nats/client/utils/SharedServer.java index 02e100499..b650a5e0c 100644 --- a/src/test/java/io/nats/client/utils/ReusableServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -18,86 +18,92 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.initVersionServerInfo; -public class ReusableServer { +public class SharedServer { + private static final int NUM_REUSABLE_CONNECTIONS = 3; private static final int RETRY_DELAY_INCREMENT = 50; private static final int CONNECTION_RETRIES = 10; private static final long RETRY_DELAY = 100; - private static final Thread REUSABLES_SHUTDOWN_HOOK_THREAD; - private static final Map REUSABLES; + private static final Thread SHARED_SHUTDOWN_HOOK_THREAD; + private static final Map SHARED_BY_NAME; + private static final Map SHARED_BY_URL; private static final ReentrantLock STATIC_LOCK; static { STATIC_LOCK = new ReentrantLock(); - REUSABLES = new HashMap<>(); - REUSABLES_SHUTDOWN_HOOK_THREAD = new Thread("Reusables-Shutdown-Hook") { + SHARED_BY_NAME = new HashMap<>(); + SHARED_BY_URL = new HashMap<>(); + SHARED_SHUTDOWN_HOOK_THREAD = new Thread("Reusables-Shutdown-Hook") { @Override public void run() { - for (ReusableServer rs : REUSABLES.values()) { + for (SharedServer rs : SHARED_BY_URL.values()) { rs.shutdown(); } - REUSABLES.clear(); + SHARED_BY_URL.clear(); } }; - Runtime.getRuntime().addShutdownHook(REUSABLES_SHUTDOWN_HOOK_THREAD); + Runtime.getRuntime().addShutdownHook(SHARED_SHUTDOWN_HOOK_THREAD); } private final ReentrantLock instanceLock; - private final String internalConnectionName; + private final String reusableConnectionPrefix; private final Map connectionMap; + private final AtomicInteger currentReusableId; private NatsTestServer natsTestServer; - public final String serverUri; + public final String serverUrl; - public static ReusableServer getInstance(String name) throws IOException { + public static SharedServer getInstance(String name) throws IOException { STATIC_LOCK.lock(); try { - ReusableServer rs = REUSABLES.get(name); - if (rs == null) { - rs = new ReusableServer(); - REUSABLES.put(name, rs); + SharedServer shared = SHARED_BY_URL.get(name); + if (shared == null) { + shared = new SharedServer(); + SHARED_BY_NAME.put(name, shared); + SHARED_BY_URL.put(shared.serverUrl, shared); } - return rs; + return shared; } finally { STATIC_LOCK.unlock(); } } - public static void shutdownInstance(String name) { - STATIC_LOCK.lock(); - try { - ReusableServer rs = REUSABLES.remove(name); - if (rs != null) { - rs.shutdown(); - } - } - finally { - STATIC_LOCK.unlock(); - } - } - - private ReusableServer() throws IOException { + private SharedServer() throws IOException { instanceLock = new ReentrantLock(); - internalConnectionName = new NUID().next(); + reusableConnectionPrefix = new NUID().next(); connectionMap = new HashMap<>(); - + currentReusableId = new AtomicInteger(-1); natsTestServer = new NatsTestServer( NatsTestServer.builder() .jetstream(true) .customName("Reusable") ); - serverUri = natsTestServer.getLocalhostUri(); + serverUrl = natsTestServer.getLocalhostUri(); } - public Connection getReusableNc() { - return getConnection(internalConnectionName); + public Connection getSharedConnection() { + int id = currentReusableId.incrementAndGet(); + if (id >= NUM_REUSABLE_CONNECTIONS) { + currentReusableId.set(0); + id = 0; + } + return getSharedConnection(reusableConnectionPrefix + "-" + id); + } + + public static Connection sharedConnectionForSameServer(Connection nc) { + SharedServer shared = SHARED_BY_URL.get(nc.getConnectedUrl()); + if (shared == null) { + throw new RuntimeException("No shared server for that connection."); + } + return shared.getSharedConnection(); } private void waitUntilStatus(Connection conn) { @@ -109,26 +115,12 @@ private void waitUntilStatus(Connection conn) { } } - private Connection getConnection(String name) { + private Connection getSharedConnection(String name) { instanceLock.lock(); try { Connection ncs = connectionMap.get(name); if (ncs == null) { - long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; - Options options = options(serverUri); - for (int x = 0; ncs == null && x < CONNECTION_RETRIES; x++) { - if (x > 0) { - delay += RETRY_DELAY_INCREMENT; - sleep(delay); - } - try { - ncs = Nats.connect(options); - } - catch (IOException ignored) {} - catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - } - } + ncs = newConnection(optionsBuilder()); if (ncs != null) { connectionMap.put(name, ncs); waitUntilStatus(ncs); @@ -137,7 +129,7 @@ private Connection getConnection(String name) { } else if (ncs.getStatus() != Connection.Status.CONNECTED) { try { ncs.close(); } catch (Exception ignore) {} - return getConnection(name); + return getSharedConnection(name); } return ncs; } @@ -146,6 +138,25 @@ else if (ncs.getStatus() != Connection.Status.CONNECTED) { } } + public Connection newConnection(Options.Builder builder) { + long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; + Options options = builder.server(serverUrl).build(); + for (int x = 0; x < CONNECTION_RETRIES; x++) { + if (x > 0) { + delay += RETRY_DELAY_INCREMENT; + sleep(delay); + } + try { + return Nats.connect(options); + } + catch (IOException ignored) {} + catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + } + } + return null; + } + public void shutdown() { instanceLock.lock(); try { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 371bba355..58f57957d 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -94,15 +94,15 @@ public static ServerInfo ensureVersionServerInfo() throws Exception { // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- - public interface ServerTest { + public interface OneConnectionTest { void test(Connection nc) throws Exception; } - public interface TwoServerTest { + public interface TwoConnectionTest { void test(Connection nc1, Connection nc2) throws Exception; } - public interface ThreeServerTest { + public interface ThreeConnectionTest { void test(Connection nc1, Connection nc2, Connection nc3) throws Exception; } @@ -124,30 +124,31 @@ public interface JetStreamTestingContextTest { // ---------------------------------------------------------------------------------------------------- // runners -> own server // ---------------------------------------------------------------------------------------------------- - private static void _runInServer( + private static void _runInOwnServer( Options.Builder optionsBuilder, VersionCheck vc, String configFilePath, - ServerTest serverTest, + OneConnectionTest oneNcTest, JetStreamTest jsTest ) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } - NatsServerRunner.Builder builder = NatsServerRunner.builder().jetstream(jsTest != null); + NatsServerRunner.Builder nsrb = NatsServerRunner.builder().jetstream(jsTest != null); if (configFilePath != null) { - builder.configFilePath(configResource(configFilePath)); + nsrb.configFilePath(configResource(configFilePath)); } - try (NatsTestServer ts = new NatsTestServer(builder)) { - Options options = (optionsBuilder == null ? optionsBuilder() : optionsBuilder) - .server(ts.getLocalhostUri()) + try (NatsTestServer ts = new NatsTestServer(nsrb)) { + Options options = (optionsBuilder == null + ? optionsBuilder(ts) + : optionsBuilder.server(ts.getLocalhostUri())) .build(); try (Connection nc = standardConnectionWait(options)) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { if (jsTest == null) { - serverTest.test(nc); + oneNcTest.test(nc); } else { NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); @@ -162,27 +163,27 @@ private static void _runInServer( // -------------------------------------------------- // Not using JetStream // -------------------------------------------------- - public static void runInServer(ServerTest serverTest) throws Exception { - _runInServer(null, null, null, serverTest, null); - } - - public static void runInServer(Options.Builder builder, ServerTest serverTest) throws Exception { - _runInServer(builder, null, null, serverTest, null); + public static void runInOwnServer(OneConnectionTest oneNcTest) throws Exception { + _runInOwnServer(null, null, null, oneNcTest, null); } // -------------------------------------------------- // JetStream needing isolation // -------------------------------------------------- - public static void runInJsServer(JetStreamTest jetStreamTest) throws Exception { - _runInServer(null, null, null, null, jetStreamTest); + public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exception { + _runInOwnServer(null, null, null, null, jetStreamTest); } - public static void runInJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { - _runInServer(null, null, configFilePath, null, jetStreamTest); + public static void runInOwnJsServer(ErrorListener el, JetStreamTest jetStreamTest) throws Exception { + _runInOwnServer(optionsBuilder(el), null, null, null, jetStreamTest); } - public static void runInJsServer(VersionCheck vc, JetStreamTest jetStreamTest) throws Exception { - _runInServer(null, vc, null, null, jetStreamTest); + public static void runInOwnJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { + _runInOwnServer(null, null, configFilePath, null, jetStreamTest); + } + + public static void runInOwnJsServer(VersionCheck vc, JetStreamTest jetStreamTest) throws Exception { + _runInOwnServer(null, vc, null, null, jetStreamTest); } // ---------------------------------------------------------------------------------------------------- @@ -191,7 +192,7 @@ public static void runInJsServer(VersionCheck vc, JetStreamTest jetStreamTest) t private static void _runInShared( Options.Builder optionsBuilder, VersionCheck vc, - ServerTest test, + OneConnectionTest oneNcTest, int jstcTestSubjectCount, JetStreamTestingContextTest ctxTest ) throws Exception { @@ -199,7 +200,7 @@ private static void _runInShared( return; // had vc, already had run server info and fails check } - ReusableServer reusable = ReusableServer.getInstance("shared"); + SharedServer shared = SharedServer.getInstance("shared"); // no builder, we can use the long-running connection since it's totally generic // with a builder, just make a fresh connection and close it at the end. @@ -207,11 +208,14 @@ private static void _runInShared( Connection nc; if (optionsBuilder == null) { closeNcWhenDone = false; - nc = reusable.getReusableNc(); + nc = shared.getSharedConnection(); } else { closeNcWhenDone = true; - nc = longConnectionWait(optionsBuilder.server(reusable.serverUri).build()); + nc = shared.newConnection(optionsBuilder); + if (nc == null) { + throw new RuntimeException("Unable to open a new connection to reusable sever."); + } } initVersionServerInfo(nc); @@ -223,7 +227,7 @@ private static void _runInShared( } } else { - test.test(nc); + oneNcTest.test(nc); } } finally { @@ -243,23 +247,23 @@ private static void _runInShared( // 3. or need to do something special with the // connection list close it // -------------------------------------------------- - public static void runInShared(ServerTest test) throws Exception { + public static void runInShared(OneConnectionTest test) throws Exception { _runInShared(null, null, test, -1, null); } - public static void runInShared(VersionCheck vc, ServerTest test) throws Exception { + public static void runInShared(VersionCheck vc, OneConnectionTest test) throws Exception { _runInShared(null, vc, test, -1, null); } - public static void runInSharedOwnNc(ServerTest test) throws Exception { + public static void runInSharedOwnNc(OneConnectionTest test) throws Exception { _runInShared(optionsBuilder(), null, test, -1, null); } - public static void runInSharedOwnNc(ErrorListener el, ServerTest test) throws Exception { + public static void runInSharedOwnNc(ErrorListener el, OneConnectionTest test) throws Exception { _runInShared(optionsBuilder(el), null, test, -1, null); } - public static void runInSharedOwnNc(Options.Builder builder, ServerTest test) throws Exception { + public static void runInSharedOwnNc(Options.Builder builder, OneConnectionTest test) throws Exception { _runInShared(builder, null, test, -1, null); } @@ -308,13 +312,13 @@ public static void runInSharedCustom(Options.Builder builder, JetStreamTestingCo // ---------------------------------------------------------------------------------------------------- // runners / external // ---------------------------------------------------------------------------------------------------- - public static void runInExternalServer(ServerTest serverTest) throws Exception { - runInExternalServer(Options.DEFAULT_URL, serverTest); + public static void runInExternalServer(OneConnectionTest oneNcTest) throws Exception { + runInExternalServer(Options.DEFAULT_URL, oneNcTest); } - public static void runInExternalServer(String url, ServerTest serverTest) throws Exception { + public static void runInExternalServer(String url, OneConnectionTest oneNcTest) throws Exception { try (Connection nc = Nats.connect(url)) { - serverTest.test(nc); + oneNcTest.test(nc); } } @@ -325,7 +329,7 @@ public static void runInExternalServer(String url, ServerTest serverTest) throws public static String HUB_DOMAIN = "HUB"; public static String LEAF_DOMAIN = "LEAF"; - public static void runInJsHubLeaf(TwoServerTest twoServerTest) throws Exception { + public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Exception { int hubPort = NatsTestServer.nextPort(); int hubLeafPort = NatsTestServer.nextPort(); int leafPort = NatsTestServer.nextPort(); @@ -357,15 +361,15 @@ public static void runInJsHubLeaf(TwoServerTest twoServerTest) throws Exception NatsTestServer leaf = new NatsTestServer(leafPort, true, null, leafInserts, null); Connection ncleaf = standardConnectionWait(leaf.getLocalhostUri()) ) { - twoServerTest.test(nchub, ncleaf); + twoConnectionTest.test(nchub, ncleaf); } } - public static void runInCluster(ThreeServerTest threeServerTest) throws Exception { + public static void runInCluster(ThreeConnectionTest threeServerTest) throws Exception { runInCluster(null, threeServerTest); } - public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeServerTest threeServerTest) throws Exception { + public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeConnectionTest threeServerTest) throws Exception { if (tstOpts == null) { tstOpts = new ThreeServerTestOptions() {}; } diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index fa2430fa5..76417e888 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -905,7 +905,7 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { @Test public void testHandlerException() throws Exception { - runInServer(nc -> { + runInShared(nc -> { ServiceEndpoint exServiceEndpoint = ServiceEndpoint.builder() .endpointName("exEndpoint") .endpointSubject("exSubject") @@ -936,7 +936,7 @@ public void testHandlerException() throws Exception { @Test public void testServiceMessage() throws Exception { - runInServer(nc -> { + runInShared(nc -> { AtomicInteger which = new AtomicInteger(); ServiceEndpoint se = ServiceEndpoint.builder() .endpointName("testServiceMessage") @@ -1575,7 +1575,7 @@ public String get() { @Test public void testInboxSupplier() throws Exception { - runInServer(nc -> { + runInShared(nc -> { Discovery discovery = new Discovery(nc, 100, 1); TestInboxSupplier supplier = new TestInboxSupplier(); discovery.setInboxSupplier(supplier); From 45ced7b17a398500af6b22df85b08b8fa15bdf5f Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 28 Nov 2025 11:07:30 -0500 Subject: [PATCH 17/51] fix test after merge --- build.gradle | 3 +++ .../io/nats/client/impl/ObjectStoreTests.java | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d68b20992..9d4fc1f0b 100644 --- a/build.gradle +++ b/build.gradle @@ -112,6 +112,9 @@ test { if (compilerIsJava8 || isNotWindows) { maxParallelForks = Runtime.runtime.availableProcessors() } + else { + maxParallelForks = 2; + } systemProperty 'junit.jupiter.execution.timeout.default', '3m' } diff --git a/src/test/java/io/nats/client/impl/ObjectStoreTests.java b/src/test/java/io/nats/client/impl/ObjectStoreTests.java index 4b757e00a..63ce74daa 100644 --- a/src/test/java/io/nats/client/impl/ObjectStoreTests.java +++ b/src/test/java/io/nats/client/impl/ObjectStoreTests.java @@ -483,15 +483,11 @@ public void testCompression() throws Exception { @Test public void testOverwrite() throws Exception { - jsServer.run(TestBase::atLeast2_10, nc -> { - JetStreamManagement jsm = nc.jetStreamManagement(); - JetStream js = jsm.jetStream(); - - String bucket = bucket(); - String objName = variant(); + runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { + String bucket = random(); + String objName = random(); - ObjectStoreManagement osm = nc.objectStoreManagement(); - ObjectStoreStatus oss = osm.create(ObjectStoreConfiguration.builder(bucket) + ObjectStoreStatus oss = ctx.osCreate(ObjectStoreConfiguration.builder(bucket) .storageType(StorageType.Memory) .build()); String realStreamName = oss.getConfiguration().getBackingConfig().getName(); @@ -504,13 +500,13 @@ public void testOverwrite() throws Exception { try (InputStream in = Files.newInputStream(file.toPath())) { os.put(objName, in); } - StreamInfo si = jsm.getStreamInfo(realStreamName, StreamInfoOptions.allSubjects()); + StreamInfo si = ctx.jsm.getStreamInfo(realStreamName, StreamInfoOptions.allSubjects()); long byteCount1 = si.getStreamState().getByteCount(); try (InputStream in = Files.newInputStream(file.toPath())) { os.put(objName, in); } - si = jsm.getStreamInfo(realStreamName, StreamInfoOptions.allSubjects()); + si = ctx.jsm.getStreamInfo(realStreamName, StreamInfoOptions.allSubjects()); long byteCount2 = si.getStreamState().getByteCount(); assertEquals(byteCount1, byteCount2); From 8eceeddd4a543cffdcd279bab37e700d71086bcb Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 28 Nov 2025 12:25:22 -0500 Subject: [PATCH 18/51] timing is everything --- .../io/nats/client/impl/KeyValueTests.java | 2 +- .../nats/client/impl/MessageManagerTests.java | 276 +++++++++--------- .../io/nats/client/utils/SharedServer.java | 3 - 3 files changed, 138 insertions(+), 143 deletions(-) diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 504919e0a..75a7e69ff 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -1971,7 +1971,7 @@ else if (mcount == 4) { } assertEquals(1, errorLatch.getCount(), error.get()); assertEquals(2, messages.get()); - assertTrue(gotZero - mark >= 1000); + assertTrue(gotZero - mark >= 100); // this is arbitrary but I need something assertEquals("PUT", ops.get(0)); assertEquals("MaxAge", ops.get(1)); diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 37aa66812..62be5e256 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -70,172 +70,170 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO } @Test - public void testPushBeforeQueueProcessorAndManageHbFcSync() throws Exception { + public void testPushBeforeQueueProcessorAndManage() throws Exception { ListenerForTesting listener = new ListenerForTesting(); runInSharedOwnNc(listener, nc -> { - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_hb_fc(), sub, false, true, false); - testPushBqpAndManage(sub, listener, pushMgr); - }); - } - - @Test - public void testPushBeforeQueueProcessorAndManageHbXfcSync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, true, false); - testPushBqpAndManage(sub, listener, pushMgr); + _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, true, false); + _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, true, false); + _testPushBqpAndManageRetriable(nc, listener, push_xhb_xfc(), false, true, false); + _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, false, false); + _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, false, false); + _testPushBqpAndManageRetriable(nc, listener, push_xhb_xfc(), false, false, false); }); } - @Test - public void testPushBeforeQueueProcessorAndManageXhbXfcSync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { + private void _testPushBqpAndManageRetriable(Connection nc, ListenerForTesting listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException { + int triesLeft = 3; + while (triesLeft-- > 0) { + sleep(50); // just so we aren't slamming a shared server NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, true, false); - testPushBqpAndManage(sub, listener, pushMgr); - }); + PushMessageManager pushMgr = getPushManager(nc, pso, sub, ordered, syncMode, queueMode); + boolean passed = _testPushBqpAndManage(sub, listener, pushMgr, triesLeft > 0); + if (passed) { + break; + } + } } - @Test - public void testPushBeforeQueueProcessorAndManageHbFcAsync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_hb_fc(), sub, false, false, false); - testPushBqpAndManage(sub, listener, pushMgr); - }); - } + private boolean _testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTesting listener, PushMessageManager manager, boolean canRetry) { + try { + listener.reset(); + String sid = sub.getSID(); - @Test - public void testPushBeforeQueueProcessorAndManageHbXfcAsync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_hb_xfc(), sub, false, false, false); - testPushBqpAndManage(sub, listener, pushMgr); - }); - } + assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); + assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); - @Test - public void testPushBeforeQueueProcessorAndManageXhbXfcAsync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, nc -> { - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), sub, false, false, false); - testPushBqpAndManage(sub, listener, pushMgr); - }); - } + assertEquals(!manager.hb.get(), manager.beforeQueueProcessorImpl(getHeartbeat(sid))); - private void testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTesting listener, PushMessageManager manager) { - String sid = sub.getSID(); + List unhandledCodes = new ArrayList<>(); + assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); + assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); + if (manager.fc) { + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); + } + else { + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFlowControl(1, sid))); + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); + unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // fc + unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // hb + } - assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); - assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); + assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); + unhandledCodes.add(999); - assertEquals(!manager.hb.get(), manager.beforeQueueProcessorImpl(getHeartbeat(sid))); + sleep(100); + List list = listener.getUnhandledStatuses(); + if (canRetry && unhandledCodes.size() != list.size()) { + return false; // didn't pass + } + assertEquals(unhandledCodes.size(), list.size()); + for (int x = 0; x < list.size(); x++) { + ListenerForTesting.StatusEvent se = list.get(x); + assertSame(sub.getSID(), se.sid); + if (canRetry && unhandledCodes.get(x) != se.status.getCode()) { + return false; // didn't pass + } + assertEquals(unhandledCodes.get(x), se.status.getCode()); + } - List unhandledCodes = new ArrayList<>(); - assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); - assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); - if (manager.fc) { - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); + return true; } - else { - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); - unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // fc - unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // hb - } - - assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - unhandledCodes.add(999); - - sleep(100); - List list = listener.getUnhandledStatuses(); - assertEquals(unhandledCodes.size(), list.size()); - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - assertEquals(unhandledCodes.get(x), se.status.getCode()); + finally { + try { sub.unsubscribe(); } catch (Exception ignore) {} } } @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - runInOwnJsServer(listener, (nc, jsm, js) -> { - NatsJetStreamSubscription sub = genericPullSub(nc); + runInSharedOwnNc(listener, (nc, ctx) -> { + _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).build()); + _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build()); + }); + } - String pullSubject = random(); + private void _testPullBqpAndManage(Connection nc, ListenerForTesting listener, PullRequestOptions pro) throws JetStreamApiException, IOException { + int triesLeft = 2; + while (triesLeft-- > 0) { + NatsJetStreamSubscription sub = genericPullSub(nc); PullMessageManager pullMgr = getPullManager(nc, sub, true); - pullMgr.startPullRequest(pullSubject, PullRequestOptions.builder(1).build(), true, null); - testPullBqpAndManage(sub, listener, pullMgr); - - pullMgr = getPullManager(nc, sub, true); - pullMgr.startPullRequest(pullSubject, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build(), true, null); - testPullBqpAndManage(sub, listener, pullMgr); - }); + pullMgr.startPullRequest(random(), pro, true, null); + boolean passed = _testPullBqpAndManageRetriable(sub, listener, pullMgr, triesLeft > 0); + if (passed) { + break; + } + } } - private void testPullBqpAndManage(NatsJetStreamSubscription sub, ListenerForTesting listener, PullMessageManager manager) { - listener.reset(); - String sid = sub.getSID(); + private boolean _testPullBqpAndManageRetriable(NatsJetStreamSubscription sub, ListenerForTesting listener, PullMessageManager manager, boolean canRetry) { + try { + listener.reset(); + String sid = sub.getSID(); + + // only plain heartbeats don't get queued + assertFalse(manager.beforeQueueProcessorImpl(getHeartbeat(sid))); + + assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); + assertTrue(manager.beforeQueueProcessorImpl(getNotFoundStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getRequestTimeoutStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, BATCH_COMPLETED))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); + assertTrue(manager.beforeQueueProcessorImpl(getBadRequest(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_DELETED))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); + + assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); + assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getNotFoundStatus(sid))); + assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getRequestTimeoutStatus(sid))); + assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, BATCH_COMPLETED))); + assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); + assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); + + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getBadRequest(sid))); + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_DELETED))); + assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); + + sleep(100); + + List list = listener.getPullStatusWarnings(); + int[] codes = new int[]{NOT_FOUND_CODE, REQUEST_TIMEOUT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE}; + assertEquals(8, list.size()); + for (int x = 0; x < list.size(); x++) { + ListenerForTesting.StatusEvent se = list.get(x); + assertSame(sub.getSID(), se.sid); + if (canRetry && codes[x] != se.status.getCode()) { + return false; // didn't pass + } + assertEquals(codes[x], se.status.getCode()); + } - // only plain heartbeats don't get queued - assertFalse(manager.beforeQueueProcessorImpl(getHeartbeat(sid))); - - assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); - assertTrue(manager.beforeQueueProcessorImpl(getNotFoundStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getRequestTimeoutStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, BATCH_COMPLETED))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); - assertTrue(manager.beforeQueueProcessorImpl(getBadRequest(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_DELETED))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); - - assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getNotFoundStatus(sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getRequestTimeoutStatus(sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, BATCH_COMPLETED))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); - - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getBadRequest(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_DELETED))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); - - sleep(100); - - List list = listener.getPullStatusWarnings(); - int[] codes = new int[]{NOT_FOUND_CODE, REQUEST_TIMEOUT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE}; - assertEquals(8, list.size()); - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - assertEquals(codes[x], se.status.getCode()); - } + list = listener.getPullStatusErrors(); + assertEquals(4, list.size()); + codes = new int[]{BAD_REQUEST_CODE, 999, CONFLICT_CODE, CONFLICT_CODE}; + for (int x = 0; x < list.size(); x++) { + ListenerForTesting.StatusEvent se = list.get(x); + assertSame(sub.getSID(), se.sid); + if (canRetry && codes[x] != se.status.getCode()) { + return false; // didn't pass + } + assertEquals(codes[x], se.status.getCode()); + } - list = listener.getPullStatusErrors(); - assertEquals(4, list.size()); - codes = new int[]{BAD_REQUEST_CODE, 999, CONFLICT_CODE, CONFLICT_CODE}; - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - assertEquals(codes[x], se.status.getCode()); + return true; // true means passed + } + finally { + try { sub.unsubscribe(); } catch (Exception ignore) {} } } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index b650a5e0c..11e726b4e 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -32,13 +32,11 @@ public class SharedServer { private static final int CONNECTION_RETRIES = 10; private static final long RETRY_DELAY = 100; private static final Thread SHARED_SHUTDOWN_HOOK_THREAD; - private static final Map SHARED_BY_NAME; private static final Map SHARED_BY_URL; private static final ReentrantLock STATIC_LOCK; static { STATIC_LOCK = new ReentrantLock(); - SHARED_BY_NAME = new HashMap<>(); SHARED_BY_URL = new HashMap<>(); SHARED_SHUTDOWN_HOOK_THREAD = new Thread("Reusables-Shutdown-Hook") { @Override @@ -66,7 +64,6 @@ public static SharedServer getInstance(String name) throws IOException { SharedServer shared = SHARED_BY_URL.get(name); if (shared == null) { shared = new SharedServer(); - SHARED_BY_NAME.put(name, shared); SHARED_BY_URL.put(shared.serverUrl, shared); } return shared; From d11b2bf2786d7dc8632caede5236d74aeb1ed018 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 28 Nov 2025 16:46:39 -0500 Subject: [PATCH 19/51] timing is everything --- .../nats/client/impl/PullMessageManager.java | 2 + src/test/java/io/nats/client/AuthTests.java | 92 +- .../java/io/nats/client/ConnectTests.java | 113 +- src/test/java/io/nats/client/EchoTests.java | 12 +- .../nats/client/NatsServerProtocolMock.java | 6 +- .../java/io/nats/client/NatsTestServer.java | 5 +- .../java/io/nats/client/PublishTests.java | 14 +- .../java/io/nats/client/SubscriberTests.java | 3 +- src/test/java/io/nats/client/TestServer.java | 19 + .../nats/client/impl/AuthAndConnectTests.java | 7 +- ...tionDuringReconnectOnFlushTimeoutTest.java | 4 +- .../client/impl/ConnectionListenerTests.java | 12 +- .../java/io/nats/client/impl/DrainTests.java | 160 +-- .../nats/client/impl/ErrorListenerTests.java | 34 +- .../io/nats/client/impl/InfoHandlerTests.java | 23 +- .../client/impl/JetStreamGeneralTests.java | 10 +- .../JetStreamManagementWithConfTests.java | 4 +- .../io/nats/client/impl/KeyValueTests.java | 6 +- .../nats/client/impl/ListenerByFutures.java | 92 +- .../nats/client/impl/MessageContentTests.java | 9 +- .../nats/client/impl/MessageManagerTests.java | 150 +-- .../client/impl/NatsConnectionImplTests.java | 55 +- .../io/nats/client/impl/NatsMessageTests.java | 8 +- .../java/io/nats/client/impl/ParseTests.java | 3 +- .../java/io/nats/client/impl/PingTests.java | 43 +- .../io/nats/client/impl/ReconnectTests.java | 34 +- .../io/nats/client/impl/RequestTests.java | 97 +- .../io/nats/client/impl/ServerPoolTests.java | 17 +- .../io/nats/client/impl/TLSConnectTests.java | 45 +- .../client/impl/ValidateIssue1426Test.java | 4 +- .../client/impl/WebsocketConnectTests.java | 4 +- .../io/nats/client/other/ReconnectCheck.java | 4 +- .../io/nats/client/utils/ConnectionUtils.java | 44 +- .../io/nats/client/utils/OptionsUtils.java | 50 +- .../io/nats/client/utils/SharedServer.java | 2 +- .../java/io/nats/client/utils/TestBase.java | 34 +- .../java/io/nats/service/ServiceTests.java | 1047 +++++++++-------- 37 files changed, 1149 insertions(+), 1119 deletions(-) create mode 100644 src/test/java/io/nats/client/TestServer.java diff --git a/src/main/java/io/nats/client/impl/PullMessageManager.java b/src/main/java/io/nats/client/impl/PullMessageManager.java index c1538803e..4ed388a9d 100644 --- a/src/main/java/io/nats/client/impl/PullMessageManager.java +++ b/src/main/java/io/nats/client/impl/PullMessageManager.java @@ -16,6 +16,7 @@ import io.nats.client.Message; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; +import io.nats.client.support.Debug; import io.nats.client.support.Status; import static io.nats.client.impl.MessageManager.ManageResult.*; @@ -158,6 +159,7 @@ protected void subTrackJsMessage(Message msg) { } protected ManageResult manageStatus(Message msg) { + Debug.info("MAN", msg); Status status = msg.getStatus(); switch (status.getCode()) { case NOT_FOUND_CODE: diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 8fbcac0b6..aec262962 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -19,6 +19,7 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.ListenerForTesting; import io.nats.client.support.JwtUtils; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Disabled; @@ -66,23 +67,23 @@ public void testUserPass() throws Exception { String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // u/p in url - Options inUrl = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); + Options inUrl = OptionsUtils.optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); assertCanConnect(inUrl); // u/p in options - Options inOptions = optionsBuilder(ts).maxReconnects(0) + Options inOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); assertCanConnect(inOptions); - Options badUser = optionsBuilder(ts).maxReconnects(0) + Options badUser = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .userInfo("zzz".toCharArray(), "ppp".toCharArray()).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(badUser)); - Options badPass = optionsBuilder(ts).maxReconnects(0) + Options badPass = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(badPass)); - Options missingUserPass = optionsBuilder(ts).maxReconnects(0).build(); + Options missingUserPass = OptionsUtils.optionsBuilder(ts).maxReconnects(0).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPass)); } } @@ -121,7 +122,7 @@ public void testEncodedPassword() throws Exception { private void assertEncoded(String encoded, int port) throws IOException, InterruptedException { String url = userPassInUrl("u" + encoded, "p" + encoded, port); - Options options = optionsBuilder(url).build(); + Options options = OptionsUtils.optionsBuilder(url).build(); Connection c = Nats.connect(options); c.getServerInfo(); c.close(); @@ -147,7 +148,7 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsServerRunner.builder().customArgs(customArgs))) { // See config file for user/pass - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .userInfo(user, pass) .maxReconnects(0).build(); assertCanConnect(options); @@ -165,7 +166,7 @@ public void testUserPassOnReconnect() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs)) { port = ts.getPort(); // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(-1) + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(-1) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -206,7 +207,7 @@ public void testUserBCryptPass() throws Exception { "$2a$12$UjzncyjtsE6rJG4LSGk.JOweXV3P2umZ38gHuj4OMY0X/nQudiDgG" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass - Options options = optionsBuilder(ts).maxReconnects(0) + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); assertCanConnect(options); } @@ -263,7 +264,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); String url2 = userPassInUrl("uuu2", "ppp2", ts2.getPort()); - Options options = optionsBuilder(url1, url2) + Options options = OptionsUtils.optionsBuilder(url1, url2) .maxReconnects(4) .noRandomize() .connectionListener(listener) @@ -288,7 +289,7 @@ public void testUserPassInURLWithFallback() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); - Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(url1, ts2.getNatsLocalhostUri()) .userInfo("uuu2".toCharArray(), "ppp2".toCharArray()) .maxReconnects(4) .noRandomize() @@ -301,7 +302,7 @@ public void testUserPassInURLWithFallback() throws Exception { ts1.close(); listener.waitForStatusChange(10, TimeUnit.SECONDS); assertConnected(nc); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -315,7 +316,7 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); String url2 = tokenInUrl("token_two", ts2.getPort()); - Options options = optionsBuilder(url1, url2) + Options options = OptionsUtils.optionsBuilder(url1, url2) .maxReconnects(4) .noRandomize() .connectionListener(listener) @@ -343,7 +344,7 @@ public void testTokenInURLWithFallback() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); - Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(url1, ts2.getNatsLocalhostUri()) .token("token_two".toCharArray()) .maxReconnects(4) .noRandomize() @@ -358,7 +359,7 @@ public void testTokenInURLWithFallback() throws Exception { listener.waitForStatusChange(STANDARD_CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); listenerConnectionWait(nc, listener); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -368,26 +369,26 @@ public void testToken() throws Exception { String[] customArgs = { "--auth", "token" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // token in options - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .token("token".toCharArray()) .build(); assertCanConnect(options); // token in url - options = optionsBuilder(tokenInUrl("token", ts.getPort())) + options = OptionsUtils.optionsBuilder(tokenInUrl("token", ts.getPort())) .maxReconnects(0).build(); assertCanConnect(options); // incorrect token - Options incorrectToken = optionsBuilder(ts) + Options incorrectToken = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .token("incorrectToken".toCharArray()) .build(); assertThrows(AuthenticationException.class, () -> Nats.connect(incorrectToken)); // incorrect token - Options missingToken = optionsBuilder(ts) + Options missingToken = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .build(); assertThrows(AuthenticationException.class, () -> Nats.connect(missingToken)); @@ -426,21 +427,21 @@ public void testNKeyAuth() throws Exception { NatsServerRunner.Builder b = NatsServerRunner.builder().configFilePath(configFilePath); try (NatsTestServer ts = new NatsTestServer(b)) { - Options authHandlerOptions = optionsBuilder(ts).maxReconnects(0) + Options authHandlerOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(theKey)).build(); assertCanConnect(authHandlerOptions); - Options staticOptions = optionsBuilder(ts).maxReconnects(0) + Options staticOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); assertCanConnect(staticOptions); // direct through Nats.connect - Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.staticCredentials(null, theKey.getSeed())); + Connection nc = Nats.connect(ts.getServerUri(), Nats.staticCredentials(null, theKey.getSeed())); standardConnectionWait(nc); standardCloseConnection(nc); // fails with no nkey - Options noNkey = optionsBuilder(ts).maxReconnects(0) + Options noNkey = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(null)).build(); assertThrows(IOException.class, () -> Nats.connect(noNkey)); } @@ -450,18 +451,18 @@ public void testNKeyAuth() throws Exception { public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0) + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .authHandler(getUserCredsAuthHander()) .build(); assertCanConnect(options); - options = optionsBuilder(ts).maxReconnects(0) + options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .credentialPath(jwtResource("user.creds")) .build(); assertCanConnect(options); //test Nats.connect method - Connection nc = Nats.connect(ts.getLocalhostUri(), getUserCredsAuthHander()); + Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -471,7 +472,7 @@ public void testJWTAuthWithCredsFile() throws Exception { public void testJWTAuthWithCredsFileAlso() throws Exception { //test Nats.connect method try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { - Connection nc = Nats.connect(ts.getLocalhostUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); + Connection nc = Nats.connect(ts.getServerUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); standardConnectionWait(nc); standardCloseConnection(nc); } @@ -482,7 +483,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); // in options - Options options = optionsBuilder(uri).maxReconnects(0) + Options options = OptionsUtils.optionsBuilder(uri).maxReconnects(0) .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); @@ -499,7 +500,7 @@ public void testWssJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipConnectValidateServer("wss_operator.conf")) { String uri = ts.getLocalhostUri("wss"); - Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) + Options options = OptionsUtils.optionsBuilder(uri).maxReconnects(0).sslContext(ctx) .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); } @@ -512,7 +513,7 @@ public void testStaticJWTAuth() throws Exception { String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; try (NatsTestServer ts = configFileServer("operator.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0) + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); } @@ -523,10 +524,10 @@ public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .noRandomize().maxReconnects(-1).authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); @@ -535,7 +536,7 @@ public void testReconnectWithAuth() throws Exception { // Reconnect will fail because ts has the same auth error listener.waitForStatusChange(5, TimeUnit.SECONDS); assertConnected(nc); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -546,11 +547,11 @@ public void testCloseOnReconnectWithSameError() throws Exception { // Connect should fail on ts1 try (NatsTestServer ts = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.CLOSED); @@ -568,7 +569,7 @@ public void testThatAuthErrorIsCleared() throws Exception { try (NatsTestServer ts1 = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts1.getLocalhostUri(), ts2.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) .noRandomize() .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) @@ -577,9 +578,9 @@ public void testThatAuthErrorIsCleared() throws Exception { .errorListener(new ListenerForTesting()) .build(); Connection nc = standardConnectionWait(options); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - String tsURI = ts1.getLocalhostUri(); + String tsURI = ts1.getServerUri(); int port1 = ts1.getPort(); int port2 = ts2.getPort(); @@ -594,8 +595,8 @@ public void testThatAuthErrorIsCleared() throws Exception { // reconnect should work because we are now running with the good config listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); - assertEquals(tsURI, ts3.getLocalhostUri()); + assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); + assertEquals(tsURI, ts3.getServerUri()); // Close this and go back to the bad config on that port, should be ok 1x listener.prepForStatusChange(Events.RECONNECTED); @@ -604,7 +605,7 @@ public void testThatAuthErrorIsCleared() throws Exception { try (NatsTestServer ignored = configFileServer("operator_noacct.conf", port1); NatsTestServer ts5 = configFileServer("operator.conf", port2)) { listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - assertEquals(ts5.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts5.getServerUri(), nc.getConnectedUrl()); } } standardCloseConnection(nc); @@ -647,22 +648,21 @@ private static void _testReconnectAfter(String errText) throws Exception { // Connect should fail on ts1 try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true); NatsTestServer ts2 = skipConnectValidateServer("operator.conf")) { - Options options = optionsBuilder() - .servers(new String[]{mockTs.getMockUri(), ts2.getLocalhostUri()}) + Options options = optionsBuilder(mockTs, ts2) .maxReconnects(-1) .noRandomize() .authHandler(getUserCredsAuthHander()) .build(); Connection nc = standardConnectionWait(options); - assertEquals(mockTs.getMockUri(), nc.getConnectedUrl()); + assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); f.complete(true); listenerConnectionWait(nc, listener); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); String err = nc.getLastError(); assertNotNull(err); @@ -720,7 +720,7 @@ else if (error.equalsIgnoreCase("authorization violation")) { try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { Options options = Options.builder() - .server(ts.getLocalhostUri()) + .server(ts.getServerUri()) .credentialPath(credsFile) .connectionListener(cl) .errorListener(el) diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index b98d450ee..fd4e741de 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -44,29 +44,29 @@ public class ConnectTests { @Test public void testConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getLocalhostUri()); - assertEquals(ts.getPort(), nc.getServerInfo().getPort()); - // coverage for getClientAddress - InetAddress inetAddress = nc.getClientInetAddress(); - assertNotNull(inetAddress); - assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) - || inetAddress.equals(InetAddress.getLocalHost())); - standardCloseConnection(nc); + try (Connection nc = Nats.connect(ts.getServerUri())) { + assertEquals(ts.getPort(), nc.getServerInfo().getPort()); + + // coverage for getClientAddress + InetAddress inetAddress = nc.getClientInetAddress(); + assertNotNull(inetAddress); + assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) + || inetAddress.equals(InetAddress.getLocalHost())); + } } } @Test public void testConnectionWithOptions() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).build(); - assertCanConnect(options); + assertCanConnect(options(ts)); } } @Test public void testFullFakeConnect() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - assertCanConnect(mockTs.getMockUri()); + assertCanConnect(options(mockTs)); } } @@ -74,56 +74,48 @@ public void testFullFakeConnect() throws Exception { public void testFullFakeConnectWithTabs() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { mockTs.useTabs(); - assertCanConnect(mockTs.getMockUri()); + assertCanConnect(options(mockTs)); } } @Test - public void testConnectExitBeforeInfo() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); - assertCanConnect(options); - } - }); + public void testConnectExitBeforeInfo() throws IOException { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { + Options options = optionsBuilder(mockTs).noReconnect().build(); + assertThrows(IOException.class, () -> assertCanConnect(options)); + } } @Test - public void testConnectExitAfterInfo() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); - assertCanConnect(options); - } - }); + public void testConnectExitAfterInfo() throws IOException { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { + Options options = optionsBuilder(mockTs).noReconnect().build(); + assertThrows(IOException.class, () -> assertCanConnect(options)); + } } @Test - public void testConnectExitAfterConnect() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); - assertCanConnect(options); - } - }); + public void testConnectExitAfterConnect() throws IOException { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { + Options options = optionsBuilder(mockTs).noReconnect().build(); + assertThrows(IOException.class, () -> assertCanConnect(options)); + } } @Test - public void testConnectExitAfterPing() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); - assertCanConnect(options); - } - }); + public void testConnectExitAfterPing() throws IOException { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { + Options options = optionsBuilder(mockTs).noReconnect().build(); + assertThrows(IOException.class, () -> assertCanConnect(options)); + } } @Test public void testConnectionFailureWithFallback() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (NatsServerProtocolMock fake = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { - Options options = optionsBuilder(fake.getMockUri(), ts.getLocalhostUri()) - .connectionTimeout(Duration.ofSeconds(5)) + try (NatsServerProtocolMock mock = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { + Options options = optionsBuilder(mock, ts) + .noRandomize() .build(); assertCanConnect(options); } @@ -133,7 +125,7 @@ public void testConnectionFailureWithFallback() throws Exception { @Test public void testConnectWithConfig() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("simple.conf")) { - assertCanConnect(ts.getLocalhostUri()); + assertCanConnect(options(ts)); } } @@ -141,7 +133,8 @@ public void testConnectWithConfig() throws Exception { public void testConnectWithCommas() throws Exception { try (NatsTestServer ts1 = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - assertCanConnect(ts1.getLocalhostUri() + "," + ts2.getLocalhostUri()); + Options options = optionsBuilder().server(ts1.getServerUri() + "," + ts2.getServerUri()).build(); + assertCanConnect(options); } } } @@ -155,15 +148,15 @@ public void testConnectRandomize() throws Exception { int count = 0; int maxTries = 100; while (count++ < maxTries && (needOne || needTwo)) { - Connection nc = standardConnectionWait(ts1.getLocalhostUri() + "," + ts2.getLocalhostUri()); - if (ts1.getLocalhostUri().equals(nc.getConnectedUrl())) { + Connection nc = standardConnectionWait(options(ts1, ts2)); + if (ts1.getServerUri().equals(nc.getConnectedUrl())) { needOne = false; } else { needTwo = false; } Collection servers = nc.getServers(); - assertTrue(servers.contains(ts1.getLocalhostUri())); - assertTrue(servers.contains(ts2.getLocalhostUri())); + assertTrue(servers.contains(ts1.getServerUri())); + assertTrue(servers.contains(ts2.getServerUri())); standardCloseConnection(nc); } assertFalse(needOne); @@ -181,9 +174,9 @@ public void testConnectNoRandomize() throws Exception { // should get at least 1 for each for (int i = 0; i < 10; i++) { - Options options = optionsBuilder(ts1.getLocalhostUri(), ts2.getLocalhostUri()).noRandomize().build(); + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()).noRandomize().build(); Connection nc = standardConnectionWait(options); - if (ts1.getLocalhostUri().equals(nc.getConnectedUrl())) { + if (ts1.getServerUri().equals(nc.getConnectedUrl())) { one++; } else { two++; @@ -202,7 +195,7 @@ public void testFailWithMissingLineFeedAfterInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -213,7 +206,7 @@ public void testFailWithStuffAfterInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -225,7 +218,7 @@ public void testFailWrongInitialInfoOP() { String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { mockTs.useCustomInfoAsFullInfo(); - Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -236,7 +229,7 @@ public void testIncompleteInitialInfo() { assertThrows(IOException.class, () -> { String badInfo = "{\"server_id\"\r\n"; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs.getMockUri()).reconnectWait(Duration.ofDays(1)).build(); + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); Nats.connect(options); } }); @@ -308,11 +301,11 @@ public void testErrorOnAsync() throws Exception { public void testConnectionTimeout() { assertThrows(IOException.class, () -> { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect().traceConnection() + Options options = optionsBuilder(mockTs).noReconnect().traceConnection() .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test build(); Connection nc = Nats.connect(options); - assertNotSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertNotSame(Connection.Status.CONNECTED, nc.getStatus()); } }); } @@ -320,7 +313,7 @@ public void testConnectionTimeout() { @Test public void testSlowConnectionNoTimeout() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { - Options options = optionsBuilder(mockTs.getMockUri()).noReconnect() + Options options = optionsBuilder(mockTs).noReconnect() .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep build(); assertCanConnect(options); @@ -403,7 +396,7 @@ public void testConnectExceptionHasURLS() { @Test public void testFlushBuffer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getLocalhostUri()); + Connection nc = standardConnectionWait(options(ts)); // test connected nc.flushBuffer(); @@ -425,7 +418,7 @@ public void testFlushBuffer() throws Exception { @Test public void testFlushBufferThreadSafety() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getLocalhostUri()); + Connection nc = standardConnectionWait(options(ts)); // use two latches to sync the threads as close as // possible. diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 481221141..b746fa189 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -14,6 +14,7 @@ package io.nats.client; import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.SharedServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -21,6 +22,7 @@ import java.io.IOException; import java.time.Duration; +import static io.nats.client.utils.ConnectionUtils.assertClosed; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -31,14 +33,14 @@ public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = optionsBuilder(mockTs.getMockUri()).noEcho().noReconnect().build(); + Options opt = OptionsUtils.optionsBuilder(mockTs).noEcho().noReconnect().build(); try { nc = Nats.connect(opt); // Should fail } finally { if (nc != null) { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -49,13 +51,13 @@ public void testFailWithBadServerProtocol() { public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = optionsBuilder(mockTs.getMockUri()).noReconnect().build(); + Options opt = OptionsUtils.optionsBuilder(mockTs).noReconnect().build(); try { nc = Nats.connect(opt); } finally { if (nc != null) { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -64,7 +66,7 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { runInShared(nc1 -> { - try (Connection nc2 = standardConnectionWait(optionsBuilder(nc1).build())) { + try (Connection nc2 = standardConnectionWait(OptionsUtils.optionsBuilder(nc1).build())) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/NatsServerProtocolMock.java b/src/test/java/io/nats/client/NatsServerProtocolMock.java index 9b489667d..9092a3c6d 100644 --- a/src/test/java/io/nats/client/NatsServerProtocolMock.java +++ b/src/test/java/io/nats/client/NatsServerProtocolMock.java @@ -24,7 +24,7 @@ * Handles the begining of the connect sequence, all hard coded, but * is configurable to fail at specific points to allow client testing. */ -public class NatsServerProtocolMock implements Closeable { +public class NatsServerProtocolMock implements Closeable, TestServer { // Default is to exit after pong public enum ExitAt { @@ -122,11 +122,13 @@ public void useCustomInfoAsFullInfo() { customInfoIsFullInfo = true; } + @Override public int getPort() { return port; } - public String getMockUri() { + @Override + public String getServerUri() { return "nats://0.0.0.0:" + port; } diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index bf069c6c8..242e30b81 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -22,7 +22,7 @@ import static io.nats.client.utils.ResourceUtils.configResource; -public class NatsTestServer extends NatsServerRunner { +public class NatsTestServer extends NatsServerRunner implements TestServer { static { NatsTestServer.quiet(); @@ -99,7 +99,8 @@ public String getLocalhostUri(String schema) { return NatsRunnerUtils.getLocalhostUri(schema, getPort()); } - public String getLocalhostUri() { + @Override + public String getServerUri() { return NatsRunnerUtils.getNatsLocalhostUri(getPort()); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 35374945f..f1bf0b968 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -18,6 +18,7 @@ import io.nats.client.impl.JetStreamTestingContext; import io.nats.client.impl.ListenerByFutures; import io.nats.client.impl.NatsMessage; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -32,6 +33,7 @@ import static io.nats.client.support.NatsConstants.*; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static org.junit.jupiter.api.Assertions.*; @@ -63,7 +65,7 @@ public void testThrowsWithoutSubject() throws Exception { @Test public void testThrowsIfTooBig() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("max_payload.conf")) { - Connection nc = standardConnectionWait(ts.getLocalhostUri()); + Connection nc = standardConnectionWait(options(ts)); byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); @@ -87,7 +89,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { } } }; - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .clientSideLimitChecks(false) .errorListener(el) .build(); @@ -109,9 +111,9 @@ public void testThrowsIfHeadersNotSupported() { String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo); - Connection nc = Nats.connect(mockTs.getMockUri())) + Connection nc = Nats.connect(mockTs.getServerUri())) { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); nc.publish(NatsMessage.builder() .subject("testThrowsIfheadersNotSupported") @@ -188,7 +190,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(mockTs.getMockUri())) { + Connection nc = standardConnectionWait(options(mockTs))) { byte[] bodyBytes; if (bodyString == null || bodyString.isEmpty()) { @@ -274,7 +276,7 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { - Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); + Options ncSupportedOptions = OptionsUtils.optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { ctxNotSupported.createStream(jsSubject); diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index 805e82ae0..e3d6e18c1 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -21,6 +21,7 @@ import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; @@ -108,7 +109,7 @@ public void testTabInProtocolLine() throws Exception { }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(mockTs.getMockUri())) { + Connection nc = standardConnectionWait(options(mockTs))) { String subject = random(); Subscription sub = nc.subscribe(subject); diff --git a/src/test/java/io/nats/client/TestServer.java b/src/test/java/io/nats/client/TestServer.java new file mode 100644 index 000000000..e7a162924 --- /dev/null +++ b/src/test/java/io/nats/client/TestServer.java @@ -0,0 +1,19 @@ +// Copyright 2015-2022 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client; + +public interface TestServer { + int getPort(); + String getServerUri(); +} diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 078b5443e..3bf20f872 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -31,7 +32,7 @@ public class AuthAndConnectTests { @Test public void testIsAuthError() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(ts.getLocalhostUri()); + Connection nc = standardConnectionWait(options(ts)); NatsConnection nats = (NatsConnection)nc; assertTrue(nats.isAuthenticationError("user authentication expired")); @@ -48,7 +49,7 @@ public void testIsAuthError() throws Exception { @Test() public void testConnectWhenClosed() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - NatsConnection nc = (NatsConnection) standardConnectionWait(ts.getLocalhostUri()); + NatsConnection nc = (NatsConnection) standardConnectionWait(options(ts)); standardCloseConnection(nc); nc.connect(false); // should do nothing assertClosed(nc); @@ -73,7 +74,7 @@ public void errorOccurred(Connection conn, String error) { try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() - .server(ts.getLocalhostUri()) + .server(ts.getServerUri()) .maxReconnects(-1) .reconnectWait(Duration.ZERO) .errorListener(noopErrorListener) diff --git a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java index 3c7b938a2..9da48ec01 100644 --- a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java +++ b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java @@ -1,6 +1,7 @@ package io.nats.client.impl; import io.nats.client.*; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -10,7 +11,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,7 +43,7 @@ public void testAuthViolationDuringReconnect() throws Exception { ctx.port = NatsTestServer.nextPort(); startServer(ctx); - Options options = optionsBuilder(ctx.port) + Options options = OptionsUtils.optionsBuilder(ctx.port) .noRandomize() .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index eaaba6f94..e2d1551ac 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -55,11 +56,10 @@ public void testCloseEvent() throws Exception { public void testDiscoveredServersCountAndListenerInOptions() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getLocalhostUri()+"\"]}"; + String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getServerUri()+"\"]}"; try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) { ListenerForTesting listener = new ListenerForTesting(); - Options options = optionsBuilder() - .server(mockTs2.getMockUri()) + Options options = optionsBuilder(mockTs2) .maxReconnects(0) .connectionListener(listener) .build(); @@ -77,14 +77,14 @@ public void testDisconnectReconnectCount() throws Exception { Connection nc; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .reconnectWait(Duration.ofMillis(100)) .maxReconnects(-1) .connectionListener(listener) .build(); port = ts.getPort(); nc = standardConnectionWait(options); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -97,7 +97,7 @@ public void testDisconnectReconnectCount() throws Exception { try (NatsTestServer ts = new NatsTestServer(port)) { standardConnectionWait(nc); assertEquals(1, listener.getEventCount(Events.RECONNECTED)); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 4b9754efc..dbd23bb67 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -25,8 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.TestBase.flushConnection; import static io.nats.client.utils.ThreadUtils.park; import static io.nats.client.utils.ThreadUtils.sleep; @@ -38,7 +38,7 @@ public class DrainTests { @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - final Connection nc = standardConnectionWait(optionsBuilder(ts).maxReconnects(0).build()); + final Connection nc = standardConnectionWait(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); nc.subscribe("draintest"); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do @@ -52,10 +52,10 @@ public void testCloseOnDrainFailure() throws Exception { @Test public void testSimpleSubDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -82,10 +82,10 @@ public void testSimpleSubDrain() throws Exception { @Test public void testSimpleDispatchDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -115,10 +115,10 @@ public void testSimpleDispatchDrain() throws Exception { @Test public void testSimpleConnectionDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -147,17 +147,17 @@ public void testSimpleConnectionDrain() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); assertEquals(2, count.get()); // Should get both - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @Test public void testConnectionDrainWithZeroTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -186,17 +186,17 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); assertEquals(count.get(), 2); // Should get both - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @Test public void testDrainWithZeroTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -223,10 +223,10 @@ public void testDrainWithZeroTimeout() throws Exception { public void testSubDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -250,10 +250,10 @@ public void testSubDuringDrainThrows() { public void testCreateDispatcherDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -276,10 +276,10 @@ public void testCreateDispatcherDuringDrainThrows() { @Test public void testUnsubDuringDrainIsNoop() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -312,17 +312,17 @@ public void testUnsubDuringDrainIsNoop() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertEquals(2, count.get()); // Should get both - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @Test public void testDrainInMessageHandler() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); AtomicReference dispatcher = new AtomicReference<>(); @@ -352,10 +352,10 @@ public void testDrainInMessageHandler() throws Exception { @Test public void testDrainFutureMatches() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -390,7 +390,7 @@ public void testDrainFutureMatches() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertEquals(2, count.get()); // Should get both - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @@ -398,10 +398,10 @@ public void testDrainFutureMatches() throws Exception { public void testFirstTimeRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -427,7 +427,7 @@ public void testFirstTimeRequestReplyDuringDrain() { assertNotNull(msg); assertTrue(tracker.get(500, TimeUnit.SECONDS)); // wait for the drain to complete - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } }); } @@ -436,10 +436,10 @@ public void testFirstTimeRequestReplyDuringDrain() { public void testRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); Subscription sub = subCon.subscribe("draintest"); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -469,7 +469,7 @@ public void testRequestReplyDuringDrain() { assertNotNull(msg); assertTrue(tracker.get(500, TimeUnit.SECONDS)); // wait for the drain to complete - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } }); } @@ -477,8 +477,8 @@ public void testRequestReplyDuringDrain() { @Test public void testQueueHandoffWithDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(pubCon); final int total = 5_000; final Duration sleepBetweenDrains = Duration.ofMillis(250); @@ -492,8 +492,8 @@ public void testQueueHandoffWithDrain() throws Exception { NatsDispatcher workingD; NatsDispatcher drainingD; - Connection draining = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - assertSame(Connection.Status.CONNECTED, draining.getStatus(), "Connected Status"); + Connection draining = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + assertConnected(draining); drainingD = (NatsDispatcher) draining.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); draining.flush(Duration.ofSeconds(5)); @@ -510,8 +510,8 @@ public void testQueueHandoffWithDrain() throws Exception { while (count.get() < total && Duration.between(start, now).compareTo(testTimeout) < 0) { - working = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - assertSame(Connection.Status.CONNECTED, working.getStatus(), "Connected Status"); + working = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + assertConnected(working); workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); working.flush(Duration.ofSeconds(5)); @@ -539,10 +539,10 @@ public void testQueueHandoffWithDrain() throws Exception { @Test public void testDrainWithLotsOfMessages() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); int total = 1000; Subscription sub = subCon.subscribe("draintest"); @@ -579,10 +579,10 @@ public void testDrainWithLotsOfMessages() throws Exception { @Test public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -611,7 +611,7 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { assertTrue(tracker.get(10, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); assertEquals(2, count.get()); // Should get both - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @@ -619,10 +619,10 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); - assertSame(Connection.Status.CONNECTED, pubCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); + Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); + assertConnected(pubCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { @@ -652,7 +652,7 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { assertFalse(tracker.get(10, TimeUnit.SECONDS)); assertFalse(((NatsConnection) subCon).isDrained()); assertEquals(0, listener.getExceptionCount()); // Don't throw during drain from reader - assertSame(Connection.Status.CLOSED, subCon.getStatus()); + assertClosed(subCon); } } @@ -661,7 +661,7 @@ public void testThrowIfCantFlush() { assertThrows(TimeoutException.class, () -> { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) + Connection subCon = standardConnectionWait(OptionsUtils.optionsBuilder(ts).connectionListener(listener).build())) { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -677,8 +677,8 @@ public void testThrowIfCantFlush() { public void testThrowIfClosing() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertSame(Connection.Status.CONNECTED, subCon.getStatus(), "Connected Status"); + Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(subCon); subCon.close(); subCon.drain(Duration.ofSeconds(1)); diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 49f3ef309..28a867c7c 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Status; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -28,7 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -44,15 +44,15 @@ public void testLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri(), ts3.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) Nats.connect(options); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertConnected(nc); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); @@ -72,7 +72,7 @@ public void testLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 3000)); longConnectionWait(nc); - assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); } } @@ -85,15 +85,15 @@ public void testClearLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri(), ts3.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) Nats.connect(options); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertConnected(nc); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); @@ -112,8 +112,8 @@ public void testClearLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 2000)); - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); - assertEquals(ts3.getLocalhostUri(), nc.getConnectedUrl()); + assertConnected(nc); + assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); nc.clearLastError(); assertNull(nc.getLastError()); @@ -131,7 +131,7 @@ public void testErrorOnNoAuth() throws Exception { sleep(1000); // give the server time to get ready, otherwise sometimes this test flaps // See config file for user/pass // no or wrong u/p in the options is an error - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -153,7 +153,7 @@ public void testErrorOnNoAuth() throws Exception { public void testExceptionOnBadDispatcher() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -188,7 +188,7 @@ public void testExceptionInErrorHandler() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass // don't put u/p in options - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -200,7 +200,7 @@ public void testExceptionInErrorHandler() throws Exception { public void testExceptionInSlowConsumerHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { + Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).errorListener(listener).build())) { Subscription sub = nc.subscribe("subject"); sub.setPendingLimits(1, -1); @@ -224,7 +224,7 @@ public void testExceptionInSlowConsumerHandler() throws Exception { public void testExceptionInExceptionHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); Connection nc = Nats.connect(options); try { Dispatcher d = nc.createDispatcher(msg -> { @@ -254,7 +254,7 @@ public void testDiscardedMessageFastProducer() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) .discardMessagesWhenOutgoingQueueFull() .errorListener(listener) @@ -289,7 +289,7 @@ public void testDiscardedMessageServerClosed() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) .discardMessagesWhenOutgoingQueueFull() .errorListener(listener) diff --git a/src/test/java/io/nats/client/impl/InfoHandlerTests.java b/src/test/java/io/nats/client/impl/InfoHandlerTests.java index a4a99e3fc..47e3f7d93 100644 --- a/src/test/java/io/nats/client/impl/InfoHandlerTests.java +++ b/src/test/java/io/nats/client/impl/InfoHandlerTests.java @@ -22,8 +22,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static io.nats.client.utils.ConnectionUtils.assertClosed; +import static io.nats.client.utils.ConnectionUtils.assertConnected; import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class InfoHandlerTests { @Test @@ -31,13 +34,13 @@ public void testInitialInfo() throws IOException, InterruptedException { String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\"}"; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo)) { - Connection nc = Nats.connect(mockTs.getMockUri()); + Connection nc = Nats.connect(mockTs.getServerUri()); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -86,9 +89,9 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(infoCustomizer, customInfo)) { - Connection nc = Nats.connect(mockTs.getMockUri()); + Connection nc = Nats.connect(mockTs.getServerUri()); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); sendInfo.complete(Boolean.TRUE); @@ -96,7 +99,7 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info"); } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -152,11 +155,11 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti if (type.equals(ConnectionListener.Events.LAME_DUCK)) connectLDM.complete(type); }; - Options options = optionsBuilder().server(mockTs.getMockUri()).connectionListener(cl).build(); + Options options = optionsBuilder(mockTs).connectionListener(cl).build(); Connection nc = Nats.connect(options); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info"); sendInfo.complete(Boolean.TRUE); @@ -164,7 +167,7 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info"); } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 05c0adfcd..186d83ae8 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsJetStreamUtil; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -34,7 +35,6 @@ import static io.nats.client.support.NatsJetStreamClientError.*; import static io.nats.client.utils.ConnectionUtils.longConnectionWait; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -64,7 +64,7 @@ public void testJetNotEnabled() throws Exception { @Test public void testJetEnabledGoodAccount() throws Exception { try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = longConnectionWait(options)) { nc.jetStreamManagement(); @@ -396,10 +396,10 @@ public void testPrefix() throws Exception { String subjectMadeByTar = "sub-made-by.tar"; try (NatsTestServer ts = configuredJsServer("js_prefix.conf")) { - Options optionsSrc = optionsBuilder(ts) + Options optionsSrc = OptionsUtils.optionsBuilder(ts) .userInfo("src".toCharArray(), "spass".toCharArray()).build(); - Options optionsTar = optionsBuilder(ts) + Options optionsTar = OptionsUtils.optionsBuilder(ts) .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); try (Connection ncSrc = standardConnectionWait(optionsSrc); @@ -1107,7 +1107,7 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { - Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); + Options optReport = OptionsUtils.optionsBuilder(ncCancel).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index c010a169d..61c39a30b 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -18,13 +18,13 @@ import io.nats.client.NatsTestServer; import io.nats.client.Options; import io.nats.client.api.*; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.util.List; import static io.nats.client.NatsTestServer.configuredJsServer; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; public class JetStreamManagementWithConfTests extends JetStreamTestBase { @@ -117,7 +117,7 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long @Test public void testAuthCreateUpdateStream() throws Exception { try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options optionsSrc = optionsBuilder(ts) + Options optionsSrc = OptionsUtils.optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = standardConnectionWait(optionsSrc)) { diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 75a7e69ff..760a09274 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsKeyValueUtil; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; @@ -35,7 +36,6 @@ import static io.nats.client.api.KeyValueWatchOption.*; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsJetStreamConstants.SERVER_DEFAULT_DUPLICATE_WINDOW_MS; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -1090,8 +1090,8 @@ else if (expected instanceof String) { @Test public void testWithAccount() throws Exception { try (NatsTestServer ts = configFileServer("kv_account.conf")) { - Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); - Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); + Options acctA = OptionsUtils.optionsBuilder(ts).userInfo("a", "a").build(); + Options acctI = OptionsUtils.optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); try (Connection connUserA = Nats.connect(acctA); Connection connUserI = Nats.connect(acctI)) diff --git a/src/test/java/io/nats/client/impl/ListenerByFutures.java b/src/test/java/io/nats/client/impl/ListenerByFutures.java index e9a3ad02f..555a60722 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFutures.java +++ b/src/test/java/io/nats/client/impl/ListenerByFutures.java @@ -33,6 +33,9 @@ public class ListenerByFutures implements ErrorListener, ConnectionListener { private final Map> eventsFutures = new HashMap<>(); private final Map> textFutures = new HashMap<>(); + private CompletableFuture statusFuture; + private StatusType preppedStatusType; + private int preppedStatusCode; private final boolean printExceptions; private final boolean verbose; @@ -64,7 +67,8 @@ public void reset() { public void validate(CompletableFuture future, long waitInMillis, String failMessage) { try { future.get(waitInMillis, TimeUnit.MILLISECONDS); - } catch (TimeoutException | ExecutionException | InterruptedException e) { + } + catch (TimeoutException | ExecutionException | InterruptedException e) { Assertions.fail("Failed to get '" + failMessage + "' message.", e); } } @@ -72,12 +76,49 @@ public void validate(CompletableFuture future, long waitInMillis, String f public void validate(CompletableFuture future, long waitInMillis, Events type) { try { future.get(waitInMillis, TimeUnit.MILLISECONDS); - } catch (TimeoutException | ExecutionException | InterruptedException e) { - + } + catch (TimeoutException | ExecutionException | InterruptedException e) { Assertions.fail("Failed to get " + type.name() + " event.", e); } } + public void validateStatus(CompletableFuture future, long waitInMillis) { + try { + future.get(waitInMillis, TimeUnit.MILLISECONDS); + } + catch (TimeoutException | ExecutionException | InterruptedException e) { + Assertions.fail("Failed to get correct status.", e); + } + } + + public enum StatusType { + Unhandled, PullWarning, PullError + } + + public static class StatusException extends RuntimeException { + public final StatusType receivedType; + public final Status receivedStatus; + public final StatusType preppedStatusType; + public final int preppedStatusCode; + + public StatusException(StatusType receivedType, Status receivedStatus, StatusType preppedStatusType, int preppedStatusCode) { + this.receivedType = receivedType; + this.receivedStatus = receivedStatus; + this.preppedStatusType = preppedStatusType; + this.preppedStatusCode = preppedStatusCode; + } + + @Override + public String toString() { + return "StatusException{" + + "receivedType=" + receivedType + + ", receivedStatusCode=" + receivedStatus.getCode() + + ", preppedStatusType=" + preppedStatusType + + ", preppedStatusCode=" + preppedStatusCode + + "} " + super.toString(); + } + } + private CompletableFuture prepFor(String label, Map> map, T key) { lock.lock(); try { @@ -90,6 +131,29 @@ private CompletableFuture prepFor(String label, Map prepForEvent(Events type) { + return prepFor("prepForEvent", eventsFutures, type); + } + + public CompletableFuture prepForError(String errorText) { + return prepFor("prepForError", textFutures, errorText); + } + + public CompletableFuture prepForStatus(StatusType type, int statusCode) { + lock.lock(); + try { + if (verbose) { + report("prepForStatus", type + " " + statusCode); + } + preppedStatusType = type; + preppedStatusCode = statusCode; + statusFuture = new CompletableFuture<>(); + return statusFuture; + } finally { + lock.unlock(); + } + } + private void complete(String label, Map> map, T key) { lock.lock(); try { @@ -110,14 +174,6 @@ public void connectionEvent(Connection conn, Events type, Long time, String uriD complete("connectionEvent", eventsFutures, type); } - public CompletableFuture prepForEvent(Events type) { - return prepFor("prepForEvent", eventsFutures, type); - } - - public CompletableFuture prepForError(String errorText) { - return prepFor("prepForError", textFutures, errorText); - } - @Override public void errorOccurred(Connection conn, String error) { complete("errorOccurred", textFutures, error); @@ -143,16 +199,30 @@ public void messageDiscarded(Connection conn, Message msg) { public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { } + private void statusReceived(StatusType receivedType, Status received) { + if (statusFuture != null) { + if (preppedStatusType.equals(receivedType) && preppedStatusCode == received.getCode()) { + statusFuture.complete(null); + } + else { + statusFuture.completeExceptionally(new StatusException(receivedType, received, preppedStatusType, preppedStatusCode)); + } + } + } + @Override public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status status) { + statusReceived(StatusType.Unhandled, status); } @Override public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { + statusReceived(StatusType.PullWarning, status); } @Override public void pullStatusError(Connection conn, JetStreamSubscription sub, Status status) { + statusReceived(StatusType.PullError, status); } @Override diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 69636d20b..482ad811a 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -24,6 +24,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import static io.nats.client.utils.ConnectionUtils.assertClosed; +import static io.nats.client.utils.ConnectionUtils.assertConnected; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -184,15 +186,14 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF ListenerForTesting listener = new ListenerForTesting(); try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(badServer, null)) { - Options options = optionsBuilder() - .server(mockTs.getMockUri()) + Options options = optionsBuilder(mockTs) .maxReconnects(0) .errorListener(listener) .connectionListener(listener) .build(); Connection nc = Nats.connect(options); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); listener.prepForStatusChange(Events.DISCONNECTED); ready.complete(Boolean.TRUE); @@ -203,7 +204,7 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF || Connection.Status.CLOSED == nc.getStatus(), "Disconnected Status"); } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 62be5e256..9d33d9ad2 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -23,10 +23,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; +import static io.nats.client.impl.ListenerByFutures.StatusType.PullError; +import static io.nats.client.impl.ListenerByFutures.StatusType.PullWarning; import static io.nats.client.impl.MessageManager.ManageResult; +import static io.nats.client.impl.MessageManager.ManageResult.*; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; import static io.nats.client.support.NatsJetStreamConstants.CONSUMER_STALLED_HDR; import static io.nats.client.support.Status.*; @@ -109,18 +113,18 @@ private boolean _testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerFor assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); if (manager.fc) { - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); + assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); + assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); } else { - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); + assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); + assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // fc unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // hb } assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); + assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); unhandledCodes.add(999); sleep(100); @@ -147,94 +151,58 @@ private boolean _testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerFor @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + ListenerByFutures listener = new ListenerByFutures(); runInSharedOwnNc(listener, (nc, ctx) -> { _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).build()); _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build()); }); } - private void _testPullBqpAndManage(Connection nc, ListenerForTesting listener, PullRequestOptions pro) throws JetStreamApiException, IOException { - int triesLeft = 2; - while (triesLeft-- > 0) { - NatsJetStreamSubscription sub = genericPullSub(nc); - PullMessageManager pullMgr = getPullManager(nc, sub, true); - pullMgr.startPullRequest(random(), pro, true, null); - boolean passed = _testPullBqpAndManageRetriable(sub, listener, pullMgr, triesLeft > 0); - if (passed) { - break; - } - } - } - - private boolean _testPullBqpAndManageRetriable(NatsJetStreamSubscription sub, ListenerForTesting listener, PullMessageManager manager, boolean canRetry) { - try { - listener.reset(); - String sid = sub.getSID(); - - // only plain heartbeats don't get queued - assertFalse(manager.beforeQueueProcessorImpl(getHeartbeat(sid))); - - assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); - assertTrue(manager.beforeQueueProcessorImpl(getNotFoundStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getRequestTimeoutStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, BATCH_COMPLETED))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); - assertTrue(manager.beforeQueueProcessorImpl(getBadRequest(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_DELETED))); - assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); - - assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getNotFoundStatus(sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getRequestTimeoutStatus(sid))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, BATCH_COMPLETED))); - assertEquals(ManageResult.STATUS_TERMINUS, manager.manage(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); - assertEquals(ManageResult.STATUS_HANDLED, manager.manage(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); - - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getBadRequest(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_DELETED))); - assertEquals(ManageResult.STATUS_ERROR, manager.manage(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); - - sleep(100); - - List list = listener.getPullStatusWarnings(); - int[] codes = new int[]{NOT_FOUND_CODE, REQUEST_TIMEOUT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE, CONFLICT_CODE}; - assertEquals(8, list.size()); - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - if (canRetry && codes[x] != se.status.getCode()) { - return false; // didn't pass - } - assertEquals(codes[x], se.status.getCode()); - } - - list = listener.getPullStatusErrors(); - assertEquals(4, list.size()); - codes = new int[]{BAD_REQUEST_CODE, 999, CONFLICT_CODE, CONFLICT_CODE}; - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - if (canRetry && codes[x] != se.status.getCode()) { - return false; // didn't pass - } - assertEquals(codes[x], se.status.getCode()); - } + private void _testPullBqpAndManage(Connection nc, ListenerByFutures listener, PullRequestOptions pro) throws JetStreamApiException, IOException { + NatsJetStreamSubscription sub = genericPullSub(nc); + PullMessageManager manager = getPullManager(nc, sub, true); + manager.startPullRequest(random(), pro, true, null); + listener.reset(); + String sid = sub.getSID(); - return true; // true means passed - } - finally { - try { sub.unsubscribe(); } catch (Exception ignore) {} - } + // only plain heartbeats don't get queued + assertFalse(manager.beforeQueueProcessorImpl(getHeartbeat(sid))); + + assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); + assertTrue(manager.beforeQueueProcessorImpl(getNotFoundStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getRequestTimeoutStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, BATCH_COMPLETED))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_WAITING))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES))); + assertTrue(manager.beforeQueueProcessorImpl(getBadRequest(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_DELETED))); + assertTrue(manager.beforeQueueProcessorImpl(getConflictStatus(sid, CONSUMER_IS_PUSH_BASED))); + + assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); + + assertManageResult(listener, PullWarning, NOT_FOUND_CODE, STATUS_TERMINUS, manager, getNotFoundStatus(sid)); + assertManageResult(listener, PullWarning, REQUEST_TIMEOUT_CODE, STATUS_TERMINUS, manager, getRequestTimeoutStatus(sid)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_TERMINUS, manager, getConflictStatus(sid, BATCH_COMPLETED)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_TERMINUS, manager, getConflictStatus(sid, MESSAGE_SIZE_EXCEEDS_MAX_BYTES)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_HANDLED, manager, getConflictStatus(sid, EXCEEDED_MAX_WAITING)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_HANDLED, manager, getConflictStatus(sid, EXCEEDED_MAX_REQUEST_BATCH)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_HANDLED, manager, getConflictStatus(sid, EXCEEDED_MAX_REQUEST_EXPIRES)); + assertManageResult(listener, PullWarning, CONFLICT_CODE, STATUS_HANDLED, manager, getConflictStatus(sid, EXCEEDED_MAX_REQUEST_MAX_BYTES)); + + assertManageResult(listener, PullError, BAD_REQUEST_CODE, STATUS_ERROR, manager, getBadRequest(sid)); + assertManageResult(listener, PullError, 999, STATUS_ERROR, manager, getUnkownStatus(sid)); + assertManageResult(listener, PullError, CONFLICT_CODE, STATUS_ERROR, manager, getConflictStatus(sid, CONSUMER_DELETED)); + assertManageResult(listener, PullError, CONFLICT_CODE, STATUS_ERROR, manager, getConflictStatus(sid, CONSUMER_IS_PUSH_BASED)); + } + + private static void assertManageResult(ListenerByFutures listener, ListenerByFutures.StatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { + CompletableFuture f = listener.prepForStatus(expectedType, expectedStatusCode); + assertEquals(expecteManageResult, manager.manage(message)); + listener.validateStatus(f, 500); } @Test @@ -342,7 +310,7 @@ public void test_push_fc() { assertEquals(getFcSubject(3), mpi.fcSubject); assertEquals(3, mpi.pubCount); - assertEquals(ManageResult.STATUS_ERROR, pmm.manage(getHeartbeat(sid))); + assertEquals(STATUS_ERROR, pmm.manage(getHeartbeat(sid))); assertEquals(getFcSubject(3), pmm.getLastFcSubject()); assertEquals(getFcSubject(3), mpi.fcSubject); assertEquals(3, mpi.pubCount); @@ -376,12 +344,12 @@ private void _push_xfc(SubscribeOptions so) { pmm.startup(sub); assertNull(pmm.getLastFcSubject()); - assertEquals(ManageResult.STATUS_ERROR, pmm.manage(getFlowControl(1, sid))); + assertEquals(STATUS_ERROR, pmm.manage(getFlowControl(1, sid))); assertNull(pmm.getLastFcSubject()); assertNull(mpi.fcSubject); assertEquals(0, mpi.pubCount); - assertEquals(ManageResult.STATUS_ERROR, pmm.manage(getHeartbeat(sid))); + assertEquals(STATUS_ERROR, pmm.manage(getHeartbeat(sid))); assertNull(pmm.getLastFcSubject()); assertNull(mpi.fcSubject); assertEquals(0, mpi.pubCount); @@ -403,8 +371,8 @@ private void _push_xfc(SubscribeOptions so) { // coverage manager assertEquals(ManageResult.MESSAGE, pmm.manage(getTestJsMessage(1, sid))); - assertEquals(ManageResult.STATUS_ERROR, pmm.manage(getFlowControl(1, sid))); - assertEquals(ManageResult.STATUS_ERROR, pmm.manage(getFcHeartbeat(1, sid))); + assertEquals(STATUS_ERROR, pmm.manage(getFlowControl(1, sid))); + assertEquals(STATUS_ERROR, pmm.manage(getFcHeartbeat(1, sid))); // coverage beforeQueueProcessor assertTrue(pmm.beforeQueueProcessorImpl(getTestJsMessage(3, sid))); diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index b1cdf8320..81ae1e0a4 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -17,11 +17,9 @@ import io.nats.client.Options; import org.junit.jupiter.api.Test; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; - -import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.NOOP_EL; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,41 +27,32 @@ public class NatsConnectionImplTests { @Test public void testConnectionClosedProperly() throws Exception { - try (NatsTestServer server = new NatsTestServer()) { - Options options = standardOptions(server.getLocalhostUri()); - verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); + try (NatsTestServer ts = new NatsTestServer()) { + + Options options = Options.builder().server(ts.getServerUri()).errorListener(NOOP_EL).build(); + + verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); // using the same options to demonstrate the executors came // from the internal factory and were not reused - verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); + verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); // using options copied from options to demonstrate the executors // came from the internal factory and were not reused options = new Options.Builder(options).build(); - verifyInternalExecutors(options, (NatsConnection) standardConnectionWait(options)); + verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); - ExecutorService es = Executors.newFixedThreadPool(3); - ScheduledExecutorService ses = Executors.newScheduledThreadPool(3); - assertFalse(es.isShutdown()); - assertFalse(ses.isShutdown()); - - options = standardOptionsBuilder(server.getLocalhostUri()) - .executor(es) - .scheduledExecutor(ses) - .build(); - verifyExternalExecutors(options, (NatsConnection) standardConnectionWait(options)); + // the test options builder has all its own executors so none are "internal" + options = optionsBuilder(ts).build(); + verifyExternalExecutors((NatsConnection) standardConnectionWait(options)); // same options just because - verifyExternalExecutors(options, (NatsConnection) standardConnectionWait(options)); - - es.shutdown(); - ses.shutdown(); - assertTrue(es.isShutdown()); - assertTrue(ses.isShutdown()); + verifyExternalExecutors((NatsConnection) standardConnectionWait(options)); } } - private static void verifyInternalExecutors(Options options, NatsConnection nc) throws InterruptedException { + private static void verifyInternalExecutors(NatsConnection nc) throws InterruptedException { + Options options = nc.getOptions(); assertTrue(options.executorIsInternal()); assertTrue(options.scheduledExecutorIsInternal()); @@ -73,8 +62,6 @@ private static void verifyInternalExecutors(Options options, NatsConnection nc) assertFalse(nc.executorIsShutdown()); assertFalse(nc.scheduledExecutorIsShutdown()); - nc.subscribe("*"); - Thread.sleep(1000); nc.close(); assertTrue(nc.callbackRunnerIsShutdown()); @@ -84,7 +71,8 @@ private static void verifyInternalExecutors(Options options, NatsConnection nc) assertTrue(nc.scheduledExecutorIsShutdown()); } - private static void verifyExternalExecutors(Options options, NatsConnection nc) throws InterruptedException { + private static void verifyExternalExecutors(NatsConnection nc) throws InterruptedException { + Options options = nc.getOptions(); assertFalse(options.executorIsInternal()); assertFalse(options.scheduledExecutorIsInternal()); @@ -94,14 +82,11 @@ private static void verifyExternalExecutors(Options options, NatsConnection nc) assertFalse(nc.executorIsShutdown()); assertFalse(nc.scheduledExecutorIsShutdown()); - nc.subscribe("*"); - Thread.sleep(1000); nc.close(); - assertTrue(nc.callbackRunnerIsShutdown()); - assertTrue(nc.connectExecutorIsShutdown()); - assertFalse(nc.executorIsShutdown()); assertFalse(nc.scheduledExecutorIsShutdown()); + assertFalse(nc.callbackRunnerIsShutdown()); + assertFalse(nc.connectExecutorIsShutdown()); } } diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index ad2061186..594c912a4 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.NatsServerProtocolMock.ExitAt; import io.nats.client.support.IncomingHeadersProcessor; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; @@ -25,7 +26,6 @@ import static io.nats.client.support.NatsConstants.OP_PING; import static io.nats.client.support.NatsConstants.OP_PING_BYTES; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static org.junit.jupiter.api.Assertions.*; @@ -123,7 +123,7 @@ public void testCustomMaxControlLine() { } try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); Connection nc = Nats.connect(options); standardConnectionWait(nc); nc.request(subject, body); @@ -141,7 +141,7 @@ public void testBigProtocolLineWithoutBody() { } try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getMockUri())) { + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { standardConnectionWait(nc); nc.subscribe(subject); } @@ -160,7 +160,7 @@ public void testBigProtocolLineWithBody() { } try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getMockUri())) { + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { standardConnectionWait(nc); nc.publish(subject, replyTo, body); } diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index 436aca5b7..cc75351ec 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -15,6 +15,7 @@ import io.nats.client.Nats; import io.nats.client.NatsTestServer; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -91,7 +92,7 @@ private static void _testBadParse(NatsConnectionReader reader, String bad) throw @Test public void testTooShortMaxControlLineToConnect() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - assertThrows(IOException.class, () -> Nats.connect(optionsBuilder(ts).maxControlLine(16).build())); + assertThrows(IOException.class, () -> Nats.connect(OptionsUtils.optionsBuilder(ts).maxControlLine(16).build())); } } diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index eeb8e8ef0..8e6746b04 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -25,7 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -59,13 +60,13 @@ public void testHandlingPing() throws Exception { }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(pingPongCustomizer)) { - Connection nc = Nats.connect(mockTs.getMockUri()); + Connection nc = Nats.connect(mockTs.getServerUri()); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertTrue(gotPong.get(), "Got pong."); } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -85,7 +86,7 @@ public void testPingTimer() throws Exception { @Test public void testPingFailsWhenClosed() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder().server(mockTs.getMockUri()). + Options options = optionsBuilder(mockTs). pingInterval(Duration.ofMillis(10)). maxPingsOut(5). maxReconnects(0). @@ -93,7 +94,7 @@ public void testPingFailsWhenClosed() throws Exception { NatsConnection nc = (NatsConnection) Nats.connect(options); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); } finally { nc.close(); } @@ -107,17 +108,16 @@ public void testPingFailsWhenClosed() throws Exception { @Test public void testMaxPingsOut() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder(). - server(mockTs.getMockUri()). - pingInterval(Duration.ofSeconds(10)). // Avoid auto pings - maxPingsOut(2). - maxReconnects(0). - build(); + Options options = optionsBuilder(mockTs) + .pingInterval(Duration.ofSeconds(10)) // Avoid auto pings + .maxPingsOut(2) + .maxReconnects(0) + .build(); NatsConnection nc = (NatsConnection) Nats.connect(options); //noinspection TryFinallyCanBeTryWithResources try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); nc.sendPing(); nc.sendPing(); assertNull(nc.sendPing(), "No future returned when past max"); @@ -131,15 +131,14 @@ public void testMaxPingsOut() throws Exception { public void testFlushTimeout() { assertThrows(TimeoutException.class, () -> { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder(). - server(mockTs.getMockUri()). - maxReconnects(0). - build(); + Options options = optionsBuilder(mockTs) + .maxReconnects(0) + .build(); NatsConnection nc = (NatsConnection) Nats.connect(options); //noinspection TryFinallyCanBeTryWithResources try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); // fake server so flush will time out nc.flush(Duration.ofMillis(50)); } finally { @@ -153,10 +152,10 @@ public void testFlushTimeout() { public void testFlushTimeoutDisconnected() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).connectionListener(listener).build(); + Options options = OptionsUtils.optionsBuilder(ts).connectionListener(listener).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { - assertSame(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); nc.flush(Duration.ofSeconds(2)); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); @@ -165,7 +164,7 @@ public void testFlushTimeoutDisconnected() throws Exception { } finally { nc.close(); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -175,7 +174,7 @@ public void testPingTimerThroughReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder(ts.getLocalhostUri(), ts2.getLocalhostUri()) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .connectionListener(listener) .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 6b6db7e7e..dcb5748c4 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -54,7 +54,7 @@ void checkReconnectingStatus(Connection nc) { @Test public void testSimpleReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - _testReconnect(NatsServerRunner.builder(), (ts, optionsBuilder) -> optionsBuilder.server(ts.getLocalhostUri())); + _testReconnect(NatsServerRunner.builder(), (ts, optionsBuilder) -> optionsBuilder.server(ts.getServerUri())); } @Test @@ -269,7 +269,7 @@ public void testMaxReconnects() throws Exception { } flushAndWaitLong(nc, listener); - assertSame(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); standardCloseConnection(nc); } @@ -281,20 +281,20 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { try (NatsTestServer ts1 = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { // need both in bootstrap b/c these are not clustered - Options options = optionsBuilder(ts2.getLocalhostUri(), ts1.getLocalhostUri()) + Options options = optionsBuilder(ts2.getServerUri(), ts1.getServerUri()) .noRandomize() .connectionListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts1.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -306,20 +306,20 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder(ts2.getLocalhostUri(), ts.getLocalhostUri()) + Options options = optionsBuilder(ts2.getServerUri(), ts.getServerUri()) .noRandomize() .connectionListener(listener) .maxReconnects(-1) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(ts2.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -330,25 +330,24 @@ public void testReconnectToSecondServerFromInfo() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - String striped = ts.getLocalhostUri().substring("nats://".length()); // info doesn't have protocol + String striped = ts.getServerUri().substring("nats://".length()); // info doesn't have protocol String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}"; try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) { - Options options = optionsBuilder() - .server(mockTs2.getMockUri()) + Options options = optionsBuilder(mockTs2) .connectionListener(listener) .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) .build(); nc = (NatsConnection) standardConnectionWait(options); - assertEquals(mockTs2.getMockUri(), nc.getConnectedUrl()); + assertEquals(mockTs2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } flushAndWaitLong(nc, listener); assertConnected(nc); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } } @@ -443,15 +442,14 @@ public void testReconnectDropOnLineFeed() throws Exception { }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - Options options = optionsBuilder() - .server(mockTs.getMockUri()) + Options options = optionsBuilder(mockTs) .maxReconnects(-1) .reconnectWait(reconnectWait) .connectionListener(listener) .build(); port = mockTs.getPort(); nc = (NatsConnection) Nats.connect(options); - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); nc.subscribe("test"); subRef.get().get(); listener.prepForStatusChange(Events.DISCONNECTED); @@ -539,7 +537,7 @@ public void testReconnectNoIPTLSConnection() throws Exception { listener.prepForStatusChange(Events.DISCOVERED_SERVERS); nc = (NatsConnection) longConnectionWait(options); - assertEquals(ts.getLocalhostUri(), nc.getConnectedUrl()); + assertEquals(ts.getServerUri(), nc.getConnectedUrl()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -687,7 +685,7 @@ private static Thread getReconnectOnConnectTestThread(AtomicReference { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); AtomicReference replyTo = new AtomicReference<>(); Dispatcher d = nc.createDispatcher(msg -> { @@ -123,8 +124,8 @@ public void testRequestVarieties() throws Exception { @Test public void testSimpleResponseMessageHasConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); @@ -146,8 +147,8 @@ public void testSimpleResponseMessageHasConnection() throws Exception { @Test public void testSafeRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe("subject"); @@ -164,8 +165,8 @@ public void testSafeRequest() throws Exception { @Test public void testMultipleRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); d.subscribe("subject"); @@ -227,8 +228,8 @@ public void testMultipleReplies() throws Exception { @Test public void testManualRequestReplyAndPublishSignatures() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(ts.getLocalhostUri())) { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + Connection nc = Nats.connect(ts.getServerUri())) { + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { // also getting coverage here of multiple publish signatures @@ -263,8 +264,8 @@ public void testManualRequestReplyAndPublishSignatures() throws Exception { @Test public void testRequestWithCustomInboxPrefix() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith("myinbox")); @@ -285,13 +286,13 @@ public void testRequestWithCustomInboxPrefix() throws Exception { @Test public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertThrows(TimeoutException.class, () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); @@ -299,7 +300,7 @@ public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -310,13 +311,13 @@ public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { long cleanupInterval = 100; - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .requestCleanupInterval(Duration.ofMillis(cleanupInterval)) .noNoResponders().build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); NatsMessage nm = NatsMessage.builder().subject(random()).data(dataBytes(2)).build(); CompletableFuture future = nc.requestWithTimeout(nm, Duration.ofMillis(cleanupInterval)); @@ -327,7 +328,7 @@ public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -337,12 +338,12 @@ public void testSimpleRequestWithTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); + Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); @@ -378,7 +379,7 @@ public void testSimpleRequestWithTimeout() throws Exception { } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -387,12 +388,12 @@ public void testSimpleRequestWithTimeout() throws Exception { public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 10; - Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); //slow responder long delay = 2 * cleanupInterval + Options.DEFAULT_CONNECTION_TIMEOUT.toMillis(); @@ -411,7 +412,7 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -419,18 +420,18 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { @Test public void testRequireCleanupOnCancelFromNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertThrows(CancellationException.class, () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } @@ -439,17 +440,17 @@ public void testRequireCleanupOnCancelFromNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertThrows(CancellationException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } @@ -458,21 +459,21 @@ public void testRequireCleanupWithTimeoutNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); assertThrows(TimeoutException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -480,10 +481,10 @@ public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { @Test public void testRequireCleanupOnCancel() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); + Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); NatsRequestCompletableFuture incoming = (NatsRequestCompletableFuture)nc.request("subject", null); incoming.cancel(true); NatsStatistics stats = (NatsStatistics)nc.getStatistics(); @@ -493,7 +494,7 @@ public void testRequireCleanupOnCancel() throws Exception { } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -502,10 +503,10 @@ public void testRequireCleanupOnCancel() throws Exception { public void testCleanupTimerWorks() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; - Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); Future incoming = nc.request("subject", null); incoming.cancel(true); @@ -532,7 +533,7 @@ public void testCleanupTimerWorks() throws Exception { assertTrueByTimeout(timeout, () -> nc.getStatistics().getOutstandingRequests() == 0); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -542,10 +543,10 @@ public void testRequestsVsCleanup() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; int msgCount = 100; - Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); d.subscribe("subject"); @@ -567,7 +568,7 @@ public void testRequestsVsCleanup() throws Exception { assertTrue(0 >= nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -577,9 +578,9 @@ public void testDelayInPickingUpFuture() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int msgCount = 100; ArrayList> messages = new ArrayList<>(); - Connection nc = Nats.connect(ts.getLocalhostUri()); + Connection nc = Nats.connect(ts.getServerUri()); try { - assertEquals(Connection.Status.CONNECTED, nc.getStatus(), "Connected Status"); + assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[1])); d.subscribe("subject"); @@ -599,7 +600,7 @@ public void testDelayInPickingUpFuture() throws Exception { assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); - assertEquals(Connection.Status.CLOSED, nc.getStatus(), "Closed Status"); + assertClosed(nc); } } } @@ -630,7 +631,7 @@ public void testBuffersResize() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int initialSize = 128; int messageSize = 1024; - Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); + Options options = OptionsUtils.optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); try (Connection nc = standardConnectionWait(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); @@ -728,7 +729,7 @@ public void testNatsImplAndEmptyStatsCoverage() { public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { Options options = Options.builder() - .server(ts.getLocalhostUri()) + .server(ts.getServerUri()) .noNoResponders() .requestCleanupInterval(Duration.ofSeconds(10)) .build(); diff --git a/src/test/java/io/nats/client/impl/ServerPoolTests.java b/src/test/java/io/nats/client/impl/ServerPoolTests.java index a9c1fd912..0380dbd10 100644 --- a/src/test/java/io/nats/client/impl/ServerPoolTests.java +++ b/src/test/java/io/nats/client/impl/ServerPoolTests.java @@ -15,6 +15,7 @@ import io.nats.client.Options; import io.nats.client.support.NatsUri; +import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -42,7 +43,7 @@ public void testPoolOptions() throws URISyntaxException { NatsUri lastConnectedServer = new NatsUri(BOOT_ONE); // testing that the expected show up in the pool - Options o = optionsBuilder(bootstrap).build(); + Options o = OptionsUtils.optionsBuilder(bootstrap).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); @@ -51,7 +52,7 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, false, combined); // testing that noRandomize maintains order - o = optionsBuilder(bootstrap).noRandomize().build(); + o = OptionsUtils.optionsBuilder(bootstrap).noRandomize().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, true, combined); @@ -60,19 +61,19 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, true, combined); // testing that ignoreDiscoveredServers ignores discovered servers - o = optionsBuilder(bootstrap).ignoreDiscoveredServers().build(); + o = OptionsUtils.optionsBuilder(bootstrap).ignoreDiscoveredServers().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, BOOT_ONE, BOOT_TWO); // testing that duplicates don't get added String[] secureAndNotSecure = new String[]{BOOT_ONE, BOOT_ONE_SECURE}; String[] secureBootstrap = new String[]{BOOT_ONE_SECURE}; - o = optionsBuilder(secureAndNotSecure).build(); + o = OptionsUtils.optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); secureAndNotSecure = new String[]{BOOT_ONE_SECURE, BOOT_ONE}; - o = optionsBuilder(secureAndNotSecure).build(); + o = OptionsUtils.optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); } @@ -82,7 +83,7 @@ public void testMaxReconnects() throws URISyntaxException { NatsUri failed = new NatsUri(BOOT_ONE); // testing that servers that fail max times and is removed - Options o = optionsBuilder(BOOT_ONE).maxReconnects(3).build(); + Options o = OptionsUtils.optionsBuilder(BOOT_ONE).maxReconnects(3).build(); NatsServerPool nsp = newNatsServerPool(o, null, null); for (int x = 0; x < 4; x++) { nsp.nextServer(); @@ -96,7 +97,7 @@ public void testMaxReconnects() throws URISyntaxException { validateNslp(nsp, null, false, BOOT_ONE); // testing that servers that fail max times and is removed - o = optionsBuilder(BOOT_ONE).maxReconnects(0).build(); + o = OptionsUtils.optionsBuilder(BOOT_ONE).maxReconnects(0).build(); nsp = newNatsServerPool(o, null, null); nsp.nextServer(); validateNslp(nsp, null, false, BOOT_ONE); @@ -111,7 +112,7 @@ public void testMaxReconnects() throws URISyntaxException { @Test public void testPruning() throws URISyntaxException { // making sure that pruning happens. get baseline - Options o = optionsBuilder(bootstrap).maxReconnects(0).build(); + Options o = OptionsUtils.optionsBuilder(bootstrap).maxReconnects(0).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 95819e610..5e1d189fb 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.utils.CloseOnUpgradeAttempt; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; @@ -41,7 +42,7 @@ public class TLSConnectTests { private static Options createTestOptionsManually(String... servers) throws Exception { - return optionsBuilder(servers) + return OptionsUtils.optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .build(); @@ -57,7 +58,7 @@ private static Options createTestOptionsViaProperties(String... servers) { } private static Options createTestOptionsViaFactoryInstance(String... servers) { - return optionsBuilder(servers) + return OptionsUtils.optionsBuilder(servers) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) .build(); @@ -66,7 +67,7 @@ private static Options createTestOptionsViaFactoryInstance(String... servers) { private static Options createTestOptionsViaFactoryClassName(String... servers) { Properties properties = new Properties(); properties.setProperty(PROP_SSL_CONTEXT_FACTORY_CLASS, SSLContextFactoryForTesting.class.getCanonicalName()); - return optionsBuilder(servers) + return OptionsUtils.optionsBuilder(servers) .properties(properties) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) @@ -77,7 +78,7 @@ private static Options createTestOptionsViaFactoryClassName(String... servers) { public void testSimpleTLSConnection() throws Exception { //System.setProperty("javax.net.debug", "all"); try (NatsTestServer ts = configFileServer("tls.conf")) { - String servers = ts.getLocalhostUri(); + String servers = ts.getServerUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -89,7 +90,7 @@ public void testSimpleTLSConnection() throws Exception { public void testSimpleTlsFirstConnection() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .tlsFirst() .sslContext(SslTestingHelper.createTestSSLContext()) @@ -140,7 +141,7 @@ public void testSimpleIPTLSConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { try (NatsTestServer ts = configFileServer("tlsverify.conf")) { - String servers = ts.getLocalhostUri(); + String servers = ts.getServerUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); @@ -151,7 +152,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testOpenTLSConnection() throws Exception { try (NatsTestServer ts = configFileServer("tls.conf")) { - String servers = ts.getLocalhostUri(); + String servers = ts.getServerUri(); Options options = optionsBuilder() .server(servers) .maxReconnects(0) @@ -193,7 +194,7 @@ public void testURISchemeIPTLSConnection() throws Exception { public void testURISchemeOpenTLSConnection() throws Exception { try (NatsTestServer ts = configFileServer("tls.conf")) { String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); - Options options = optionsBuilder(servers) + Options options = OptionsUtils.optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); @@ -214,7 +215,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { NatsTestServer server2 = NatsTestServer.configFileServer("tls.conf") ) { String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); - Options options = optionsBuilder(servers) + Options options = OptionsUtils.optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); @@ -233,7 +234,7 @@ public void testTLSMessageFlow() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .build(); @@ -263,7 +264,7 @@ public void testTLSOnReconnect() throws Exception { // Use two server ports to avoid port release timing issues try (NatsTestServer ts = configFileServer("tlsverify.conf", port)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts.getLocalhostUri(), NatsTestServer.getLocalhostUri(newPort)) + Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) .sslContext(ctx) .connectionListener(listener) @@ -289,7 +290,7 @@ public void testDisconnectOnUpgrade() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) .sslContext(ctx) @@ -303,7 +304,7 @@ public void testDisconnectOnUpgrade() { public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0).build(); + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); } }); @@ -314,7 +315,7 @@ public void testClientSecureServerNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer()) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); + Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); Nats.connect(options); } }); @@ -333,7 +334,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = optionsBuilder(ts) + Options options = OptionsUtils.optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .errorListener(el) @@ -385,7 +386,7 @@ public ProxyConnection(String servers, boolean tlsFirst, ErrorListener listener, } private static Options makeMiddleman(String servers, boolean tlsFirst, ErrorListener listener) throws Exception { - Options.Builder builder = optionsBuilder(servers) + Options.Builder builder = OptionsUtils.optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .errorListener(listener); @@ -424,17 +425,17 @@ public void testProxyTlsFirst() throws Exception { // cannot check connect b/c tls first try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { // 1. client tls first | secure proxy | server insecure -> connects - ProxyConnection connTI = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_INSECURE); + ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); connTI.connect(false); closeConnection(standardConnectionWait(connTI), 1000); // 2. client tls first | secure proxy | server tls required -> connects - ProxyConnection connTR = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_TLS_REQUIRED); + ProxyConnection connTR = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_REQUIRED); connTR.connect(false); closeConnection(standardConnectionWait(connTR), 1000); // 3. client tls first | secure proxy | server tls available -> connects - ProxyConnection connTA = new ProxyConnection(ts.getLocalhostUri(), true, null, SERVER_TLS_AVAILABLE); + ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); connTA.connect(false); closeConnection(standardConnectionWait(connTA), 1000); } @@ -446,19 +447,19 @@ public void testProxyNotTlsFirst() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("tls.conf")) { // 1. client regular secure | secure proxy | server insecure -> mismatch exception ListenerForTesting listener = new ListenerForTesting(); - ProxyConnection connRI = new ProxyConnection(ts.getLocalhostUri(), false, listener, SERVER_INSECURE); + ProxyConnection connRI = new ProxyConnection(ts.getServerUri(), false, listener, SERVER_INSECURE); assertThrows(Exception.class, () -> connRI.connect(false)); sleep(100); // give time for listener to get message assertEquals(1, listener.getExceptions().size()); assertTrue(listener.getExceptions().get(0).getMessage().contains("SSL connection wanted by client")); // 2. client regular secure | secure proxy | server tls required -> connects - ProxyConnection connRR = new ProxyConnection(ts.getLocalhostUri(), false, null, SERVER_TLS_REQUIRED); + ProxyConnection connRR = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_REQUIRED); connRR.connect(false); closeConnection(standardConnectionWait(connRR), 1000); // 3. client regular secure | secure proxy | server tls available -> connects - ProxyConnection connRA = new ProxyConnection(ts.getLocalhostUri(), false, null, SERVER_TLS_AVAILABLE); + ProxyConnection connRA = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_AVAILABLE); connRA.connect(false); closeConnection(standardConnectionWait(connRA), 1000); } diff --git a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java index ce00b8ab8..9c4d950ba 100644 --- a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java +++ b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java @@ -14,6 +14,7 @@ package io.nats.client.impl; import io.nats.client.*; +import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -25,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -51,7 +51,7 @@ public void errorOccurred(Connection conn, String error) { } }; - Options options = optionsBuilder(port) + Options options = OptionsUtils.optionsBuilder(port) .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) .reconnectBufferSize(NUMBER_OF_SUBS * 100) diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index a79161f43..2f10f11e8 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -264,13 +264,13 @@ public void testTLSOnReconnect() throws Exception { nc = Nats.connect(options); assertInstanceOf(SocketDataPort.class, ((NatsConnection) nc).getDataPort(), "Correct data port class"); listener.waitForStatusChange(1, TimeUnit.SECONDS); - assertEquals(Connection.Status.CONNECTED, nc.getStatus()); + assertConnected(nc); } listener.prepForStatusChange(CONNECTED); try (NatsTestServer ignored = new NatsTestServer(builder)) { listener.waitForStatusChange(1, TimeUnit.SECONDS); - assertEquals(Connection.Status.CONNECTED, nc.getStatus()); + assertConnected(nc); } } diff --git a/src/test/java/io/nats/client/other/ReconnectCheck.java b/src/test/java/io/nats/client/other/ReconnectCheck.java index f43a51a04..bb5755f56 100644 --- a/src/test/java/io/nats/client/other/ReconnectCheck.java +++ b/src/test/java/io/nats/client/other/ReconnectCheck.java @@ -1,10 +1,10 @@ package io.nats.client.other; import io.nats.client.*; +import io.nats.client.utils.OptionsUtils; import java.time.Duration; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; /* Program to reproduce #231 */ @@ -48,7 +48,7 @@ public static void main(String []args) throws Exception { } private static Options buildOptions(String name, NatsTestServer ts) { - return optionsBuilder(ts) + return OptionsUtils.optionsBuilder(ts) .connectionName(name) .reconnectWait(Duration.ofSeconds(1)) .connectionTimeout(Duration.ofSeconds(5)) diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index e44b6f183..0addea5fd 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit; import static io.nats.client.utils.ThreadUtils.sleep; -import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; public abstract class ConnectionUtils { @@ -38,34 +37,10 @@ public abstract class ConnectionUtils { // ---------------------------------------------------------------------------------------------------- // connect or wait for a connection // ---------------------------------------------------------------------------------------------------- - public static Options.Builder standardOptionsBuilder() { - return Options.builder().reportNoResponders().errorListener(new ListenerForTesting()); - } - - public static Options.Builder standardOptionsBuilder(String serverURL) { - return standardOptionsBuilder().server(serverURL); - } - - public static Options standardOptions() { - return standardOptionsBuilder().build(); - } - - public static Options standardOptions(String serverURL) { - return standardOptionsBuilder(serverURL).build(); - } - public static Connection connectionWait(Connection conn, long millis) { return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); } - public static Connection standardConnectionWait() throws IOException, InterruptedException { - return standardConnectionWait( Nats.connect(standardOptions()) ); - } - - public static Connection standardConnectionWait(String serverURL) throws IOException, InterruptedException { - return connectionWait(Nats.connect(standardOptions(serverURL)), STANDARD_CONNECTION_WAIT_MS); - } - public static Connection standardConnectionWait(Options options) throws IOException, InterruptedException { return connectionWait(Nats.connect(options), STANDARD_CONNECTION_WAIT_MS); } @@ -74,15 +49,11 @@ public static Connection standardConnectionWait(Connection conn) { return connectionWait(conn, STANDARD_CONNECTION_WAIT_MS); } - public static Connection longConnectionWait(String serverURL) throws IOException, InterruptedException { - return connectionWait(Nats.connect(standardOptions(serverURL)), LONG_CONNECTION_WAIT_MS); - } - public static Connection longConnectionWait(Options options) throws IOException, InterruptedException { return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); } - public static Connection longConnectionWait(Connection conn) throws IOException, InterruptedException { + public static Connection longConnectionWait(Connection conn) { return connectionWait(conn, LONG_CONNECTION_WAIT_MS); } @@ -143,24 +114,11 @@ public static void assertConnected(Connection conn) { () -> expectingMessage(conn, Connection.Status.CONNECTED)); } - public static void assertNotConnected(Connection conn) { - assertNotSame(Connection.Status.CONNECTED, conn.getStatus(), - () -> "Failed not expecting Connection Status " + Connection.Status.CONNECTED.name()); - } - public static void assertClosed(Connection conn) { assertSame(Connection.Status.CLOSED, conn.getStatus(), () -> expectingMessage(conn, Connection.Status.CLOSED)); } - public static void assertCanConnect() throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait() ); - } - - public static void assertCanConnect(String serverURL) throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait(serverURL) ); - } - public static void assertCanConnect(Options options) throws IOException, InterruptedException { standardCloseConnection( standardConnectionWait(options) ); } diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index badf9ccd9..8cfc62229 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -13,10 +13,8 @@ package io.nats.client.utils; -import io.nats.client.Connection; -import io.nats.client.ErrorListener; -import io.nats.client.NatsTestServer; -import io.nats.client.Options; +import io.nats.client.*; +import io.nats.client.impl.ListenerForTesting; import org.jspecify.annotations.NonNull; import java.time.Duration; @@ -41,10 +39,16 @@ public static Options.Builder optionsBuilder(ErrorListener el) { return optionsBuilder().errorListener(el); } - public static Options.Builder optionsBuilder(NatsTestServer ts) { - return optionsBuilder().server(ts.getLocalhostUri()); + public static Options.Builder optionsBuilder(TestServer... tses) { + if (tses.length == 1) { + return optionsBuilder().server(tses[0].getServerUri()); + } + String[] servers = new String[tses.length]; + for (int i = 0; i < tses.length; i++) { + servers[i] = tses[i].getServerUri(); + } + return optionsBuilder().servers(servers); } - public static Options.Builder optionsBuilder(NatsTestServer ts, String schema) { return optionsBuilder().server(ts.getLocalhostUri(schema)); } @@ -62,12 +66,20 @@ public static Options.Builder optionsBuilder(Connection nc) { return optionsBuilder().server(nc.getConnectedUrl()); } + public static Options options() { + return optionsBuilder().build(); + } + public static Options options(int port) { return optionsBuilder(port).build(); } - public static Options options(NatsTestServer ts) { - return optionsBuilder(ts).build(); + public static Options options(NatsTestServer... tses) { + return optionsBuilder(tses).build(); + } + + public static Options options(NatsServerProtocolMock... mockTses) { + return optionsBuilder(mockTses).build(); } public static Options options(String... servers) { @@ -129,4 +141,24 @@ public Thread newThread(@NonNull Runnable r) { return t; } } + + private static Options.Builder _plainOptionsBuilder() { + return Options.builder().reportNoResponders().errorListener(new ListenerForTesting()); + } + + public static Options.Builder plainOptionsBuilder(String serverURL) { + return _plainOptionsBuilder().server(serverURL); + } + + public static Options.Builder plainOptionsBuilder(NatsTestServer ts) { + return _plainOptionsBuilder().server(ts.getServerUri()); + } + + public static Options plainOptions(String serverURL) { + return plainOptionsBuilder(serverURL).build(); + } + + public static Options plainOptions(NatsTestServer ts) { + return plainOptionsBuilder(ts).build(); + } } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index 11e726b4e..534a38a83 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -83,7 +83,7 @@ private SharedServer() throws IOException { .jetstream(true) .customName("Reusable") ); - serverUrl = natsTestServer.getLocalhostUri(); + serverUrl = natsTestServer.getServerUri(); } public Connection getSharedConnection() { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 58f57957d..4c0601035 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -38,6 +38,7 @@ import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_ARGUMENT; import static io.nats.client.support.NatsJetStreamClientError.KIND_ILLEGAL_STATE; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.configResource; import static io.nats.client.utils.ThreadUtils.sleep; @@ -141,8 +142,8 @@ private static void _runInOwnServer( } try (NatsTestServer ts = new NatsTestServer(nsrb)) { Options options = (optionsBuilder == null - ? optionsBuilder(ts) - : optionsBuilder.server(ts.getLocalhostUri())) + ? OptionsUtils.optionsBuilder(ts) + : optionsBuilder.server(ts.getServerUri())) .build(); try (Connection nc = standardConnectionWait(options)) { initVersionServerInfo(nc); @@ -175,7 +176,7 @@ public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exceptio } public static void runInOwnJsServer(ErrorListener el, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(optionsBuilder(el), null, null, null, jetStreamTest); + _runInOwnServer(OptionsUtils.optionsBuilder(el), null, null, null, jetStreamTest); } public static void runInOwnJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { @@ -260,7 +261,7 @@ public static void runInSharedOwnNc(OneConnectionTest test) throws Exception { } public static void runInSharedOwnNc(ErrorListener el, OneConnectionTest test) throws Exception { - _runInShared(optionsBuilder(el), null, test, -1, null); + _runInShared(OptionsUtils.optionsBuilder(el), null, test, -1, null); } public static void runInSharedOwnNc(Options.Builder builder, OneConnectionTest test) throws Exception { @@ -279,11 +280,11 @@ public static void runInShared(VersionCheck vc, JetStreamTestingContextTest ctxT } public static void runInSharedOwnNc(ErrorListener el, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(optionsBuilder(el), null, null, 1, ctxTest); + _runInShared(OptionsUtils.optionsBuilder(el), null, null, 1, ctxTest); } public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(optionsBuilder(el), vc, null, 1, ctxTest); + _runInShared(OptionsUtils.optionsBuilder(el), vc, null, 1, ctxTest); } public static void runInSharedOwnNc(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { @@ -357,9 +358,9 @@ public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Ex }; try (NatsTestServer hub = new NatsTestServer(hubPort, true, null, hubInserts, null); - Connection nchub = standardConnectionWait(hub.getLocalhostUri()); + Connection nchub = standardConnectionWait(options(hub)); NatsTestServer leaf = new NatsTestServer(leafPort, true, null, leafInserts, null); - Connection ncleaf = standardConnectionWait(leaf.getLocalhostUri()) + Connection ncleaf = standardConnectionWait(options(leaf)) ) { twoConnectionTest.test(nchub, ncleaf); } @@ -442,12 +443,12 @@ private static Options makeOptions(int id, ThreeServerTestOptions tstOpts, NatsT String[] servers = new String[srvs.length]; for (int i = 0; i < srvs.length; i++) { NatsTestServer nts = srvs[i]; - servers[i] = nts.getLocalhostUri(); + servers[i] = nts.getServerUri(); } b.servers(servers); } else { - b.server(srvs[0].getLocalhostUri()); + b.server(srvs[0].getServerUri()); } if (tstOpts.configureAccount()) { b.authHandler(Nats.staticCredentials(null, USER_SEED.toCharArray())); @@ -511,19 +512,6 @@ public static NatsMessage getDataMessage(String data) { // ---------------------------------------------------------------------------------------------------- // assertions // ---------------------------------------------------------------------------------------------------- - - public static void assertCanConnectAndPubSub() throws IOException, InterruptedException { - Connection conn = standardConnectionWait(); - assertPubSub(conn); - standardCloseConnection(conn); - } - - public static void assertCanConnectAndPubSub(String serverURL) throws IOException, InterruptedException { - Connection conn = standardConnectionWait(serverURL); - assertPubSub(conn); - standardCloseConnection(conn); - } - public static void assertCanConnectAndPubSub(Options options) throws IOException, InterruptedException { Connection conn = standardConnectionWait(options); assertPubSub(conn); diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 76417e888..8207cf741 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -13,7 +13,10 @@ package io.nats.service; -import io.nats.client.*; +import io.nats.client.Connection; +import io.nats.client.Dispatcher; +import io.nats.client.Message; +import io.nats.client.Options; import io.nats.client.impl.Headers; import io.nats.client.impl.JetStreamTestBase; import io.nats.client.impl.MockNatsConnection; @@ -22,6 +25,7 @@ import io.nats.client.support.JsonSerializable; import io.nats.client.support.JsonUtils; import io.nats.client.support.JsonValue; +import io.nats.client.utils.SharedServer; import nl.jqno.equalsverifier.EqualsVerifier; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; @@ -45,7 +49,6 @@ import static io.nats.client.support.JsonValueUtils.readString; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsConstants.EMPTY; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.service.Service.SRV_PING; @@ -70,260 +73,258 @@ public class ServiceTests extends JetStreamTestBase { @Test public void testServiceWorkflow() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); - Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); - Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { - - Endpoint endEcho = Endpoint.builder() - .name(ECHO_ENDPOINT_NAME) - .subject(ECHO_ENDPOINT_SUBJECT) - .queueGroup(CUSTOM_QGROUP) - .build(); - - Endpoint endSortA = Endpoint.builder() - .name(SORT_ENDPOINT_ASCENDING_NAME) - .subject(SORT_ENDPOINT_ASCENDING_SUBJECT) - .build(); - - // constructor coverage - Endpoint endSortD = new Endpoint( - SORT_ENDPOINT_DESCENDING_NAME, - SORT_ENDPOINT_DESCENDING_SUBJECT); - - // sort is going to be grouped - Group sortGroup = new Group(SORT_GROUP); - - ServiceEndpoint seEcho1 = ServiceEndpoint.builder() - .endpoint(endEcho) - .handler(new EchoHandler(serviceNc1)) - .statsDataSupplier(ServiceTests::supplyData) - .build(); - - ServiceEndpoint seSortA1 = ServiceEndpoint.builder() - .group(sortGroup) - .endpoint(endSortA) - .handler(new SortHandlerA(serviceNc1)) - .build(); - - ServiceEndpoint seSortD1 = ServiceEndpoint.builder() - .group(sortGroup) - .endpoint(endSortD) - .handler(new SortHandlerD(serviceNc1)) - .build(); - - ServiceEndpoint seEcho2 = ServiceEndpoint.builder() - .endpoint(endEcho) - .handler(new EchoHandler(serviceNc2)) - .statsDataSupplier(ServiceTests::supplyData) - .build(); - - // build variations - ServiceEndpoint seSortA2 = ServiceEndpoint.builder() - .group(sortGroup) - .endpointName(endSortA.getName()) - .endpointSubject(endSortA.getSubject()) - .handler(new SortHandlerA(serviceNc2)) - .build(); - - ServiceEndpoint seSortD2 = ServiceEndpoint.builder() - .group(sortGroup) - .endpointName(endSortD.getName()) - .endpointSubject(endSortD.getSubject()) - .handler(new SortHandlerD(serviceNc2)) - .build(); - - Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) - .version("1.0.0") - .connection(serviceNc1) - .addServiceEndpoint(seEcho1) - .addServiceEndpoint(seSortA1) - .addServiceEndpoint(seSortD1) - .build(); - String serviceId1 = service1.getId(); - CompletableFuture serviceStoppedFuture1 = service1.startService(); - - Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) - .version("1.0.0") - .connection(serviceNc2) - .addServiceEndpoint(seEcho2) - .addServiceEndpoint(seSortA2) - .addServiceEndpoint(seSortD2) - .build(); - String serviceId2 = service2.getId(); - CompletableFuture serviceStoppedFuture2 = service2.startService(); - - assertNotEquals(serviceId1, serviceId2); - - sleep(1000); // just make sure services are all started, for slow CI machines - - // service request execution - int requestCount = 10; - for (int x = 0; x < requestCount; x++) { - verifyServiceExecution(clientNc, ECHO_ENDPOINT_NAME, ECHO_ENDPOINT_SUBJECT, null); - verifyServiceExecution(clientNc, SORT_ENDPOINT_ASCENDING_NAME, SORT_ENDPOINT_ASCENDING_SUBJECT, sortGroup); - verifyServiceExecution(clientNc, SORT_ENDPOINT_DESCENDING_NAME, SORT_ENDPOINT_DESCENDING_SUBJECT, sortGroup); - } + runInShared(clientNc -> { + Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); + Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + + Endpoint endEcho = Endpoint.builder() + .name(ECHO_ENDPOINT_NAME) + .subject(ECHO_ENDPOINT_SUBJECT) + .queueGroup(CUSTOM_QGROUP) + .build(); - PingResponse pingResponse1 = service1.getPingResponse(); - PingResponse pingResponse2 = service2.getPingResponse(); - InfoResponse infoResponse1 = service1.getInfoResponse(); - InfoResponse infoResponse2 = service2.getInfoResponse(); - StatsResponse statsResponse1 = service1.getStatsResponse(); - StatsResponse statsResponse2 = service2.getStatsResponse(); - EndpointStats[] endpointStatsArray1 = new EndpointStats[]{ - service1.getEndpointStats(ECHO_ENDPOINT_NAME), - service1.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), - service1.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) - }; - EndpointStats[] endpointStatsArray2 = new EndpointStats[]{ - service2.getEndpointStats(ECHO_ENDPOINT_NAME), - service2.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), - service2.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) - }; - assertNull(service1.getEndpointStats("notAnEndpoint")); - - assertEquals(serviceId1, pingResponse1.getId()); - assertEquals(serviceId2, pingResponse2.getId()); - assertEquals(serviceId1, infoResponse1.getId()); - assertEquals(serviceId2, infoResponse2.getId()); - assertEquals(serviceId1, statsResponse1.getId()); - assertEquals(serviceId2, statsResponse2.getId()); - - // this relies on the fact that I load the endpoints up in the service - // in the same order and the json list comes back ordered - // expecting 10 responses across each endpoint between 2 services - for (int x = 0; x < 3; x++) { - assertEquals(requestCount, - endpointStatsArray1[x].getNumRequests() - + endpointStatsArray2[x].getNumRequests()); - assertEquals(requestCount, - statsResponse1.getEndpointStatsList().get(x).getNumRequests() - + statsResponse2.getEndpointStatsList().get(x).getNumRequests()); - } + Endpoint endSortA = Endpoint.builder() + .name(SORT_ENDPOINT_ASCENDING_NAME) + .subject(SORT_ENDPOINT_ASCENDING_SUBJECT) + .build(); + + // constructor coverage + Endpoint endSortD = new Endpoint( + SORT_ENDPOINT_DESCENDING_NAME, + SORT_ENDPOINT_DESCENDING_SUBJECT); + + // sort is going to be grouped + Group sortGroup = new Group(SORT_GROUP); + + ServiceEndpoint seEcho1 = ServiceEndpoint.builder() + .endpoint(endEcho) + .handler(new EchoHandler(serviceNc1)) + .statsDataSupplier(ServiceTests::supplyData) + .build(); + + ServiceEndpoint seSortA1 = ServiceEndpoint.builder() + .group(sortGroup) + .endpoint(endSortA) + .handler(new SortHandlerA(serviceNc1)) + .build(); + + ServiceEndpoint seSortD1 = ServiceEndpoint.builder() + .group(sortGroup) + .endpoint(endSortD) + .handler(new SortHandlerD(serviceNc1)) + .build(); + + ServiceEndpoint seEcho2 = ServiceEndpoint.builder() + .endpoint(endEcho) + .handler(new EchoHandler(serviceNc2)) + .statsDataSupplier(ServiceTests::supplyData) + .build(); + + // build variations + ServiceEndpoint seSortA2 = ServiceEndpoint.builder() + .group(sortGroup) + .endpointName(endSortA.getName()) + .endpointSubject(endSortA.getSubject()) + .handler(new SortHandlerA(serviceNc2)) + .build(); + + ServiceEndpoint seSortD2 = ServiceEndpoint.builder() + .group(sortGroup) + .endpointName(endSortD.getName()) + .endpointSubject(endSortD.getSubject()) + .handler(new SortHandlerD(serviceNc2)) + .build(); - // discovery - wait at most 500 millis for responses, 5 total responses max - Discovery discovery = new Discovery(clientNc, 500, 5); - - // ping discovery - Verifier pingVerifier = (expected, response) -> assertInstanceOf(PingResponse.class, response); - verifyDiscovery(discovery.ping(), pingVerifier, pingResponse1, pingResponse2); - verifyDiscovery(discovery.ping(SERVICE_NAME_1), pingVerifier, pingResponse1); - verifyDiscovery(discovery.ping(SERVICE_NAME_2), pingVerifier, pingResponse2); - verifyDiscovery(discovery.ping(SERVICE_NAME_1, serviceId1), pingVerifier, pingResponse1); - assertNull(discovery.ping(SERVICE_NAME_1, "badId")); - assertNull(discovery.ping("bad", "badId")); - - // info discovery - Verifier infoVerifier = (expected, response) -> { - assertInstanceOf(InfoResponse.class, response); - InfoResponse exp = (InfoResponse) expected; - InfoResponse r = (InfoResponse) response; - assertEquals(exp.getDescription(), r.getDescription()); - assertEquals(exp.getEndpoints(), r.getEndpoints()); - }; - verifyDiscovery(discovery.info(), infoVerifier, infoResponse1, infoResponse2); - verifyDiscovery(discovery.info(SERVICE_NAME_1), infoVerifier, infoResponse1); - verifyDiscovery(discovery.info(SERVICE_NAME_2), infoVerifier, infoResponse2); - verifyDiscovery(discovery.info(SERVICE_NAME_1, serviceId1), infoVerifier, infoResponse1); - assertNull(discovery.info(SERVICE_NAME_1, "badId")); - assertNull(discovery.info("bad", "badId")); - - // stats discovery - Verifier statsVerifier = (expected, response) -> { - assertInstanceOf(StatsResponse.class, response); - StatsResponse exp = (StatsResponse) expected; - StatsResponse sr = (StatsResponse) response; - assertEquals(exp.getStarted(), sr.getStarted()); - for (int x = 0; x < 3; x++) { - EndpointStats er = exp.getEndpointStatsList().get(x); - if (!er.getName().equals(ECHO_ENDPOINT_NAME)) { - // echo endpoint has data that will vary - assertEquals(er, sr.getEndpointStatsList().get(x)); - } + Service service1 = new ServiceBuilder() + .name(SERVICE_NAME_1) + .version("1.0.0") + .connection(serviceNc1) + .addServiceEndpoint(seEcho1) + .addServiceEndpoint(seSortA1) + .addServiceEndpoint(seSortD1) + .build(); + String serviceId1 = service1.getId(); + CompletableFuture serviceStoppedFuture1 = service1.startService(); + + Service service2 = new ServiceBuilder() + .name(SERVICE_NAME_2) + .version("1.0.0") + .connection(serviceNc2) + .addServiceEndpoint(seEcho2) + .addServiceEndpoint(seSortA2) + .addServiceEndpoint(seSortD2) + .build(); + String serviceId2 = service2.getId(); + CompletableFuture serviceStoppedFuture2 = service2.startService(); + + assertNotEquals(serviceId1, serviceId2); + + sleep(1000); // just make sure services are all started, for slow CI machines + + // service request execution + int requestCount = 10; + for (int x = 0; x < requestCount; x++) { + verifyServiceExecution(clientNc, ECHO_ENDPOINT_NAME, ECHO_ENDPOINT_SUBJECT, null); + verifyServiceExecution(clientNc, SORT_ENDPOINT_ASCENDING_NAME, SORT_ENDPOINT_ASCENDING_SUBJECT, sortGroup); + verifyServiceExecution(clientNc, SORT_ENDPOINT_DESCENDING_NAME, SORT_ENDPOINT_DESCENDING_SUBJECT, sortGroup); + } + + PingResponse pingResponse1 = service1.getPingResponse(); + PingResponse pingResponse2 = service2.getPingResponse(); + InfoResponse infoResponse1 = service1.getInfoResponse(); + InfoResponse infoResponse2 = service2.getInfoResponse(); + StatsResponse statsResponse1 = service1.getStatsResponse(); + StatsResponse statsResponse2 = service2.getStatsResponse(); + EndpointStats[] endpointStatsArray1 = new EndpointStats[]{ + service1.getEndpointStats(ECHO_ENDPOINT_NAME), + service1.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), + service1.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) + }; + EndpointStats[] endpointStatsArray2 = new EndpointStats[]{ + service2.getEndpointStats(ECHO_ENDPOINT_NAME), + service2.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), + service2.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) + }; + assertNull(service1.getEndpointStats("notAnEndpoint")); + + assertEquals(serviceId1, pingResponse1.getId()); + assertEquals(serviceId2, pingResponse2.getId()); + assertEquals(serviceId1, infoResponse1.getId()); + assertEquals(serviceId2, infoResponse2.getId()); + assertEquals(serviceId1, statsResponse1.getId()); + assertEquals(serviceId2, statsResponse2.getId()); + + // this relies on the fact that I load the endpoints up in the service + // in the same order and the json list comes back ordered + // expecting 10 responses across each endpoint between 2 services + for (int x = 0; x < 3; x++) { + assertEquals(requestCount, + endpointStatsArray1[x].getNumRequests() + + endpointStatsArray2[x].getNumRequests()); + assertEquals(requestCount, + statsResponse1.getEndpointStatsList().get(x).getNumRequests() + + statsResponse2.getEndpointStatsList().get(x).getNumRequests()); + } + + // discovery - wait at most 500 millis for responses, 5 total responses max + Discovery discovery = new Discovery(clientNc, 500, 5); + + // ping discovery + Verifier pingVerifier = (expected, response) -> assertInstanceOf(PingResponse.class, response); + verifyDiscovery(discovery.ping(), pingVerifier, pingResponse1, pingResponse2); + verifyDiscovery(discovery.ping(SERVICE_NAME_1), pingVerifier, pingResponse1); + verifyDiscovery(discovery.ping(SERVICE_NAME_2), pingVerifier, pingResponse2); + verifyDiscovery(discovery.ping(SERVICE_NAME_1, serviceId1), pingVerifier, pingResponse1); + assertNull(discovery.ping(SERVICE_NAME_1, "badId")); + assertNull(discovery.ping("bad", "badId")); + + // info discovery + Verifier infoVerifier = (expected, response) -> { + assertInstanceOf(InfoResponse.class, response); + InfoResponse exp = (InfoResponse) expected; + InfoResponse r = (InfoResponse) response; + assertEquals(exp.getDescription(), r.getDescription()); + assertEquals(exp.getEndpoints(), r.getEndpoints()); + }; + verifyDiscovery(discovery.info(), infoVerifier, infoResponse1, infoResponse2); + verifyDiscovery(discovery.info(SERVICE_NAME_1), infoVerifier, infoResponse1); + verifyDiscovery(discovery.info(SERVICE_NAME_2), infoVerifier, infoResponse2); + verifyDiscovery(discovery.info(SERVICE_NAME_1, serviceId1), infoVerifier, infoResponse1); + assertNull(discovery.info(SERVICE_NAME_1, "badId")); + assertNull(discovery.info("bad", "badId")); + + // stats discovery + Verifier statsVerifier = (expected, response) -> { + assertInstanceOf(StatsResponse.class, response); + StatsResponse exp = (StatsResponse) expected; + StatsResponse sr = (StatsResponse) response; + assertEquals(exp.getStarted(), sr.getStarted()); + for (int x = 0; x < 3; x++) { + EndpointStats er = exp.getEndpointStatsList().get(x); + if (!er.getName().equals(ECHO_ENDPOINT_NAME)) { + // echo endpoint has data that will vary + assertEquals(er, sr.getEndpointStatsList().get(x)); } - }; - discovery = new Discovery(clientNc); // coverage for the simple constructor - verifyDiscovery(discovery.stats(), statsVerifier, statsResponse1, statsResponse2); - verifyDiscovery(discovery.stats(SERVICE_NAME_1), statsVerifier, statsResponse1); - verifyDiscovery(discovery.stats(SERVICE_NAME_2), statsVerifier, statsResponse2); - verifyDiscovery(discovery.stats(SERVICE_NAME_1, serviceId1), statsVerifier, statsResponse1); - assertNull(discovery.stats(SERVICE_NAME_1, "badId")); - assertNull(discovery.stats("bad", "badId")); - - // --------------------------------------------------------------------------- - // TEST ADDING AN ENDPOINT TO A RUNNING SERVICE - // --------------------------------------------------------------------------- - Endpoint endReverse = Endpoint.builder() - .name(REVERSE_ENDPOINT_NAME) - .subject(REVERSE_ENDPOINT_SUBJECT) - .build(); - - ServiceEndpoint seRev1 = ServiceEndpoint.builder() - .endpoint(endReverse) - .handler(new ReverseHandler(serviceNc1)) - .build(); - - service1.addServiceEndpoints(seRev1); - sleep(100); // give the service some time to get running. remember it's got to subscribe on the server - - for (int x = 0; x < requestCount; x++) { - verifyServiceExecution(clientNc, REVERSE_ENDPOINT_NAME, REVERSE_ENDPOINT_SUBJECT, null); } - infoResponse1 = service1.getInfoResponse(); - boolean found = false; - for (Endpoint e : infoResponse1.getEndpoints()) { - if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { - found = true; - break; - } + }; + discovery = new Discovery(clientNc); // coverage for the simple constructor + verifyDiscovery(discovery.stats(), statsVerifier, statsResponse1, statsResponse2); + verifyDiscovery(discovery.stats(SERVICE_NAME_1), statsVerifier, statsResponse1); + verifyDiscovery(discovery.stats(SERVICE_NAME_2), statsVerifier, statsResponse2); + verifyDiscovery(discovery.stats(SERVICE_NAME_1, serviceId1), statsVerifier, statsResponse1); + assertNull(discovery.stats(SERVICE_NAME_1, "badId")); + assertNull(discovery.stats("bad", "badId")); + + // --------------------------------------------------------------------------- + // TEST ADDING AN ENDPOINT TO A RUNNING SERVICE + // --------------------------------------------------------------------------- + Endpoint endReverse = Endpoint.builder() + .name(REVERSE_ENDPOINT_NAME) + .subject(REVERSE_ENDPOINT_SUBJECT) + .build(); + + ServiceEndpoint seRev1 = ServiceEndpoint.builder() + .endpoint(endReverse) + .handler(new ReverseHandler(serviceNc1)) + .build(); + + service1.addServiceEndpoints(seRev1); + sleep(100); // give the service some time to get running. remember it's got to subscribe on the server + + for (int x = 0; x < requestCount; x++) { + verifyServiceExecution(clientNc, REVERSE_ENDPOINT_NAME, REVERSE_ENDPOINT_SUBJECT, null); + } + infoResponse1 = service1.getInfoResponse(); + boolean found = false; + for (Endpoint e : infoResponse1.getEndpoints()) { + if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { + found = true; + break; } - assertTrue(found); + } + assertTrue(found); - statsResponse1 = service1.getStatsResponse(); - found = false; - for (EndpointStats e : statsResponse1.getEndpointStatsList()) { - if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { - found = true; - break; - } + statsResponse1 = service1.getStatsResponse(); + found = false; + for (EndpointStats e : statsResponse1.getEndpointStatsList()) { + if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { + found = true; + break; } - assertTrue(found); - - // test reset - ZonedDateTime zdt = DateTimeUtils.gmtNow(); - sleep(1); - service1.reset(); - StatsResponse sr = service1.getStatsResponse(); - assertTrue(zdt.isBefore(sr.getStarted())); - for (int x = 0; x < 3; x++) { - EndpointStats er = sr.getEndpointStatsList().get(x); - assertEquals(0, er.getNumRequests()); - assertEquals(0, er.getNumErrors()); - assertEquals(0, er.getProcessingTime()); - assertEquals(0, er.getAverageProcessingTime()); - assertNull(er.getLastError()); - if (er.getName().equals(ECHO_ENDPOINT_NAME)) { - assertNotNull(er.getData()); - assertNotNull(er.getDataAsJson()); - } - else { - assertNull(er.getData()); - assertNull(er.getDataAsJson()); - } - assertTrue(zdt.isBefore(er.getStarted())); + } + assertTrue(found); + + // test reset + ZonedDateTime zdt = DateTimeUtils.gmtNow(); + sleep(1); + service1.reset(); + StatsResponse sr = service1.getStatsResponse(); + assertTrue(zdt.isBefore(sr.getStarted())); + for (int x = 0; x < 3; x++) { + EndpointStats er = sr.getEndpointStatsList().get(x); + assertEquals(0, er.getNumRequests()); + assertEquals(0, er.getNumErrors()); + assertEquals(0, er.getProcessingTime()); + assertEquals(0, er.getAverageProcessingTime()); + assertNull(er.getLastError()); + if (er.getName().equals(ECHO_ENDPOINT_NAME)) { + assertNotNull(er.getData()); + assertNotNull(er.getDataAsJson()); } - - // shutdown - service1.stop(); - serviceStoppedFuture1.get(); - service2.stop(new RuntimeException("Testing stop(Throwable t)")); - ExecutionException ee = assertThrows(ExecutionException.class, serviceStoppedFuture2::get); - assertTrue(ee.getMessage().contains("Testing stop(Throwable t)")); + else { + assertNull(er.getData()); + assertNull(er.getDataAsJson()); + } + assertTrue(zdt.isBefore(er.getStarted())); } - } + + // shutdown + service1.stop(); + serviceStoppedFuture1.get(); + service2.stop(new RuntimeException("Testing stop(Throwable t)")); + ExecutionException ee = assertThrows(ExecutionException.class, serviceStoppedFuture2::get); + assertTrue(ee.getMessage().contains("Testing stop(Throwable t)")); + }); } interface Verifier { @@ -471,300 +472,300 @@ private static String reverse(byte[] data) { @Test public void testQueueGroup() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); - Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); - Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { - - String yesQueueSubject = "subjyes"; - String noQueueSubject = "subjno"; - - Endpoint ep1 = Endpoint.builder() - .name("with") - .subject(yesQueueSubject) - .build(); - - Endpoint ep2 = Endpoint.builder() - .name("without") - .subject(noQueueSubject) - .noQueueGroup() - .build(); - - EchoHandler handler1Ep1 = new EchoHandler(serviceNc1); - EchoHandler handler1Ep2 = new EchoHandler(serviceNc1); - EchoHandler handler2Ep1 = new EchoHandler(serviceNc2); - EchoHandler handler2Ep2 = new EchoHandler(serviceNc2); - - ServiceEndpoint service1Ep1 = ServiceEndpoint.builder() - .endpoint(ep1) - .handler(handler1Ep1) - .build(); - - ServiceEndpoint service1Ep2 = ServiceEndpoint.builder() - .endpoint(ep2) - .handler(handler1Ep2) - .build(); - - ServiceEndpoint service2Ep1 = ServiceEndpoint.builder() - .endpoint(ep1) - .handler(handler2Ep1) - .build(); - - ServiceEndpoint service2Ep2 = ServiceEndpoint.builder() - .endpoint(ep2) - .handler(handler2Ep2) - .build(); - - Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) - .version("1.0.0") - .connection(serviceNc1) - .addServiceEndpoint(service1Ep1) - .addServiceEndpoint(service1Ep2) - .build(); - - Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) - .version("1.0.0") - .connection(serviceNc2) - .addServiceEndpoint(service2Ep1) - .addServiceEndpoint(service2Ep2) - .build(); - - service1.startService(); - service2.startService(); - - String replyTo = "qreplyto"; - AtomicInteger y1Count = new AtomicInteger(); - AtomicInteger y2Count = new AtomicInteger(); - AtomicInteger n1Count = new AtomicInteger(); - AtomicInteger n2Count = new AtomicInteger(); - CountDownLatch latch = new CountDownLatch(6); - Dispatcher d = clientNc.createDispatcher(m -> { - switch (new String(m.getData())) { - case "Echo y1": y1Count.incrementAndGet(); break; - case "Echo y2": y2Count.incrementAndGet(); break; - case "Echo n1": n1Count.incrementAndGet(); break; - case "Echo n2": n2Count.incrementAndGet(); break; - } - latch.countDown(); - }); - d.subscribe(replyTo); - - clientNc.publish(yesQueueSubject, replyTo, "y1".getBytes()); - clientNc.publish(yesQueueSubject, replyTo, "y2".getBytes()); - clientNc.publish(noQueueSubject, replyTo, "n1".getBytes()); - clientNc.publish(noQueueSubject, replyTo, "n2".getBytes()); - - assertTrue(latch.await(2, TimeUnit.SECONDS)); - assertEquals(2, y1Count.get() + y2Count.get()); - assertEquals(4, n1Count.get() + n2Count.get()); - } - } + runInShared(clientNc -> { + Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); + Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + String yesQueueSubject = "subjyes"; + String noQueueSubject = "subjno"; + + Endpoint ep1 = Endpoint.builder() + .name("with") + .subject(yesQueueSubject) + .build(); + + Endpoint ep2 = Endpoint.builder() + .name("without") + .subject(noQueueSubject) + .noQueueGroup() + .build(); + + EchoHandler handler1Ep1 = new EchoHandler(serviceNc1); + EchoHandler handler1Ep2 = new EchoHandler(serviceNc1); + EchoHandler handler2Ep1 = new EchoHandler(serviceNc2); + EchoHandler handler2Ep2 = new EchoHandler(serviceNc2); + + ServiceEndpoint service1Ep1 = ServiceEndpoint.builder() + .endpoint(ep1) + .handler(handler1Ep1) + .build(); + + ServiceEndpoint service1Ep2 = ServiceEndpoint.builder() + .endpoint(ep2) + .handler(handler1Ep2) + .build(); + + ServiceEndpoint service2Ep1 = ServiceEndpoint.builder() + .endpoint(ep1) + .handler(handler2Ep1) + .build(); + + ServiceEndpoint service2Ep2 = ServiceEndpoint.builder() + .endpoint(ep2) + .handler(handler2Ep2) + .build(); + + Service service1 = new ServiceBuilder() + .name(SERVICE_NAME_1) + .version("1.0.0") + .connection(serviceNc1) + .addServiceEndpoint(service1Ep1) + .addServiceEndpoint(service1Ep2) + .build(); + + Service service2 = new ServiceBuilder() + .name(SERVICE_NAME_2) + .version("1.0.0") + .connection(serviceNc2) + .addServiceEndpoint(service2Ep1) + .addServiceEndpoint(service2Ep2) + .build(); + + service1.startService(); + service2.startService(); + + String replyTo = "qreplyto"; + AtomicInteger y1Count = new AtomicInteger(); + AtomicInteger y2Count = new AtomicInteger(); + AtomicInteger n1Count = new AtomicInteger(); + AtomicInteger n2Count = new AtomicInteger(); + CountDownLatch latch = new CountDownLatch(6); + Dispatcher d = clientNc.createDispatcher(m -> { + switch (new String(m.getData())) { + case "Echo y1": + y1Count.incrementAndGet(); + break; + case "Echo y2": + y2Count.incrementAndGet(); + break; + case "Echo n1": + n1Count.incrementAndGet(); + break; + case "Echo n2": + n2Count.incrementAndGet(); + break; + } + latch.countDown(); + }); + d.subscribe(replyTo); + + clientNc.publish(yesQueueSubject, replyTo, "y1".getBytes()); + clientNc.publish(yesQueueSubject, replyTo, "y2".getBytes()); + clientNc.publish(noQueueSubject, replyTo, "n1".getBytes()); + clientNc.publish(noQueueSubject, replyTo, "n2".getBytes()); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); + assertEquals(2, y1Count.get() + y2Count.get()); + assertEquals(4, n1Count.get() + n2Count.get()); + }); } @Test public void testResponsesFromAllInstances() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - try (Connection serviceNc1 = standardConnectionWait(ts.getLocalhostUri()); - Connection serviceNc2 = standardConnectionWait(ts.getLocalhostUri()); - Connection clientNc = standardConnectionWait(ts.getLocalhostUri())) { - - Endpoint ep = Endpoint.builder() - .name("ep") - .subject("eps") - .build(); - - EchoHandler handler1 = new EchoHandler(serviceNc1); - EchoHandler handler2 = new EchoHandler(serviceNc2); - - ServiceEndpoint service1Ep1 = ServiceEndpoint.builder() - .endpoint(ep) - .handler(handler1) - .build(); - - ServiceEndpoint service2Ep1 = ServiceEndpoint.builder() - .endpoint(ep) - .handler(handler2) - .build(); - - Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) - .version("1.0.0") - .connection(serviceNc1) - .addServiceEndpoint(service1Ep1) - .build(); - - Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) - .version("1.0.0") - .connection(serviceNc2) - .addServiceEndpoint(service2Ep1) - .build(); - - service1.startService(); - service2.startService(); - - assertTrue(service1.isStarted(1, TimeUnit.SECONDS)); - assertTrue(service2.isStarted(1, TimeUnit.SECONDS)); - - Discovery discovery = new Discovery(clientNc); - - List prs = discovery.ping(); - boolean one = false; - boolean two = false; - for (PingResponse response : prs) { - if (response.getName().equals(SERVICE_NAME_1)) { - one = true; - } - else if (response.getName().equals(SERVICE_NAME_2)) { - two = true; - } + runInShared(clientNc -> { + Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); + Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + + Endpoint ep = Endpoint.builder() + .name("ep") + .subject("eps") + .build(); + + EchoHandler handler1 = new EchoHandler(serviceNc1); + EchoHandler handler2 = new EchoHandler(serviceNc2); + + ServiceEndpoint service1Ep1 = ServiceEndpoint.builder() + .endpoint(ep) + .handler(handler1) + .build(); + + ServiceEndpoint service2Ep1 = ServiceEndpoint.builder() + .endpoint(ep) + .handler(handler2) + .build(); + + Service service1 = new ServiceBuilder() + .name(SERVICE_NAME_1) + .version("1.0.0") + .connection(serviceNc1) + .addServiceEndpoint(service1Ep1) + .build(); + + Service service2 = new ServiceBuilder() + .name(SERVICE_NAME_2) + .version("1.0.0") + .connection(serviceNc2) + .addServiceEndpoint(service2Ep1) + .build(); + + service1.startService(); + service2.startService(); + + assertTrue(service1.isStarted(1, TimeUnit.SECONDS)); + assertTrue(service2.isStarted(1, TimeUnit.SECONDS)); + + Discovery discovery = new Discovery(clientNc); + + List prs = discovery.ping(); + boolean one = false; + boolean two = false; + for (PingResponse response : prs) { + if (response.getName().equals(SERVICE_NAME_1)) { + one = true; } - assertTrue(one); - assertTrue(two); - - List irs = discovery.info(); - one = false; - two = false; - for (InfoResponse response : irs) { - if (response.getName().equals(SERVICE_NAME_1)) { - one = true; - } - else if (response.getName().equals(SERVICE_NAME_2)) { - two = true; - } + else if (response.getName().equals(SERVICE_NAME_2)) { + two = true; } - assertTrue(one); - assertTrue(two); - - List srs = discovery.stats(); - one = false; - two = false; - for (StatsResponse response : srs) { - if (response.getName().equals(SERVICE_NAME_1)) { - one = true; - } - else if (response.getName().equals(SERVICE_NAME_2)) { - two = true; - } + } + assertTrue(one); + assertTrue(two); + + List irs = discovery.info(); + one = false; + two = false; + for (InfoResponse response : irs) { + if (response.getName().equals(SERVICE_NAME_1)) { + one = true; + } + else if (response.getName().equals(SERVICE_NAME_2)) { + two = true; } - assertTrue(one); - assertTrue(two); } - } + assertTrue(one); + assertTrue(two); + + List srs = discovery.stats(); + one = false; + two = false; + for (StatsResponse response : srs) { + if (response.getName().equals(SERVICE_NAME_1)) { + one = true; + } + else if (response.getName().equals(SERVICE_NAME_2)) { + two = true; + } + } + assertTrue(one); + assertTrue(two); + }); } @Test public void testDispatchers() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - try (Connection nc = standardConnectionWait(ts.getLocalhostUri())) { - - Map dispatchers = getDispatchers(nc); - assertEquals(0, dispatchers.size()); - - Dispatcher dPing = nc.createDispatcher(); - Dispatcher dInfo = nc.createDispatcher(); - Dispatcher dStats = nc.createDispatcher(); - Dispatcher dEnd = nc.createDispatcher(); - - dispatchers = getDispatchers(nc); - assertEquals(4, dispatchers.size()); - - ServiceEndpoint se1 = ServiceEndpoint.builder() - .endpointName("dispatch") - .handler(m -> { - }) - .dispatcher(dEnd) - .build(); - Service service = new ServiceBuilder() - .connection(nc) - .name("testDispatchers") - .version("0.0.1") - .addServiceEndpoint(se1) - .pingDispatcher(dPing) - .infoDispatcher(dInfo) - .statsDispatcher(dStats) - .build(); - - CompletableFuture done = service.startService(); - sleep(100); // give the service time to spin up - service.stop(false); // no need to drain, plus // Coverage - done.get(100, TimeUnit.MILLISECONDS); - - dispatchers = getDispatchers(nc); - assertEquals(4, dispatchers.size()); // stop doesn't touch supplied dispatchers - - nc.closeDispatcher(dPing); - nc.closeDispatcher(dInfo); - sleep(100); // no rush - - dispatchers = getDispatchers(nc); - assertEquals(2, dispatchers.size()); // dEnd and dStats - assertTrue(dispatchers.containsValue(dStats)); - assertTrue(dispatchers.containsValue(dEnd)); - - service = new ServiceBuilder() - .connection(nc) - .name("testDispatchers") - .version("0.0.1") - .addServiceEndpoint(se1) - .statsDispatcher(dStats) - .build(); - - dispatchers = getDispatchers(nc); - assertEquals(3, dispatchers.size()); // endpoint, stats, internal discovery - - done = service.startService(); - sleep(100); // give the service time to spin up - service.stop(); // Coverage - done.get(100, TimeUnit.MILLISECONDS); - - dispatchers = getDispatchers(nc); - assertEquals(0, dispatchers.size()); // stop() calls drain which closes dispatchers - - se1 = ServiceEndpoint.builder() - .endpointName("dispatch") - .handler(m -> { - }) - .build(); - - ServiceEndpoint se2 = ServiceEndpoint.builder() - .endpointName("another") - .handler(m -> { - }) - .build(); - - service = new ServiceBuilder() - .connection(nc) - .name("testDispatchers") - .version("0.0.1") - .addServiceEndpoint(se1) - .addServiceEndpoint(se2) - .build(); - - dispatchers = getDispatchers(nc); - assertEquals(2, dispatchers.size()); // 1 internal discovery and 1 internal endpoints - - done = service.startService(); - sleep(100); // give the service time to spin up - service.stop(); // Coverage - done.get(100, TimeUnit.MILLISECONDS); - - dispatchers = getDispatchers(nc); - assertEquals(0, dispatchers.size()); // service cleans up internal dispatchers - } - } + runInSharedOwnNc(nc -> { + + Map dispatchers = getDispatchers(nc); + assertEquals(0, dispatchers.size()); + + Dispatcher dPing = nc.createDispatcher(); + Dispatcher dInfo = nc.createDispatcher(); + Dispatcher dStats = nc.createDispatcher(); + Dispatcher dEnd = nc.createDispatcher(); + + dispatchers = getDispatchers(nc); + assertEquals(4, dispatchers.size()); + + ServiceEndpoint se1 = ServiceEndpoint.builder() + .endpointName("dispatch") + .handler(m -> { + }) + .dispatcher(dEnd) + .build(); + Service service = new ServiceBuilder() + .connection(nc) + .name("testDispatchers") + .version("0.0.1") + .addServiceEndpoint(se1) + .pingDispatcher(dPing) + .infoDispatcher(dInfo) + .statsDispatcher(dStats) + .build(); + + CompletableFuture done = service.startService(); + sleep(100); // give the service time to spin up + service.stop(false); // no need to drain, plus // Coverage + done.get(100, TimeUnit.MILLISECONDS); + + dispatchers = getDispatchers(nc); + assertEquals(4, dispatchers.size()); // stop doesn't touch supplied dispatchers + + nc.closeDispatcher(dPing); + nc.closeDispatcher(dInfo); + sleep(100); // no rush + + dispatchers = getDispatchers(nc); + assertEquals(2, dispatchers.size()); // dEnd and dStats + assertTrue(dispatchers.containsValue(dStats)); + assertTrue(dispatchers.containsValue(dEnd)); + + service = new ServiceBuilder() + .connection(nc) + .name("testDispatchers") + .version("0.0.1") + .addServiceEndpoint(se1) + .statsDispatcher(dStats) + .build(); + + dispatchers = getDispatchers(nc); + assertEquals(3, dispatchers.size()); // endpoint, stats, internal discovery + + done = service.startService(); + sleep(100); // give the service time to spin up + service.stop(); // Coverage + done.get(100, TimeUnit.MILLISECONDS); + + dispatchers = getDispatchers(nc); + assertEquals(0, dispatchers.size()); // stop() calls drain which closes dispatchers + + se1 = ServiceEndpoint.builder() + .endpointName("dispatch") + .handler(m -> { + }) + .build(); + + ServiceEndpoint se2 = ServiceEndpoint.builder() + .endpointName("another") + .handler(m -> { + }) + .build(); + + service = new ServiceBuilder() + .connection(nc) + .name("testDispatchers") + .version("0.0.1") + .addServiceEndpoint(se1) + .addServiceEndpoint(se2) + .build(); + + dispatchers = getDispatchers(nc); + assertEquals(2, dispatchers.size()); // 1 internal discovery and 1 internal endpoints + + done = service.startService(); + sleep(100); // give the service time to spin up + service.stop(); // Coverage + done.get(100, TimeUnit.MILLISECONDS); + + dispatchers = getDispatchers(nc); + assertEquals(0, dispatchers.size()); // service cleans up internal dispatchers + }); } @Test public void testServiceBuilderConstruction() { - Options options = options(); + Options options = options(); // server not needed, a connection is never made Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() .endpoint(new Endpoint(random())) - .handler(m -> { - }) + .handler(m -> {}) .build(); // minimum valid service @@ -842,7 +843,7 @@ public void testServiceBuilderConstruction() { @Test public void testAddingEndpointAfterServiceBuilderConstruction() { - Options options = options(); + Options options = options(); // server not needed, a connection is never made Connection conn = new MockNatsConnection(options); ServiceEndpoint se = ServiceEndpoint.builder() .endpoint(new Endpoint(random())) From caf4e793f12afbd228f00b437049390d59801de3 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 28 Nov 2025 17:00:31 -0500 Subject: [PATCH 20/51] timing is everything --- src/main/java/io/nats/client/impl/PullMessageManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/io/nats/client/impl/PullMessageManager.java b/src/main/java/io/nats/client/impl/PullMessageManager.java index 4ed388a9d..c1538803e 100644 --- a/src/main/java/io/nats/client/impl/PullMessageManager.java +++ b/src/main/java/io/nats/client/impl/PullMessageManager.java @@ -16,7 +16,6 @@ import io.nats.client.Message; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; -import io.nats.client.support.Debug; import io.nats.client.support.Status; import static io.nats.client.impl.MessageManager.ManageResult.*; @@ -159,7 +158,6 @@ protected void subTrackJsMessage(Message msg) { } protected ManageResult manageStatus(Message msg) { - Debug.info("MAN", msg); Status status = msg.getStatus(); switch (status.getCode()) { case NOT_FOUND_CODE: From 9067d32a7c6f90d6073044182ac67620d08521eb Mon Sep 17 00:00:00 2001 From: scottf Date: Sat, 29 Nov 2025 06:00:28 -0500 Subject: [PATCH 21/51] fixing flappers with futures --- .../java/io/nats/client/PublishTests.java | 4 +- .../client/impl/ConnectionListenerTests.java | 5 +- ...erByFutures.java => ListenerByFuture.java} | 223 +++++++++--------- .../nats/client/impl/MessageManagerTests.java | 99 +++----- 4 files changed, 155 insertions(+), 176 deletions(-) rename src/test/java/io/nats/client/impl/{ListenerByFutures.java => ListenerByFuture.java} (50%) diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index f1bf0b968..7778574fe 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -16,7 +16,7 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.Headers; import io.nats.client.impl.JetStreamTestingContext; -import io.nats.client.impl.ListenerByFutures; +import io.nats.client.impl.ListenerByFuture; import io.nats.client.impl.NatsMessage; import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; @@ -243,7 +243,7 @@ public void testMaxPayload() throws Exception { @Test public void testMaxPayloadNoClientSideLimitChecks() throws Exception { - ListenerByFutures listener = new ListenerByFutures(); + ListenerByFuture listener = new ListenerByFuture(); Options.Builder builder = optionsBuilder() .noReconnect() .clientSideLimitChecks(false) diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index e2d1551ac..4ec908686 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -42,7 +42,7 @@ public void testToString() { @Test public void testCloseEvent() throws Exception { - ListenerByFutures listener = new ListenerByFutures(); + ListenerByFuture listener = new ListenerByFuture(); CompletableFuture fEvent = listener.prepForEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { @@ -115,7 +115,7 @@ public void testExceptionInConnectionListener() throws Exception { @Test public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); - ListenerByFutures listener = new ListenerByFutures(); + ListenerByFuture listener = new ListenerByFuture(); CompletableFuture fClosed = listener.prepForEvent(Events.CLOSED); AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); @@ -140,7 +140,6 @@ public void testMultipleConnectionListeners() throws Exception { assertNull(nc.getConnectedUrl()); }); - sleep(100); // it needs time here assertTrue(stats.get().getExceptions() > 0); listener.validate(fClosed, 500, Events.CLOSED); diff --git a/src/test/java/io/nats/client/impl/ListenerByFutures.java b/src/test/java/io/nats/client/impl/ListenerByFuture.java similarity index 50% rename from src/test/java/io/nats/client/impl/ListenerByFutures.java rename to src/test/java/io/nats/client/impl/ListenerByFuture.java index 555a60722..dfd42be3c 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFutures.java +++ b/src/test/java/io/nats/client/impl/ListenerByFuture.java @@ -19,20 +19,20 @@ import org.junit.jupiter.api.Assertions; import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.Map; +import java.util.Arrays; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.concurrent.locks.ReentrantLock; @SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) -public class ListenerByFutures implements ErrorListener, ConnectionListener { - private final ReentrantLock lock = new ReentrantLock(); +public class ListenerByFuture implements ErrorListener, ConnectionListener { + private CompletableFuture eventFuture; + private Events eventFutureType; + + private CompletableFuture errorFuture; + private String errorFutureText; - private final Map> eventsFutures = new HashMap<>(); - private final Map> textFutures = new HashMap<>(); private CompletableFuture statusFuture; private StatusType preppedStatusType; private int preppedStatusCode; @@ -40,144 +40,147 @@ public class ListenerByFutures implements ErrorListener, ConnectionListener { private final boolean printExceptions; private final boolean verbose; - public ListenerByFutures() { + private CompletableFuture fcFuture; + private String preppedFcSubject; + private FlowControlSource preppedFcSource; + + public enum StatusType { + Unhandled, PullWarning, PullError + } + + public ListenerByFuture() { this(false, false); } - public ListenerByFutures(boolean verbose) { + public ListenerByFuture(boolean verbose) { this(false, verbose); } - public ListenerByFutures(boolean printExceptions, boolean verbose) { + public ListenerByFuture(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; } public void reset() { - for (CompletableFuture f : eventsFutures.values()) { - f.cancel(true); + if (eventFuture != null) { + eventFuture.cancel(true); + eventFuture = null; + eventFutureType = null; } - for (CompletableFuture f : textFutures.values()) { - f.cancel(true); - } - eventsFutures.clear(); - textFutures.clear(); - } - public void validate(CompletableFuture future, long waitInMillis, String failMessage) { - try { - future.get(waitInMillis, TimeUnit.MILLISECONDS); + if (errorFuture != null) { + errorFuture.cancel(true); + errorFuture = null; + errorFutureText = null; } - catch (TimeoutException | ExecutionException | InterruptedException e) { - Assertions.fail("Failed to get '" + failMessage + "' message.", e); + + if (statusFuture != null) { + statusFuture.cancel(true); + statusFuture = null; + preppedStatusType = null; + preppedStatusCode = -1; } } - public void validate(CompletableFuture future, long waitInMillis, Events type) { + // ---------------------------------------------------------------------------------------------------- + // Validate + // ---------------------------------------------------------------------------------------------------- + public void validate(CompletableFuture future, long waitInMillis, Object... details) { try { future.get(waitInMillis, TimeUnit.MILLISECONDS); } catch (TimeoutException | ExecutionException | InterruptedException e) { - Assertions.fail("Failed to get " + type.name() + " event.", e); + Assertions.fail("Listener Validate Failed " + Arrays.asList(details), e); } } - public void validateStatus(CompletableFuture future, long waitInMillis) { - try { - future.get(waitInMillis, TimeUnit.MILLISECONDS); + // ---------------------------------------------------------------------------------------------------- + // Prep + // ---------------------------------------------------------------------------------------------------- + public CompletableFuture prepForEvent(Events type) { + if (verbose) { + report("prepForEvent", type); } - catch (TimeoutException | ExecutionException | InterruptedException e) { - Assertions.fail("Failed to get correct status.", e); + if (eventFuture != null) { + eventFuture.cancel(true); } + eventFuture = new CompletableFuture<>(); + eventFutureType = type; + return eventFuture; } - public enum StatusType { - Unhandled, PullWarning, PullError - } - - public static class StatusException extends RuntimeException { - public final StatusType receivedType; - public final Status receivedStatus; - public final StatusType preppedStatusType; - public final int preppedStatusCode; - - public StatusException(StatusType receivedType, Status receivedStatus, StatusType preppedStatusType, int preppedStatusCode) { - this.receivedType = receivedType; - this.receivedStatus = receivedStatus; - this.preppedStatusType = preppedStatusType; - this.preppedStatusCode = preppedStatusCode; + public CompletableFuture prepForError(String errorText) { + if (verbose) { + report("prepForEvent", errorText); } - - @Override - public String toString() { - return "StatusException{" + - "receivedType=" + receivedType + - ", receivedStatusCode=" + receivedStatus.getCode() + - ", preppedStatusType=" + preppedStatusType + - ", preppedStatusCode=" + preppedStatusCode + - "} " + super.toString(); + if (errorFuture != null) { + errorFuture.cancel(true); } + errorFuture = new CompletableFuture<>(); + errorFutureText = errorText; + return errorFuture; } - private CompletableFuture prepFor(String label, Map> map, T key) { - lock.lock(); - try { - if (verbose) { - report(label, key.toString()); - } - return map.computeIfAbsent(key, k -> new CompletableFuture<>()); - } finally { - lock.unlock(); + public CompletableFuture prepForStatus(StatusType type, int statusCode) { + if (verbose) { + report("prepForStatus", type + " " + statusCode); } + if (statusFuture != null) { + statusFuture.cancel(true); + } + statusFuture = new CompletableFuture<>(); + preppedStatusType = type; + preppedStatusCode = statusCode; + return statusFuture; } - public CompletableFuture prepForEvent(Events type) { - return prepFor("prepForEvent", eventsFutures, type); - } - - public CompletableFuture prepForError(String errorText) { - return prepFor("prepForError", textFutures, errorText); - } - - public CompletableFuture prepForStatus(StatusType type, int statusCode) { - lock.lock(); - try { - if (verbose) { - report("prepForStatus", type + " " + statusCode); - } - preppedStatusType = type; - preppedStatusCode = statusCode; - statusFuture = new CompletableFuture<>(); - return statusFuture; - } finally { - lock.unlock(); + public CompletableFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { + if (verbose) { + report("prepForFlowControl", fcSubject + " " + fcSource); } + if (fcFuture != null) { + fcFuture.cancel(true); + } + fcFuture = new CompletableFuture<>(); + preppedFcSubject = fcSubject; + preppedFcSource = fcSource; + return fcFuture; } - private void complete(String label, Map> map, T key) { - lock.lock(); - try { - if (verbose) { - report(label, key.toString()); - } - CompletableFuture f = map.get(key); - if (f != null) { - f.complete(null); - } - } finally { - lock.unlock(); - } + // ---------------------------------------------------------------------------------------------------- + // Connection Listener + // ---------------------------------------------------------------------------------------------------- + @Override + public void connectionEvent(Connection conn, Events type) { + // deprecated } @Override public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) { - complete("connectionEvent", eventsFutures, type); + if (verbose) { + report("connectionEvent", type); + } + if (eventFuture != null) { + if (eventFutureType.equals(type)) { + eventFuture.complete(null); + } + } } + // ---------------------------------------------------------------------------------------------------- + // Error Listener + // ---------------------------------------------------------------------------------------------------- @Override public void errorOccurred(Connection conn, String error) { - complete("errorOccurred", textFutures, error); - } + if (verbose) { + report("errorOccurred", error); + } + if (errorFuture != null) { + if (errorFutureText.equals(error)) { + errorFuture.complete(null); + } + } + } @Override public void exceptionOccurred(Connection conn, Exception exp) { @@ -200,13 +203,13 @@ public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long last } private void statusReceived(StatusType receivedType, Status received) { + if (verbose) { + report("statusReceived", received); + } if (statusFuture != null) { if (preppedStatusType.equals(receivedType) && preppedStatusCode == received.getCode()) { statusFuture.complete(null); } - else { - statusFuture.completeExceptionally(new StatusException(receivedType, received, preppedStatusType, preppedStatusCode)); - } } } @@ -227,12 +230,23 @@ public void pullStatusError(Connection conn, JetStreamSubscription sub, Status s @Override public void flowControlProcessed(Connection conn, JetStreamSubscription sub, String subject, FlowControlSource source) { + if (verbose) { + report("flowControlProcessed", subject + " " + source); + } + if (fcFuture != null) { + if (preppedFcSubject.equals(subject) && preppedFcSource == source) { + fcFuture.complete(null); + } + } } @Override public void socketWriteTimeout(Connection conn) { } + // ---------------------------------------------------------------------------------------------------- + // Helpers + // ---------------------------------------------------------------------------------------------------- public static final DateTimeFormatter SIMPLE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); public static String simpleTime() { @@ -242,9 +256,4 @@ public static String simpleTime() { private void report(String func, Object message) { System.out.println("[" + simpleTime() + " " + func + "] " + message); } - - @Override - public void connectionEvent(Connection conn, Events type) { - // deprecated - } } diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 9d33d9ad2..be8926bbc 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -21,14 +21,12 @@ import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import static io.nats.client.impl.ListenerByFutures.StatusType.PullError; -import static io.nats.client.impl.ListenerByFutures.StatusType.PullWarning; +import static io.nats.client.impl.ListenerByFuture.StatusType.PullError; +import static io.nats.client.impl.ListenerByFuture.StatusType.PullWarning; import static io.nats.client.impl.MessageManager.ManageResult; import static io.nats.client.impl.MessageManager.ManageResult.*; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; @@ -75,7 +73,7 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO @Test public void testPushBeforeQueueProcessorAndManage() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + ListenerByFuture listener = new ListenerByFuture(); runInSharedOwnNc(listener, nc -> { _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, true, false); _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, true, false); @@ -86,79 +84,52 @@ public void testPushBeforeQueueProcessorAndManage() throws Exception { }); } - private void _testPushBqpAndManageRetriable(Connection nc, ListenerForTesting listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException { - int triesLeft = 3; - while (triesLeft-- > 0) { - sleep(50); // just so we aren't slamming a shared server - NatsJetStreamSubscription sub = genericPushSub(nc); - PushMessageManager pushMgr = getPushManager(nc, pso, sub, ordered, syncMode, queueMode); - boolean passed = _testPushBqpAndManage(sub, listener, pushMgr, triesLeft > 0); - if (passed) { - break; - } - } - } - - private boolean _testPushBqpAndManage(NatsJetStreamSubscription sub, ListenerForTesting listener, PushMessageManager manager, boolean canRetry) { - try { - listener.reset(); - String sid = sub.getSID(); - - assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); - assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); - - assertEquals(!manager.hb.get(), manager.beforeQueueProcessorImpl(getHeartbeat(sid))); + private void _testPushBqpAndManageRetriable(Connection nc, ListenerByFuture listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException { + listener.reset(); - List unhandledCodes = new ArrayList<>(); - assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); - assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); - if (manager.fc) { - assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); - assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); - } - else { - assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); - unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // fc - unhandledCodes.add(FLOW_OR_HEARTBEAT_STATUS_CODE); // hb - } + NatsJetStreamSubscription sub = genericPushSub(nc); + String sid = sub.getSID(); + PushMessageManager manager = getPushManager(nc, pso, sub, ordered, syncMode, queueMode); - assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - unhandledCodes.add(999); + assertTrue(manager.beforeQueueProcessorImpl(getTestJsMessage(1, sid))); + assertEquals(ManageResult.MESSAGE, manager.manage(getTestJsMessage(1, sid))); - sleep(100); - List list = listener.getUnhandledStatuses(); - if (canRetry && unhandledCodes.size() != list.size()) { - return false; // didn't pass - } - assertEquals(unhandledCodes.size(), list.size()); - for (int x = 0; x < list.size(); x++) { - ListenerForTesting.StatusEvent se = list.get(x); - assertSame(sub.getSID(), se.sid); - if (canRetry && unhandledCodes.get(x) != se.status.getCode()) { - return false; // didn't pass - } - assertEquals(unhandledCodes.get(x), se.status.getCode()); - } + assertEquals(!manager.hb.get(), manager.beforeQueueProcessorImpl(getHeartbeat(sid))); - return true; + assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); + assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); + if (manager.fc) { + CompletableFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); + assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); + assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); + listener.validate(f, 500, getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); } - finally { - try { sub.unsubscribe(); } catch (Exception ignore) {} + else { + CompletableFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); + listener.validate(f, 500, FLOW_OR_HEARTBEAT_STATUS_CODE, FLOW_CONTROL_TEXT); + + f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); + listener.validate(f, 500, FLOW_OR_HEARTBEAT_STATUS_CODE, HEARTBEAT_TEXT); } + + assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); + CompletableFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, 999); + assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); + listener.validate(f, 500, 999, "unknown"); } @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { - ListenerByFutures listener = new ListenerByFutures(); + ListenerByFuture listener = new ListenerByFuture(); runInSharedOwnNc(listener, (nc, ctx) -> { _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).build()); _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build()); }); } - private void _testPullBqpAndManage(Connection nc, ListenerByFutures listener, PullRequestOptions pro) throws JetStreamApiException, IOException { + private void _testPullBqpAndManage(Connection nc, ListenerByFuture listener, PullRequestOptions pro) throws JetStreamApiException, IOException { NatsJetStreamSubscription sub = genericPullSub(nc); PullMessageManager manager = getPullManager(nc, sub, true); manager.startPullRequest(random(), pro, true, null); @@ -199,10 +170,10 @@ private void _testPullBqpAndManage(Connection nc, ListenerByFutures listener, Pu assertManageResult(listener, PullError, CONFLICT_CODE, STATUS_ERROR, manager, getConflictStatus(sid, CONSUMER_IS_PUSH_BASED)); } - private static void assertManageResult(ListenerByFutures listener, ListenerByFutures.StatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { + private static void assertManageResult(ListenerByFuture listener, ListenerByFuture.StatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { CompletableFuture f = listener.prepForStatus(expectedType, expectedStatusCode); assertEquals(expecteManageResult, manager.manage(message)); - listener.validateStatus(f, 500); + listener.validate(f, 500, expectedType, expectedStatusCode); } @Test From a8d9ec5291559a570b3da6d9e6dd465322555018 Mon Sep 17 00:00:00 2001 From: scottf Date: Sat, 29 Nov 2025 16:07:20 -0500 Subject: [PATCH 22/51] on and on and on --- build.gradle | 2 +- src/test/java/io/nats/client/AuthTests.java | 64 ++--- src/test/java/io/nats/client/EchoTests.java | 7 +- src/test/java/io/nats/client/NKeyTests.java | 52 ++-- .../java/io/nats/client/PublishTests.java | 50 ++-- .../client/api/StreamConfigurationTests.java | 2 +- ...tionDuringReconnectOnFlushTimeoutTest.java | 4 +- .../client/impl/ConnectionListenerTests.java | 12 +- .../java/io/nats/client/impl/DrainTests.java | 85 ++++--- .../nats/client/impl/ErrorListenerTests.java | 20 +- .../client/impl/JetStreamConsumerTests.java | 2 +- .../client/impl/JetStreamGeneralTests.java | 18 +- .../client/impl/JetStreamManagementTests.java | 103 ++++---- .../JetStreamManagementWithConfTests.java | 4 +- .../impl/JetStreamMirrorAndSourcesTests.java | 147 ++++++----- .../nats/client/impl/JetStreamPubTests.java | 19 +- .../nats/client/impl/JetStreamPullTests.java | 2 +- .../client/impl/JetStreamPushAsyncTests.java | 5 +- .../nats/client/impl/JetStreamPushTests.java | 10 +- .../client/impl/JetStreamTestingContext.java | 86 ++++--- .../io/nats/client/impl/KeyValueTests.java | 6 +- .../io/nats/client/impl/ListenerByFuture.java | 230 +++++++++++------- .../nats/client/impl/MessageManagerTests.java | 19 +- .../io/nats/client/impl/NatsMessageTests.java | 4 +- .../java/io/nats/client/impl/ParseTests.java | 3 +- .../java/io/nats/client/impl/PingTests.java | 5 +- .../io/nats/client/impl/RequestTests.java | 31 ++- .../io/nats/client/impl/ServerPoolTests.java | 17 +- .../nats/client/impl/SimplificationTests.java | 2 +- .../io/nats/client/impl/TLSConnectTests.java | 27 +- .../client/impl/ValidateIssue1426Test.java | 4 +- .../io/nats/client/other/ReconnectCheck.java | 4 +- .../io/nats/client/utils/OptionsUtils.java | 22 +- .../java/io/nats/client/utils/TestBase.java | 15 +- .../io/nats/client/utils/ThreadUtils.java | 7 - 35 files changed, 549 insertions(+), 541 deletions(-) diff --git a/build.gradle b/build.gradle index 9d4fc1f0b..012ff3e84 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ test { maxRetries = 4 } if (compilerIsJava8 || isNotWindows) { - maxParallelForks = Runtime.runtime.availableProcessors() + maxParallelForks = Math.min(6, Runtime.runtime.availableProcessors()) } else { maxParallelForks = 2; diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index aec262962..cbc59e9ea 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -19,9 +19,9 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.ListenerForTesting; import io.nats.client.support.JwtUtils; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; @@ -44,12 +44,18 @@ import static io.nats.client.utils.OptionsUtils.NOOP_EL; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.jwtResource; +import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @Isolated public class AuthTests extends TestBase { + @BeforeAll + public static void beforeAll() { + sleep(2000); // Isolated, makes connections, which are the point of failure for no reason + } + private String userPassInUrl(String user, String pass, int port) { return "nats://" + user + ":" + pass + "@" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port; } @@ -67,23 +73,23 @@ public void testUserPass() throws Exception { String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // u/p in url - Options inUrl = OptionsUtils.optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); + Options inUrl = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); assertCanConnect(inUrl); // u/p in options - Options inOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options inOptions = optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); assertCanConnect(inOptions); - Options badUser = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options badUser = optionsBuilder(ts).maxReconnects(0) .userInfo("zzz".toCharArray(), "ppp".toCharArray()).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(badUser)); - Options badPass = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options badPass = optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(badPass)); - Options missingUserPass = OptionsUtils.optionsBuilder(ts).maxReconnects(0).build(); + Options missingUserPass = optionsBuilder(ts).maxReconnects(0).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPass)); } } @@ -122,7 +128,7 @@ public void testEncodedPassword() throws Exception { private void assertEncoded(String encoded, int port) throws IOException, InterruptedException { String url = userPassInUrl("u" + encoded, "p" + encoded, port); - Options options = OptionsUtils.optionsBuilder(url).build(); + Options options = optionsBuilder(url).build(); Connection c = Nats.connect(options); c.getServerInfo(); c.close(); @@ -148,7 +154,7 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { try (NatsTestServer ts = new NatsTestServer( NatsServerRunner.builder().customArgs(customArgs))) { // See config file for user/pass - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .userInfo(user, pass) .maxReconnects(0).build(); assertCanConnect(options); @@ -166,7 +172,7 @@ public void testUserPassOnReconnect() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs)) { port = ts.getPort(); // See config file for user/pass - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(-1) + Options options = optionsBuilder(ts).maxReconnects(-1) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).connectionListener(listener).build(); nc = standardConnectionWait(options); @@ -207,7 +213,7 @@ public void testUserBCryptPass() throws Exception { "$2a$12$UjzncyjtsE6rJG4LSGk.JOweXV3P2umZ38gHuj4OMY0X/nQudiDgG" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); assertCanConnect(options); } @@ -264,7 +270,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); String url2 = userPassInUrl("uuu2", "ppp2", ts2.getPort()); - Options options = OptionsUtils.optionsBuilder(url1, url2) + Options options = optionsBuilder(url1, url2) .maxReconnects(4) .noRandomize() .connectionListener(listener) @@ -289,7 +295,7 @@ public void testUserPassInURLWithFallback() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); - Options options = OptionsUtils.optionsBuilder(url1, ts2.getNatsLocalhostUri()) + Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) .userInfo("uuu2".toCharArray(), "ppp2".toCharArray()) .maxReconnects(4) .noRandomize() @@ -316,7 +322,7 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); String url2 = tokenInUrl("token_two", ts2.getPort()); - Options options = OptionsUtils.optionsBuilder(url1, url2) + Options options = optionsBuilder(url1, url2) .maxReconnects(4) .noRandomize() .connectionListener(listener) @@ -344,7 +350,7 @@ public void testTokenInURLWithFallback() throws Exception { try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); - Options options = OptionsUtils.optionsBuilder(url1, ts2.getNatsLocalhostUri()) + Options options = optionsBuilder(url1, ts2.getNatsLocalhostUri()) .token("token_two".toCharArray()) .maxReconnects(4) .noRandomize() @@ -369,26 +375,26 @@ public void testToken() throws Exception { String[] customArgs = { "--auth", "token" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // token in options - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .token("token".toCharArray()) .build(); assertCanConnect(options); // token in url - options = OptionsUtils.optionsBuilder(tokenInUrl("token", ts.getPort())) + options = optionsBuilder(tokenInUrl("token", ts.getPort())) .maxReconnects(0).build(); assertCanConnect(options); // incorrect token - Options incorrectToken = OptionsUtils.optionsBuilder(ts) + Options incorrectToken = optionsBuilder(ts) .maxReconnects(0) .token("incorrectToken".toCharArray()) .build(); assertThrows(AuthenticationException.class, () -> Nats.connect(incorrectToken)); // incorrect token - Options missingToken = OptionsUtils.optionsBuilder(ts) + Options missingToken = optionsBuilder(ts) .maxReconnects(0) .build(); assertThrows(AuthenticationException.class, () -> Nats.connect(missingToken)); @@ -427,11 +433,11 @@ public void testNKeyAuth() throws Exception { NatsServerRunner.Builder b = NatsServerRunner.builder().configFilePath(configFilePath); try (NatsTestServer ts = new NatsTestServer(b)) { - Options authHandlerOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options authHandlerOptions = optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(theKey)).build(); assertCanConnect(authHandlerOptions); - Options staticOptions = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options staticOptions = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(null, theKey.getSeed())).build(); assertCanConnect(staticOptions); @@ -441,7 +447,7 @@ public void testNKeyAuth() throws Exception { standardCloseConnection(nc); // fails with no nkey - Options noNkey = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options noNkey = optionsBuilder(ts).maxReconnects(0) .authHandler(new AuthHandlerForTesting(null)).build(); assertThrows(IOException.class, () -> Nats.connect(noNkey)); } @@ -451,12 +457,12 @@ public void testNKeyAuth() throws Exception { public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(getUserCredsAuthHander()) .build(); assertCanConnect(options); - options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + options = optionsBuilder(ts).maxReconnects(0) .credentialPath(jwtResource("user.creds")) .build(); assertCanConnect(options); @@ -483,7 +489,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { String uri = ts.getLocalhostUri("ws"); // in options - Options options = OptionsUtils.optionsBuilder(uri).maxReconnects(0) + Options options = optionsBuilder(uri).maxReconnects(0) .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); @@ -500,7 +506,7 @@ public void testWssJWTAuthWithCredsFile() throws Exception { try (NatsTestServer ts = skipConnectValidateServer("wss_operator.conf")) { String uri = ts.getLocalhostUri("wss"); - Options options = OptionsUtils.optionsBuilder(uri).maxReconnects(0).sslContext(ctx) + Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); } @@ -513,7 +519,7 @@ public void testStaticJWTAuth() throws Exception { String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; try (NatsTestServer ts = configFileServer("operator.conf")) { - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0) + Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); } @@ -524,7 +530,7 @@ public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) + Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .noRandomize().maxReconnects(-1).authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); @@ -547,7 +553,7 @@ public void testCloseOnReconnectWithSameError() throws Exception { // Connect should fail on ts1 try (NatsTestServer ts = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) + Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(getUserCredsAuthHander()).build(); Connection nc = standardConnectionWait(options); @@ -569,7 +575,7 @@ public void testThatAuthErrorIsCleared() throws Exception { try (NatsTestServer ts1 = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = OptionsUtils.optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) .noRandomize() .maxReconnects(-1) .connectionTimeout(Duration.ofSeconds(5)) diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index b746fa189..5250e8120 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -14,7 +14,6 @@ package io.nats.client; import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.SharedServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -33,7 +32,7 @@ public void testFailWithBadServerProtocol() { assertThrows(IOException.class, () -> { Connection nc = null; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = OptionsUtils.optionsBuilder(mockTs).noEcho().noReconnect().build(); + Options opt = optionsBuilder(mockTs).noEcho().noReconnect().build(); try { nc = Nats.connect(opt); // Should fail } @@ -51,7 +50,7 @@ public void testFailWithBadServerProtocol() { public void testConnectToOldServerWithEcho() throws Exception { Connection nc = null; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = OptionsUtils.optionsBuilder(mockTs).noReconnect().build(); + Options opt = optionsBuilder(mockTs).noReconnect().build(); try { nc = Nats.connect(opt); } finally { @@ -66,7 +65,7 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { runInShared(nc1 -> { - try (Connection nc2 = standardConnectionWait(OptionsUtils.optionsBuilder(nc1).build())) { + try (Connection nc2 = standardConnectionWait(optionsBuilder(nc1).build())) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/NKeyTests.java b/src/test/java/io/nats/client/NKeyTests.java index 711d2bd88..b04c2e2b7 100644 --- a/src/test/java/io/nats/client/NKeyTests.java +++ b/src/test/java/io/nats/client/NKeyTests.java @@ -78,7 +78,7 @@ public void testBase32() { char[] encoded = base32Encode(bytes); byte[] decoded = base32Decode(encoded); String test = new String(decoded, StandardCharsets.UTF_8); - assertEquals(test, expected); + assertEquals(expected, test); } // bad input for coverage @@ -97,8 +97,8 @@ public void testEncodeDecodeSeed() throws Exception { char[] encoded = NKey.encodeSeed(NKey.Type.ACCOUNT, bytes); DecodedSeed decoded = NKey.decodeSeed(encoded); - assertEquals(NKey.Type.fromPrefix(decoded.prefix), NKey.Type.ACCOUNT); - assertTrue(Arrays.equals(bytes, decoded.bytes)); + assertEquals(NKey.Type.ACCOUNT, NKey.Type.fromPrefix(decoded.prefix)); + assertArrayEquals(bytes, decoded.bytes); } @Test @@ -109,19 +109,19 @@ public void testEncodeDecode() throws Exception { char[] encoded = NKey.encode(NKey.Type.ACCOUNT, bytes); byte[] decoded = NKey.decode(NKey.Type.ACCOUNT, encoded, false); - assertTrue(Arrays.equals(bytes, decoded)); + assertArrayEquals(bytes, decoded); encoded = NKey.encode(NKey.Type.USER, bytes); decoded = NKey.decode(NKey.Type.USER, encoded, false); - assertTrue(Arrays.equals(bytes, decoded)); + assertArrayEquals(bytes, decoded); encoded = NKey.encode(NKey.Type.SERVER, bytes); decoded = NKey.decode(NKey.Type.SERVER, encoded, false); - assertTrue(Arrays.equals(bytes, decoded)); + assertArrayEquals(bytes, decoded); encoded = NKey.encode(NKey.Type.CLUSTER, bytes); decoded = NKey.decode(NKey.Type.CLUSTER, encoded, false); - assertTrue(Arrays.equals(bytes, decoded)); + assertArrayEquals(bytes, decoded); } @Test @@ -196,15 +196,15 @@ public void testAccount() throws Exception { assertEquals(NKey.fromSeed(theKey.getSeed()), NKey.fromSeed(theKey.getSeed())); char[] publicKey = theKey.getPublicKey(); - assertEquals(publicKey[0], 'A'); + assertEquals('A', publicKey[0]); char[] privateKey = theKey.getPrivateKey(); - assertEquals(privateKey[0], 'P'); + assertEquals('P', privateKey[0]); byte[] data = "Synadia".getBytes(StandardCharsets.UTF_8); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); @@ -230,15 +230,15 @@ public void testUser() throws Exception { assertEquals(NKey.fromSeed(theKey.getSeed()), NKey.fromSeed(theKey.getSeed())); char[] publicKey = theKey.getPublicKey(); - assertEquals(publicKey[0], 'U'); + assertEquals('U', publicKey[0]); char[] privateKey = theKey.getPrivateKey(); - assertEquals(privateKey[0], 'P'); + assertEquals('P', privateKey[0]); byte[] data = "Mister Zero".getBytes(StandardCharsets.UTF_8); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); @@ -264,15 +264,15 @@ public void testCluster() throws Exception { assertEquals(NKey.fromSeed(theKey.getSeed()), NKey.fromSeed(theKey.getSeed())); char[] publicKey = theKey.getPublicKey(); - assertEquals(publicKey[0], 'C'); + assertEquals('C', publicKey[0]); char[] privateKey = theKey.getPrivateKey(); - assertEquals(privateKey[0], 'P'); + assertEquals('P', privateKey[0]); byte[] data = "Connect Everything".getBytes(StandardCharsets.UTF_8); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); @@ -298,15 +298,15 @@ public void testOperator() throws Exception { assertEquals(NKey.fromSeed(theKey.getSeed()), NKey.fromSeed(theKey.getSeed())); char[] publicKey = theKey.getPublicKey(); - assertEquals(publicKey[0], 'O'); + assertEquals('O', publicKey[0]); char[] privateKey = theKey.getPrivateKey(); - assertEquals(privateKey[0], 'P'); + assertEquals('P', privateKey[0]); byte[] data = "Connect Everything".getBytes(StandardCharsets.UTF_8); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); @@ -332,15 +332,15 @@ public void testServer() throws Exception { assertEquals(NKey.fromSeed(theKey.getSeed()), NKey.fromSeed(theKey.getSeed())); char[] publicKey = theKey.getPublicKey(); - assertEquals(publicKey[0], 'N'); + assertEquals('N', publicKey[0]); char[] privateKey = theKey.getPrivateKey(); - assertEquals(privateKey[0], 'P'); + assertEquals('P', privateKey[0]); byte[] data = "Polaris and Pluto".getBytes(StandardCharsets.UTF_8); byte[] sig = theKey.sign(data); - assertEquals(sig.length, ED25519_SIGNATURE_SIZE); + assertEquals(ED25519_SIGNATURE_SIZE, sig.length); assertTrue(theKey.verify(data, sig)); @@ -379,9 +379,9 @@ public void testPublicOnly() throws Exception { assertNotEquals(otherKey, theKey); assertNotEquals(otherKey, pubOnly); - assertNotEquals(pubOnly.getPublicKey()[0], '\0'); + assertNotEquals('\0', pubOnly.getPublicKey()[0]); pubOnly.clear(); - assertEquals(pubOnly.getPublicKey()[0], '\0'); + assertEquals('\0', pubOnly.getPublicKey()[0]); } @Test @@ -517,7 +517,7 @@ public void testInterop() throws Exception { NKey fromSeed = NKey.fromSeed(seed); NKey fromPublicKey = NKey.fromPublicKey(publicKey); - assertEquals(fromSeed.getType(), NKey.Type.USER); + assertEquals(NKey.Type.USER, fromSeed.getType()); byte[] nonceData = base64UrlDecode(nonce); byte[] nonceSig = base64UrlDecode(nonceEncodedSig); @@ -583,7 +583,7 @@ public void testEquals() throws Exception { NKey key = NKey.createServer(null); assertEquals(key, key); assertEquals(key, NKey.fromSeed(key.getSeed())); - assertNotEquals(key, new Object()); + assertNotEquals(new Object(), key); assertNotEquals(key, NKey.createServer(null)); assertNotEquals(key, NKey.createAccount(null)); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 7778574fe..4c9a60328 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -17,8 +17,8 @@ import io.nats.client.impl.Headers; import io.nats.client.impl.JetStreamTestingContext; import io.nats.client.impl.ListenerByFuture; +import io.nats.client.impl.ListenerByFuture.ListenerFuture; import io.nats.client.impl.NatsMessage; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -72,36 +72,20 @@ public void testThrowsIfTooBig() throws Exception { nc.close(); Thread.sleep(1000); - CountDownLatch mpvLatch = new CountDownLatch(1); - CountDownLatch seLatch = new CountDownLatch(1); - ErrorListener el = new ErrorListener() { - @Override - public void errorOccurred(Connection conn, String error) { - if (error.contains("Maximum Payload Violation")) { - mpvLatch.countDown(); - } - } - - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - if (exp instanceof SocketException) { - seLatch.countDown(); - } - } - }; - Options options = OptionsUtils.optionsBuilder(ts) + ListenerByFuture listener = new ListenerByFuture(); + Options options = optionsBuilder(ts) .clientSideLimitChecks(false) - .errorListener(el) + .errorListener(listener) .build(); - Connection nc2 = longConnectionWait(options); + Connection nc2 = standardConnectionWait(options); + + ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); + ListenerFuture fException = listener.prepForException(SocketException.class); + nc2.publish(random(), null, null, body); - if (!mpvLatch.await(10, TimeUnit.SECONDS)) { - fail(); - } - if (!seLatch.await(10, TimeUnit.SECONDS)) { - fail(); - } + // sometimes the exception comes in before the error and the error never comes. + fError.validate(fException); } } @@ -251,12 +235,12 @@ public void testMaxPayloadNoClientSideLimitChecks() throws Exception { .connectionListener(listener); runInSharedOwnNc(builder, nc -> { - CompletableFuture fError = listener.prepForError("Maximum Payload Violation"); - CompletableFuture fEvent = listener.prepForEvent(Events.DISCONNECTED); + ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); + ListenerFuture fEvent = listener.prepForEvent(Events.DISCONNECTED); int maxPayload = (int)nc.getServerInfo().getMaxPayload(); nc.publish(random(), new byte[maxPayload + 1]); - listener.validate(fError, 500, "Maximum Payload Violation"); - listener.validate(fEvent, 500, Events.DISCONNECTED); + fError.validate(); + fEvent.validate(); }); } @@ -276,10 +260,10 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { - Options ncSupportedOptions = OptionsUtils.optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); + Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { - ctxNotSupported.createStream(jsSubject); + ctxNotSupported.createOrReplaceStream(jsSubject); JetStream jsNotSupported = ncNotSupported.jetStream(); JetStream jsSupported = ncNotSupported.jetStream(); diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java index 2021c14d8..eeab8d4f9 100644 --- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java +++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java @@ -70,7 +70,7 @@ public void testRoundTrip() throws Exception { .allowMessageCounter(false) .persistMode(null) .build(); - validateTestStreamConfiguration(ctx.jsm.addStream(sc).getConfiguration(), true, ctx.stream); + validateTestStreamConfiguration(ctx.createOrReplaceStream(sc).getConfiguration(), true, ctx.stream); }); } diff --git a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java index 9da48ec01..3c7b938a2 100644 --- a/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java +++ b/src/test/java/io/nats/client/impl/AuthViolationDuringReconnectOnFlushTimeoutTest.java @@ -1,7 +1,6 @@ package io.nats.client.impl; import io.nats.client.*; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,7 +43,7 @@ public void testAuthViolationDuringReconnect() throws Exception { ctx.port = NatsTestServer.nextPort(); startServer(ctx); - Options options = OptionsUtils.optionsBuilder(ctx.port) + Options options = optionsBuilder(ctx.port) .noRandomize() .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 4ec908686..c6b0e08b5 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -23,7 +22,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -43,13 +41,13 @@ public void testToString() { @Test public void testCloseEvent() throws Exception { ListenerByFuture listener = new ListenerByFuture(); - CompletableFuture fEvent = listener.prepForEvent(Events.CLOSED); + ListenerByFuture.ListenerFuture fEvent = listener.prepForEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); }); - listener.validate(fEvent, 500, Events.CLOSED); + fEvent.validate(); } @Test @@ -77,7 +75,7 @@ public void testDisconnectReconnectCount() throws Exception { Connection nc; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .reconnectWait(Duration.ofMillis(100)) .maxReconnects(-1) .connectionListener(listener) @@ -116,7 +114,7 @@ public void testExceptionInConnectionListener() throws Exception { public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); ListenerByFuture listener = new ListenerByFuture(); - CompletableFuture fClosed = listener.prepForEvent(Events.CLOSED); + ListenerByFuture.ListenerFuture fClosed = listener.prepForEvent(Events.CLOSED); AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { @@ -141,7 +139,7 @@ public void testMultipleConnectionListeners() throws Exception { }); assertTrue(stats.get().getExceptions() > 0); - listener.validate(fClosed, 500, Events.CLOSED); + fClosed.validate(); Set expectedEvents = new HashSet<>(Arrays.asList( "CL1-CLOSED", diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index dbd23bb67..c2975d472 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -27,8 +26,8 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.TestBase.flushConnection; -import static io.nats.client.utils.ThreadUtils.park; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -38,7 +37,7 @@ public class DrainTests { @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - final Connection nc = standardConnectionWait(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + final Connection nc = standardConnectionWait(optionsBuilder(ts).maxReconnects(0).build()); nc.subscribe("draintest"); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do @@ -52,8 +51,8 @@ public void testCloseOnDrainFailure() throws Exception { @Test public void testSimpleSubDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -82,8 +81,8 @@ public void testSimpleSubDrain() throws Exception { @Test public void testSimpleDispatchDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -115,8 +114,8 @@ public void testSimpleDispatchDrain() throws Exception { @Test public void testSimpleConnectionDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -154,8 +153,8 @@ public void testSimpleConnectionDrain() throws Exception { @Test public void testConnectionDrainWithZeroTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -193,8 +192,8 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { @Test public void testDrainWithZeroTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -223,8 +222,8 @@ public void testDrainWithZeroTimeout() throws Exception { public void testSubDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -250,8 +249,8 @@ public void testSubDuringDrainThrows() { public void testCreateDispatcherDuringDrainThrows() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -276,8 +275,8 @@ public void testCreateDispatcherDuringDrainThrows() { @Test public void testUnsubDuringDrainIsNoop() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -319,8 +318,8 @@ public void testUnsubDuringDrainIsNoop() throws Exception { @Test public void testDrainInMessageHandler() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -352,8 +351,8 @@ public void testDrainInMessageHandler() throws Exception { @Test public void testDrainFutureMatches() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -398,8 +397,8 @@ public void testDrainFutureMatches() throws Exception { public void testFirstTimeRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -436,8 +435,8 @@ public void testFirstTimeRequestReplyDuringDrain() { public void testRequestReplyDuringDrain() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -477,13 +476,13 @@ public void testRequestReplyDuringDrain() { @Test public void testQueueHandoffWithDrain() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(pubCon); final int total = 5_000; - final Duration sleepBetweenDrains = Duration.ofMillis(250); - final Duration sleepBetweenMessages = Duration.ofMillis(1); - final Duration testTimeout = Duration.ofMillis(5 * total * (sleepBetweenDrains.toMillis() + sleepBetweenMessages.toMillis())); + final long sleepBetweenDrains = 250; + final long sleepBetweenMessages = 5; + final Duration testTimeout = Duration.ofMillis(5 * total * (sleepBetweenDrains + sleepBetweenMessages)); final Duration waitTimeout = testTimeout.plusSeconds(1); AtomicInteger count = new AtomicInteger(); Instant start = Instant.now(); @@ -492,7 +491,7 @@ public void testQueueHandoffWithDrain() throws Exception { NatsDispatcher workingD; NatsDispatcher drainingD; - Connection draining = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + Connection draining = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertConnected(draining); drainingD = (NatsDispatcher) draining.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); @@ -501,7 +500,7 @@ public void testQueueHandoffWithDrain() throws Exception { Thread pubThread = new Thread(() -> { for (int i = 0; i < total; i++) { pubCon.publish("draintest", null); - park(sleepBetweenMessages); + sleep(sleepBetweenMessages); } flushConnection(pubCon, Duration.ofSeconds(5)); }); @@ -510,12 +509,12 @@ public void testQueueHandoffWithDrain() throws Exception { while (count.get() < total && Duration.between(start, now).compareTo(testTimeout) < 0) { - working = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); + working = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); assertConnected(working); workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); working.flush(Duration.ofSeconds(5)); - park(sleepBetweenDrains); + sleep(sleepBetweenDrains); CompletableFuture tracker = draining.drain(testTimeout); @@ -539,8 +538,8 @@ public void testQueueHandoffWithDrain() throws Exception { @Test public void testDrainWithLotsOfMessages() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -579,8 +578,8 @@ public void testDrainWithLotsOfMessages() throws Exception { @Test public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -619,8 +618,8 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); - Connection pubCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); + Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); assertConnected(pubCon); @@ -661,7 +660,7 @@ public void testThrowIfCantFlush() { assertThrows(TimeoutException.class, () -> { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = standardConnectionWait(OptionsUtils.optionsBuilder(ts).connectionListener(listener).build())) + Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -677,7 +676,7 @@ public void testThrowIfCantFlush() { public void testThrowIfClosing() { assertThrows(IllegalStateException.class, () -> { try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(subCon); subCon.close(); diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 28a867c7c..756e3e6b5 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Status; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -29,6 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -44,7 +44,7 @@ public void testLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) + Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) @@ -85,7 +85,7 @@ public void testClearLastError() throws Exception { try (NatsTestServer ts = new NatsTestServer(); NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth NatsTestServer ts3 = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) + Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri()) .noRandomize() .connectionListener(listener) .errorListener(listener) @@ -131,7 +131,7 @@ public void testErrorOnNoAuth() throws Exception { sleep(1000); // give the server time to get ready, otherwise sometimes this test flaps // See config file for user/pass // no or wrong u/p in the options is an error - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -153,7 +153,7 @@ public void testErrorOnNoAuth() throws Exception { public void testExceptionOnBadDispatcher() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -188,7 +188,7 @@ public void testExceptionInErrorHandler() throws Exception { try (NatsTestServer ts = new NatsTestServer(customArgs)) { // See config file for user/pass // don't put u/p in options - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); @@ -200,7 +200,7 @@ public void testExceptionInErrorHandler() throws Exception { public void testExceptionInSlowConsumerHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).errorListener(listener).build())) { + Connection nc = Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { Subscription sub = nc.subscribe("subject"); sub.setPendingLimits(1, -1); @@ -224,7 +224,7 @@ public void testExceptionInSlowConsumerHandler() throws Exception { public void testExceptionInExceptionHandler() throws Exception { BadHandler listener = new BadHandler(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); + Options options = optionsBuilder(ts).maxReconnects(0).errorListener(listener).build(); Connection nc = Nats.connect(options); try { Dispatcher d = nc.createDispatcher(msg -> { @@ -254,7 +254,7 @@ public void testDiscardedMessageFastProducer() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) .discardMessagesWhenOutgoingQueueFull() .errorListener(listener) @@ -289,7 +289,7 @@ public void testDiscardedMessageServerClosed() throws Exception { int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) .discardMessagesWhenOutgoingQueueFull() .errorListener(listener) diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index 6f8211e58..643d4fde3 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -334,7 +334,7 @@ private static SimulatorState setupPullFactory(JetStream js) { @Test public void testMultipleSubjectFilters() throws Exception { runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { - ctx.createStream(2); + ctx.createOrReplaceStream(2); jsPublish(ctx.js, ctx.subject(0), 10); jsPublish(ctx.js, ctx.subject(1), 5); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 186d83ae8..0d0a48a47 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsJetStreamUtil; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -35,6 +34,7 @@ import static io.nats.client.support.NatsJetStreamClientError.*; import static io.nats.client.utils.ConnectionUtils.longConnectionWait; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -64,7 +64,7 @@ public void testJetNotEnabled() throws Exception { @Test public void testJetEnabledGoodAccount() throws Exception { try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = longConnectionWait(options)) { nc.jetStreamManagement(); @@ -329,7 +329,7 @@ public void testFilterSubjectEphemeral() throws Exception { String subjectWild = subject + ".*"; String subjectA = subject + ".A"; String subjectB = subject + ".B"; - ctx.createStream(subjectWild); + ctx.createOrReplaceStream(subjectWild); jsPublish(ctx.js, subjectA, 1); jsPublish(ctx.js, subjectB, 1); @@ -396,10 +396,10 @@ public void testPrefix() throws Exception { String subjectMadeByTar = "sub-made-by.tar"; try (NatsTestServer ts = configuredJsServer("js_prefix.conf")) { - Options optionsSrc = OptionsUtils.optionsBuilder(ts) + Options optionsSrc = optionsBuilder(ts) .userInfo("src".toCharArray(), "spass".toCharArray()).build(); - Options optionsTar = OptionsUtils.optionsBuilder(ts) + Options optionsTar = optionsBuilder(ts) .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); try (Connection ncSrc = standardConnectionWait(optionsSrc); @@ -1107,19 +1107,13 @@ public void testNatsJetStreamUtil() { @Test public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { - Options optReport = OptionsUtils.optionsBuilder(ncCancel).reportNoResponders().build(); + Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); try (Connection ncReport = standardConnectionWait(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); assertInstanceOf(JetStreamStatusException.class, ee.getCause()); assertTrue(ee.getMessage().contains("503 No Responders Available For Request")); - String subject = random(); - ctx.jsm.addStream( - StreamConfiguration.builder() - .name(ctx.stream).subjects(subject).storageType(StorageType.Memory) - .build()); - JetStream jsCancel = ncCancel.jetStream(); JetStream jsReport = ncReport.jetStream(); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index b6cffb573..8011cac4e 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -18,7 +18,6 @@ import io.nats.client.support.DateTimeUtils; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -48,7 +47,8 @@ public void testStreamCreate() throws Exception { String subject0 = ctx.subject(0); String subject1 = ctx.subject(1); - StreamInfo si = ctx.addStream(sc); + StreamInfo si = ctx.createOrReplaceStream(sc); + assertNotNull(si.getStreamState().toString()); // coverage assertTrue(now <= si.getCreateTime().toEpochSecond()); @@ -93,7 +93,7 @@ public void testStreamCreate210() throws Exception { runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { StreamConfiguration sc = ctx.scBuilder(1) .firstSequence(42).build(); - StreamInfo si = ctx.addStream(sc); + StreamInfo si = ctx.createOrReplaceStream(sc); assertNotNull(si.getTimestamp()); assertEquals(42, si.getConfiguration().getFirstSequence()); PublishAck pa = ctx.js.publish(ctx.subject(), null); @@ -106,7 +106,7 @@ public void testStreamMetadata() throws Exception { runInSharedCustom(VersionUtils::atLeast2_9_0, (nc, ctx) -> { Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE); StreamConfiguration sc = ctx.scBuilder(1).metadata(metaData).build(); - StreamInfo si = ctx.addStream(sc); + StreamInfo si = ctx.createOrReplaceStream(sc); assertNotNull(si.getConfiguration()); assertMetaData(si.getConfiguration().getMetadata()); }); @@ -116,7 +116,7 @@ public void testStreamMetadata() throws Exception { public void testStreamCreateWithNoSubject() throws Exception { long now = ZonedDateTime.now().toEpochSecond(); runInSharedCustom((nc, ctx) -> { - StreamConfiguration sc = ctx.scBuilder().build(); + StreamConfiguration sc = ctx.scBuilder().subjects().build(); StreamInfo si = ctx.addStream(sc); assertTrue(now <= si.getCreateTime().toEpochSecond()); @@ -155,7 +155,7 @@ public void testStreamCreateWithNoSubject() throws Exception { @Test public void testUpdateStream() throws Exception { runInSharedCustom((nc, ctx) -> { - ctx.createStream(2); + ctx.createOrReplaceStream(2); String subject0 = ctx.subject(0); String subject1 = ctx.subject(1); @@ -216,52 +216,53 @@ public void testUpdateStream() throws Exception { ctx.jsm.updateStream(StreamConfiguration.builder(sc).allowDirect(false).build()); // allowed to change Mirror Direct - ctx.replaceStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); + ctx.createOrReplaceStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); ctx.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(true).build()); ctx.jsm.updateStream(StreamConfiguration.builder(sc).mirrorDirect(false).build()); }); } @Test - public void testAddStreamInvalids() throws Exception { + public void testStreamExceptions() throws Exception { runInSharedCustom((nc, ctx) -> { assertThrows(IllegalArgumentException.class, () -> ctx.jsm.addStream(null)); + // stream isn't even created yet + assertStatus(10059, assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1))); + StreamConfiguration sc = ctx.scBuilder(1) .description(random()) .build(); - ctx.addStream(sc); - - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).subjects(random()).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).description(random()).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMessages(1).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build())); + ctx.createOrReplaceStream(sc); + + // no messages yet + assertStatus(10037, assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1))); + + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).subjects(random()).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).description(random()).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.Interest).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).retentionPolicy(RetentionPolicy.WorkQueue).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).compressionOption(CompressionOption.S2).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maxConsumers(1).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maxMessages(1).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maxMessagesPerSubject(1).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maxAge(Duration.ofSeconds(1L)).build()))); //noinspection deprecation - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build())); // COVERAGE for deprecated - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build())); - - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).noAck(true).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).allowRollup(true).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).allowDirect(true).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).denyDelete(true).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).denyPurge(true).build())); - assert10058(() -> ctx.addStream(StreamConfiguration.builder(sc).firstSequence(100).build())); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maxMsgSize(1).build()))); // COVERAGE for deprecated + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).maximumMessageSize(1).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).storageType(StorageType.File).build()))); + + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).noAck(true).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).discardPolicy(DiscardPolicy.New).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).duplicateWindow(Duration.ofSeconds(1L)).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).allowRollup(true).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).allowDirect(true).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).denyDelete(true).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).denyPurge(true).build()))); + assertStatus(10058, assertThrows(JetStreamApiException.class, () -> ctx.jsm.addStream(StreamConfiguration.builder(sc).firstSequence(100).build()))); }); } - // io.nats.client.JetStreamApiException: stream name already in use with a different configuration [10058] - private void assert10058(Executable executable) { - assertEquals(10058, assertThrows(JetStreamApiException.class, executable).getApiErrorCode()); - } - @Test public void testUpdateStreamInvalids() throws Exception { runInSharedCustom((nc, ctx) -> { @@ -272,7 +273,7 @@ public void testUpdateStreamInvalids() throws Exception { assertThrows(JetStreamApiException.class, () -> ctx.jsm.updateStream(sc)); // add the stream - ctx.addStream(sc); + ctx.createOrReplaceStream(sc); // cannot change storage type StreamConfiguration scMemToFile = ctx.scBuilder(2) @@ -311,7 +312,7 @@ public void testGetStreamInfo() throws Exception { } subjects[5] = subjectIx5 + ".>"; - ctx.createStream(subjects); + ctx.createOrReplaceStream(subjects); StreamInfo si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(ctx.stream, si.getConfiguration().getName()); @@ -517,7 +518,7 @@ public void testPurgeStreamAndOptions() throws Exception { // error to purge a stream that does not exist assertThrows(JetStreamApiException.class, () -> ctx.jsm.purgeStream(random())); - ctx.createStream(2); + ctx.createOrReplaceStream(2); StreamInfo si = ctx.jsm.getStreamInfo(ctx.stream); assertEquals(0, si.getStreamState().getMsgCount()); @@ -564,7 +565,7 @@ public void testPurgeStreamAndOptions() throws Exception { public void testAddDeleteConsumerPart1() throws Exception { runInSharedCustom((nc, ctx) -> { String subject = random(); - ctx.createStream(subjectGt(subject)); + ctx.createOrReplaceStream(subjectGt(subject)); List list = ctx.jsm.getConsumers(ctx.stream); assertEquals(0, list.size()); @@ -597,7 +598,7 @@ public void testAddDeleteConsumerPart2() throws Exception { runInSharedCustom((nc, ctx) -> { boolean atLeast2dot9 = nc.getServerInfo().isSameOrNewerThanVersion("2.9"); String subject = random(); - ctx.createStream(subjectGt(subject)); + ctx.createOrReplaceStream(subjectGt(subject)); // with and w/o deliver subject for push/pull String dur0 = random(); @@ -750,7 +751,7 @@ public void testValidConsumerUpdates() throws Exception { runInSharedCustom((nc, ctx) -> { String subject = random(); String subjectGt = subjectGt(subject); - ctx.createStream(subjectGt); + ctx.createOrReplaceStream(subjectGt); ConsumerConfiguration cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverSubject(random()).build(); @@ -783,7 +784,7 @@ public void testInvalidConsumerUpdates() throws Exception { runInSharedCustom((nc, ctx) -> { String subject = random(); String subjectGt = subjectGt(subject); - ctx.createStream(subjectGt); + ctx.createOrReplaceStream(subjectGt); ConsumerConfiguration cc = prepForUpdateTest(ctx.jsm, ctx.stream, subjectGt, null); cc = ConsumerConfiguration.builder(cc).deliverPolicy(DeliverPolicy.New).build(); @@ -871,7 +872,7 @@ public void testCreateConsumersWithFilters() throws Exception { } // wildcard subject - ctx.replaceStream(subjectStar(subject)); + ctx.createOrReplaceStream(subjectStar(subject)); String subjectA = subjectDot(subject, "A"); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectA).build()); @@ -879,7 +880,7 @@ public void testCreateConsumersWithFilters() throws Exception { assertEquals(subjectA, cis.get(0).getConsumerConfiguration().getFilterSubject()); // gt subject - ctx.replaceStream(subjectGt(subject)); + ctx.createOrReplaceStream(subjectGt(subject)); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder.filterSubject(subjectA).build()); cis = ctx.jsm.getConsumers(ctx.stream); @@ -1037,7 +1038,7 @@ public void testConsumerReplica() throws Exception { @Test public void testGetMessage() throws Exception { runInSharedCustom((nc, ctx) -> { - ctx.createStream(2); + ctx.createOrReplaceStream(2); assertFalse(ctx.si.getConfiguration().getAllowDirect()); ZonedDateTime timeBeforeCreated = ZonedDateTime.now(); @@ -1199,7 +1200,7 @@ public void testDirectMessageRepublishedSubject() throws Exception { .destination(republishDest) .build()) .build(); - ctx.addStream(sc); + ctx.createOrReplaceStream(sc); ctx.kvCreate(bucketName); KeyValue kv = nc.keyValue(bucketName); @@ -1353,14 +1354,6 @@ public void testCreateConsumerUpdateConsumer() throws Exception { public void testNoRespondersWhenConsumerDeleted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); runInSharedOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, ctx) -> { - // stream isn't even created yet - assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1)); - - ctx.createStream(); - - // no messages yet - assertThrows(JetStreamApiException.class, () -> ctx.jsm.getMessage(ctx.stream, 1)); - String subject = ctx.subject(); for (int x = 0; x < 5; x++) { ctx.js.publish(subject, null); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 61c39a30b..c010a169d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -18,13 +18,13 @@ import io.nats.client.NatsTestServer; import io.nats.client.Options; import io.nats.client.api.*; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.util.List; import static io.nats.client.NatsTestServer.configuredJsServer; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; public class JetStreamManagementWithConfTests extends JetStreamTestBase { @@ -117,7 +117,7 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long @Test public void testAuthCreateUpdateStream() throws Exception { try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options optionsSrc = OptionsUtils.optionsBuilder(ts) + Options optionsSrc = optionsBuilder(ts) .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); try (Connection nc = standardConnectionWait(optionsSrc)) { diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index 97686a080..80f3b3948 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -54,9 +54,10 @@ public void testMirrorBasics() throws Exception { // Now create our mirror stream. sc = ctx.scBuilder() - .name(M1) - .mirror(mirror) - .build(); + .name(M1) + .subjects() // scBuilder added subjects + .mirror(mirror) + .build(); ctx.addStream(sc); assertMirror(ctx.jsm, M1, S1, null, null); @@ -73,10 +74,11 @@ public void testMirrorBasics() throws Exception { // Create second mirror sc = ctx.scBuilder() - .name(S2) - .mirror(mirror) - .build(); - ctx.addStream(sc); + .name(S2) + .subjects() // scBuilder added subjects + .mirror(mirror) + .build(); + ctx.createOrReplaceStream(sc); // Check the state assertMirror(ctx.jsm, S2, S1, 50L, 101L); @@ -85,10 +87,11 @@ public void testMirrorBasics() throws Exception { // third mirror checks start seq sc = ctx.scBuilder() - .name(S3) - .mirror(Mirror.builder().sourceName(S1).startSeq(150).build()) - .build(); - ctx.addStream(sc); + .name(S3) + .subjects() // scBuilder added subjects + .mirror(Mirror.builder().sourceName(S1).startSeq(150).build()) + .build(); + ctx.createOrReplaceStream(sc); // Check the state assertMirror(ctx.jsm, S3, S1, 101L, 150L); @@ -96,10 +99,11 @@ public void testMirrorBasics() throws Exception { // third mirror checks start seq ZonedDateTime zdt = DateTimeUtils.fromNow(Duration.ofHours(-2)); sc = ctx.scBuilder() - .name(S4) - .mirror(Mirror.builder().sourceName(S1).startTime(zdt).build()) - .build(); - ctx.addStream(sc); + .name(S4) + .subjects() // scBuilder added subjects + .mirror(Mirror.builder().sourceName(S1).startTime(zdt).build()) + .build(); + ctx.createOrReplaceStream(sc); // Check the state assertMirror(ctx.jsm, S4, S1, 150L, 101L); @@ -118,7 +122,7 @@ public void testMirrorReading() throws Exception { StreamConfiguration sc = ctx.scBuilder(U1, U2) .name(S1) .build(); - StreamInfo si = ctx.addStream(sc); + StreamInfo si = ctx.createOrReplaceStream(sc); sc = si.getConfiguration(); assertNotNull(sc); assertEquals(S1, sc.getName()); @@ -127,9 +131,10 @@ public void testMirrorReading() throws Exception { // Now create our mirror stream. sc = ctx.scBuilder() - .name(M1) - .mirror(mirror) - .build(); + .name(M1) + .subjects() // scBuilder added subjects + .mirror(mirror) + .build(); ctx.addStream(sc); assertMirror(ctx.jsm, M1, S1, null, null); @@ -181,91 +186,101 @@ public void testMirrorExceptions() throws Exception { .subjects(random()) .mirror(mirror) .build(); - assertThrows(JetStreamApiException.class, () -> ctx.addStream(scEx)); + assertThrows(JetStreamApiException.class, () -> ctx.createOrReplaceStream(scEx)); }); } @Test public void testSourceBasics() throws Exception { - String N1 = random(); - String N2 = random(); - String N3 = random(); - String N4 = random(); - String N5 = random(); - String N6 = random(); - String U1 = random(); + String S1 = random(); + String S2 = random(); + String S3 = random(); + String S4 = random(); + String S5 = random(); + String S99 = random(); String R1 = random(); String R2 = random(); runInSharedCustom((nc, ctx) -> { // Create streams - StreamInfo si = ctx.addStream(ctx.scBuilder().name(N1).build()); + StreamInfo si = ctx.addStream(StreamConfiguration.builder() + .name(S1).storageType(StorageType.Memory).build()); StreamConfiguration sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(N1, sc.getName()); + assertEquals(S1, sc.getName()); - si = ctx.addStream(ctx.scBuilder().name(N2).build()); + si = ctx.addStream(StreamConfiguration.builder() + .name(S2).storageType(StorageType.Memory).build()); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(N2, sc.getName()); + assertEquals(S2, sc.getName()); - si = ctx.addStream(ctx.scBuilder().name(N3).build()); + si = ctx.addStream(StreamConfiguration.builder() + .name(S3).storageType(StorageType.Memory).build()); sc = si.getConfiguration(); assertNotNull(sc); - assertEquals(N3, sc.getName()); + assertEquals(S3, sc.getName()); // Populate each one. - jsPublish(ctx.js, N1, 10); - jsPublish(ctx.js, N2, 15); - jsPublish(ctx.js, N3, 25); - - sc = ctx.scBuilder() - .name(R1) - .sources(Source.builder().sourceName(N1).build(), - Source.builder().sourceName(N2).build(), - Source.builder().sourceName(N3).build()) + jsPublish(ctx.js, S1, 10); + jsPublish(ctx.js, S2, 15); + jsPublish(ctx.js, S3, 25); + + sc = StreamConfiguration.builder() + .name(R1) + .storageType(StorageType.Memory) + .sources(Source.builder().sourceName(S1).build(), + Source.builder().sourceName(S2).build(), + Source.builder().sourceName(S3).build()) .build(); + ctx.addStream(sc); assertSource(ctx.jsm, R1, 50L, null); - sc = ctx.scBuilder() - .name(R1) - .sources(Source.builder().sourceName(N1).build(), - Source.builder().sourceName(N2).build(), - Source.builder().sourceName(N4).build()) - .build(); + sc = StreamConfiguration.builder() + .name(R1) + .storageType(StorageType.Memory) + .sources(Source.builder().sourceName(S1).build(), + Source.builder().sourceName(S2).build(), + Source.builder().sourceName(S4).build()) + .build(); ctx.jsm.updateStream(sc); - sc = ctx.scBuilder(N4, U1) - .name(N5) - .build(); + sc = StreamConfiguration.builder() + .name(S99) + .storageType(StorageType.Memory) + .subjects(S4, S5) + .build(); ctx.addStream(sc); - jsPublish(ctx.js, N4, 20); - jsPublish(ctx.js, U1, 20); - jsPublish(ctx.js, N4, 10); + jsPublish(ctx.js, S4, 20); + jsPublish(ctx.js, S5, 20); + jsPublish(ctx.js, S4, 10); - sc = ctx.scBuilder() - .name(R2) - .sources(Source.builder().sourceName(N5).startSeq(26).build()) - .build(); + sc = StreamConfiguration.builder() + .name(R2) + .storageType(StorageType.Memory) + .sources(Source.builder().sourceName(S99).startSeq(26).build()) + .build(); ctx.addStream(sc); assertSource(ctx.jsm, R2, 25L, null); MessageInfo info = ctx.jsm.getMessage(R2, 1); - assertStreamSource(info, N5, 26); + assertStreamSource(info, S99, 26); - sc = ctx.scBuilder() - .name(N6) - .sources(Source.builder().sourceName(N5).startSeq(11).filterSubject(N4).build()) - .build(); + String source3 = random(); + sc = StreamConfiguration.builder() + .name(source3) + .storageType(StorageType.Memory) + .sources(Source.builder().sourceName(S99).startSeq(11).filterSubject(S4).build()) + .build(); ctx.addStream(sc); - assertSource(ctx.jsm, N6, 20L, null); + assertSource(ctx.jsm, source3, 20L, null); - info = ctx.jsm.getMessage(N6, 1); - assertStreamSource(info, N5, 11); + info = ctx.jsm.getMessage(source3, 1); + assertStreamSource(info, S99, 11); }); } diff --git a/src/test/java/io/nats/client/impl/JetStreamPubTests.java b/src/test/java/io/nats/client/impl/JetStreamPubTests.java index bddc6f2af..c42078735 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPubTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPubTests.java @@ -238,7 +238,7 @@ public void testPublishExpectations() throws Exception { String sub1 = subjectPrefix + ".foo.1"; String sub2 = subjectPrefix + ".foo.2"; String sub3 = subjectPrefix + ".bar.3"; - jstc1.createStream(streamSubject); + jstc1.createOrReplaceStream(streamSubject); String mid = random(); PublishOptions po = PublishOptions.builder() @@ -463,7 +463,8 @@ public void testPublishNoAck() throws Exception { public void testMaxPayloadJs() throws Exception { runInSharedCustom(optionsBuilder().noReconnect(), (nc, ctx) -> { long expectedSeq = 0; - ctx.addStream(ctx.scBuilder(1).maximumMessageSize(1000)); + StreamConfiguration.Builder builder = ctx.scBuilder().maximumMessageSize(1000); + ctx.createOrReplaceStream(builder); String subject0 = ctx.subject(0); for (int x = 1; x <= 3; x++) { @@ -500,15 +501,11 @@ public void testMaxPayloadJs() throws Exception { @Test public void testPublishWithTTL() throws Exception { runInShared((nc, ctx) -> { - String stream = random(); - String subject = random(); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.Memory) - .allowMessageTtl() - .subjects(subject).build(); + StreamConfiguration.Builder builder = ctx.scBuilder().allowMessageTtl(); + ctx.createOrReplaceStream(builder); - ctx.jsm.addStream(sc); + String stream = ctx.stream; + String subject = ctx.subject(); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); PublishAck pa1 = ctx.js.publish(subject, null, opts); @@ -545,7 +542,7 @@ public void testMsgDeleteMarkerMaxAge() throws Exception { .subjectDeleteMarkerTtl(Duration.ofSeconds(50)) .maxAge(1000) .build(); - ctx.addStream(sc); + ctx.createOrReplaceStream(sc); String subject = ctx.subject(); PublishOptions opts = PublishOptions.builder().messageTtlSeconds(1).build(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 5cfd09054..438b3fbec 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -1020,7 +1020,7 @@ public void testExceedsMaxRequestBytesExactBytes() throws Exception { ctx.stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes - ctx.createStream(subject); + ctx.createOrReplaceStream(subject); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, durable); JetStreamSubscription sub = ctx.js.subscribe(subject, so); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index 0c294e5b6..d88864fd0 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -189,7 +189,7 @@ public void testDoNotAutoAckSituations() throws Exception { runInSharedCustom((nc, ctx) -> { String subject = ctx.subject(); - ctx.createStream(subject, subjectStar(mockAckReply)); + ctx.createOrReplaceStream(subject, subjectStar(mockAckReply)); int pubCount = 5; @@ -304,7 +304,6 @@ public void onMessage(Message msg) throws InterruptedException { @Test public void testMemoryStorageServerBugPR2719() throws Exception { - String stream = random(); String subBase = random(); String sub = subjectGt(subBase); String key1 = subjectDot(subBase, "key1"); @@ -322,7 +321,7 @@ public void testMemoryStorageServerBugPR2719() throws Exception { .denyDelete(true) .build(); - ctx.jsm.addStream(sc); + ctx.createOrReplaceStream(sc); MemStorBugHandler fullHandler = new MemStorBugHandler(); MemStorBugHandler onlyHandler = new MemStorBugHandler(); diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index 1389895a6..48fbad452 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -123,11 +123,11 @@ public void testPushDurableWithDeliver() throws Exception { } private void _testPushDurable(boolean useDeliverSubject) throws Exception { - runInShared((nc, ctx) -> { - // create the stream. - String stream = random(); + runInSharedCustom((nc, ctx) -> { String subjectDotGt = random() + ".>"; - createMemoryStream(ctx.jsm, stream, subjectDotGt); + ctx.createOrReplaceStream(subjectDotGt); + + String stream = ctx.stream; // For async, create a dispatcher without a default handler. Dispatcher dispatcher = nc.createDispatcher(); @@ -460,7 +460,7 @@ public void testDeliveryPolicy() throws Exception { runInSharedCustom((nc, ctx) -> { String subject = ctx.subject(); String subjectStar = subjectStar(subject); - ctx.createStream(subjectStar); + ctx.createOrReplaceStream(subjectStar); String subjectA = subjectDot(subject, "A"); String subjectB = subjectDot(subject, "B"); diff --git a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java index bfc549ab0..026157a41 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java @@ -19,10 +19,10 @@ import io.nats.client.utils.TestBase; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; +import java.util.HashSet; import java.util.Map; +import java.util.Set; public class JetStreamTestingContext implements AutoCloseable { public final NatsJetStreamManagement jsm; @@ -37,8 +37,9 @@ public class JetStreamTestingContext implements AutoCloseable { public String stream; public StreamInfo si; - private final List kvBuckets; - private final List osBuckets; + private final Set streams; + private final Set kvBuckets; + private final Set osBuckets; public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStreamApiException, IOException { jsm = (NatsJetStreamManagement)nc.jetStreamManagement(); @@ -52,14 +53,14 @@ public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStream consumerNameBase = TestBase.random(); consumerNames = new HashMap<>(); + streams = new HashSet<>(); + kvBuckets = new HashSet<>(); + osBuckets = new HashSet<>(); + if (subjectCount > 0) { - si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); - } - else { - si = null; + createOrReplaceStream(subjectCount); } - kvBuckets = new ArrayList<>(); - osBuckets = new ArrayList<>(); + } // ---------------------------------------------------------------------------------------------------- @@ -73,16 +74,36 @@ public String[] getSubjects(int subjectCount) { return subjects; } - public void createStream() throws JetStreamApiException, IOException { - si = TestBase.createMemoryStream(jsm, stream, subject(0)); + public void createOrReplaceStream() throws JetStreamApiException, IOException { + createOrReplaceStream(scBuilder(subject(0)).build()); + } + + public void createOrReplaceStream(int subjectCount) throws JetStreamApiException, IOException { + createOrReplaceStream(scBuilder(getSubjects(subjectCount)).build()); } - public void createStream(int subjectCount) throws JetStreamApiException, IOException { - si = TestBase.createMemoryStream(jsm, stream, getSubjects(subjectCount)); + public void createOrReplaceStream(String... subjects) throws JetStreamApiException, IOException { + createOrReplaceStream(scBuilder(subjects).build()); } - public void createStream(String... subjects) throws JetStreamApiException, IOException { - si = TestBase.createMemoryStream(jsm, stream, subjects); + public void createOrReplaceStream(StreamConfiguration.Builder builder) throws JetStreamApiException, IOException { + createOrReplaceStream(builder.build()); + } + + public StreamInfo createOrReplaceStream(StreamConfiguration sc) throws JetStreamApiException, IOException { + String streamName = sc.getName(); + try { jsm.deleteStream(streamName); } catch (Exception ignore) {} + streams.remove(streamName); + si = jsm.addStream(sc); + streams.add(streamName); + return si; + } + + public StreamInfo addStream(StreamConfiguration sc) throws JetStreamApiException, IOException { + String streamName = sc.getName(); + si = jsm.addStream(sc); + streams.add(streamName); + return si; } public StreamConfiguration.Builder scBuilder(int subjectCount) { @@ -96,34 +117,21 @@ public StreamConfiguration.Builder scBuilder(int subjectCount) { } public StreamConfiguration.Builder scBuilder(String... subjects) { + if (subjects.length == 0) { + subjects = new String[]{subject(0)}; + } return StreamConfiguration.builder() .name(stream) .storageType(StorageType.Memory) .subjects(subjects); } - public StreamInfo addStream(StreamConfiguration.Builder builder) throws JetStreamApiException, IOException { - si = jsm.addStream(builder.name(stream).storageType(StorageType.Memory).build()); - return si; - } - - public StreamInfo addStream(StreamConfiguration sc) throws JetStreamApiException, IOException { - si = jsm.addStream(sc); - return si; - } - - public void replaceStream(String... newSubjects) throws JetStreamApiException, IOException { - jsm.deleteStream(stream); - createStream(newSubjects); - } - - public void replaceStream(StreamConfiguration newSc) throws JetStreamApiException, IOException { - jsm.deleteStream(stream); - addStream(newSc); - } - public boolean deleteStream() throws JetStreamApiException, IOException { - return jsm.deleteStream(stream); + boolean deleted = jsm.deleteStream(stream); + if (deleted) { + streams.remove(stream); + } + return deleted; } public String subject() { @@ -188,7 +196,9 @@ public ObjectStoreStatus osCreate(ObjectStoreConfiguration osc) throws JetStream @Override public void close() throws Exception { - try { jsm.deleteStream(stream); } catch (Exception ignore) {} + for (String strm : streams) { + try { jsm.deleteStream(strm); } catch (Exception ignore) {} + } for (String bucket : kvBuckets) { try { kvm.delete(bucket); } catch (Exception ignore) {} diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 760a09274..75a7e69ff 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsKeyValueUtil; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; @@ -36,6 +35,7 @@ import static io.nats.client.api.KeyValueWatchOption.*; import static io.nats.client.support.NatsConstants.DOT; import static io.nats.client.support.NatsJetStreamConstants.SERVER_DEFAULT_DUPLICATE_WINDOW_MS; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -1090,8 +1090,8 @@ else if (expected instanceof String) { @Test public void testWithAccount() throws Exception { try (NatsTestServer ts = configFileServer("kv_account.conf")) { - Options acctA = OptionsUtils.optionsBuilder(ts).userInfo("a", "a").build(); - Options acctI = OptionsUtils.optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); + Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); + Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); try (Connection connUserA = Nats.connect(acctA); Connection connUserI = Nats.connect(acctI)) diff --git a/src/test/java/io/nats/client/impl/ListenerByFuture.java b/src/test/java/io/nats/client/impl/ListenerByFuture.java index dfd42be3c..86cde9d70 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFuture.java +++ b/src/test/java/io/nats/client/impl/ListenerByFuture.java @@ -19,35 +19,31 @@ import org.junit.jupiter.api.Assertions; import java.time.format.DateTimeFormatter; -import java.util.Arrays; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.function.Predicate; @SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) public class ListenerByFuture implements ErrorListener, ConnectionListener { - private CompletableFuture eventFuture; - private Events eventFutureType; - - private CompletableFuture errorFuture; - private String errorFutureText; - - private CompletableFuture statusFuture; - private StatusType preppedStatusType; - private int preppedStatusCode; + private static final int VALIDATE_TIMEOUT = 5000; private final boolean printExceptions; private final boolean verbose; - private CompletableFuture fcFuture; - private String preppedFcSubject; - private FlowControlSource preppedFcSource; + private List eventFutures; + private List errorFutures; + private List exceptionFutures; + private List statusFutures; + private List fcFutures; public enum StatusType { Unhandled, PullWarning, PullError } - + public ListenerByFuture() { this(false, false); } @@ -59,92 +55,129 @@ public ListenerByFuture(boolean verbose) { public ListenerByFuture(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; + eventFutures = new ArrayList<>(); + errorFutures = new ArrayList<>(); + exceptionFutures = new ArrayList<>(); + statusFutures = new ArrayList<>(); + fcFutures = new ArrayList<>(); } public void reset() { - if (eventFuture != null) { - eventFuture.cancel(true); - eventFuture = null; - eventFutureType = null; + eventFutures.clear(); + errorFutures.clear(); + exceptionFutures.clear(); + statusFutures.clear(); + fcFutures.clear(); + } + + public ListenerFuture prepForEvent(Events type) { + if (verbose) { + report("Future For Event", type); } + ListenerFuture f = new ListenerFuture(type); + eventFutures.add(f); + return f; + } - if (errorFuture != null) { - errorFuture.cancel(true); - errorFuture = null; - errorFutureText = null; + public ListenerFuture prepForException(Class exceptionClass) { + if (verbose) { + report("Future For Exception", exceptionClass); } + ListenerFuture f = new ListenerFuture(exceptionClass); + exceptionFutures.add(f); + return f; + } - if (statusFuture != null) { - statusFuture.cancel(true); - statusFuture = null; - preppedStatusType = null; - preppedStatusCode = -1; + public ListenerFuture prepForError(String errorText) { + if (verbose) { + report("Future For Event", errorText); } + ListenerFuture f = new ListenerFuture(errorText); + errorFutures.add(f); + return f; } - // ---------------------------------------------------------------------------------------------------- - // Validate - // ---------------------------------------------------------------------------------------------------- - public void validate(CompletableFuture future, long waitInMillis, Object... details) { - try { - future.get(waitInMillis, TimeUnit.MILLISECONDS); + public ListenerFuture prepForStatus(StatusType type, int statusCode) { + if (verbose) { + report("Future For Status", type + " " + statusCode); } - catch (TimeoutException | ExecutionException | InterruptedException e) { - Assertions.fail("Listener Validate Failed " + Arrays.asList(details), e); + ListenerFuture f = new ListenerFuture(type, statusCode); + statusFutures.add(f); + return f; + } + + public ListenerFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { + if (verbose) { + report("Future For FlowControl", fcSubject + " " + fcSource); } + ListenerFuture f = new ListenerFuture(fcSubject, fcSource); + fcFutures.add(f); + return f; } // ---------------------------------------------------------------------------------------------------- // Prep // ---------------------------------------------------------------------------------------------------- - public CompletableFuture prepForEvent(Events type) { - if (verbose) { - report("prepForEvent", type); + public static class ListenerFuture extends CompletableFuture { + private Events eventType; + private String error; + private Class exceptionClass; + private StatusType statusType; + private int statusCode = -1; + private String fcSubject; + private FlowControlSource fcSource; + + public ListenerFuture(Events type) { + this.eventType = type; } - if (eventFuture != null) { - eventFuture.cancel(true); + + public ListenerFuture(Class exceptionClass) { + this.exceptionClass = exceptionClass; } - eventFuture = new CompletableFuture<>(); - eventFutureType = type; - return eventFuture; - } - public CompletableFuture prepForError(String errorText) { - if (verbose) { - report("prepForEvent", errorText); + public ListenerFuture(String errorText) { + error = errorText; } - if (errorFuture != null) { - errorFuture.cancel(true); + + public ListenerFuture(StatusType type, int statusCode) { + statusType = type; + this.statusCode = statusCode; } - errorFuture = new CompletableFuture<>(); - errorFutureText = errorText; - return errorFuture; - } - public CompletableFuture prepForStatus(StatusType type, int statusCode) { - if (verbose) { - report("prepForStatus", type + " " + statusCode); + public ListenerFuture(String fcSubject, FlowControlSource fcSource) { + this.fcSubject = fcSubject; + this.fcSource = fcSource; } - if (statusFuture != null) { - statusFuture.cancel(true); + + public void validate() { + try { + get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + } + catch (TimeoutException | ExecutionException | InterruptedException e) { + Assertions.fail("Validate Failed " + getDetails(), e); + } } - statusFuture = new CompletableFuture<>(); - preppedStatusType = type; - preppedStatusCode = statusCode; - return statusFuture; - } - public CompletableFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { - if (verbose) { - report("prepForFlowControl", fcSubject + " " + fcSource); + public void validate(ListenerFuture second) { + try { + get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + } + catch (TimeoutException | ExecutionException | InterruptedException e) { + second.validate(); + } } - if (fcFuture != null) { - fcFuture.cancel(true); + + public List getDetails() { + List details = new ArrayList<>(); + if (eventType != null) { details.add(eventType.toString()); } + if (error != null) { details.add(error); } + if (exceptionClass != null) { details.add(exceptionClass.toString()); } + if (statusType != null) { details.add(statusType.toString()); } + if (statusCode != -1) { details.add(Integer.toString(statusCode)); } + if (fcSubject != null) { details.add(fcSubject); } + if (fcSource != null) { details.add(fcSource.toString()); } + return details; } - fcFuture = new CompletableFuture<>(); - preppedFcSubject = fcSubject; - preppedFcSource = fcSource; - return fcFuture; } // ---------------------------------------------------------------------------------------------------- @@ -155,16 +188,23 @@ public void connectionEvent(Connection conn, Events type) { // deprecated } + private void tryToComplete(List futures, Predicate predicate) { + for (int i = 0; i < futures.size(); i++) { + ListenerFuture f = futures.get(i); + if (predicate.test(f)) { + f.complete(null); + futures.remove(i); + return; + } + } + } + @Override public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) { if (verbose) { report("connectionEvent", type); } - if (eventFuture != null) { - if (eventFutureType.equals(type)) { - eventFuture.complete(null); - } - } + tryToComplete(eventFutures, f -> f.eventType.equals(type)); } // ---------------------------------------------------------------------------------------------------- @@ -175,11 +215,7 @@ public void errorOccurred(Connection conn, String error) { if (verbose) { report("errorOccurred", error); } - if (errorFuture != null) { - if (errorFutureText.equals(error)) { - errorFuture.complete(null); - } - } + tryToComplete(errorFutures, f -> f.error.equals(error)); } @Override @@ -188,6 +224,20 @@ public void exceptionOccurred(Connection conn, Exception exp) { System.err.print("exceptionOccurred:"); exp.printStackTrace(); } + else if (verbose) { + report("exceptionOccurred", exp.getClass() + " --> " + exp.getMessage()); + } + tryToComplete(exceptionFutures, f -> { + Throwable t = exp; + while (t != null) { + if (f.exceptionClass.equals(t.getClass())) { + f.complete(null); + return true; + } + t = t.getCause(); + } + return false; + }); } @Override @@ -202,15 +252,11 @@ public void messageDiscarded(Connection conn, Message msg) { public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { } - private void statusReceived(StatusType receivedType, Status received) { + private void statusReceived(StatusType type, Status status) { if (verbose) { - report("statusReceived", received); - } - if (statusFuture != null) { - if (preppedStatusType.equals(receivedType) && preppedStatusCode == received.getCode()) { - statusFuture.complete(null); - } + report("statusReceived", status); } + tryToComplete(statusFutures, f -> f.statusType.equals(type) && f.statusCode == status.getCode()); } @Override @@ -233,11 +279,7 @@ public void flowControlProcessed(Connection conn, JetStreamSubscription sub, Str if (verbose) { report("flowControlProcessed", subject + " " + source); } - if (fcFuture != null) { - if (preppedFcSubject.equals(subject) && preppedFcSource == source) { - fcFuture.complete(null); - } - } + tryToComplete(fcFutures, f -> f.fcSubject.equals(subject) && f.fcSource == source); } @Override diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index be8926bbc..10c313fa5 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -99,25 +98,25 @@ private void _testPushBqpAndManageRetriable(Connection nc, ListenerByFuture list assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); if (manager.fc) { - CompletableFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); + ListenerByFuture.ListenerFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); - listener.validate(f, 500, getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); + f.validate(); } else { - CompletableFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + ListenerByFuture.ListenerFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - listener.validate(f, 500, FLOW_OR_HEARTBEAT_STATUS_CODE, FLOW_CONTROL_TEXT); + f.validate(); f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); - listener.validate(f, 500, FLOW_OR_HEARTBEAT_STATUS_CODE, HEARTBEAT_TEXT); + f.validate(); } assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - CompletableFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, 999); + ListenerByFuture.ListenerFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, 999); assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - listener.validate(f, 500, 999, "unknown"); + f.validate(); } @Test @@ -171,9 +170,9 @@ private void _testPullBqpAndManage(Connection nc, ListenerByFuture listener, Pul } private static void assertManageResult(ListenerByFuture listener, ListenerByFuture.StatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { - CompletableFuture f = listener.prepForStatus(expectedType, expectedStatusCode); + ListenerByFuture.ListenerFuture f = listener.prepForStatus(expectedType, expectedStatusCode); assertEquals(expecteManageResult, manager.manage(message)); - listener.validate(f, 500, expectedType, expectedStatusCode); + f.validate(); } @Test diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index 594c912a4..c51163631 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.NatsServerProtocolMock.ExitAt; import io.nats.client.support.IncomingHeadersProcessor; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; @@ -26,6 +25,7 @@ import static io.nats.client.support.NatsConstants.OP_PING; import static io.nats.client.support.NatsConstants.OP_PING_BYTES; import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static org.junit.jupiter.api.Assertions.*; @@ -123,7 +123,7 @@ public void testCustomMaxControlLine() { } try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); + Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); Connection nc = Nats.connect(options); standardConnectionWait(nc); nc.request(subject, body); diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index cc75351ec..436aca5b7 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -15,7 +15,6 @@ import io.nats.client.Nats; import io.nats.client.NatsTestServer; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -92,7 +91,7 @@ private static void _testBadParse(NatsConnectionReader reader, String bad) throw @Test public void testTooShortMaxControlLineToConnect() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - assertThrows(IOException.class, () -> Nats.connect(OptionsUtils.optionsBuilder(ts).maxControlLine(16).build())); + assertThrows(IOException.class, () -> Nats.connect(optionsBuilder(ts).maxControlLine(16).build())); } } diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 8e6746b04..cfbc006fd 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -152,7 +151,7 @@ public void testFlushTimeout() { public void testFlushTimeoutDisconnected() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts).connectionListener(listener).build(); + Options options = optionsBuilder(ts).connectionListener(listener).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { assertConnected(nc); @@ -174,7 +173,7 @@ public void testPingTimerThroughReconnect() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), ts2.getServerUri()) + Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .connectionListener(listener) .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index a7195ec68..b72b44c85 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.support.NatsRequestCompletableFuture; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -124,7 +123,7 @@ public void testRequestVarieties() throws Exception { @Test public void testSimpleResponseMessageHasConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { @@ -147,7 +146,7 @@ public void testSimpleResponseMessageHasConnection() throws Exception { @Test public void testSafeRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); @@ -165,7 +164,7 @@ public void testSafeRequest() throws Exception { @Test public void testMultipleRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); @@ -264,7 +263,7 @@ public void testManualRequestReplyAndPublishSignatures() throws Exception { @Test public void testRequestWithCustomInboxPrefix() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(OptionsUtils.optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsBuilder(ts).inboxPrefix("myinbox").maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { @@ -286,7 +285,7 @@ public void testRequestWithCustomInboxPrefix() throws Exception { @Test public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); @@ -311,7 +310,7 @@ public void testRequireCleanupOnTimeoutCleanCompletable() throws Exception { long cleanupInterval = 100; - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofMillis(cleanupInterval)) .noNoResponders().build(); @@ -338,7 +337,7 @@ public void testSimpleRequestWithTimeout() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { @@ -388,7 +387,7 @@ public void testSimpleRequestWithTimeout() throws Exception { public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 10; - Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); NatsConnection nc = (NatsConnection) Nats.connect(options); try { @@ -420,7 +419,7 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { @Test public void testRequireCleanupOnCancelFromNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); @@ -440,7 +439,7 @@ public void testRequireCleanupOnCancelFromNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); @@ -459,7 +458,7 @@ public void testRequireCleanupWithTimeoutNoResponders() throws Exception { @Test public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .requestCleanupInterval(Duration.ofHours(1)) .noNoResponders().build(); @@ -481,7 +480,7 @@ public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { @Test public void testRequireCleanupOnCancel() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofHours(1)).build(); Connection nc = Nats.connect(options); try { assertConnected(nc); @@ -503,7 +502,7 @@ public void testRequireCleanupOnCancel() throws Exception { public void testCleanupTimerWorks() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; - Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { assertConnected(nc); @@ -543,7 +542,7 @@ public void testRequestsVsCleanup() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { long cleanupInterval = 50; int msgCount = 100; - Options options = OptionsUtils.optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); + Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); Connection nc = Nats.connect(options); try { assertConnected(nc); @@ -631,7 +630,7 @@ public void testBuffersResize() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int initialSize = 128; int messageSize = 1024; - Options options = OptionsUtils.optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); + Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); try (Connection nc = standardConnectionWait(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); d.subscribe("subject"); diff --git a/src/test/java/io/nats/client/impl/ServerPoolTests.java b/src/test/java/io/nats/client/impl/ServerPoolTests.java index 0380dbd10..a9c1fd912 100644 --- a/src/test/java/io/nats/client/impl/ServerPoolTests.java +++ b/src/test/java/io/nats/client/impl/ServerPoolTests.java @@ -15,7 +15,6 @@ import io.nats.client.Options; import io.nats.client.support.NatsUri; -import io.nats.client.utils.OptionsUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -43,7 +42,7 @@ public void testPoolOptions() throws URISyntaxException { NatsUri lastConnectedServer = new NatsUri(BOOT_ONE); // testing that the expected show up in the pool - Options o = OptionsUtils.optionsBuilder(bootstrap).build(); + Options o = optionsBuilder(bootstrap).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); @@ -52,7 +51,7 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, false, combined); // testing that noRandomize maintains order - o = OptionsUtils.optionsBuilder(bootstrap).noRandomize().build(); + o = optionsBuilder(bootstrap).noRandomize().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, true, combined); @@ -61,19 +60,19 @@ public void testPoolOptions() throws URISyntaxException { validateNslp(nsp, lastConnectedServer, true, combined); // testing that ignoreDiscoveredServers ignores discovered servers - o = OptionsUtils.optionsBuilder(bootstrap).ignoreDiscoveredServers().build(); + o = optionsBuilder(bootstrap).ignoreDiscoveredServers().build(); nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, BOOT_ONE, BOOT_TWO); // testing that duplicates don't get added String[] secureAndNotSecure = new String[]{BOOT_ONE, BOOT_ONE_SECURE}; String[] secureBootstrap = new String[]{BOOT_ONE_SECURE}; - o = OptionsUtils.optionsBuilder(secureAndNotSecure).build(); + o = optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); secureAndNotSecure = new String[]{BOOT_ONE_SECURE, BOOT_ONE}; - o = OptionsUtils.optionsBuilder(secureAndNotSecure).build(); + o = optionsBuilder(secureAndNotSecure).build(); nsp = newNatsServerPool(o, null, null); validateNslp(nsp, null, false, secureBootstrap); } @@ -83,7 +82,7 @@ public void testMaxReconnects() throws URISyntaxException { NatsUri failed = new NatsUri(BOOT_ONE); // testing that servers that fail max times and is removed - Options o = OptionsUtils.optionsBuilder(BOOT_ONE).maxReconnects(3).build(); + Options o = optionsBuilder(BOOT_ONE).maxReconnects(3).build(); NatsServerPool nsp = newNatsServerPool(o, null, null); for (int x = 0; x < 4; x++) { nsp.nextServer(); @@ -97,7 +96,7 @@ public void testMaxReconnects() throws URISyntaxException { validateNslp(nsp, null, false, BOOT_ONE); // testing that servers that fail max times and is removed - o = OptionsUtils.optionsBuilder(BOOT_ONE).maxReconnects(0).build(); + o = optionsBuilder(BOOT_ONE).maxReconnects(0).build(); nsp = newNatsServerPool(o, null, null); nsp.nextServer(); validateNslp(nsp, null, false, BOOT_ONE); @@ -112,7 +111,7 @@ public void testMaxReconnects() throws URISyntaxException { @Test public void testPruning() throws URISyntaxException { // making sure that pruning happens. get baseline - Options o = OptionsUtils.optionsBuilder(bootstrap).maxReconnects(0).build(); + Options o = optionsBuilder(bootstrap).maxReconnects(0).build(); NatsServerPool nsp = newNatsServerPool(o, null, discoveredServers); validateNslp(nsp, null, false, combined); diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 6369bd893..ad1bb0040 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -1210,7 +1210,7 @@ private void _testOrderedConsume(JetStreamTestingContext ctx, OrderedConsumerCon @Test public void testOrderedConsumeMultipleSubjects() throws Exception { runInSharedCustom(VersionUtils::atLeast2_10, (nc, ctx) -> { - ctx.createStream(2); + ctx.createOrReplaceStream(2); jsPublish(ctx.js, ctx.subject(0), 10); jsPublish(ctx.js, ctx.subject(1), 5); diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 5e1d189fb..0d7ae4765 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.utils.CloseOnUpgradeAttempt; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; @@ -42,7 +41,7 @@ public class TLSConnectTests { private static Options createTestOptionsManually(String... servers) throws Exception { - return OptionsUtils.optionsBuilder(servers) + return optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .build(); @@ -58,7 +57,7 @@ private static Options createTestOptionsViaProperties(String... servers) { } private static Options createTestOptionsViaFactoryInstance(String... servers) { - return OptionsUtils.optionsBuilder(servers) + return optionsBuilder(servers) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) .build(); @@ -67,7 +66,7 @@ private static Options createTestOptionsViaFactoryInstance(String... servers) { private static Options createTestOptionsViaFactoryClassName(String... servers) { Properties properties = new Properties(); properties.setProperty(PROP_SSL_CONTEXT_FACTORY_CLASS, SSLContextFactoryForTesting.class.getCanonicalName()); - return OptionsUtils.optionsBuilder(servers) + return optionsBuilder(servers) .properties(properties) .maxReconnects(0) .sslContextFactory(new SSLContextFactoryForTesting()) @@ -90,7 +89,7 @@ public void testSimpleTLSConnection() throws Exception { public void testSimpleTlsFirstConnection() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .tlsFirst() .sslContext(SslTestingHelper.createTestSSLContext()) @@ -194,7 +193,7 @@ public void testURISchemeIPTLSConnection() throws Exception { public void testURISchemeOpenTLSConnection() throws Exception { try (NatsTestServer ts = configFileServer("tls.conf")) { String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); - Options options = OptionsUtils.optionsBuilder(servers) + Options options = optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); @@ -215,7 +214,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { NatsTestServer server2 = NatsTestServer.configFileServer("tls.conf") ) { String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); - Options options = OptionsUtils.optionsBuilder(servers) + Options options = optionsBuilder(servers) .maxReconnects(0) .opentls() .build(); @@ -234,7 +233,7 @@ public void testTLSMessageFlow() throws Exception { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .build(); @@ -264,7 +263,7 @@ public void testTLSOnReconnect() throws Exception { // Use two server ports to avoid port release timing issues try (NatsTestServer ts = configFileServer("tlsverify.conf", port)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = OptionsUtils.optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) + Options options = optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) .sslContext(ctx) .connectionListener(listener) @@ -290,7 +289,7 @@ public void testDisconnectOnUpgrade() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) .sslContext(ctx) @@ -304,7 +303,7 @@ public void testDisconnectOnUpgrade() { public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).build(); + Options options = optionsBuilder(ts).maxReconnects(0).build(); Nats.connect(options); } }); @@ -315,7 +314,7 @@ public void testClientSecureServerNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = new NatsTestServer()) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = OptionsUtils.optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); + Options options = optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); Nats.connect(options); } }); @@ -334,7 +333,7 @@ public void exceptionOccurred(Connection conn, Exception exp) { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = OptionsUtils.optionsBuilder(ts) + Options options = optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .errorListener(el) @@ -386,7 +385,7 @@ public ProxyConnection(String servers, boolean tlsFirst, ErrorListener listener, } private static Options makeMiddleman(String servers, boolean tlsFirst, ErrorListener listener) throws Exception { - Options.Builder builder = OptionsUtils.optionsBuilder(servers) + Options.Builder builder = optionsBuilder(servers) .maxReconnects(0) .sslContext(SslTestingHelper.createTestSSLContext()) .errorListener(listener); diff --git a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java index 9c4d950ba..ce00b8ab8 100644 --- a/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java +++ b/src/test/java/io/nats/client/impl/ValidateIssue1426Test.java @@ -14,7 +14,6 @@ package io.nats.client.impl; import io.nats.client.*; -import io.nats.client.utils.OptionsUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -26,6 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -51,7 +51,7 @@ public void errorOccurred(Connection conn, String error) { } }; - Options options = OptionsUtils.optionsBuilder(port) + Options options = optionsBuilder(port) .token(new char[]{'1', '2', '3', '4'}) .maxMessagesInOutgoingQueue(NUMBER_OF_SUBS ) .reconnectBufferSize(NUMBER_OF_SUBS * 100) diff --git a/src/test/java/io/nats/client/other/ReconnectCheck.java b/src/test/java/io/nats/client/other/ReconnectCheck.java index bb5755f56..f43a51a04 100644 --- a/src/test/java/io/nats/client/other/ReconnectCheck.java +++ b/src/test/java/io/nats/client/other/ReconnectCheck.java @@ -1,10 +1,10 @@ package io.nats.client.other; import io.nats.client.*; -import io.nats.client.utils.OptionsUtils; import java.time.Duration; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; /* Program to reproduce #231 */ @@ -48,7 +48,7 @@ public static void main(String []args) throws Exception { } private static Options buildOptions(String name, NatsTestServer ts) { - return OptionsUtils.optionsBuilder(ts) + return optionsBuilder(ts) .connectionName(name) .reconnectWait(Duration.ofSeconds(1)) .connectionTimeout(Duration.ofSeconds(5)) diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 8cfc62229..283029d1a 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -30,8 +30,6 @@ public abstract class OptionsUtils { private static ExecutorService EX; private static ScheduledThreadPoolExecutor SC; - private static ExecutorService CB; - private static ExecutorService CN; public static ErrorListener NOOP_EL = new ErrorListener() {}; @@ -88,35 +86,23 @@ public static Options options(String... servers) { public static Options.Builder optionsBuilder() { if (EX == null) { - EX = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, + EX = new ThreadPoolExecutor(8, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, new SynchronousQueue<>(), new TestThreadFactory("ex")); } if (SC == null) { - SC = new ScheduledThreadPoolExecutor(3, new TestThreadFactory("sc")); + SC = new ScheduledThreadPoolExecutor(4, new TestThreadFactory("sc")); SC.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); SC.setRemoveOnCancelPolicy(true); } - if (CB == null) { - CB = new ThreadPoolExecutor(2, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, - new SynchronousQueue<>(), - new TestThreadFactory("cb")); - } - - if (CN == null) { - CN = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, - new SynchronousQueue<>(), - new TestThreadFactory("cn")); - } - return Options.builder() .connectionTimeout(Duration.ofSeconds(4)) .executor(EX) .scheduledExecutor(SC) - .callbackExecutor(CB) - .connectExecutor(CN) + .callbackExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("cb"))) + .connectExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("cn"))) .errorListener(NOOP_EL); } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 4c0601035..325bec266 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -18,7 +18,6 @@ import io.nats.client.api.ServerInfo; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; -import io.nats.client.api.StreamInfo; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; import org.junit.jupiter.api.function.Executable; @@ -142,7 +141,7 @@ private static void _runInOwnServer( } try (NatsTestServer ts = new NatsTestServer(nsrb)) { Options options = (optionsBuilder == null - ? OptionsUtils.optionsBuilder(ts) + ? optionsBuilder(ts) : optionsBuilder.server(ts.getServerUri())) .build(); try (Connection nc = standardConnectionWait(options)) { @@ -176,7 +175,7 @@ public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exceptio } public static void runInOwnJsServer(ErrorListener el, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(OptionsUtils.optionsBuilder(el), null, null, null, jetStreamTest); + _runInOwnServer(optionsBuilder(el), null, null, null, jetStreamTest); } public static void runInOwnJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { @@ -261,7 +260,7 @@ public static void runInSharedOwnNc(OneConnectionTest test) throws Exception { } public static void runInSharedOwnNc(ErrorListener el, OneConnectionTest test) throws Exception { - _runInShared(OptionsUtils.optionsBuilder(el), null, test, -1, null); + _runInShared(optionsBuilder(el), null, test, -1, null); } public static void runInSharedOwnNc(Options.Builder builder, OneConnectionTest test) throws Exception { @@ -280,11 +279,11 @@ public static void runInShared(VersionCheck vc, JetStreamTestingContextTest ctxT } public static void runInSharedOwnNc(ErrorListener el, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(OptionsUtils.optionsBuilder(el), null, null, 1, ctxTest); + _runInShared(optionsBuilder(el), null, null, 1, ctxTest); } public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(OptionsUtils.optionsBuilder(el), vc, null, 1, ctxTest); + _runInShared(optionsBuilder(el), vc, null, 1, ctxTest); } public static void runInSharedOwnNc(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { @@ -608,7 +607,7 @@ else if (atLeast2_9_0() ){ // ---------------------------------------------------------------------------------------------------- // JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream JetStream // ---------------------------------------------------------------------------------------------------- - public static StreamInfo createMemoryStream(JetStreamManagement jsm, String streamName, String... subjects) throws IOException, JetStreamApiException { + public static void createMemoryStream(JetStreamManagement jsm, String streamName, String... subjects) throws IOException, JetStreamApiException { if (streamName == null) { streamName = random(); } @@ -622,6 +621,6 @@ public static StreamInfo createMemoryStream(JetStreamManagement jsm, String stre .storageType(StorageType.Memory) .subjects(subjects).build(); - return jsm.addStream(sc); + jsm.addStream(sc); } } diff --git a/src/test/java/io/nats/client/utils/ThreadUtils.java b/src/test/java/io/nats/client/utils/ThreadUtils.java index 820748d6c..eb4048953 100644 --- a/src/test/java/io/nats/client/utils/ThreadUtils.java +++ b/src/test/java/io/nats/client/utils/ThreadUtils.java @@ -13,15 +13,8 @@ package io.nats.client.utils; -import java.time.Duration; -import java.util.concurrent.locks.LockSupport; - public abstract class ThreadUtils { public static void sleep(long ms) { try { Thread.sleep(ms); } catch (InterruptedException ignored) { /* ignored */ } } - - public static void park(Duration d) { - try { LockSupport.parkNanos(d.toNanos()); } catch (Exception ignored) { /* ignored */ } - } } From 46f1c6a4157b64e1d1607b1544ceebed5336ed9b Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 30 Nov 2025 15:41:24 -0500 Subject: [PATCH 23/51] worked some disabled into enabled --- build.gradle | 5 +- .../io/nats/client/impl/MessageManager.java | 2 + .../nats/client/impl/PullMessageManager.java | 2 + src/test/java/io/nats/client/AuthTests.java | 59 +-- .../java/io/nats/client/ConnectTests.java | 13 +- .../java/io/nats/client/HttpRequestTests.java | 12 +- src/test/java/io/nats/client/NKeyTests.java | 90 ++-- .../java/io/nats/client/OptionsTests.java | 23 +- .../java/io/nats/client/PublishTests.java | 49 +- .../client/impl/ConnectionListenerTests.java | 8 +- .../java/io/nats/client/impl/DrainTests.java | 419 +++++++----------- .../io/nats/client/impl/InfoHandlerTests.java | 22 +- .../impl/JetStreamMirrorAndSourcesTests.java | 2 - .../nats/client/impl/JetStreamPullTests.java | 228 ++++++---- .../client/impl/JetStreamTestingContext.java | 1 - .../io/nats/client/impl/ListenerByFuture.java | 192 +++----- .../impl/ListenerByFutureStatusType.java | 18 + .../io/nats/client/impl/ListenerFuture.java | 87 ++++ .../nats/client/impl/MessageManagerTests.java | 26 +- .../nats/client/impl/MessageQueueTests.java | 15 +- .../io/nats/client/impl/NatsMessageTests.java | 86 ++-- .../io/nats/client/impl/ReconnectTests.java | 51 ++- .../io/nats/client/impl/RequestTests.java | 7 +- .../nats/client/impl/SimplificationTests.java | 186 ++++---- .../io/nats/client/impl/TLSConnectTests.java | 3 +- .../client/support/DateTimeUtilsTests.java | 3 - .../nats/client/support/JsonUtilsTests.java | 1 - .../io/nats/client/utils/ConnectionUtils.java | 24 + .../io/nats/client/utils/OptionsUtils.java | 8 + .../io/nats/client/utils/SharedServer.java | 33 +- .../java/io/nats/client/utils/TestBase.java | 71 ++- 31 files changed, 855 insertions(+), 891 deletions(-) create mode 100644 src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java create mode 100644 src/test/java/io/nats/client/impl/ListenerFuture.java diff --git a/build.gradle b/build.gradle index 012ff3e84..d6d4ef7e7 100644 --- a/build.gradle +++ b/build.gradle @@ -109,11 +109,12 @@ test { maxFailures = 4 maxRetries = 4 } + int mpf = Math.max(1, (int)(Runtime.runtime.availableProcessors() * 3 / 4)) if (compilerIsJava8 || isNotWindows) { - maxParallelForks = Math.min(6, Runtime.runtime.availableProcessors()) + maxParallelForks = Math.min(6, mpf) } else { - maxParallelForks = 2; + maxParallelForks = Math.min(3, mpf); } systemProperty 'junit.jupiter.execution.timeout.default', '3m' } diff --git a/src/main/java/io/nats/client/impl/MessageManager.java b/src/main/java/io/nats/client/impl/MessageManager.java index 79ef4baee..6fc1c05ea 100644 --- a/src/main/java/io/nats/client/impl/MessageManager.java +++ b/src/main/java/io/nats/client/impl/MessageManager.java @@ -17,6 +17,7 @@ import io.nats.client.NatsSystemClock; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; +import io.nats.client.support.Debug; import io.nats.client.support.NatsConstants; import io.nats.client.support.ScheduledTask; @@ -155,6 +156,7 @@ protected void initOrResetHeartbeatTimer() { new ScheduledTask(conn.getScheduledExecutor(), alarmPeriodSettingNanos.get(), TimeUnit.NANOSECONDS, () -> { long sinceLast = NatsSystemClock.nanoTime() - lastMsgReceivedNanoTime.get(); + Debug.info("HB?", sinceLast, alarmPeriodSettingNanos.get()); if (sinceLast > alarmPeriodSettingNanos.get()) { handleHeartbeatError(); } diff --git a/src/main/java/io/nats/client/impl/PullMessageManager.java b/src/main/java/io/nats/client/impl/PullMessageManager.java index c1538803e..9c2390f3d 100644 --- a/src/main/java/io/nats/client/impl/PullMessageManager.java +++ b/src/main/java/io/nats/client/impl/PullMessageManager.java @@ -16,6 +16,7 @@ import io.nats.client.Message; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; +import io.nats.client.support.Debug; import io.nats.client.support.Status; import static io.nats.client.impl.MessageManager.ManageResult.*; @@ -66,6 +67,7 @@ protected void startPullRequest(String pullSubject, PullRequestOptions pro, bool @Override protected void handleHeartbeatError() { + Debug.info("HHB"); super.handleHeartbeatError(); resetTracking(); if (pullManagerObserver != null) { diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index cbc59e9ea..e658e646e 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -17,12 +17,13 @@ import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; +import io.nats.client.impl.ListenerByFuture; import io.nats.client.impl.ListenerForTesting; +import io.nats.client.impl.ListenerFuture; import io.nats.client.support.JwtUtils; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.parallel.Isolated; @@ -35,14 +36,12 @@ import java.nio.file.Files; import java.time.Duration; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.NOOP_EL; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.ResourceUtils.jwtResource; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -89,7 +88,7 @@ public void testUserPass() throws Exception { .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); assertThrows(AuthenticationException.class, () -> Nats.connect(badPass)); - Options missingUserPass = optionsBuilder(ts).maxReconnects(0).build(); + Options missingUserPass = optionsNoReconnect(ts); assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPass)); } } @@ -677,34 +676,10 @@ private static void _testReconnectAfter(String errText) throws Exception { } } - @Disabled("This test flaps on CI, it must be that environment") @Test public void testRealUserAuthenticationExpired() throws Exception { - CountDownLatch cdlConnected = new CountDownLatch(1); - CountDownLatch cdlDisconnected = new CountDownLatch(1); - CountDownLatch cdlReconnected = new CountDownLatch(1); - CountDownLatch elUserAuthenticationExpired = new CountDownLatch(1); - CountDownLatch elAuthorizationViolation = new CountDownLatch(1); - - ConnectionListener cl = (conn, type) -> { - switch (type) { - case CONNECTED: cdlConnected.countDown(); break; - case DISCONNECTED: cdlDisconnected.countDown(); break; - case RECONNECTED: cdlReconnected.countDown(); break; - } - }; - - ErrorListener el = new ErrorListener() { - @Override - public void errorOccurred(Connection conn, String error) { - if (error.equalsIgnoreCase("user authentication expired")) { - elUserAuthenticationExpired.countDown(); - } - else if (error.equalsIgnoreCase("authorization violation")) { - elAuthorizationViolation.countDown(); - } - } - }; + ListenerByFuture listener = new ListenerByFuture(false); + ListenerFuture fExpired = listener.prepForError("User Authentication Expired"); String accountSeed = "SAAPXJRFMUYDUH3NOZKE7BS2ZDO2P4ND7G6W743MTNA3KCSFPX3HNN6AX4"; String accountId = "ACPWDUYSZRRF7XAEZKUAGPUH6RPICWEHSTFELYKTOWUVZ4R2XMP4QJJX"; @@ -715,8 +690,7 @@ else if (error.equalsIgnoreCase("authorization violation")) { NKey nKeyUser = NKey.fromSeed(userSeed.toCharArray()); String publicUserKey = new String(nKeyUser.getPublicKey()); - long expires = 2500; - long wait = 5000; + long expires = 1000; Duration expiration = Duration.ofMillis(expires); String jwt = JwtUtils.issueUserJWT(nKeyAccount, accountId, publicUserKey, "jnatsTestUser", expiration); @@ -724,23 +698,16 @@ else if (error.equalsIgnoreCase("authorization violation")) { String credsFile = ResourceUtils.createTempFile("nats_java_test", ".creds", creds.split("\\Q\\n\\E")); try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { - Options options = Options.builder() .server(ts.getServerUri()) .credentialPath(credsFile) - .connectionListener(cl) - .errorListener(el) - .maxReconnects(5) + .connectionListener(listener) + .errorListener(listener) + .maxReconnects(2) .build(); - Connection nc = Nats.connect(options); - - assertTrue(cdlConnected.await(wait, TimeUnit.MILLISECONDS)); - assertTrue(cdlDisconnected.await(wait, TimeUnit.MILLISECONDS)); - assertTrue(cdlReconnected.await(wait, TimeUnit.MILLISECONDS)); - assertTrue(elUserAuthenticationExpired.await(wait, TimeUnit.MILLISECONDS)); - assertTrue(elAuthorizationViolation.await(wait, TimeUnit.MILLISECONDS)); - - nc.close(); + try (Connection nc = newConnection(options)) { + listener.validateReceived(fExpired); + } } catch (Exception ignore) {} } diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index fd4e741de..a7b7f4016 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -275,15 +275,14 @@ public void testAsyncConnectionWithReconnect() throws Exception { } @Test - public void testThrowOnAsyncWithoutListener() { - assertThrows(IllegalArgumentException.class, () -> { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).build(); - Nats.connectAsynchronously(options, false); - } - }); + public void testThrowOnAsyncWithoutListener() throws Exception { + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).build(); + assertThrows(IllegalArgumentException.class, () -> Nats.connectAsynchronously(options, false)); + } } + @Test public void testErrorOnAsync() throws Exception { ListenerForTesting listener = new ListenerForTesting(); diff --git a/src/test/java/io/nats/client/HttpRequestTests.java b/src/test/java/io/nats/client/HttpRequestTests.java index 45afa5a28..34f05c3dd 100644 --- a/src/test/java/io/nats/client/HttpRequestTests.java +++ b/src/test/java/io/nats/client/HttpRequestTests.java @@ -57,14 +57,8 @@ public void testSetters() { @Test public void testNulls() { HttpRequest request = new HttpRequest(); - assertThrows(IllegalArgumentException.class, () -> { - request.method(null); - }); - assertThrows(IllegalArgumentException.class, () -> { - request.uri(null); - }); - assertThrows(IllegalArgumentException.class, () -> { - request.version(null); - }); + assertThrows(IllegalArgumentException.class, () -> request.method(null)); + assertThrows(IllegalArgumentException.class, () -> request.uri(null)); + assertThrows(IllegalArgumentException.class, () -> request.version(null)); } } diff --git a/src/test/java/io/nats/client/NKeyTests.java b/src/test/java/io/nats/client/NKeyTests.java index b04c2e2b7..fc16d588a 100644 --- a/src/test/java/io/nats/client/NKeyTests.java +++ b/src/test/java/io/nats/client/NKeyTests.java @@ -125,26 +125,21 @@ public void testEncodeDecode() throws Exception { } @Test - public void testDecodeWrongType() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] bytes = new byte[32]; - SecureRandom random = new SecureRandom(); - random.nextBytes(bytes); - - char[] encoded = NKey.encode(NKey.Type.ACCOUNT, bytes); - NKey.decode(NKey.Type.USER, encoded, false); - }); + public void testDecodeWrongType() throws IOException { + byte[] bytes = new byte[32]; + SecureRandom random = new SecureRandom(); + random.nextBytes(bytes); + + char[] encoded = NKey.encode(NKey.Type.ACCOUNT, bytes); + assertThrows(IllegalArgumentException.class, () -> NKey.decode(NKey.Type.USER, encoded, false)); } @Test public void testEncodeSeedSize() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] bytes = new byte[48]; - SecureRandom random = new SecureRandom(); - random.nextBytes(bytes); - - NKey.encodeSeed(NKey.Type.ACCOUNT, bytes); - }); + byte[] bytes = new byte[48]; + SecureRandom random = new SecureRandom(); + random.nextBytes(bytes); + assertThrows(IllegalArgumentException.class, () -> NKey.encodeSeed(NKey.Type.ACCOUNT, bytes)); } @Test @@ -385,48 +380,38 @@ public void testPublicOnly() throws Exception { } @Test - public void testPublicOnlyCantSign() { - assertThrows(IllegalStateException.class, () -> { - NKey theKey = NKey.createUser(null); - NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); - - byte[] data = "Public and Private".getBytes(StandardCharsets.UTF_8); - pubOnly.sign(data); - }); + public void testPublicOnlyCantSign() throws Exception { + NKey theKey = NKey.createUser(null); + NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); + + byte[] data = "Public and Private".getBytes(StandardCharsets.UTF_8); + assertThrows(IllegalStateException.class, () -> pubOnly.sign(data)); } @Test - public void testPublicOnlyCantProvideSeed() { - assertThrows(IllegalStateException.class, () -> { - NKey theKey = NKey.createUser(null); - NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); - pubOnly.getSeed(); - }); + public void testPublicOnlyCantProvideSeed() throws Exception { + NKey theKey = NKey.createUser(null); + NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); + assertThrows(IllegalStateException.class, pubOnly::getSeed); } @Test - public void testPublicOnlyCantProvidePrivate() { - assertThrows(IllegalStateException.class, () -> { - NKey theKey = NKey.createUser(null); - NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); - pubOnly.getPrivateKey(); - }); + public void testPublicOnlyCantProvidePrivate() throws Exception { + NKey theKey = NKey.createUser(null); + NKey pubOnly = NKey.fromPublicKey(theKey.getPublicKey()); + assertThrows(IllegalStateException.class, pubOnly::getPrivateKey); } @Test - public void testPublicFromSeedShouldFail() { - assertThrows(IllegalArgumentException.class, () -> { - NKey theKey = NKey.createUser(null); - NKey.fromPublicKey(theKey.getSeed()); - }); + public void testPublicFromSeedShouldFail() throws Exception { + NKey theKey = NKey.createUser(null); + assertThrows(IllegalArgumentException.class, () -> NKey.fromPublicKey(theKey.getSeed())); } @Test - public void testSeedFromPublicShouldFail() { - assertThrows(IllegalArgumentException.class, () -> { - NKey theKey = NKey.createUser(null); - NKey.fromSeed(theKey.getPublicKey()); - }); + public void testSeedFromPublicShouldFail() throws Exception { + NKey theKey = NKey.createUser(null); + assertThrows(IllegalArgumentException.class, () -> NKey.fromSeed(theKey.getPublicKey())); } @Test @@ -562,7 +547,7 @@ public void testTypeEnum() { assertEquals(NKey.Type.OPERATOR, NKey.Type.fromPrefix(NKey.PREFIX_BYTE_OPERATOR)); assertEquals(NKey.Type.CLUSTER, NKey.Type.fromPrefix(NKey.PREFIX_BYTE_CLUSTER)); assertEquals(NKey.Type.ACCOUNT, NKey.Type.fromPrefix(NKey.PREFIX_BYTE_PRIVATE)); - assertThrows(IllegalArgumentException.class, () -> { NKey.Type ignored = NKey.Type.fromPrefix(9999); }); + assertThrows(IllegalArgumentException.class, () -> NKey.Type.fromPrefix(9999)); } @Test @@ -589,13 +574,10 @@ public void testEquals() throws Exception { } @Test - public void testClear() { - assertThrows(IllegalArgumentException.class, () -> { - NKey key = NKey.createServer(null); - key.clear(); - key.getPrivateKey(); - - }, "Invalid encoding"); + public void testClear() throws Exception { + NKey key = NKey.createServer(null); + key.clear(); + assertThrows(IllegalArgumentException.class, key::getPrivateKey); } @Test diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index fc3c4eaf8..c694f8a76 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -531,7 +531,6 @@ public void testProperties() throws Exception { _testProperties(o); String propertiesFilePath = createTempPropertiesFile(props); - System.out.println(propertiesFilePath); o = new Options.Builder(propertiesFilePath).build(); _testProperties(o); @@ -1063,20 +1062,16 @@ private void assertServersAndUnprocessed(boolean two, Options o) { @Test public void testBadClassInPropertyConnectionListeners() { - assertThrows(IllegalArgumentException.class, () -> { - Properties props = new Properties(); - props.setProperty(Options.PROP_CONNECTION_CB, "foo"); - new Options.Builder(props); - }); + Properties props = new Properties(); + props.setProperty(Options.PROP_CONNECTION_CB, "foo"); + assertThrows(IllegalArgumentException.class, () -> new Options.Builder(props)); } @Test public void testBadClassInPropertyStatisticsCollector() { - assertThrows(IllegalArgumentException.class, () -> { - Properties props = new Properties(); - props.setProperty(Options.PROP_STATISTICS_COLLECTOR, "foo"); - new Options.Builder(props); - }); + Properties props = new Properties(); + props.setProperty(Options.PROP_STATISTICS_COLLECTOR, "foo"); + assertThrows(IllegalArgumentException.class, () -> new Options.Builder(props)); } @Test @@ -1093,10 +1088,8 @@ public void testThrowOnBadServerURI() { @Test public void testThrowOnBadServersURI() { - assertThrows(IllegalArgumentException.class, () -> { - String[] serverUrls = {URL_PROTO_HOST_PORT_8080, "foo:/bar\\:blammer"}; - new Options.Builder().servers(serverUrls).build(); - }); + String[] serverUrls = {URL_PROTO_HOST_PORT_8080, "foo:/bar\\:blammer"}; + assertThrows(IllegalArgumentException.class, () -> new Builder().servers(serverUrls).build()); } @Test diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 4c9a60328..73d55690e 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -14,11 +14,7 @@ package io.nats.client; import io.nats.client.ConnectionListener.Events; -import io.nats.client.impl.Headers; -import io.nats.client.impl.JetStreamTestingContext; -import io.nats.client.impl.ListenerByFuture; -import io.nats.client.impl.ListenerByFuture.ListenerFuture; -import io.nats.client.impl.NatsMessage; +import io.nats.client.impl.*; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -84,28 +80,25 @@ public void testThrowsIfTooBig() throws Exception { nc2.publish(random(), null, null, body); - // sometimes the exception comes in before the error and the error never comes. - fError.validate(fException); + // sometimes the exception comes in before the error and the error never comes, so validate for either. + listener.validateReceived(fError, fException); } } @Test - public void testThrowsIfHeadersNotSupported() { - assertThrows(IllegalArgumentException.class, () -> { - String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; - - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo); - Connection nc = Nats.connect(mockTs.getServerUri())) - { - assertConnected(nc); - - nc.publish(NatsMessage.builder() - .subject("testThrowsIfheadersNotSupported") - .headers(new Headers().add("key", "value")) - .build()); - fail(); - } - }); + public void testThrowsIfHeadersNotSupported() throws Exception { + String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}"; + + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo); + Connection nc = Nats.connect(mockTs.getServerUri())) { + assertConnected(nc); + + assertThrows(IllegalArgumentException.class, + () -> nc.publish(NatsMessage.builder() + .subject("testThrowsIfheadersNotSupported") + .headers(new Headers().add("key", "value")) + .build())); + } } @Test @@ -145,7 +138,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header StringBuilder headerLine; String bodyLine; - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for " + proto + " ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " waiting for " + proto + " ..."); try { pubLine = r.readLine(); if (hPub) { @@ -165,7 +158,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header } if (pubLine.startsWith(proto)) { - System.out.println("*** Mock Server @" + ts.getPort() + " got " + proto + " ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " got " + proto + " ..."); protocol.set(pubLine); hdrProto.set(headerLine.toString()); body.set(bodyLine); @@ -236,11 +229,11 @@ public void testMaxPayloadNoClientSideLimitChecks() throws Exception { runInSharedOwnNc(builder, nc -> { ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); - ListenerFuture fEvent = listener.prepForEvent(Events.DISCONNECTED); + ListenerFuture fEvent = listener.prepForConnectionEvent(Events.DISCONNECTED); int maxPayload = (int)nc.getServerInfo().getMaxPayload(); nc.publish(random(), new byte[maxPayload + 1]); - fError.validate(); - fEvent.validate(); + listener.validateReceived(fError); + listener.validateReceived(fEvent); }); } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index c6b0e08b5..683624d6f 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -41,13 +41,13 @@ public void testToString() { @Test public void testCloseEvent() throws Exception { ListenerByFuture listener = new ListenerByFuture(); - ListenerByFuture.ListenerFuture fEvent = listener.prepForEvent(Events.CLOSED); + ListenerFuture fEvent = listener.prepForConnectionEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); }); - fEvent.validate(); + listener.validateReceived(fEvent); } @Test @@ -114,7 +114,7 @@ public void testExceptionInConnectionListener() throws Exception { public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); ListenerByFuture listener = new ListenerByFuture(); - ListenerByFuture.ListenerFuture fClosed = listener.prepForEvent(Events.CLOSED); + ListenerFuture fClosed = listener.prepForConnectionEvent(Events.CLOSED); AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { @@ -139,7 +139,7 @@ public void testMultipleConnectionListeners() throws Exception { }); assertTrue(stats.get().getExceptions() > 0); - fClosed.validate(); + listener.validateReceived(fClosed); Set expectedEvents = new HashSet<>(Arrays.asList( "CL1-CLOSED", diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index c2975d472..eb2bf1718 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.utils.SharedServer; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -26,20 +27,20 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.TestBase.flushConnection; +import static io.nats.client.utils.OptionsUtils.*; +import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class DrainTests { - @SuppressWarnings("resource") @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - final Connection nc = standardConnectionWait(optionsBuilder(ts).maxReconnects(0).build()); + //noinspection resource + final Connection nc = standardConnectionWait(optionsNoReconnect(ts)); - nc.subscribe("draintest"); + nc.subscribe(random()); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do ts.shutdown(); // shut down the server to fail drain and subsequent close @@ -50,17 +51,13 @@ public void testCloseOnDrainFailure() throws Exception { @Test public void testSimpleSubDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - Subscription sub = subCon.subscribe("draintest"); + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); // publish 2 + pubCon.publish(subject, null); + pubCon.publish(subject, null); // publish 2 pubCon.flush(Duration.ofSeconds(1)); Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 @@ -75,28 +72,25 @@ public void testSimpleSubDrain() throws Exception { assertTrue(tracker.get(1, TimeUnit.SECONDS)); assertFalse(sub.isActive()); assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); - } + }); } @Test public void testSimpleDispatchDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(2000); // go slow so the main app can drain us }); - d.subscribe("draintest"); - d.subscribe("draintest", msg -> count.incrementAndGet()); + + String subject = random(); + d.subscribe(subject); + d.subscribe(subject, msg -> count.incrementAndGet()); subCon.flush(Duration.ofSeconds(5)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -108,29 +102,25 @@ public void testSimpleDispatchDrain() throws Exception { assertEquals(4, count.get()); // Should get both, two times. assertFalse(d.isActive()); assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); - } + }); } @Test public void testSimpleConnectionDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); - Subscription sub = subCon.subscribe("draintest"); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -147,29 +137,25 @@ public void testSimpleConnectionDrain() throws Exception { assertTrue(((NatsConnection) subCon).isDrained()); assertEquals(2, count.get()); // Should get both assertClosed(subCon); - } + }); } @Test public void testConnectionDrainWithZeroTimeout() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); - Subscription sub = subCon.subscribe("draintest"); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -184,24 +170,20 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertTrue(((NatsConnection) subCon).isDrained()); - assertEquals(count.get(), 2); // Should get both + assertEquals(2, count.get()); // Should get both assertClosed(subCon); - } + }); } @Test public void testDrainWithZeroTimeout() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - Subscription sub = subCon.subscribe("draintest"); + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); // publish 2 + pubCon.publish(subject, null); + pubCon.publish(subject, null); // publish 2 pubCon.flush(Duration.ofSeconds(1)); Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 @@ -215,83 +197,63 @@ public void testDrainWithZeroTimeout() throws Exception { assertTrue(tracker.get(1, TimeUnit.SECONDS)); assertFalse(sub.isActive()); - } + }); } @Test - public void testSubDuringDrainThrows() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - subCon.subscribe("draintest"); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); - pubCon.flush(Duration.ofSeconds(1)); + public void testSubDuringDrainThrows() throws Exception { + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + subCon.subscribe(subject); + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - subCon.flush(Duration.ofSeconds(1)); + pubCon.publish(subject, null); + pubCon.publish(subject, null); + pubCon.flush(Duration.ofSeconds(1)); + subCon.flush(Duration.ofSeconds(1)); - CompletableFuture tracker = subCon.drain(Duration.ofSeconds(500)); + subCon.drain(Duration.ofSeconds(500)); - // Try to subscribe while we are draining the sub - subCon.subscribe("another"); // Should throw - assertTrue(tracker.get(1000, TimeUnit.SECONDS)); - } + // Try to subscribe while we are draining the sub + assertThrows(IllegalStateException.class, () -> subCon.subscribe(random())); }); } @Test - public void testCreateDispatcherDuringDrainThrows() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - subCon.subscribe("draintest"); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server + public void testCreateDispatcherDuringDrainThrows() throws Exception { + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + subCon.subscribe(subject); + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); - pubCon.flush(Duration.ofSeconds(1)); + pubCon.publish(subject, null); + pubCon.publish(subject, null); + pubCon.flush(Duration.ofSeconds(1)); - subCon.flush(Duration.ofSeconds(1)); + subCon.flush(Duration.ofSeconds(1)); - CompletableFuture tracker = subCon.drain(Duration.ofSeconds(500)); + subCon.drain(Duration.ofSeconds(500)); - subCon.createDispatcher(msg -> { - }); - assertTrue(tracker.get(1000, TimeUnit.SECONDS)); - } + assertThrows(IllegalStateException.class, () -> subCon.createDispatcher(msg -> {})); }); } @Test public void testUnsubDuringDrainIsNoop() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(1000); // go slow so the main app can drain us }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); - Subscription sub = subCon.subscribe("draintest"); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -302,7 +264,7 @@ public void testUnsubDuringDrainIsNoop() throws Exception { sleep(1000); // give the drain time to get started sub.unsubscribe(); - d.unsubscribe("draintest"); + d.unsubscribe(subject); Message msg = sub.nextMessage(Duration.ofSeconds(1)); assertNotNull(msg); @@ -312,17 +274,12 @@ public void testUnsubDuringDrainIsNoop() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertEquals(2, count.get()); // Should get both assertClosed(subCon); - } + }); } @Test public void testDrainInMessageHandler() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); AtomicReference dispatcher = new AtomicReference<>(); AtomicReference> tracker = new AtomicReference<>(); @@ -330,12 +287,13 @@ public void testDrainInMessageHandler() throws Exception { count.incrementAndGet(); tracker.set(dispatcher.get().drain(Duration.ofSeconds(1))); }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); dispatcher.set(d); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -345,29 +303,25 @@ public void testDrainInMessageHandler() throws Exception { assertEquals(2, count.get()); // Should get both assertFalse(d.isActive()); assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); - } + }); } @Test public void testDrainFutureMatches() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); sleep(500); // go slow so the main app can drain us }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); - Subscription sub = subCon.subscribe("draintest"); + Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -390,95 +344,66 @@ public void testDrainFutureMatches() throws Exception { assertTrue(tracker.get(2, TimeUnit.SECONDS)); assertEquals(2, count.get()); // Should get both assertClosed(subCon); - } + }); } @Test - public void testFirstTimeRequestReplyDuringDrain() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - Subscription sub = subCon.subscribe("draintest"); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); - d.subscribe("reply"); - pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); - pubCon.flush(Duration.ofSeconds(1)); + public void testFirstTimeRequestReplyDuringDrain() throws Exception { + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + Subscription sub = subCon.subscribe(subject); + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - CompletableFuture tracker = subCon.drain(Duration.ofSeconds(500)); + Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); + String reply = random(); + d.subscribe(reply); + pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 - assertNotNull(msg); + pubCon.publish(subject, null); + pubCon.publish(subject, null); + pubCon.flush(Duration.ofSeconds(1)); - CompletableFuture response = subCon.request("reply", null); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - assertNotNull(response.get(200, TimeUnit.SECONDS)); + subCon.drain(Duration.ofSeconds(500)); - msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 - assertNotNull(msg); + Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 + assertNotNull(msg); - assertTrue(tracker.get(500, TimeUnit.SECONDS)); // wait for the drain to complete - assertClosed(subCon); - } + assertThrows(IllegalStateException.class, () -> subCon.request(reply, null)); }); } @Test - public void testRequestReplyDuringDrain() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - - Subscription sub = subCon.subscribe("draintest"); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); - d.subscribe("reply"); - pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); - pubCon.flush(Duration.ofSeconds(1)); + public void testRequestReplyDuringDrain() throws Exception { + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + String subject = random(); + Subscription sub = subCon.subscribe(subject); + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - CompletableFuture response = subCon.request("reply", null); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - assertNotNull(response.get(1, TimeUnit.SECONDS)); + Dispatcher d = pubCon.createDispatcher(msg -> pubCon.publish(msg.getReplyTo(), null)); + String reply = random(); + d.subscribe(reply); + pubCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - CompletableFuture tracker = subCon.drain(Duration.ofSeconds(1)); + pubCon.publish(subject, null); + pubCon.publish(subject, null); + pubCon.flush(Duration.ofSeconds(1)); - Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 - assertNotNull(msg); + CompletableFuture response = subCon.request(reply, null); + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server + assertNotNull(response.get(1, TimeUnit.SECONDS)); - response = subCon.request("reply", null); - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - assertNotNull(response.get(200, TimeUnit.SECONDS)); + subCon.drain(Duration.ofSeconds(1)); - msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 - assertNotNull(msg); + Message msg = sub.nextMessage(Duration.ofSeconds(1)); // read 1 + assertNotNull(msg); - assertTrue(tracker.get(500, TimeUnit.SECONDS)); // wait for the drain to complete - assertClosed(subCon); - } + assertThrows(IllegalStateException.class, () -> subCon.request(reply, null)); }); } @Test public void testQueueHandoffWithDrain() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(pubCon); - + runInSharedOwnNc(optionsBuilderNoReconnect(), pubCon -> { final int total = 5_000; final long sleepBetweenDrains = 250; final long sleepBetweenMessages = 5; @@ -491,15 +416,16 @@ public void testQueueHandoffWithDrain() throws Exception { NatsDispatcher workingD; NatsDispatcher drainingD; - Connection draining = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - assertConnected(draining); + Connection draining = SharedServer.connectionForSameServer(pubCon, optionsBuilderNoReconnect()); - drainingD = (NatsDispatcher) draining.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); + String subject = random(); + String queue = random(); + drainingD = (NatsDispatcher) draining.createDispatcher(msg -> count.incrementAndGet()).subscribe(subject, queue); draining.flush(Duration.ofSeconds(5)); Thread pubThread = new Thread(() -> { for (int i = 0; i < total; i++) { - pubCon.publish("draintest", null); + pubCon.publish(subject, null); sleep(sleepBetweenMessages); } flushConnection(pubCon, Duration.ofSeconds(5)); @@ -508,10 +434,9 @@ public void testQueueHandoffWithDrain() throws Exception { pubThread.start(); while (count.get() < total && Duration.between(start, now).compareTo(testTimeout) < 0) { - - working = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); + working = SharedServer.connectionForSameServer(pubCon, optionsBuilderNoReconnect()); assertConnected(working); - workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe("draintest", "queue"); + workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe(subject, queue); working.flush(Duration.ofSeconds(5)); sleep(sleepBetweenDrains); @@ -532,26 +457,22 @@ public void testQueueHandoffWithDrain() throws Exception { pubThread.join(); assertEquals(total, count.get()); - } + }); } @Test public void testDrainWithLotsOfMessages() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { int total = 1000; - Subscription sub = subCon.subscribe("draintest"); + String subject = random(); + Subscription sub = subCon.subscribe(subject); sub.setPendingLimits(5 * total, -1); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server // Sub should cache them in the pending queue for (int i = 0; i < total; i++) { - pubCon.publish("draintest", null); + pubCon.publish(subject, null); sleep(1); // use a nice stead pace to avoid slow consumers } try { @@ -572,17 +493,12 @@ public void testDrainWithLotsOfMessages() throws Exception { assertTrue(tracker.get(5, TimeUnit.SECONDS)); assertFalse(sub.isActive()); assertEquals(0, ((NatsConnection) subCon).getConsumerCount()); - } + }); } @Test public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { try { @@ -595,11 +511,12 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { count.incrementAndGet(); } }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -611,18 +528,14 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { assertTrue(((NatsConnection) subCon).isDrained()); assertEquals(2, count.get()); // Should get both assertClosed(subCon); - } + }); } @Test public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).errorListener(listener).maxReconnects(0).build()); - Connection pubCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - assertConnected(pubCon); - + runInSharedOwnNc(optionsBuilder().errorListener(listener).maxReconnects(0), subCon -> { + Connection pubCon = SharedServer.sharedConnectionForSameServer(subCon); AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { try { @@ -635,11 +548,12 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { count.incrementAndGet(); } }); - d.subscribe("draintest"); + String subject = random(); + d.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - pubCon.publish("draintest", null); - pubCon.publish("draintest", null); + pubCon.publish(subject, null); + pubCon.publish(subject, null); pubCon.flush(Duration.ofSeconds(1)); subCon.flush(Duration.ofSeconds(1)); @@ -652,36 +566,29 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { assertFalse(((NatsConnection) subCon).isDrained()); assertEquals(0, listener.getExceptionCount()); // Don't throw during drain from reader assertClosed(subCon); - } + }); } @Test - public void testThrowIfCantFlush() { - assertThrows(TimeoutException.class, () -> { - ListenerForTesting listener = new ListenerForTesting(); - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) - { - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - - listener.prepForStatusChange(Events.DISCONNECTED); - ts.close(); // make the drain flush fail - listener.waitForStatusChange(2, TimeUnit.SECONDS); // make sure the connection is down - subCon.drain(Duration.ofSeconds(1)); //should throw - } - }); + public void testThrowIfCantFlush() throws Exception { + ListenerByFuture listener = new ListenerByFuture(); + try (NatsTestServer ts = new NatsTestServer(); + Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) { + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server + + ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); + ts.close(); // make the drain flush fail + listener.validateReceived(f); + + assertThrows(TimeoutException.class, () -> subCon.drain(Duration.ofSeconds(1))); + } } @Test - public void testThrowIfClosing() { - assertThrows(IllegalStateException.class, () -> { - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { - assertConnected(subCon); - - subCon.close(); - subCon.drain(Duration.ofSeconds(1)); - } + public void testThrowIfClosing() throws Exception { + runInSharedOwnNc(optionsBuilderNoReconnect(), subCon -> { + subCon.close(); + assertThrows(IllegalStateException.class, () -> subCon.drain(Duration.ofSeconds(1))); }); } } diff --git a/src/test/java/io/nats/client/impl/InfoHandlerTests.java b/src/test/java/io/nats/client/impl/InfoHandlerTests.java index 47e3f7d93..bb40e05ba 100644 --- a/src/test/java/io/nats/client/impl/InfoHandlerTests.java +++ b/src/test/java/io/nats/client/impl/InfoHandlerTests.java @@ -62,15 +62,15 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec return; } - System.out.println("*** Mock Server @" + ts.getPort() + " sending INFO ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " sending INFO ..."); w.write("INFO {\"server_id\":\"replacement\", \"version\":\"9.9.99\"}\r\n"); w.flush(); - System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); w.write("PING\r\n"); w.flush(); - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); String pong; try { pong = r.readLine(); @@ -80,10 +80,10 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec } if (pong != null && pong.startsWith("PONG")) { - System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); gotPong.complete(Boolean.TRUE); } else { - System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); + // System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); gotPong.complete(Boolean.FALSE); } }; @@ -123,15 +123,15 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti return; } - System.out.println("*** Mock Server @" + ts.getPort() + " sending INFO ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " sending INFO ..."); w.write("INFO {\"server_id\":\"replacement\"}\r\n"); w.flush(); - System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " sending PING ..."); w.write("PING\r\n"); w.flush(); - System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " waiting for PONG ..."); String pong; try { pong = r.readLine(); @@ -141,10 +141,10 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti } if (pong != null && pong.startsWith("PONG")) { - System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); + // System.out.println("*** Mock Server @" + ts.getPort() + " got PONG ..."); gotPong.complete(Boolean.TRUE); } else { - System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); + // System.out.println("*** Mock Server @" + ts.getPort() + " got something else... " + pong); gotPong.complete(Boolean.FALSE); } }; @@ -173,6 +173,6 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti ConnectionListener.Events event = connectLDM.get(5, TimeUnit.SECONDS); assertEquals(ConnectionListener.Events.LAME_DUCK, event); - System.out.println(event); + // System.out.println(event); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index 80f3b3948..fe9798e38 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -20,7 +20,6 @@ import io.nats.client.api.*; import io.nats.client.support.DateTimeUtils; import io.nats.client.utils.VersionUtils; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -285,7 +284,6 @@ public void testSourceBasics() throws Exception { } @Test - @Disabled("This used to work.") public void testSourceAndTransformsRoundTrips() throws Exception { runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 438b3fbec..09d22b05d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -18,10 +18,11 @@ import io.nats.client.api.ConsumerConfiguration; import io.nats.client.api.PriorityPolicy; import io.nats.client.support.JsonUtils; +import io.nats.client.utils.SharedServer; import io.nats.client.utils.VersionUtils; import io.nats.client.utils.VersionUtils.VersionCheck; import org.jspecify.annotations.NonNull; -import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -38,14 +39,32 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.api.ConsumerConfiguration.builder; +import static io.nats.client.impl.ListenerByFutureStatusType.PullError; +import static io.nats.client.impl.ListenerByFutureStatusType.PullWarning; import static io.nats.client.support.ApiConstants.*; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPullTests extends JetStreamTestBase { + static Connection tcsNc; + static ListenerByFuture tcsListener; + + @AfterAll + public static void afterAll() { + if (tcsNc != null) { + try { + tcsNc.close(); + } + catch (InterruptedException ignore) { + Thread.currentThread().interrupt(); + } + } + } + @Test public void testFetch() throws Exception { runInShared((nc, ctx) -> { @@ -706,7 +725,7 @@ public void testPullRequestOptionsBuilder() { } interface ConflictSetup { - JetStreamSubscription setup(Connection nc, JetStreamManagement jsm, JetStream js, JetStreamTestingContext ctx, ListenerForTesting listener) throws Exception; + JetStreamSubscription setup(Connection nc, JetStreamTestingContext ctx, ListenerByFuture listener) throws Exception; } interface BuilderCustomizer { @@ -717,58 +736,57 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { return c.customize(ConsumerConfiguration.builder().ackPolicy(AckPolicy.None)).inactiveThreshold(INACTIVE_THRESHOLD).buildPullSubscribeOptions(); } - static final long NEXT_MESSAGE = 2500; - static final long WAIT_FOR_MESSAGES = 10_000; + static final long NEXT_MESSAGE_TIMEOUT = 2000; static final long INACTIVE_THRESHOLD = 30_000; - static final int TYPE_ERROR = 1; - static final int TYPE_WARNING = 2; - static final int TYPE_NONE = 0; - private void _testConflictStatuses(int statusCode, String statusText, int type, VersionCheck vc, ConflictSetup... setups) throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, vc, (nc, ctx) -> { - for (ConflictSetup setup : setups) { - listener.reset(); - JetStreamSubscription sub = setup.setup(nc, ctx.jsm, ctx.js, ctx, listener); + private void _testConflictStatuses(int statusCode, String statusText, ListenerByFutureStatusType statusType, VersionCheck vc, ConflictSetup setup) throws Exception { + runInSharedCustom(vc, (ignoredNc, ctx) -> { + if (tcsNc == null) { + tcsListener = new ListenerByFuture(); + Options.Builder builder = optionsBuilder(tcsListener); + tcsNc = SharedServer.connectionForSameServer(ignoredNc, builder); + } + else { + tcsListener.reset(); + } + try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(tcsNc, 1)) { + JetStreamSubscription sub = setup.setup(tcsNc, tcsCtx, tcsListener); + ListenerFuture f = statusType == null ? null : tcsListener.prepForStatus(statusType, statusCode); if (sub.getDispatcher() == null) { - if (type == TYPE_ERROR) { - JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE)); + if (statusType == PullError) { + JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE_TIMEOUT)); assertEquals(statusCode, jsse.getStatus().getCode()); assertEquals(sub.hashCode(), jsse.getSubscription().hashCode()); //noinspection deprecation assertTrue(jsse.getDescription().contains(statusText)); // coverage } else { - sub.nextMessage(NEXT_MESSAGE); + sub.nextMessage(NEXT_MESSAGE_TIMEOUT); } } - checkHandler(statusText, type, listener, WAIT_FOR_MESSAGES); + if (f != null) { + tcsListener.validateReceived(f); + } } }); } - private void checkHandler(String statusText, int type, ListenerForTesting listener, long timeout) { - if (type == TYPE_ERROR) { - assertTrue(listener.pullStatusErrorOrWait(statusText, timeout)); - } - else if (type == TYPE_WARNING) { - assertTrue(listener.pullStatusWarningEventually(statusText, timeout)); - } - } - @Test - public void testExceededMaxWaiting() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_WAITING, TYPE_WARNING, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testExceededMaxWaitingSync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(1); sub.pull(1); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + + @Test + public void testExceededMaxWaitingAsync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -779,18 +797,21 @@ public void testExceededMaxWaiting() throws Exception { } @Test - public void testExceedsMaxRequestBatch() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, TYPE_WARNING, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testExceedsMaxRequestBatchSync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(2); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + + @Test + public void testExceedsMaxRequestBatchAsync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -801,19 +822,22 @@ public void testExceedsMaxRequestBatch() throws Exception { } @Test - public void testMessageSizeExceedsMaxBytes() throws Exception { - _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testMessageSizeExceedsMaxBytesSync() throws Exception { + _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); ctx.js.publish(ctx.subject(), new byte[1000]); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(PullRequestOptions.builder(1).maxBytes(100).build()); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + + @Test + public void testMessageSizeExceedsMaxBytesAsync() throws Exception { + _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); ctx.js.publish(ctx.subject(), new byte[1000]); @@ -825,18 +849,21 @@ public void testMessageSizeExceedsMaxBytes() throws Exception { } @Test - public void testExceedsMaxRequestExpires() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, TYPE_WARNING, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testExceedsMaxRequestExpiresSync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pullExpiresIn(1, 2000); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + + @Test + public void testExceedsMaxRequestExpiresAsync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -847,10 +874,9 @@ public void testExceedsMaxRequestExpires() throws Exception { } @Test - public void testConsumerIsPushBased() throws Exception { - _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, TYPE_ERROR, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testConsumerIsPushBasedSync() throws Exception { + _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -860,9 +886,13 @@ public void testConsumerIsPushBased() throws Exception { ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).deliverSubject(dur).build()); sub.pull(1); return sub; - }, - // Async - (nc, jsm, js, ctx, handler) -> { + }); + } + + @Test + public void testConsumerIsPushBasedAsync() throws Exception { + _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); @@ -877,13 +907,10 @@ public void testConsumerIsPushBased() throws Exception { ); } - // This just flaps. It's a timing thing? Already spent too much time, IWOMM and it should work as is. @Test - @Disabled public void testConsumerDeletedSyncSub() throws Exception { - _testConflictStatuses(409, CONSUMER_DELETED, TYPE_ERROR, VersionUtils::atLeast2_9_6, - // Sync - (nc, jsm, js, ctx, handler) -> { + _testConflictStatuses(409, CONSUMER_DELETED, PullError, VersionUtils::atLeast2_9_6, + (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -892,10 +919,14 @@ public void testConsumerDeletedSyncSub() throws Exception { ctx.jsm.deleteConsumer(ctx.stream, dur); ctx.js.publish(ctx.subject(), null); return sub; - }, + }); + } + @Test + public void testConsumerDeletedAsyncSub() throws Exception { + _testConflictStatuses(409, CONSUMER_DELETED, PullError, VersionUtils::atLeast2_9_6, // Async - (nc, jsm, js, ctx, handler) -> { + (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); @@ -910,18 +941,20 @@ public void testConsumerDeletedSyncSub() throws Exception { } @Test - public void testBadRequest() throws Exception { - _testConflictStatuses(400, BAD_REQUEST, TYPE_ERROR, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testBadRequestSync() throws Exception { + _testConflictStatuses(400, BAD_REQUEST, PullError, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(new BadPullRequestOptions()); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + @Test + public void testBadRequestAsync() throws Exception { + _testConflictStatuses(400, BAD_REQUEST, PullError, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -931,18 +964,21 @@ public void testBadRequest() throws Exception { } @Test - public void testNotFound() throws Exception { - _testConflictStatuses(404, NO_MESSAGES, TYPE_NONE, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testNotFoundSync() throws Exception { + _testConflictStatuses(404, NO_MESSAGES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pullNoWait(1); return sub; - }, + }); + } - // Async - (nc, jsm, js, ctx, handler) -> { + + @Test + public void testNotFoundAsync() throws Exception { + _testConflictStatuses(404, NO_MESSAGES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -952,18 +988,20 @@ public void testNotFound() throws Exception { } @Test - public void testExceedsMaxRequestBytes1stMessage() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, TYPE_WARNING, VersionUtils::atLeast2_9_0, - // Sync - (nc, jsm, js, ctx, handler) -> { + public void testExceedsMaxRequestBytes1stMessageSync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); return sub; - }, - // Async + }); + } - (nc, jsm, js, ctx, handler) -> { + @Test + public void testExceedsMaxRequestBytes1stMessageAsync() throws Exception { + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -990,8 +1028,9 @@ public String toJson() { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + ListenerByFuture listener = new ListenerByFuture(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { + ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(ctx.subject()).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -1009,14 +1048,15 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { assertNotNull(sub.nextMessage(500)); assertNotNull(sub.nextMessage(500)); assertNull(sub.nextMessage(500)); - checkHandler(MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, listener, 2500); + listener.validateReceived(f); }); } @Test - public void testExceedsMaxRequestBytesExactBytes() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception { + ListenerByFuture listener = new ListenerByFuture(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { + ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); ctx.stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes @@ -1038,7 +1078,7 @@ public void testExceedsMaxRequestBytesExactBytes() throws Exception { assertNotNull(sub.nextMessage(500)); assertNotNull(sub.nextMessage(500)); assertNull(sub.nextMessage(500)); // there are no more messages - checkHandler(MESSAGE_SIZE_EXCEEDS_MAX_BYTES, TYPE_NONE, listener, 2500); + listener.validateNotReceived(f); }); } diff --git a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java index 026157a41..2e69306f5 100644 --- a/src/test/java/io/nats/client/impl/JetStreamTestingContext.java +++ b/src/test/java/io/nats/client/impl/JetStreamTestingContext.java @@ -60,7 +60,6 @@ public JetStreamTestingContext(Connection nc, int subjectCount) throws JetStream if (subjectCount > 0) { createOrReplaceStream(subjectCount); } - } // ---------------------------------------------------------------------------------------------------- diff --git a/src/test/java/io/nats/client/impl/ListenerByFuture.java b/src/test/java/io/nats/client/impl/ListenerByFuture.java index 86cde9d70..38e4c335c 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFuture.java +++ b/src/test/java/io/nats/client/impl/ListenerByFuture.java @@ -1,4 +1,4 @@ -// Copyright 2015-2018 The NATS Authors +// Copyright 2025 The NATS Authors // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: @@ -21,7 +21,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -34,16 +33,8 @@ public class ListenerByFuture implements ErrorListener, ConnectionListener { private final boolean printExceptions; private final boolean verbose; - private List eventFutures; - private List errorFutures; - private List exceptionFutures; - private List statusFutures; - private List fcFutures; + private final List futures; - public enum StatusType { - Unhandled, PullWarning, PullError - } - public ListenerByFuture() { this(false, false); } @@ -55,129 +46,81 @@ public ListenerByFuture(boolean verbose) { public ListenerByFuture(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; - eventFutures = new ArrayList<>(); - errorFutures = new ArrayList<>(); - exceptionFutures = new ArrayList<>(); - statusFutures = new ArrayList<>(); - fcFutures = new ArrayList<>(); + futures = new ArrayList<>(); } public void reset() { - eventFutures.clear(); - errorFutures.clear(); - exceptionFutures.clear(); - statusFutures.clear(); - fcFutures.clear(); + futures.clear(); } - public ListenerFuture prepForEvent(Events type) { - if (verbose) { - report("Future For Event", type); + public void validateReceived(ListenerFuture... futuresToTry) { + int len = futuresToTry.length; + int lastIx = len - 1; + for (int ix = 0; ix < len; ix++) { + ListenerFuture f = futuresToTry[ix]; + try { + f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + // future was completed, it and all the rest can be cancelled and removed from tracking + while (ix < len) { + f = futuresToTry[ix++]; + futures.remove(f); + f.cancel(true); + } + return; + } + catch (TimeoutException | ExecutionException | InterruptedException e) { + futures.remove(f); // removed from tracking + f.cancel(true); + if (ix == lastIx) { + Assertions.fail("'Validate Received' Failed " + f.getDetails(), e); + } + } } - ListenerFuture f = new ListenerFuture(type); - eventFutures.add(f); - return f; } - public ListenerFuture prepForException(Class exceptionClass) { - if (verbose) { - report("Future For Exception", exceptionClass); + public void validateNotReceived(ListenerFuture f) { + futures.remove(f); // removed from tracking + try { + f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + Assertions.fail("'Validate Not Received' Failed " + f.getDetails()); } - ListenerFuture f = new ListenerFuture(exceptionClass); - exceptionFutures.add(f); - return f; - } - - public ListenerFuture prepForError(String errorText) { - if (verbose) { - report("Future For Event", errorText); + catch (TimeoutException ignore) { + // this is what is supposed to happen! } - ListenerFuture f = new ListenerFuture(errorText); - errorFutures.add(f); - return f; - } - - public ListenerFuture prepForStatus(StatusType type, int statusCode) { - if (verbose) { - report("Future For Status", type + " " + statusCode); + catch (InterruptedException e) { + f.cancel(true); + } + catch (ExecutionException e) { + Assertions.fail("'Validate Not Received' Failed " + f.getDetails(), e); } - ListenerFuture f = new ListenerFuture(type, statusCode); - statusFutures.add(f); - return f; } - public ListenerFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { + private ListenerFuture prepFor(String label, ListenerFuture f) { if (verbose) { - report("Future For FlowControl", fcSubject + " " + fcSource); + report("Future For " + label, f.getDetails()); } - ListenerFuture f = new ListenerFuture(fcSubject, fcSource); - fcFutures.add(f); + futures.add(f); return f; } - // ---------------------------------------------------------------------------------------------------- - // Prep - // ---------------------------------------------------------------------------------------------------- - public static class ListenerFuture extends CompletableFuture { - private Events eventType; - private String error; - private Class exceptionClass; - private StatusType statusType; - private int statusCode = -1; - private String fcSubject; - private FlowControlSource fcSource; - - public ListenerFuture(Events type) { - this.eventType = type; - } - - public ListenerFuture(Class exceptionClass) { - this.exceptionClass = exceptionClass; - } - - public ListenerFuture(String errorText) { - error = errorText; - } - - public ListenerFuture(StatusType type, int statusCode) { - statusType = type; - this.statusCode = statusCode; - } + public ListenerFuture prepForConnectionEvent(Events type) { + return prepFor("Event", new ListenerFuture(type)); + } - public ListenerFuture(String fcSubject, FlowControlSource fcSource) { - this.fcSubject = fcSubject; - this.fcSource = fcSource; - } + public ListenerFuture prepForException(Class exceptionClass) { + return prepFor("Exception", new ListenerFuture(exceptionClass)); + } - public void validate() { - try { - get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); - } - catch (TimeoutException | ExecutionException | InterruptedException e) { - Assertions.fail("Validate Failed " + getDetails(), e); - } - } + public ListenerFuture prepForError(String errorText) { + return prepFor("Error", new ListenerFuture(errorText)); + } - public void validate(ListenerFuture second) { - try { - get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); - } - catch (TimeoutException | ExecutionException | InterruptedException e) { - second.validate(); - } - } + public ListenerFuture prepForStatus(ListenerByFutureStatusType type, int statusCode) { + return prepFor("Status", new ListenerFuture(type, statusCode)); + } - public List getDetails() { - List details = new ArrayList<>(); - if (eventType != null) { details.add(eventType.toString()); } - if (error != null) { details.add(error); } - if (exceptionClass != null) { details.add(exceptionClass.toString()); } - if (statusType != null) { details.add(statusType.toString()); } - if (statusCode != -1) { details.add(Integer.toString(statusCode)); } - if (fcSubject != null) { details.add(fcSubject); } - if (fcSource != null) { details.add(fcSource.toString()); } - return details; - } + public ListenerFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { + return prepFor("FlowControl", new ListenerFuture(fcSubject, fcSource)); } // ---------------------------------------------------------------------------------------------------- @@ -204,7 +147,7 @@ public void connectionEvent(Connection conn, Events type, Long time, String uriD if (verbose) { report("connectionEvent", type); } - tryToComplete(eventFutures, f -> f.eventType.equals(type)); + tryToComplete(futures, f -> type.equals(f.eventType)); } // ---------------------------------------------------------------------------------------------------- @@ -215,7 +158,7 @@ public void errorOccurred(Connection conn, String error) { if (verbose) { report("errorOccurred", error); } - tryToComplete(errorFutures, f -> f.error.equals(error)); + tryToComplete(futures, f -> error.equals(f.error)); } @Override @@ -227,10 +170,10 @@ public void exceptionOccurred(Connection conn, Exception exp) { else if (verbose) { report("exceptionOccurred", exp.getClass() + " --> " + exp.getMessage()); } - tryToComplete(exceptionFutures, f -> { + tryToComplete(futures, f -> { Throwable t = exp; while (t != null) { - if (f.exceptionClass.equals(t.getClass())) { + if (t.getClass().equals(f.exceptionClass)) { f.complete(null); return true; } @@ -250,28 +193,31 @@ public void messageDiscarded(Connection conn, Message msg) { @Override public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { + if (verbose) { + report("Heartbeat Alarm", lastStreamSequence + " " + lastConsumerSequence); + } } - private void statusReceived(StatusType type, Status status) { + private void statusReceived(ListenerByFutureStatusType type, Status status) { if (verbose) { - report("statusReceived", status); + report("Status Received " + type.name(), status); } - tryToComplete(statusFutures, f -> f.statusType.equals(type) && f.statusCode == status.getCode()); + tryToComplete(futures, f -> type.equals(f.lbfStatusType) && f.statusCode == status.getCode()); } @Override public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(StatusType.Unhandled, status); + statusReceived(ListenerByFutureStatusType.Unhandled, status); } @Override public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(StatusType.PullWarning, status); + statusReceived(ListenerByFutureStatusType.PullWarning, status); } @Override public void pullStatusError(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(StatusType.PullError, status); + statusReceived(ListenerByFutureStatusType.PullError, status); } @Override @@ -279,7 +225,7 @@ public void flowControlProcessed(Connection conn, JetStreamSubscription sub, Str if (verbose) { report("flowControlProcessed", subject + " " + source); } - tryToComplete(fcFutures, f -> f.fcSubject.equals(subject) && f.fcSource == source); + tryToComplete(futures, f -> subject.equals(f.fcSubject) && f.fcSource == source); } @Override diff --git a/src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java b/src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java new file mode 100644 index 000000000..c72dc1ce0 --- /dev/null +++ b/src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java @@ -0,0 +1,18 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +public enum ListenerByFutureStatusType { + Unhandled, PullWarning, PullError, None +} diff --git a/src/test/java/io/nats/client/impl/ListenerFuture.java b/src/test/java/io/nats/client/impl/ListenerFuture.java new file mode 100644 index 000000000..9d86222cf --- /dev/null +++ b/src/test/java/io/nats/client/impl/ListenerFuture.java @@ -0,0 +1,87 @@ +// Copyright 2025 The NATS Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package io.nats.client.impl; + +import io.nats.client.ConnectionListener; +import io.nats.client.ErrorListener; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +// ---------------------------------------------------------------------------------------------------- +// Prep +// ---------------------------------------------------------------------------------------------------- +public class ListenerFuture extends CompletableFuture { + public ConnectionListener.Events eventType; + public String error; + public Class exceptionClass; + public ListenerByFutureStatusType lbfStatusType; + public int statusCode = -1; + public String fcSubject; + public ErrorListener.FlowControlSource fcSource; + + public ListenerFuture(ConnectionListener.Events type) { + this.eventType = type; + } + + public ListenerFuture(Class exceptionClass) { + this.exceptionClass = exceptionClass; + } + + public ListenerFuture(String errorText) { + error = errorText; + } + + public ListenerFuture(ListenerByFutureStatusType type, int statusCode) { + lbfStatusType = type; + this.statusCode = statusCode; + } + + public ListenerFuture(String fcSubject, ErrorListener.FlowControlSource fcSource) { + this.fcSubject = fcSubject; + this.fcSource = fcSource; + } + + @Override + public String toString() { + return "ListenerFuture{" + getDetails() + "}"; + } + + public List getDetails() { + List details = new ArrayList<>(); + if (eventType != null) { + details.add(eventType.toString()); + } + if (error != null) { + details.add(error); + } + if (exceptionClass != null) { + details.add(exceptionClass.toString()); + } + if (lbfStatusType != null) { + details.add(lbfStatusType.toString()); + } + if (statusCode != -1) { + details.add(Integer.toString(statusCode)); + } + if (fcSubject != null) { + details.add(fcSubject); + } + if (fcSource != null) { + details.add(fcSource.toString()); + } + return details; + } +} diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 10c313fa5..c5e58a6da 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import static io.nats.client.impl.ListenerByFuture.StatusType.PullError; -import static io.nats.client.impl.ListenerByFuture.StatusType.PullWarning; +import static io.nats.client.impl.ListenerByFutureStatusType.PullError; +import static io.nats.client.impl.ListenerByFutureStatusType.PullWarning; import static io.nats.client.impl.MessageManager.ManageResult; import static io.nats.client.impl.MessageManager.ManageResult.*; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; @@ -98,25 +98,25 @@ private void _testPushBqpAndManageRetriable(Connection nc, ListenerByFuture list assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); if (manager.fc) { - ListenerByFuture.ListenerFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); + ListenerFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); - f.validate(); + listener.validateReceived(f); } else { - ListenerByFuture.ListenerFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + ListenerFuture f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - f.validate(); + listener.validateReceived(f); - f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); - f.validate(); + listener.validateReceived(f); } assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - ListenerByFuture.ListenerFuture f = listener.prepForStatus(ListenerByFuture.StatusType.Unhandled, 999); + ListenerFuture f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, 999); assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - f.validate(); + listener.validateReceived(f); } @Test @@ -169,10 +169,10 @@ private void _testPullBqpAndManage(Connection nc, ListenerByFuture listener, Pul assertManageResult(listener, PullError, CONFLICT_CODE, STATUS_ERROR, manager, getConflictStatus(sid, CONSUMER_IS_PUSH_BASED)); } - private static void assertManageResult(ListenerByFuture listener, ListenerByFuture.StatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { - ListenerByFuture.ListenerFuture f = listener.prepForStatus(expectedType, expectedStatusCode); + private static void assertManageResult(ListenerByFuture listener, ListenerByFutureStatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { + ListenerFuture f = listener.prepForStatus(expectedType, expectedStatusCode); assertEquals(expecteManageResult, manager.manage(message)); - f.validate(); + listener.validateReceived(f); } @Test diff --git a/src/test/java/io/nats/client/impl/MessageQueueTests.java b/src/test/java/io/nats/client/impl/MessageQueueTests.java index 79f02ad7d..93db5e65d 100644 --- a/src/test/java/io/nats/client/impl/MessageQueueTests.java +++ b/src/test/java/io/nats/client/impl/MessageQueueTests.java @@ -43,11 +43,9 @@ public void testEmptyPop() throws InterruptedException { @Test public void testAccumulateThrowsOnNonSingleReader() { - assertThrows(IllegalStateException.class, () -> { - MessageQueue q = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); - q.push(new ProtocolMessage(PING)); - q.accumulate(100,1,null); - }); + MessageQueue q = new MessageQueue(false, REQUEST_CLEANUP_INTERVAL); + q.push(new ProtocolMessage(PING)); + assertThrows(IllegalStateException.class, () -> q.accumulate(100, 1, null)); } @Test @@ -629,11 +627,8 @@ public void testPausedAccumulate() throws InterruptedException { @Test public void testThrowOnFilterIfRunning() { - assertThrows(IllegalStateException.class, () -> { - MessageQueue q = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); - q.filter(msg -> true); - fail(); - }); + MessageQueue q = new MessageQueue(true, REQUEST_CLEANUP_INTERVAL); + assertThrows(IllegalStateException.class, () -> q.filter(msg -> true)); } @Test diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index c51163631..9af94e7fd 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -112,59 +112,51 @@ public void testSizeOnPublishMessageOnlySubject() { } @Test - public void testCustomMaxControlLine() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] body = new byte[10]; - String subject = "subject"; - int maxControlLine = 1024; - - while (subject.length() <= maxControlLine) { - subject += subject; - } - - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); - Connection nc = Nats.connect(options); - standardConnectionWait(nc); - nc.request(subject, body); - } - }); + public void testCustomMaxControlLine() throws Exception { + byte[] body = new byte[10]; + int maxControlLine = 1024; + + StringBuilder subject = new StringBuilder(random()); + while (subject.length() <= maxControlLine) { + subject.append(subject); + } + + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); + Connection nc = Nats.connect(options); + standardConnectionWait(nc); + assertThrows(IllegalArgumentException.class, () -> nc.request(subject.toString(), body)); + } } @Test - public void testBigProtocolLineWithoutBody() { - assertThrows(IllegalArgumentException.class, () -> { - String subject = "subject"; - - while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { - subject += subject; - } - - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { - standardConnectionWait(nc); - nc.subscribe(subject); - } - }); + public void testBigProtocolLineWithoutBody() throws Exception { + StringBuilder subject = new StringBuilder(random()); + while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { + subject.append(subject); + } + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { + standardConnectionWait(nc); + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(subject.toString())); + } } @Test - public void testBigProtocolLineWithBody() { - assertThrows(IllegalArgumentException.class, () -> { - byte[] body = new byte[10]; - String subject = "subject"; - String replyTo = "reply"; - - while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { - subject += subject; - } - - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { - standardConnectionWait(nc); - nc.publish(subject, replyTo, body); - } - }); + public void testBigProtocolLineWithBody() throws Exception { + byte[] body = new byte[10]; + String replyTo = "reply"; + + StringBuilder subject = new StringBuilder(random()); + while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { + subject.append(subject); + } + + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); + NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { + standardConnectionWait(nc); + assertThrows(IllegalArgumentException.class, () -> nc.publish(subject.toString(), replyTo, body)); + } } diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index dcb5748c4..d8854e5eb 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -47,7 +47,7 @@ @Isolated public class ReconnectTests { - void checkReconnectingStatus(Connection nc) { + void checkNotConnected(Connection nc) { Connection.Status status = nc.getStatus(); assertTrue(Connection.Status.RECONNECTING == status || Connection.Status.DISCONNECTED == status, "Reconnecting status"); } @@ -104,7 +104,7 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer { - Connection nc; - ListenerForTesting listener = new ListenerForTesting(); - - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts) - .maxReconnects(-1) - .connectionListener(listener) - .reconnectBufferSize(4*512) - .reconnectWait(Duration.ofSeconds(480)) - .build(); - nc = standardConnectionWait(options); - listener.prepForStatusChange(Events.DISCONNECTED); - } + public void testOverflowReconnectBuffer() throws Exception { + ListenerByFuture listener = new ListenerByFuture(); + ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); + Connection nc; + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts) + .connectionListener(listener) + .reconnectBufferSize(4*512) + .reconnectWait(Duration.ofSeconds(480)) + .build(); + nc = standardConnectionWait(options); + } - flushAndWaitLong(nc, listener); - checkReconnectingStatus(nc); + listener.validateReceived(f); - for (int i=0;i<20;i++) { - nc.publish("test", new byte[512]);// Should blow up by the 5th message + assertThrows(IllegalStateException.class, () -> { + for (int i = 0; i < 20; i++) { + nc.publish("test", new byte[512]);// Should be full by the 5th message } }); + + nc.close(); } @Test @@ -394,7 +393,7 @@ public void testInfiniteReconnectBuffer() throws Exception { } flushAndWaitLong(nc, listener); - checkReconnectingStatus(nc); + checkNotConnected(nc); byte[] payload = new byte[1024]; for (int i=0;i<1_000;i++) { @@ -460,7 +459,7 @@ public void testReconnectDropOnLineFeed() throws Exception { // Thrash in and out of connect status // server starts thrashCount times, so we should succeed thrashCount x for (int i=0;i(); subRef.set(gotSub); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index b72b44c85..f292087a6 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -28,6 +28,7 @@ import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.OptionsUtils.optionsNoReconnect; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -123,7 +124,7 @@ public void testRequestVarieties() throws Exception { @Test public void testSimpleResponseMessageHasConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsNoReconnect(ts))) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { @@ -146,7 +147,7 @@ public void testSimpleResponseMessageHasConnection() throws Exception { @Test public void testSafeRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsNoReconnect(ts))) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); @@ -164,7 +165,7 @@ public void testSafeRequest() throws Exception { @Test public void testMultipleRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { + Connection nc = Nats.connect(optionsNoReconnect(ts))) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index ad1bb0040..040443c34 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -1693,106 +1693,110 @@ public void testFinishEmptyStream() throws Exception { } @Test - @Disabled("This is a timing flapper and is annoying.") + @Disabled("This is a timing flapper and is annoying. java 21 makes it worse") public void testReconnectOverOrdered() throws Exception { - // ------------------------------------------------------------ - // The idea here is... - // 1. connect with an ordered consumer and start consuming - // 2. stop the server then restart it causing a disconnect, - // but reconnect before the idle heartbeat alarm kicks in - // 3. stop the server but wait a little before restarting - // so the alarm goes off but still disconnected - // to make sure the consumer continues after that condition - // ------------------------------------------------------------ - int port = NatsTestServer.nextPort(); - ListenerForTesting lft = new ListenerForTesting(); - Options options = optionsBuilder() - .connectionListener(lft) - .errorListener(lft) - .server(NatsTestServer.getLocalhostUri(port)).build(); - NatsConnection nc; - - String stream = random(); - String subject = random(); - - AtomicBoolean allInOrder = new AtomicBoolean(true); - AtomicInteger atomicCount = new AtomicInteger(); - AtomicLong nextExpectedSequence = new AtomicLong(0); - - MessageHandler handler = msg -> { - if (msg.metaData().streamSequence() != nextExpectedSequence.incrementAndGet()) { - allInOrder.set(false); - } - msg.ack(); - atomicCount.incrementAndGet(); - sleep(50); // simulate some work and to slow the endless consume - }; - - // variable are here. initialized during first server, but used after. - StreamContext streamContext; - OrderedConsumerContext orderedConsumerContext; - MessageConsumer mcon; - String firstConsumerName; - - //noinspection unused - try (NatsTestServer ts = new NatsTestServer(port, true)) { - nc = (NatsConnection) standardConnectionWait(options); - StreamConfiguration sc = StreamConfiguration.builder() - .name(stream) - .storageType(StorageType.File) // file since we are killing the server and bringing it back up. - .subjects(subject).build(); - nc.jetStreamManagement().addStream(sc); - - jsPublish(nc, subject, 10000); + // ------------------------------------------------------------ + // The idea here is... + // 1. connect with an ordered consumer and start consuming + // 2. stop the server then restart it causing a disconnect, + // but reconnect before the idle heartbeat alarm kicks in + // 3. stop the server but wait a little before restarting + // so the alarm goes off but still disconnected + // to make sure the consumer continues after that condition + // ------------------------------------------------------------ + int port = NatsTestServer.nextPort(); + ListenerForTesting lft = new ListenerForTesting(true); + Options options = optionsBuilder() + .connectionListener(lft) + .errorListener(lft) + .server(NatsTestServer.getLocalhostUri(port)).build(); + NatsConnection nc; + + String stream = random(); + String subject = random(); + + AtomicBoolean allInOrder = new AtomicBoolean(true); + AtomicInteger atomicCount = new AtomicInteger(); + AtomicLong nextExpectedSequence = new AtomicLong(0); - ConsumeOptions consumeOptions = ConsumeOptions.builder() - .batchSize(100) // small batch size means more round trips - .expiresIn(1500) // idle heartbeat is half of this, alarm time is 3 * ihb - .build(); + MessageHandler handler = msg -> { +// Debug.info("H", msg); + if (msg.metaData().streamSequence() != nextExpectedSequence.incrementAndGet()) { + allInOrder.set(false); + } + msg.ack(); + atomicCount.incrementAndGet(); + sleep(50); // simulate some work and to slow the endless consume + }; - OrderedConsumerConfiguration ocConfig = new OrderedConsumerConfiguration().filterSubjects(subject); - streamContext = nc.getStreamContext(stream); - orderedConsumerContext = streamContext.createOrderedConsumer(ocConfig); - assertNull(orderedConsumerContext.getConsumerName()); - mcon = orderedConsumerContext.consume(consumeOptions, handler); - firstConsumerName = validateConsumerNameForOrdered(orderedConsumerContext, mcon, null); + // variable are here. initialized during first server, but used after. + StreamContext streamContext; + OrderedConsumerContext orderedConsumerContext; + MessageConsumer mcon; + String firstConsumerName; + + //noinspection unused + try (NatsTestServer ts = new NatsTestServer(port, true)) { + nc = (NatsConnection) standardConnectionWait(options); + StreamConfiguration sc = StreamConfiguration.builder() + .name(stream) + .storageType(StorageType.File) // file since we are killing the server and bringing it back up. + .subjects(subject).build(); + nc.jetStreamManagement().addStream(sc); + + jsPublish(nc, subject, 10000); + + ConsumeOptions consumeOptions = ConsumeOptions.builder() + .batchSize(100) // small batch size means more round trips + .expiresIn(1500) // idle heartbeat is half of this, alarm time is 3 * ihb + .build(); + + OrderedConsumerConfiguration ocConfig = new OrderedConsumerConfiguration().filterSubjects(subject); + streamContext = nc.getStreamContext(stream); + orderedConsumerContext = streamContext.createOrderedConsumer(ocConfig); + assertNull(orderedConsumerContext.getConsumerName()); + mcon = orderedConsumerContext.consume(consumeOptions, handler); + firstConsumerName = validateConsumerNameForOrdered(orderedConsumerContext, mcon, null); +// Debug.info("FCN", firstConsumerName); + + sleep(500); // time enough to get some messages + } - sleep(500); // time enough to get some messages - } + assertTrue(allInOrder.get()); + int count1 = atomicCount.get(); + assertTrue(count1 > 0); + assertEquals(count1, nextExpectedSequence.get()); - assertTrue(allInOrder.get()); - int count1 = atomicCount.get(); - assertTrue(count1 > 0); - assertEquals(count1, nextExpectedSequence.get()); + // reconnect and get some more messages + try (NatsTestServer ignored = new NatsTestServer(port, true)) { + standardConnectionWait(nc); + sleep(10000); // long enough to get messages and for the hb alarm to have tripped + } - // reconnect and get some more messages - try (NatsTestServer ignored = new NatsTestServer(port, true)) { - standardConnectionWait(nc); - sleep(6000); // long enough to get messages and for the hb alarm to have tripped - } - assertNotEquals(firstConsumerName, orderedConsumerContext.getConsumerName()); +// Debug.info("XCN", orderedConsumerContext.getConsumerName()); + assertNotEquals(firstConsumerName, orderedConsumerContext.getConsumerName()); - assertTrue(allInOrder.get()); - int count2 = atomicCount.get(); - assertTrue(count2 > count1); - assertEquals(count2, nextExpectedSequence.get()); + assertTrue(allInOrder.get()); + int count2 = atomicCount.get(); + assertTrue(count2 > count1); + assertEquals(count2, nextExpectedSequence.get()); - sleep(6000); // enough delay before reconnect to trip hb alarm again - try (NatsTestServer ignored = new NatsTestServer(port, true)) { - standardConnectionWait(nc); - sleep(6000); // long enough to get messages and for the hb alarm to have tripped + sleep(6000); // enough delay before reconnect to trip hb alarm again + try (NatsTestServer ignored = new NatsTestServer(port, true)) { + standardConnectionWait(nc); + sleep(6000); // long enough to get messages and for the hb alarm to have tripped - try { - nc.jetStreamManagement().deleteStream(stream); // it was a file stream clean it up - } - catch (JetStreamApiException ignore) { - // in GH actions this fails sometimes + try { + nc.jetStreamManagement().deleteStream(stream); // it was a file stream clean it up + } + catch (JetStreamApiException ignore) { + // in GH actions this fails sometimes + } } - } - assertTrue(allInOrder.get()); - int count3 = atomicCount.get(); - assertTrue(count3 > count2); - assertEquals(count3, nextExpectedSequence.get()); - } + assertTrue(allInOrder.get()); + int count3 = atomicCount.get(); + assertTrue(count3 > count2); + assertEquals(count3, nextExpectedSequence.get()); + } } diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 0d7ae4765..febac4c8b 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -33,6 +33,7 @@ import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; +import static io.nats.client.utils.OptionsUtils.optionsNoReconnect; import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.atLeast2_10_3; @@ -303,7 +304,7 @@ public void testDisconnectOnUpgrade() { public void testServerSecureClientNotMismatch() { assertThrows(IOException.class, () -> { try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0).build(); + Options options = optionsNoReconnect(ts); Nats.connect(options); } }); diff --git a/src/test/java/io/nats/client/support/DateTimeUtilsTests.java b/src/test/java/io/nats/client/support/DateTimeUtilsTests.java index 546ee662d..454d374cd 100644 --- a/src/test/java/io/nats/client/support/DateTimeUtilsTests.java +++ b/src/test/java/io/nats/client/support/DateTimeUtilsTests.java @@ -49,14 +49,11 @@ public void testToRfc3339() { Instant i = Instant.ofEpochSecond(1611186068); ZonedDateTime zdt1 = ZonedDateTime.ofInstant(i, ZoneId.systemDefault()); ZonedDateTime zdt2 = ZonedDateTime.ofInstant(i, DateTimeUtils.ZONE_ID_GMT); - System.out.println(zdt1); - System.out.println(zdt2); assertEquals(zdt1.toEpochSecond(), zdt2.toEpochSecond()); String rfc1 = DateTimeUtils.toRfc3339(zdt1); String rfc2 = DateTimeUtils.toRfc3339(zdt2); assertEquals(rfc1, rfc2); - System.out.println(zdt2.toEpochSecond()); assertEquals("2021-01-20T23:41:08.579594000Z", DateTimeUtils.toRfc3339(DateTimeUtils.parseDateTime("2021-01-20T23:41:08.579594Z"))); assertEquals("2021-02-02T19:18:28.347722551Z", DateTimeUtils.toRfc3339(DateTimeUtils.parseDateTime("2021-02-02T11:18:28.347722551-08:00"))); diff --git a/src/test/java/io/nats/client/support/JsonUtilsTests.java b/src/test/java/io/nats/client/support/JsonUtilsTests.java index fde80f9f1..c53204430 100644 --- a/src/test/java/io/nats/client/support/JsonUtilsTests.java +++ b/src/test/java/io/nats/client/support/JsonUtilsTests.java @@ -483,7 +483,6 @@ public void testMiscCoverage() { addField(sb, "foo64", base64); addField(sb, "zdt", zdt); endJson(sb); - System.out.println(sb); bytes = readBase64(sb.toString(), string_pattern("foo64")); assertArrayEquals(byte64, bytes); diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index 0addea5fd..782a22fe5 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -126,4 +126,28 @@ public static void assertCanConnect(Options options) throws IOException, Interru private static String expectingMessage(Connection conn, Connection.Status expecting) { return "Failed expecting Connection Status " + expecting.name() + " but was " + conn.getStatus(); } + + // ---------------------------------------------------------------------------------------------------- + // new connection better for java 21 + // ---------------------------------------------------------------------------------------------------- + private static final int RETRY_DELAY_INCREMENT = 50; + private static final int CONNECTION_RETRIES = 10; + private static final long RETRY_DELAY = 100; + public static Connection newConnection(Options options) { + long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; + for (int x = 0; x < CONNECTION_RETRIES; x++) { + if (x > 0) { + delay += RETRY_DELAY_INCREMENT; + sleep(delay); + } + try { + return Nats.connect(options); + } + catch (IOException ignored) {} + catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + } + } + return null; + } } diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 283029d1a..33ca4f7d8 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -37,6 +37,10 @@ public static Options.Builder optionsBuilder(ErrorListener el) { return optionsBuilder().errorListener(el); } + public static Options.Builder optionsBuilderNoReconnect() { + return optionsBuilder().maxReconnects(0); + } + public static Options.Builder optionsBuilder(TestServer... tses) { if (tses.length == 1) { return optionsBuilder().server(tses[0].getServerUri()); @@ -76,6 +80,10 @@ public static Options options(NatsTestServer... tses) { return optionsBuilder(tses).build(); } + public static Options optionsNoReconnect(NatsTestServer ts) { + return optionsBuilder(ts).maxReconnects(0).build(); + } + public static Options options(NatsServerProtocolMock... mockTses) { return optionsBuilder(mockTses).build(); } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index 534a38a83..e57b62c54 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -13,7 +13,10 @@ package io.nats.client.utils; -import io.nats.client.*; +import io.nats.client.Connection; +import io.nats.client.NUID; +import io.nats.client.NatsTestServer; +import io.nats.client.Options; import java.io.IOException; import java.util.HashMap; @@ -28,9 +31,6 @@ public class SharedServer { private static final int NUM_REUSABLE_CONNECTIONS = 3; - private static final int RETRY_DELAY_INCREMENT = 50; - private static final int CONNECTION_RETRIES = 10; - private static final long RETRY_DELAY = 100; private static final Thread SHARED_SHUTDOWN_HOOK_THREAD; private static final Map SHARED_BY_URL; private static final ReentrantLock STATIC_LOCK; @@ -103,6 +103,14 @@ public static Connection sharedConnectionForSameServer(Connection nc) { return shared.getSharedConnection(); } + public static Connection connectionForSameServer(Connection nc, Options.Builder builder) { + SharedServer shared = SHARED_BY_URL.get(nc.getConnectedUrl()); + if (shared == null) { + throw new RuntimeException("No shared server for that connection."); + } + return shared.newConnection(builder); + } + private void waitUntilStatus(Connection conn) { for (long x = 0; x < 100; x++) { sleep(100); @@ -136,22 +144,7 @@ else if (ncs.getStatus() != Connection.Status.CONNECTED) { } public Connection newConnection(Options.Builder builder) { - long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; - Options options = builder.server(serverUrl).build(); - for (int x = 0; x < CONNECTION_RETRIES; x++) { - if (x > 0) { - delay += RETRY_DELAY_INCREMENT; - sleep(delay); - } - try { - return Nats.connect(options); - } - catch (IOException ignored) {} - catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - } - } - return null; + return ConnectionUtils.newConnection(builder.server(serverUrl).build()); } public void shutdown() { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 325bec266..5d8feb95f 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -125,7 +125,7 @@ public interface JetStreamTestingContextTest { // runners -> own server // ---------------------------------------------------------------------------------------------------- private static void _runInOwnServer( - Options.Builder optionsBuilder, + @SuppressWarnings("SameParameterValue") Options.Builder optionsBuilder, VersionCheck vc, String configFilePath, OneConnectionTest oneNcTest, @@ -174,10 +174,6 @@ public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exceptio _runInOwnServer(null, null, null, null, jetStreamTest); } - public static void runInOwnJsServer(ErrorListener el, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(optionsBuilder(el), null, null, null, jetStreamTest); - } - public static void runInOwnJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { _runInOwnServer(null, null, configFilePath, null, jetStreamTest); } @@ -193,6 +189,7 @@ private static void _runInShared( Options.Builder optionsBuilder, VersionCheck vc, OneConnectionTest oneNcTest, + TwoConnectionTest twoNcTest, int jstcTestSubjectCount, JetStreamTestingContextTest ctxTest ) throws Exception { @@ -206,9 +203,14 @@ private static void _runInShared( // with a builder, just make a fresh connection and close it at the end. boolean closeNcWhenDone; Connection nc; + Connection nc2 = null; + if (optionsBuilder == null) { closeNcWhenDone = false; nc = shared.getSharedConnection(); + if (twoNcTest != null) { + nc2 = shared.getSharedConnection(); + } } else { closeNcWhenDone = true; @@ -216,6 +218,12 @@ private static void _runInShared( if (nc == null) { throw new RuntimeException("Unable to open a new connection to reusable sever."); } + if (twoNcTest != null) { + nc2 = shared.newConnection(optionsBuilder); + if (nc2 == null) { + throw new RuntimeException("Unable to open a new connection to reusable sever."); + } + } } initVersionServerInfo(nc); @@ -226,13 +234,20 @@ private static void _runInShared( ctxTest.test(nc, ctx); } } - else { + else if (oneNcTest != null) { oneNcTest.test(nc); + + } + else if (twoNcTest != null) { + twoNcTest.test(nc, nc2); } } finally { if (closeNcWhenDone) { try { nc.close(); } catch (Exception ignore) {} + if (nc2 != null) { + try { nc2.close(); } catch (Exception ignore) {} + } } } } @@ -248,65 +263,73 @@ private static void _runInShared( // connection list close it // -------------------------------------------------- public static void runInShared(OneConnectionTest test) throws Exception { - _runInShared(null, null, test, -1, null); + _runInShared(null, null, test, null, -1, null); + } + + public static void runInShared(VersionCheck vc, OneConnectionTest onNcTest) throws Exception { + _runInShared(null, vc, onNcTest, null, -1, null); + } + + public static void runInSharedOwnNc(OneConnectionTest onNcTest) throws Exception { + _runInShared(optionsBuilder(), null, onNcTest, null, -1, null); } - public static void runInShared(VersionCheck vc, OneConnectionTest test) throws Exception { - _runInShared(null, vc, test, -1, null); + public static void runInSharedOwnNc(ErrorListener el, OneConnectionTest onNcTest) throws Exception { + _runInShared(optionsBuilder(el), null, onNcTest, null, -1, null); } - public static void runInSharedOwnNc(OneConnectionTest test) throws Exception { - _runInShared(optionsBuilder(), null, test, -1, null); + public static void runInSharedOwnNc(Options.Builder builder, OneConnectionTest onNcTest) throws Exception { + _runInShared(builder, null, onNcTest, null, -1, null); } - public static void runInSharedOwnNc(ErrorListener el, OneConnectionTest test) throws Exception { - _runInShared(optionsBuilder(el), null, test, -1, null); + public static void runInSharedOwnNcs(TwoConnectionTest test) throws Exception { + _runInShared(optionsBuilder(), null, null, test, -1, null); } - public static void runInSharedOwnNc(Options.Builder builder, OneConnectionTest test) throws Exception { - _runInShared(builder, null, test, -1, null); + public static void runInSharedOwnNcs(Options.Builder builder, TwoConnectionTest twoNcTest) throws Exception { + _runInShared(builder, null, null, twoNcTest, -1, null); } // -------------------------------------------------- // JetStream: 1 stream 1 subject // -------------------------------------------------- public static void runInShared(JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(null, null, null, 1, ctxTest); + _runInShared(null, null, null, null, 1, ctxTest); } public static void runInShared(VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(null, vc, null, 1, ctxTest); + _runInShared(null, vc, null, null, 1, ctxTest); } public static void runInSharedOwnNc(ErrorListener el, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(optionsBuilder(el), null, null, 1, ctxTest); + _runInShared(optionsBuilder(el), null, null, null, 1, ctxTest); } public static void runInSharedOwnNc(ErrorListener el, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(optionsBuilder(el), vc, null, 1, ctxTest); + _runInShared(optionsBuilder(el), vc, null, null, 1, ctxTest); } public static void runInSharedOwnNc(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(builder, null, null, 1, ctxTest); + _runInShared(builder, null, null, null, 1, ctxTest); } public static void runInSharedOwnNc(Options.Builder builder, VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(builder, vc, null, 1, ctxTest); + _runInShared(builder, vc, null, null, 1, ctxTest); } // -------------------------------------------------- // JetStream: 1 stream custom subjects, kv or os // -------------------------------------------------- public static void runInSharedCustom(JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(null, null, null, 0, ctxTest); + _runInShared(null, null, null, null, 0, ctxTest); } public static void runInSharedCustom(VersionCheck vc, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(null, vc, null, 0, ctxTest); + _runInShared(null, vc, null, null, 0, ctxTest); } public static void runInSharedCustom(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception { - _runInShared(builder, null, null, -1, ctxTest); + _runInShared(builder, null, null, null, 0, ctxTest); } // ---------------------------------------------------------------------------------------------------- From 4d5becf1e1d6e887444c4d164676041a9eb98373 Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 30 Nov 2025 17:54:39 -0500 Subject: [PATCH 24/51] worked some disabled into enabled --- src/main/java/io/nats/client/impl/MessageManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/io/nats/client/impl/MessageManager.java b/src/main/java/io/nats/client/impl/MessageManager.java index 6fc1c05ea..79ef4baee 100644 --- a/src/main/java/io/nats/client/impl/MessageManager.java +++ b/src/main/java/io/nats/client/impl/MessageManager.java @@ -17,7 +17,6 @@ import io.nats.client.NatsSystemClock; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; -import io.nats.client.support.Debug; import io.nats.client.support.NatsConstants; import io.nats.client.support.ScheduledTask; @@ -156,7 +155,6 @@ protected void initOrResetHeartbeatTimer() { new ScheduledTask(conn.getScheduledExecutor(), alarmPeriodSettingNanos.get(), TimeUnit.NANOSECONDS, () -> { long sinceLast = NatsSystemClock.nanoTime() - lastMsgReceivedNanoTime.get(); - Debug.info("HB?", sinceLast, alarmPeriodSettingNanos.get()); if (sinceLast > alarmPeriodSettingNanos.get()) { handleHeartbeatError(); } From 4ee828bd26afaa7bca8cecf9931ae9e2a79e707a Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 30 Nov 2025 19:11:41 -0500 Subject: [PATCH 25/51] worked some disabled into enabled --- .../nats/client/impl/PullMessageManager.java | 2 -- src/test/java/io/nats/client/AuthTests.java | 8 +++-- src/test/java/io/nats/client/EchoTests.java | 4 +-- .../java/io/nats/client/PublishTests.java | 2 +- .../nats/client/impl/AuthAndConnectTests.java | 32 ++++++++----------- .../client/impl/JetStreamGeneralTests.java | 5 ++- .../io/nats/client/impl/ReconnectTests.java | 2 +- .../io/nats/client/utils/ConnectionUtils.java | 12 ++++--- .../io/nats/client/utils/SharedServer.java | 8 ++--- .../java/io/nats/client/utils/TestBase.java | 8 +---- 10 files changed, 37 insertions(+), 46 deletions(-) diff --git a/src/main/java/io/nats/client/impl/PullMessageManager.java b/src/main/java/io/nats/client/impl/PullMessageManager.java index 9c2390f3d..c1538803e 100644 --- a/src/main/java/io/nats/client/impl/PullMessageManager.java +++ b/src/main/java/io/nats/client/impl/PullMessageManager.java @@ -16,7 +16,6 @@ import io.nats.client.Message; import io.nats.client.PullRequestOptions; import io.nats.client.SubscribeOptions; -import io.nats.client.support.Debug; import io.nats.client.support.Status; import static io.nats.client.impl.MessageManager.ManageResult.*; @@ -67,7 +66,6 @@ protected void startPullRequest(String pullSubject, PullRequestOptions pro, bool @Override protected void handleHeartbeatError() { - Debug.info("HHB"); super.handleHeartbeatError(); resetTracking(); if (pullManagerObserver != null) { diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index e658e646e..ff4b1df7b 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -703,12 +703,14 @@ public void testRealUserAuthenticationExpired() throws Exception { .credentialPath(credsFile) .connectionListener(listener) .errorListener(listener) - .maxReconnects(2) + .maxReconnects(5) .build(); - try (Connection nc = newConnection(options)) { + try (Connection ignored = newConnection(options)) { listener.validateReceived(fExpired); } + catch (RuntimeException e) { + assertTrue(e.getMessage().contains("Authorization Violation")); + } } - catch (Exception ignore) {} } } diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 5250e8120..352c6ec5f 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -22,7 +22,7 @@ import java.time.Duration; import static io.nats.client.utils.ConnectionUtils.assertClosed; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.newConnection; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -65,7 +65,7 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { runInShared(nc1 -> { - try (Connection nc2 = standardConnectionWait(optionsBuilder(nc1).build())) { + try (Connection nc2 = newConnection(optionsBuilder(nc1).build())) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 73d55690e..862d905ed 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -254,7 +254,7 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); - try (Connection ncSupported = standardConnectionWait(ncSupportedOptions)) { + try (Connection ncSupported = newConnection(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { ctxNotSupported.createOrReplaceStream(jsSubject); JetStream jsNotSupported = ncNotSupported.jetStream(); diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 3bf20f872..74bd7dea2 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -17,6 +17,7 @@ import io.nats.client.ErrorListener; import io.nats.client.NatsTestServer; import io.nats.client.Options; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -28,34 +29,29 @@ import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; -public class AuthAndConnectTests { +public class AuthAndConnectTests extends TestBase { @Test public void testIsAuthError() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(options(ts)); - NatsConnection nats = (NatsConnection)nc; - - assertTrue(nats.isAuthenticationError("user authentication expired")); - assertTrue(nats.isAuthenticationError("authorization violation")); - assertTrue(nats.isAuthenticationError("Authorization Violation")); - assertFalse(nats.isAuthenticationError("test")); - assertFalse(nats.isAuthenticationError("")); - assertFalse(nats.isAuthenticationError(null)); - - standardCloseConnection(nc); - } + //noinspection resource + NatsConnection nats = new NatsConnection(options()); + assertTrue(nats.isAuthenticationError("user authentication expired")); + assertTrue(nats.isAuthenticationError("authorization violation")); + assertTrue(nats.isAuthenticationError("Authorization Violation")); + assertFalse(nats.isAuthenticationError("test")); + assertFalse(nats.isAuthenticationError("")); + assertFalse(nats.isAuthenticationError(null)); } @Test() public void testConnectWhenClosed() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - NatsConnection nc = (NatsConnection) standardConnectionWait(options(ts)); + runInSharedOwnNc(c -> { + NatsConnection nc = (NatsConnection)c; standardCloseConnection(nc); nc.connect(false); // should do nothing assertClosed(nc); nc.reconnect(); // should do nothing assertClosed(nc); - } + }); } /** @@ -80,7 +76,7 @@ public void errorOccurred(Connection conn, String error) { .errorListener(noopErrorListener) .build(); - try (NatsConnection nc = (NatsConnection) standardConnectionWait(options)) { + try (NatsConnection nc = (NatsConnection) newConnection(options)) { // After we've connected, shut down, so we can attempt reconnecting. ts.shutdown(true); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 0d0a48a47..751450876 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -32,8 +32,7 @@ import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.*; -import static io.nats.client.utils.ConnectionUtils.longConnectionWait; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -1108,7 +1107,7 @@ public void testNatsJetStreamUtil() { public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); - try (Connection ncReport = standardConnectionWait(optReport)) { + try (Connection ncReport = newConnection(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); assertInstanceOf(JetStreamStatusException.class, ee.getCause()); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index d8854e5eb..668b75400 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -944,7 +944,7 @@ public void testSocketDataPortTimeout() throws Exception { getLocalhostUri(port1), getLocalhostUri(port2) }; - Connection nc = standardConnectionWait(builder.servers(servers).build()); + Connection nc = newConnection(builder.servers(servers).build()); String subject = random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index 782a22fe5..f1c478c00 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -134,20 +134,24 @@ private static String expectingMessage(Connection conn, Connection.Status expect private static final int CONNECTION_RETRIES = 10; private static final long RETRY_DELAY = 100; public static Connection newConnection(Options options) { + IOException last = null; long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; - for (int x = 0; x < CONNECTION_RETRIES; x++) { - if (x > 0) { + for (int x = 1; x <= CONNECTION_RETRIES; x++) { + if (x > 1) { delay += RETRY_DELAY_INCREMENT; sleep(delay); } try { return Nats.connect(options); } - catch (IOException ignored) {} + catch (IOException ioe) { + last = ioe; + } catch (InterruptedException ie) { Thread.currentThread().interrupt(); + throw new RuntimeException("Unable to open a new connection to reusable sever.", ie); } } - return null; + throw new RuntimeException("Unable to open a new connection to reusable sever.", last); } } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index e57b62c54..61f13c4a6 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -126,11 +126,9 @@ private Connection getSharedConnection(String name) { Connection ncs = connectionMap.get(name); if (ncs == null) { ncs = newConnection(optionsBuilder()); - if (ncs != null) { - connectionMap.put(name, ncs); - waitUntilStatus(ncs); - initVersionServerInfo(ncs); - } + connectionMap.put(name, ncs); + waitUntilStatus(ncs); + initVersionServerInfo(ncs); } else if (ncs.getStatus() != Connection.Status.CONNECTED) { try { ncs.close(); } catch (Exception ignore) {} diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 5d8feb95f..cec9f0bd5 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -215,14 +215,8 @@ private static void _runInShared( else { closeNcWhenDone = true; nc = shared.newConnection(optionsBuilder); - if (nc == null) { - throw new RuntimeException("Unable to open a new connection to reusable sever."); - } if (twoNcTest != null) { nc2 = shared.newConnection(optionsBuilder); - if (nc2 == null) { - throw new RuntimeException("Unable to open a new connection to reusable sever."); - } } } @@ -535,7 +529,7 @@ public static NatsMessage getDataMessage(String data) { // assertions // ---------------------------------------------------------------------------------------------------- public static void assertCanConnectAndPubSub(Options options) throws IOException, InterruptedException { - Connection conn = standardConnectionWait(options); + Connection conn = newConnection(options); assertPubSub(conn); standardCloseConnection(conn); } From 0f0a8d25657149406d74182c3379a270c309ee95 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 1 Dec 2025 14:51:18 -0500 Subject: [PATCH 26/51] reusing servers needed the same conf --- src/examples/java/io/nats/examples/README.md | 2 +- src/test/java/io/nats/client/AuthTests.java | 109 +++-- .../java/io/nats/client/NatsTestServer.java | 4 - .../java/io/nats/client/PublishTests.java | 4 +- .../client/impl/ConnectionListenerTests.java | 4 +- .../java/io/nats/client/impl/DrainTests.java | 2 +- .../nats/client/impl/JetStreamPullTests.java | 16 +- .../{ListenerByFuture.java => Listener.java} | 19 +- .../io/nats/client/impl/ListenerFuture.java | 6 +- ...tatusType.java => ListenerStatusType.java} | 2 +- .../nats/client/impl/MessageManagerTests.java | 20 +- .../io/nats/client/impl/ReconnectTests.java | 51 +-- .../io/nats/client/impl/TLSConnectTests.java | 410 ++++++++---------- .../client/impl/WebsocketConnectTests.java | 306 ++++++------- .../io/nats/client/utils/ConnectionUtils.java | 2 + .../io/nats/client/utils/OptionsUtils.java | 21 - .../io/nats/client/utils/SharedServer.java | 50 ++- .../java/io/nats/client/utils/TestBase.java | 40 +- 18 files changed, 524 insertions(+), 544 deletions(-) rename src/test/java/io/nats/client/impl/{ListenerByFuture.java => Listener.java} (92%) rename src/test/java/io/nats/client/impl/{ListenerByFutureStatusType.java => ListenerStatusType.java} (94%) diff --git a/src/examples/java/io/nats/examples/README.md b/src/examples/java/io/nats/examples/README.md index 0f00429c8..b878e5ceb 100644 --- a/src/examples/java/io/nats/examples/README.md +++ b/src/examples/java/io/nats/examples/README.md @@ -114,7 +114,7 @@ To run with the completely unverified client: java -cp build/libs/jnats-{major.minor.patch}-SNAPSHOT.jar:build/libs/jnats-{major.minor.patch}-SNAPSHOT-examples.jar io.nats.examples.NatsSub opentls://localhost:4443 test 3 ``` -There are a set tls configuration for the server in the test files that can be used to run the NATS server. +There are a set of tls configuration files for the server in the test files that can be used to run the NATS server. ```bash nats-server --config src/test/resources/tls.conf diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index ff4b1df7b..931a2abdc 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -17,16 +17,14 @@ import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; -import io.nats.client.impl.ListenerByFuture; +import io.nats.client.impl.Listener; import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.ListenerFuture; import io.nats.client.support.JwtUtils; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.parallel.Isolated; import javax.net.ssl.SSLContext; import java.io.BufferedWriter; @@ -39,22 +37,14 @@ import java.util.concurrent.TimeUnit; import static io.nats.client.NatsTestServer.configFileServer; -import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.ResourceUtils.jwtResource; -import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; -@Isolated public class AuthTests extends TestBase { - @BeforeAll - public static void beforeAll() { - sleep(2000); // Isolated, makes connections, which are the point of failure for no reason - } - private String userPassInUrl(String user, String pass, int port) { return "nats://" + user + ":" + pass + "@" + NatsRunnerUtils.getDefaultLocalhostHost().host + ":" + port; } @@ -455,26 +445,25 @@ public void testNKeyAuth() throws Exception { @Test public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path - try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(getUserCredsAuthHander()) - .build(); - assertCanConnect(options); + NatsTestServer ts = sharedConfigServer("operator.conf"); + Options options = optionsBuilder(ts).maxReconnects(0) + .authHandler(getUserCredsAuthHander()) + .build(); + assertCanConnect(options); - options = optionsBuilder(ts).maxReconnects(0) - .credentialPath(jwtResource("user.creds")) - .build(); - assertCanConnect(options); + options = optionsBuilder(ts).maxReconnects(0) + .credentialPath(jwtResource("user.creds")) + .build(); + assertCanConnect(options); - //test Nats.connect method - Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); - standardConnectionWait(nc); - standardCloseConnection(nc); - } + //test Nats.connect method + Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); + standardConnectionWait(nc); + standardCloseConnection(nc); } - @Test - public void testJWTAuthWithCredsFileAlso() throws Exception { + @Test + public void testJWTAuthWithCredsFileAlso() throws Exception { //test Nats.connect method try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { Connection nc = Nats.connect(ts.getServerUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); @@ -485,8 +474,8 @@ public void testJWTAuthWithCredsFileAlso() throws Exception { @Test public void testWsJWTAuthWithCredsFile() throws Exception { - try (NatsTestServer ts = skipConnectValidateServer("ws_operator.conf")) { - String uri = ts.getLocalhostUri("ws"); + try (NatsTestServer ts = NatsTestServer.configFileServer("ws_operator.conf")) { + String uri = ts.getLocalhostUri(WS); // in options Options options = optionsBuilder(uri).maxReconnects(0) .authHandler(getUserCredsAuthHander()).build(); @@ -502,7 +491,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { @Test public void testWssJWTAuthWithCredsFile() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - try (NatsTestServer ts = skipConnectValidateServer("wss_operator.conf")) + try (NatsTestServer ts = NatsTestServer.configFileServer("wss_operator.conf")) { String uri = ts.getLocalhostUri("wss"); Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) @@ -517,21 +506,21 @@ public void testStaticJWTAuth() throws Exception { String jwt = "eyJ0eXAiOiJqd3QiLCJhbGciOiJlZDI1NTE5In0.eyJqdGkiOiI3UE1GTkc0R1c1WkE1NEg3N09TUUZKNkJNQURaSUQ2NTRTVk1XMkRFQVZINVIyUVU0MkhBIiwiaWF0IjoxNTY1ODg5ODk4LCJpc3MiOiJBQUhWU0k1NVlQTkJRWjVQN0Y2NzZDRkFPNFBIQlREWUZRSUVHVEtMUVRJUEVZUEZEVEpOSEhPNCIsIm5hbWUiOiJkZW1vIiwic3ViIjoiVUMzT01MSlhUWVBZN0ZUTVVZNUNaNExHRVdRSTNZUzZKVFZXU0VGRURBMk9MTEpZSVlaVFo3WTMiLCJ0eXBlIjoidXNlciIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fX19.ROSJ7D9ETt9c8ZVHxsM4_FU2dBRLh5cNfb56MxPQth74HAxxtGMl0nn-9VVmWjXgFQn4JiIbwrGfFDBRMzxsAA"; String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; - try (NatsTestServer ts = configFileServer("operator.conf")) { - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); - assertCanConnect(options); - } + NatsTestServer ts = sharedConfigServer("operator.conf"); + Options options = optionsBuilder(ts).maxReconnects(0) + .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); + assertCanConnect(options); } @Test public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 - try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { + try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { // closed in test, so cannot be shared + NatsTestServer ts2 = sharedConfigServer("operator.conf"); // do not auto close this!! Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) .noRandomize().maxReconnects(-1).authHandler(getUserCredsAuthHander()).build(); - Connection nc = standardConnectionWait(options); + Connection nc = newConnection(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); @@ -551,11 +540,12 @@ public void testCloseOnReconnectWithSameError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts1 - try (NatsTestServer ts = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) + try (NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { // closed in test, so cannot be shared + NatsTestServer ts1 = sharedConfigServer("operator_noacct.conf"); // do not auto close this!!! + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() .authHandler(getUserCredsAuthHander()).build(); - Connection nc = standardConnectionWait(options); + Connection nc = newConnection(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.CLOSED); @@ -570,6 +560,7 @@ public void testCloseOnReconnectWithSameError() throws Exception { @Test public void testThatAuthErrorIsCleared() throws Exception { + // this test can't use any of the shared servers since it closes servers // Connect should fail on ts1 try (NatsTestServer ts1 = NatsTestServer.configFileServer("operator_noacct.conf"); NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { @@ -638,12 +629,11 @@ public void testReconnectAfterAccountAuthenticationExpired() throws Exception { } private static void _testReconnectAfter(String errText) throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - - CompletableFuture f = new CompletableFuture<>(); + Listener listener = new Listener(); + CompletableFuture fMock = new CompletableFuture<>(); NatsServerProtocolMock.Customizer timeoutCustomizer = (ts, r, w) -> { - f.join(); // wait until we are ready + fMock.join(); // wait until we are ready w.write("-ERR " + errText + "\r\n"); // Drop the line feed w.flush(); }; @@ -651,34 +641,35 @@ private static void _testReconnectAfter(String errText) throws Exception { int port = NatsTestServer.nextPort(); // Connect should fail on ts1 - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true); - NatsTestServer ts2 = skipConnectValidateServer("operator.conf")) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true)) { + NatsTestServer ts2 = sharedConfigServer("operator.conf"); + Options options = optionsBuilder(mockTs, ts2) .maxReconnects(-1) .noRandomize() .authHandler(getUserCredsAuthHander()) + .errorListener(listener) + .connectionListener(listener) .build(); - Connection nc = standardConnectionWait(options); - assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); - - listener.prepForStatusChange(Events.RECONNECTED); - - f.complete(true); + ListenerFuture f = listener.prepForConnectionEvent(Events.RECONNECTED); - listenerConnectionWait(nc, listener); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + try (Connection nc = newConnection(options)) { + assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); + fMock.complete(true); + listener.validateReceived(f); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - String err = nc.getLastError(); - assertNotNull(err); - assertTrue(err.toLowerCase().contains(errText)); - standardCloseConnection(nc); + String err = nc.getLastError(); + assertNotNull(err); + assertTrue(err.toLowerCase().contains(errText)); + } } } @Test public void testRealUserAuthenticationExpired() throws Exception { - ListenerByFuture listener = new ListenerByFuture(false); + Listener listener = new Listener(false); ListenerFuture fExpired = listener.prepForError("User Authentication Expired"); String accountSeed = "SAAPXJRFMUYDUH3NOZKE7BS2ZDO2P4ND7G6W743MTNA3KCSFPX3HNN6AX4"; diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index 242e30b81..8c3fa77f9 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -55,10 +55,6 @@ public static NatsTestServer configuredJsServer(String configFilePath) throws IO return new NatsTestServer(configFileBuilder(configFilePath).jetstream()); } - public static NatsTestServer skipConnectValidateServer(String configFilePath) throws IOException { - return new NatsTestServer(configFileBuilder(configFilePath).skipConnectValidate()); - } - public NatsTestServer() throws IOException { this(builder()); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 862d905ed..18edf95d7 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -68,7 +68,7 @@ public void testThrowsIfTooBig() throws Exception { nc.close(); Thread.sleep(1000); - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); Options options = optionsBuilder(ts) .clientSideLimitChecks(false) .errorListener(listener) @@ -220,7 +220,7 @@ public void testMaxPayload() throws Exception { @Test public void testMaxPayloadNoClientSideLimitChecks() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); Options.Builder builder = optionsBuilder() .noReconnect() .clientSideLimitChecks(false) diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 683624d6f..90a76ec36 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -40,7 +40,7 @@ public void testToString() { @Test public void testCloseEvent() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); ListenerFuture fEvent = listener.prepForConnectionEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { @@ -113,7 +113,7 @@ public void testExceptionInConnectionListener() throws Exception { @Test public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); ListenerFuture fClosed = listener.prepForConnectionEvent(Events.CLOSED); AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index eb2bf1718..f6e5cf510 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -571,7 +571,7 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { @Test public void testThrowIfCantFlush() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer(); Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 09d22b05d..ba0e3123f 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -39,8 +39,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.api.ConsumerConfiguration.builder; -import static io.nats.client.impl.ListenerByFutureStatusType.PullError; -import static io.nats.client.impl.ListenerByFutureStatusType.PullWarning; +import static io.nats.client.impl.ListenerStatusType.PullError; +import static io.nats.client.impl.ListenerStatusType.PullWarning; import static io.nats.client.support.ApiConstants.*; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; @@ -51,7 +51,7 @@ public class JetStreamPullTests extends JetStreamTestBase { static Connection tcsNc; - static ListenerByFuture tcsListener; + static Listener tcsListener; @AfterAll public static void afterAll() { @@ -725,7 +725,7 @@ public void testPullRequestOptionsBuilder() { } interface ConflictSetup { - JetStreamSubscription setup(Connection nc, JetStreamTestingContext ctx, ListenerByFuture listener) throws Exception; + JetStreamSubscription setup(Connection nc, JetStreamTestingContext ctx, Listener listener) throws Exception; } interface BuilderCustomizer { @@ -738,10 +738,10 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { static final long NEXT_MESSAGE_TIMEOUT = 2000; static final long INACTIVE_THRESHOLD = 30_000; - private void _testConflictStatuses(int statusCode, String statusText, ListenerByFutureStatusType statusType, VersionCheck vc, ConflictSetup setup) throws Exception { + private void _testConflictStatuses(int statusCode, String statusText, ListenerStatusType statusType, VersionCheck vc, ConflictSetup setup) throws Exception { runInSharedCustom(vc, (ignoredNc, ctx) -> { if (tcsNc == null) { - tcsListener = new ListenerByFuture(); + tcsListener = new Listener(); Options.Builder builder = optionsBuilder(tcsListener); tcsNc = SharedServer.connectionForSameServer(ignoredNc, builder); } @@ -1028,7 +1028,7 @@ public String toJson() { @Test public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); String dur = random(); @@ -1054,7 +1054,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { @Test public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); ctx.stream = randomWide(6); // six letters so I can count diff --git a/src/test/java/io/nats/client/impl/ListenerByFuture.java b/src/test/java/io/nats/client/impl/Listener.java similarity index 92% rename from src/test/java/io/nats/client/impl/ListenerByFuture.java rename to src/test/java/io/nats/client/impl/Listener.java index 38e4c335c..566b66fe8 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFuture.java +++ b/src/test/java/io/nats/client/impl/Listener.java @@ -27,7 +27,7 @@ import java.util.function.Predicate; @SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) -public class ListenerByFuture implements ErrorListener, ConnectionListener { +public class Listener implements ErrorListener, ConnectionListener { private static final int VALIDATE_TIMEOUT = 5000; private final boolean printExceptions; @@ -35,15 +35,15 @@ public class ListenerByFuture implements ErrorListener, ConnectionListener { private final List futures; - public ListenerByFuture() { + public Listener() { this(false, false); } - public ListenerByFuture(boolean verbose) { + public Listener(boolean verbose) { this(false, verbose); } - public ListenerByFuture(boolean printExceptions, boolean verbose) { + public Listener(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; futures = new ArrayList<>(); @@ -115,7 +115,7 @@ public ListenerFuture prepForError(String errorText) { return prepFor("Error", new ListenerFuture(errorText)); } - public ListenerFuture prepForStatus(ListenerByFutureStatusType type, int statusCode) { + public ListenerFuture prepForStatus(ListenerStatusType type, int statusCode) { return prepFor("Status", new ListenerFuture(type, statusCode)); } @@ -175,6 +175,7 @@ else if (verbose) { while (t != null) { if (t.getClass().equals(f.exceptionClass)) { f.complete(null); + f.receivedException = exp; return true; } t = t.getCause(); @@ -198,7 +199,7 @@ public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long last } } - private void statusReceived(ListenerByFutureStatusType type, Status status) { + private void statusReceived(ListenerStatusType type, Status status) { if (verbose) { report("Status Received " + type.name(), status); } @@ -207,17 +208,17 @@ private void statusReceived(ListenerByFutureStatusType type, Status status) { @Override public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(ListenerByFutureStatusType.Unhandled, status); + statusReceived(ListenerStatusType.Unhandled, status); } @Override public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(ListenerByFutureStatusType.PullWarning, status); + statusReceived(ListenerStatusType.PullWarning, status); } @Override public void pullStatusError(Connection conn, JetStreamSubscription sub, Status status) { - statusReceived(ListenerByFutureStatusType.PullError, status); + statusReceived(ListenerStatusType.PullError, status); } @Override diff --git a/src/test/java/io/nats/client/impl/ListenerFuture.java b/src/test/java/io/nats/client/impl/ListenerFuture.java index 9d86222cf..059ed9580 100644 --- a/src/test/java/io/nats/client/impl/ListenerFuture.java +++ b/src/test/java/io/nats/client/impl/ListenerFuture.java @@ -27,11 +27,13 @@ public class ListenerFuture extends CompletableFuture { public ConnectionListener.Events eventType; public String error; public Class exceptionClass; - public ListenerByFutureStatusType lbfStatusType; + public ListenerStatusType lbfStatusType; public int statusCode = -1; public String fcSubject; public ErrorListener.FlowControlSource fcSource; + public Throwable receivedException; + public ListenerFuture(ConnectionListener.Events type) { this.eventType = type; } @@ -44,7 +46,7 @@ public ListenerFuture(String errorText) { error = errorText; } - public ListenerFuture(ListenerByFutureStatusType type, int statusCode) { + public ListenerFuture(ListenerStatusType type, int statusCode) { lbfStatusType = type; this.statusCode = statusCode; } diff --git a/src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java b/src/test/java/io/nats/client/impl/ListenerStatusType.java similarity index 94% rename from src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java rename to src/test/java/io/nats/client/impl/ListenerStatusType.java index c72dc1ce0..f0e57a9ab 100644 --- a/src/test/java/io/nats/client/impl/ListenerByFutureStatusType.java +++ b/src/test/java/io/nats/client/impl/ListenerStatusType.java @@ -13,6 +13,6 @@ package io.nats.client.impl; -public enum ListenerByFutureStatusType { +public enum ListenerStatusType { Unhandled, PullWarning, PullError, None } diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index c5e58a6da..eb5e7132d 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import static io.nats.client.impl.ListenerByFutureStatusType.PullError; -import static io.nats.client.impl.ListenerByFutureStatusType.PullWarning; +import static io.nats.client.impl.ListenerStatusType.PullError; +import static io.nats.client.impl.ListenerStatusType.PullWarning; import static io.nats.client.impl.MessageManager.ManageResult; import static io.nats.client.impl.MessageManager.ManageResult.*; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; @@ -72,7 +72,7 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO @Test public void testPushBeforeQueueProcessorAndManage() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); runInSharedOwnNc(listener, nc -> { _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, true, false); _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, true, false); @@ -83,7 +83,7 @@ public void testPushBeforeQueueProcessorAndManage() throws Exception { }); } - private void _testPushBqpAndManageRetriable(Connection nc, ListenerByFuture listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException { + private void _testPushBqpAndManageRetriable(Connection nc, Listener listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException { listener.reset(); NatsJetStreamSubscription sub = genericPushSub(nc); @@ -104,31 +104,31 @@ private void _testPushBqpAndManageRetriable(Connection nc, ListenerByFuture list listener.validateReceived(f); } else { - ListenerFuture f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + ListenerFuture f = listener.prepForStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); listener.validateReceived(f); - f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + f = listener.prepForStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); listener.validateReceived(f); } assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - ListenerFuture f = listener.prepForStatus(ListenerByFutureStatusType.Unhandled, 999); + ListenerFuture f = listener.prepForStatus(ListenerStatusType.Unhandled, 999); assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); listener.validateReceived(f); } @Test public void testPullBeforeQueueProcessorAndManage() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); runInSharedOwnNc(listener, (nc, ctx) -> { _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).build()); _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build()); }); } - private void _testPullBqpAndManage(Connection nc, ListenerByFuture listener, PullRequestOptions pro) throws JetStreamApiException, IOException { + private void _testPullBqpAndManage(Connection nc, Listener listener, PullRequestOptions pro) throws JetStreamApiException, IOException { NatsJetStreamSubscription sub = genericPullSub(nc); PullMessageManager manager = getPullManager(nc, sub, true); manager.startPullRequest(random(), pro, true, null); @@ -169,7 +169,7 @@ private void _testPullBqpAndManage(Connection nc, ListenerByFuture listener, Pul assertManageResult(listener, PullError, CONFLICT_CODE, STATUS_ERROR, manager, getConflictStatus(sid, CONSUMER_IS_PUSH_BASED)); } - private static void assertManageResult(ListenerByFuture listener, ListenerByFutureStatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { + private static void assertManageResult(Listener listener, ListenerStatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { ListenerFuture f = listener.prepForStatus(expectedType, expectedStatusCode); assertEquals(expecteManageResult, manager.manage(message)); listener.validateReceived(f); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 668b75400..ff1f6b027 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -34,7 +34,8 @@ import java.util.function.BiConsumer; import static io.nats.client.AuthTests.getUserCredsAuthHander; -import static io.nats.client.NatsTestServer.*; +import static io.nats.client.NatsTestServer.configFileBuilder; +import static io.nats.client.NatsTestServer.getLocalhostUri; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; @@ -354,7 +355,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { @Test public void testOverflowReconnectBuffer() throws Exception { - ListenerByFuture listener = new ListenerByFuture(); + Listener listener = new Listener(); ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); Connection nc; try (NatsTestServer ts = new NatsTestServer()) { @@ -492,7 +493,7 @@ public void testReconnectDropOnLineFeed() throws Exception { } @Test - public void testReconnectNoIPTLSConnection() throws Exception { + public void testTlsNoIpConnection() throws Exception { NatsConnection nc; ListenerForTesting listener = new ListenerForTesting(); @@ -520,12 +521,27 @@ public void testReconnectNoIPTLSConnection() throws Exception { "}" }; + SslTestingHelper.setKeystoreSystemParameters(); + // Regular tls for first connection, then no ip for second try (NatsTestServer ts = new NatsTestServer("tls_noip.conf", tsInserts, tsPort); NatsTestServer ts2 = new NatsTestServer("tls_noip.conf", ts2Inserts, ts2Port) ) { - SslTestingHelper.setKeystoreSystemParameters(); - Options options = optionsBuilder(ts) + // Test 1. tls Scheme + Options options = optionsBuilder(ts, "tls") + .connectionTimeout(Duration.ofSeconds(5)) + .maxReconnects(0) + .build(); + assertCanConnect(options); + + // Test 2. opentls Scheme + options = optionsBuilder(ts, "opentls") + .maxReconnects(0) + .build(); + assertCanConnect(options); + + // Test 3. Reconnect + options = optionsBuilder(ts) .secure() .connectionListener(listener) .maxReconnects(20) @@ -552,31 +568,6 @@ public void testReconnectNoIPTLSConnection() throws Exception { } } - @Test - public void testURISchemeNoIPTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - SslTestingHelper.setKeystoreSystemParameters(); - try (NatsTestServer ts = configFileServer("tls_noip.conf")) { - Options options = optionsBuilder(ts, "tls") - .connectionTimeout(Duration.ofSeconds(5)) - .maxReconnects(0) - .build(); - assertCanConnect(options); - } - } - - @Test - public void testURISchemeNoIPOpenTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - SslTestingHelper.setKeystoreSystemParameters(); - try (NatsTestServer ts = configFileServer("tls_noip.conf")) { - Options options = optionsBuilder(ts, "opentls") - .maxReconnects(0) - .build(); - assertCanConnect(options); - } - } - @Test public void testWriterFilterTiming() throws Exception { NatsConnection nc; diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index febac4c8b..767b96fc9 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -26,10 +26,8 @@ import java.util.Properties; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.NatsTestServer.configFileServer; -import static io.nats.client.NatsTestServer.skipConnectValidateServer; import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; @@ -76,182 +74,175 @@ private static Options createTestOptionsViaFactoryClassName(String... servers) { @Test public void testSimpleTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("tls.conf")) { - String servers = ts.getServerUri(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + String servers = ts.getServerUri(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test - public void testSimpleTlsFirstConnection() throws Exception { - if (atLeast2_10_3(ensureVersionServerInfo())) { - try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { - Options options = optionsBuilder(ts) - .maxReconnects(0) - .tlsFirst() - .sslContext(SslTestingHelper.createTestSSLContext()) - .build(); - assertCanConnectAndPubSub(options); - } - } + public void testMultipleUrlTLSConnectionSetContext() throws Exception { + NatsTestServer server1 = sharedConfigServer(TLS_CONF, 1); + NatsTestServer server2 = sharedConfigServer(TLS_CONF, 2); + String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test - public void testSimpleUrlTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("tls.conf")) { - String[] servers = NatsTestServer.getLocalhostUris("tls", ts); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + public void testSimpleIPTLSConnection() throws Exception { + NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + String servers = "127.0.0.1:" + ts.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test - public void testMultipleUrlTLSConnectionSetContext() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer server1 = configFileServer("tls.conf"); - NatsTestServer server2 = configFileServer("tls.conf") - ) { - String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + public void testURISchemeOpenTLSConnection() throws Exception { + NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); + Options options = optionsBuilder(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); + + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); } @Test - public void testSimpleIPTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("tls.conf")) { - String servers = "127.0.0.1:" + ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + public void testMultipleUrlOpenTLSConnection() throws Exception { + NatsTestServer server1 = sharedConfigServer(TLS_CONF, 1); + NatsTestServer server2 = sharedConfigServer(TLS_CONF, 2); + String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); + Options options = optionsBuilder(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); + + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); } @Test - public void testVerifiedTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("tlsverify.conf")) { - String servers = ts.getServerUri(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + public void testProxyNotTlsFirst() throws Exception { + NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + // 1. client regular secure | secure proxy | server insecure -> mismatch exception + ListenerForTesting listener = new ListenerForTesting(); + ProxyConnection connRI = new ProxyConnection(ts.getServerUri(), false, listener, SERVER_INSECURE); + assertThrows(Exception.class, () -> connRI.connect(false)); + sleep(100); // give time for listener to get message + assertEquals(1, listener.getExceptions().size()); + assertTrue(listener.getExceptions().get(0).getMessage().contains("SSL connection wanted by client")); + + // 2. client regular secure | secure proxy | server tls required -> connects + ProxyConnection connRR = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_REQUIRED); + connRR.connect(false); + closeConnection(standardConnectionWait(connRR), 1000); + + // 3. client regular secure | secure proxy | server tls available -> connects + ProxyConnection connRA = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_AVAILABLE); + connRA.connect(false); + closeConnection(standardConnectionWait(connRA), 1000); } @Test public void testOpenTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("tls.conf")) { - String servers = ts.getServerUri(); - Options options = optionsBuilder() - .server(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); + NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + String servers = ts.getServerUri(); + Options options = optionsBuilder() + .server(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, servers); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); - } + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, servers); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); } @Test - public void testURISchemeTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("tlsverify.conf")) { - String servers = "tls://localhost:"+ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + public void testSimpleTlsFirstConnection() throws Exception { + if (atLeast2_10_3(ensureVersionServerInfo())) { + NatsTestServer ts = sharedConfigServer(TLS_FIRST_CONF); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .tlsFirst() + .sslContext(SslTestingHelper.createTestSSLContext()) + .build(); + assertCanConnectAndPubSub(options); } } @Test - public void testURISchemeIPTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("tlsverify.conf")) { - String servers = "tls://127.0.0.1:"+ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); - } + public void testVerifiedTLSConnection() throws Exception { + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + String servers = ts.getServerUri(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test - public void testURISchemeOpenTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("tls.conf")) { - String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); - Options options = optionsBuilder(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); - - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); - } + public void testURISchemeTLSConnection() throws Exception { + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + String servers = "tls://localhost:" + ts.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test - public void testMultipleUrlOpenTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer server1 = NatsTestServer.configFileServer("tls.conf"); - NatsTestServer server2 = NatsTestServer.configFileServer("tls.conf") - ) { - String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); - Options options = optionsBuilder(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); - - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); - } + public void testURISchemeIPTLSConnection() throws Exception { + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + String servers = "tls://127.0.0.1:" + ts.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); } @Test public void testTLSMessageFlow() throws Exception { - try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - int msgCount = 100; - Options options = optionsBuilder(ts) - .maxReconnects(0) - .sslContext(ctx) - .build(); - Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher( - msg -> nc.publish(msg.getReplyTo(), new byte[16])); - d.subscribe("subject"); - - for (int i=0;i incoming = nc.request("subject", null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); - } - - standardCloseConnection(nc); + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + int msgCount = 100; + Options options = optionsBuilder(ts) + .maxReconnects(0) + .sslContext(ctx) + .build(); + Connection nc = standardConnectionWait(options); + Dispatcher d = nc.createDispatcher( + msg -> nc.publish(msg.getReplyTo(), new byte[16])); + d.subscribe("subject"); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request("subject", null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); } + + standardCloseConnection(nc); } @Test @@ -262,7 +253,7 @@ public void testTLSOnReconnect() throws Exception { int newPort = NatsTestServer.nextPort(); // Use two server ports to avoid port release timing issues - try (NatsTestServer ts = configFileServer("tlsverify.conf", port)) { + try (NatsTestServer ts = configFileServer(TLSVERIFY_CONF, port)) { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) @@ -278,7 +269,7 @@ public void testTLSOnReconnect() throws Exception { flushAndWaitLong(nc, listener); listener.prepForStatusChange(Events.RESUBSCRIBED); - try (NatsTestServer ignored = configFileServer("tlsverify.conf", newPort)) { + try (NatsTestServer ignored = configFileServer(TLSVERIFY_CONF, newPort)) { listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); } @@ -286,66 +277,46 @@ public void testTLSOnReconnect() throws Exception { } @Test - public void testDisconnectOnUpgrade() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts) - .maxReconnects(0) - .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) - .sslContext(ctx) - .build(); - Nats.connect(options); - } - }); + public void testDisconnectOnUpgrade() throws Exception { + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) + .sslContext(ctx) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } @Test - public void testServerSecureClientNotMismatch() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - Options options = optionsNoReconnect(ts); - Nats.connect(options); - } - }); + public void testServerSecureClientNotMismatch() throws Exception { + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + Options options = optionsNoReconnect(ts); + assertThrows(IOException.class, () -> Nats.connect(options)); } @Test - public void testClientSecureServerNotMismatch() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer()) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts).maxReconnects(0).sslContext(ctx).build(); - Nats.connect(options); - } + public void testClientSecureServerNotMismatch() throws Exception { + runInSharedOwnNc(nc -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = optionsBuilder(nc).maxReconnects(0).sslContext(ctx).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); }); } @Test - public void testClientServerCertMismatch() { - AtomicReference listenedException = new AtomicReference<>(); - ErrorListener el = new ErrorListener() { - @Override - public void exceptionOccurred(Connection conn, Exception exp) { - listenedException.set(exp); - } - }; - - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = NatsTestServer.configFileServer("tlsverify.conf")) { - SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = optionsBuilder(ts) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(el) - .build(); - Nats.connect(options); - } - }); - - Exception e = listenedException.get(); - assertNotNull(e); - assertInstanceOf(CertificateException.class, e.getCause().getCause()); + public void testClientServerCertMismatch() throws Exception { + Listener listener = new Listener(); + ListenerFuture f = listener.prepForException(CertificateException.class); + NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createEmptySSLContext(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(listener) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + listener.validateReceived(f); } @Test @@ -423,45 +394,22 @@ void handleInfo(String infoJson) { public void testProxyTlsFirst() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { // cannot check connect b/c tls first - try (NatsTestServer ts = skipConnectValidateServer("tls_first.conf")) { - // 1. client tls first | secure proxy | server insecure -> connects - ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); - connTI.connect(false); - closeConnection(standardConnectionWait(connTI), 1000); - - // 2. client tls first | secure proxy | server tls required -> connects - ProxyConnection connTR = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_REQUIRED); - connTR.connect(false); - closeConnection(standardConnectionWait(connTR), 1000); - - // 3. client tls first | secure proxy | server tls available -> connects - ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); - connTA.connect(false); - closeConnection(standardConnectionWait(connTA), 1000); - } - } - } - - @Test - public void testProxyNotTlsFirst() throws Exception { - try (NatsTestServer ts = NatsTestServer.configFileServer("tls.conf")) { - // 1. client regular secure | secure proxy | server insecure -> mismatch exception - ListenerForTesting listener = new ListenerForTesting(); - ProxyConnection connRI = new ProxyConnection(ts.getServerUri(), false, listener, SERVER_INSECURE); - assertThrows(Exception.class, () -> connRI.connect(false)); - sleep(100); // give time for listener to get message - assertEquals(1, listener.getExceptions().size()); - assertTrue(listener.getExceptions().get(0).getMessage().contains("SSL connection wanted by client")); - - // 2. client regular secure | secure proxy | server tls required -> connects - ProxyConnection connRR = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_REQUIRED); - connRR.connect(false); - closeConnection(standardConnectionWait(connRR), 1000); - - // 3. client regular secure | secure proxy | server tls available -> connects - ProxyConnection connRA = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_AVAILABLE); - connRA.connect(false); - closeConnection(standardConnectionWait(connRA), 1000); + NatsTestServer ts = sharedConfigServer(TLS_FIRST_CONF); + + // 1. client tls first | secure proxy | server insecure -> connects + ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); + connTI.connect(false); + closeConnection(standardConnectionWait(connTI), 1000); + + // 2. client tls first | secure proxy | server tls required -> connects + ProxyConnection connTR = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_REQUIRED); + connTR.connect(false); + closeConnection(standardConnectionWait(connTR), 1000); + + // 3. client tls first | secure proxy | server tls available -> connects + ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); + connTA.connect(false); + closeConnection(standardConnectionWait(connTA), 1000); } } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 2f10f11e8..1d46d9f74 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -34,22 +34,22 @@ import static io.nats.client.ConnectionListener.Events.CONNECTED; import static io.nats.client.NatsTestServer.*; import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.OptionsUtils.NOOP_EL; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class WebsocketConnectTests extends TestBase { @Test public void testRequestReply() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("ws.conf")) { - standardRequestReply(Options.builder() - .server(getLocalhostUri(ts.getPort())) - .maxReconnects(0).build()); - - standardRequestReply(Options.builder(). - server(NatsTestServer.getLocalhostUri("ws", ts.getPort("ws"))) - .maxReconnects(0).build()); - } + NatsTestServer ts = sharedConfigServer(WS_CONF); + standardRequestReply(Options.builder() + .server(getLocalhostUri(ts.getPort())) + .maxReconnects(0).build()); + + standardRequestReply(Options.builder(). + server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) + .maxReconnects(0).build()); } private static void standardRequestReply(Options options) throws InterruptedException, IOException { @@ -68,24 +68,22 @@ private static void standardRequestReply(Options options) throws InterruptedExce @Test public void testTLSRequestReply() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("wss.conf")) { + NatsTestServer ts = sharedConfigServer(WSS_CONF); - java.util.function.Consumer interceptor = req -> { - // Ideally we could validate that this header was sent to NATS server - req.getHeaders().add("X-Ignored", "VALUE"); - }; + java.util.function.Consumer interceptor = req -> { + // Ideally we could validate that this header was sent to NATS server + req.getHeaders().add("X-Ignored", "VALUE"); + }; - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .httpRequestInterceptor(interceptor) - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - - standardRequestReply(options); - } + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .httpRequestInterceptor(interceptor) + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .build(); + + standardRequestReply(options); } @Test @@ -94,104 +92,114 @@ public void testProxyRequestReply() throws Exception { RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); executor.submit(proxy); - try (NatsTestServer ts = configFileServer("ws.conf")) { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("ws"))) - .maxReconnects(0) - .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) - .build(); - standardRequestReply(options); - } + NatsTestServer ts = sharedConfigServer(WS_CONF); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) + .maxReconnects(0) + .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) + .errorListener(NOOP_EL) + .build(); + standardRequestReply(options); } @Test public void testSimpleTLSConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("wss.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - assertCanConnect(options); - } + NatsTestServer ts = sharedConfigServer(WSS_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); } @Test public void testSimpleWSSIPConnection() throws Exception { - //System.setProperty("javax.net.debug", "all"); - try (NatsTestServer ts = configFileServer("wss.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder(). - server("wss://127.0.0.1:" + ts.getPort("wss")). - maxReconnects(0). - sslContext(ctx). - build(); - assertCanConnect(options); - } + NatsTestServer ts = sharedConfigServer(WSS_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server("wss://127.0.0.1:" + ts.getPort(WSS)) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); } @Test public void testVerifiedTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - assertCanConnect(options); - } + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); } @Test public void testOpenTLSConnection() throws Exception { - try (NatsTestServer ts = configFileServer("wss.conf")) { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnect(options); - } + NatsTestServer ts = sharedConfigServer(WSS_CONF); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnect(options); } @Test public void testURIWSSHostConnection() throws Exception { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { + SSLContext originalDefault = SSLContext.getDefault(); + try { + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one .maxReconnects(0) + .errorListener(NOOP_EL) .build(); assertCanConnect(options); } + finally { + SSLContext.setDefault(originalDefault); + } } @Test public void testURIWSSIPConnection() throws Exception { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { + SSLContext originalDefault = SSLContext.getDefault(); + try { + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); Options options = Options.builder() - .server("wss://127.0.0.1:" + ts.getPort("wss")) + .server("wss://127.0.0.1:" + ts.getPort(WSS)) .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one .maxReconnects(0) .build(); assertCanConnect(options); } + finally { + SSLContext.setDefault(originalDefault); + } } @Test public void testURISchemeWSSConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); - try (NatsTestServer ts = configFileServer("wss.conf")) { + try { + NatsTestServer ts = sharedConfigServer(WSS_CONF); SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) .maxReconnects(0) .build(); assertCanConnect(options); - } finally { + } + finally { SSLContext.setDefault(originalDefault); } } @@ -199,42 +207,44 @@ public void testURISchemeWSSConnection() throws Exception { @Test public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); - try (NatsTestServer ts = configFileServer("wss.conf")) { + try { + NatsTestServer ts = sharedConfigServer(WSS_CONF); SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) .maxReconnects(0) .tlsFirst() + .errorListener(NOOP_EL) .build(); assertCanConnect(options); - } finally { + } + finally { SSLContext.setDefault(originalDefault); } } @Test public void testTLSMessageFlow() throws Exception { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - int msgCount = 100; - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", ts.getPort("wss"))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); - d.subscribe("subject"); - - for (int i=0;i incoming = nc.request("subject", null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); - } - - standardCloseConnection(nc); + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + int msgCount = 100; + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .build(); + Connection nc = standardConnectionWait(options); + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); + String subject = random(); + d.subscribe(subject); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); } + standardCloseConnection(nc); } @Test @@ -244,19 +254,21 @@ public void testTLSOnReconnect() throws Exception { int port = nextPort(); int wssPort = nextPort(); - NatsServerRunner.Builder builder = configFileBuilder("wssverify.conf") + // can't use shared b/c custom ports + NatsServerRunner.Builder builder = configFileBuilder(WSSVERIFY_CONF) .port(port) - .port("wss", wssPort); + .port(WSS, wssPort); SSLContext ctx = SslTestingHelper.createTestSSLContext(); // Use two server ports to avoid port release timing issues try (NatsTestServer ignored = new NatsTestServer(builder)) { Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("wss", wssPort)) + .server(NatsTestServer.getLocalhostUri(WSS, wssPort)) .noRandomize() .maxReconnects(-1) .sslContext(ctx) .connectionListener(listener) + .errorListener(NOOP_EL) .reconnectWait(Duration.ofMillis(10)) .build(); @@ -275,61 +287,55 @@ public void testTLSOnReconnect() throws Exception { } @Test - public void testDisconnectOnUpgrade() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri("wss")) - .maxReconnects(0) - .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) - .sslContext(ctx) - .build(); - Nats.connect(options); - } - }); + public void testDisconnectOnUpgrade() throws Exception { + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(ts.getLocalhostUri(WSS)) + .maxReconnects(0) + .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } @Test - public void testServerSecureClientNotMismatch() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri("ws", ts.getPort("wss"))) - .maxReconnects(0) - .build(); - Nats.connect(options); - } - }); + public void testServerSecureClientNotMismatch() throws Exception { + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) + .maxReconnects(0) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } @Test - public void testClientSecureServerNotMismatch() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = new NatsTestServer()) { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri("wss")) - .maxReconnects(0) - .sslContext(ctx) - .build(); - Nats.connect(options); - } + public void testClientSecureServerNotMismatch() throws Exception { + runInSharedOwnNc(nc -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + //noinspection DataFlowIssue + Options options = optionsBuilder() + .server(nc.getConnectedUrl()) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); }); } @Test - public void testClientServerCertMismatch() { - assertThrows(IOException.class, () -> { - try (NatsTestServer ts = configFileServer("wssverify.conf")) { - SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri("wss")) - .maxReconnects(0) - .sslContext(ctx) - .build(); - Nats.connect(options); - } - }); + public void testClientServerCertMismatch() throws Exception { + NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + SSLContext ctx = SslTestingHelper.createEmptySSLContext(); + Options options = Options.builder() + .server(ts.getLocalhostUri(WSS)) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index f1c478c00..9b223d909 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -17,6 +17,7 @@ import io.nats.client.Nats; import io.nats.client.Options; import io.nats.client.impl.ListenerForTesting; +import io.nats.client.support.Debug; import org.opentest4j.AssertionFailedError; import java.io.IOException; @@ -145,6 +146,7 @@ public static Connection newConnection(Options options) { return Nats.connect(options); } catch (IOException ioe) { + Debug.info("newConnection", ioe.getMessage()); last = ioe; } catch (InterruptedException ie) { diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 33ca4f7d8..fd9cd65f8 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -14,7 +14,6 @@ package io.nats.client.utils; import io.nats.client.*; -import io.nats.client.impl.ListenerForTesting; import org.jspecify.annotations.NonNull; import java.time.Duration; @@ -135,24 +134,4 @@ public Thread newThread(@NonNull Runnable r) { return t; } } - - private static Options.Builder _plainOptionsBuilder() { - return Options.builder().reportNoResponders().errorListener(new ListenerForTesting()); - } - - public static Options.Builder plainOptionsBuilder(String serverURL) { - return _plainOptionsBuilder().server(serverURL); - } - - public static Options.Builder plainOptionsBuilder(NatsTestServer ts) { - return _plainOptionsBuilder().server(ts.getServerUri()); - } - - public static Options plainOptions(String serverURL) { - return plainOptionsBuilder(serverURL).build(); - } - - public static Options plainOptions(NatsTestServer ts) { - return plainOptionsBuilder(ts).build(); - } } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index 61f13c4a6..a95af598d 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -17,6 +17,8 @@ import io.nats.client.NUID; import io.nats.client.NatsTestServer; import io.nats.client.Options; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.util.HashMap; @@ -24,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; +import static io.nats.client.NatsTestServer.configFileBuilder; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.initVersionServerInfo; @@ -32,18 +35,21 @@ public class SharedServer { private static final int NUM_REUSABLE_CONNECTIONS = 3; private static final Thread SHARED_SHUTDOWN_HOOK_THREAD; + private static final Map SHARED_BY_NAME; private static final Map SHARED_BY_URL; private static final ReentrantLock STATIC_LOCK; static { STATIC_LOCK = new ReentrantLock(); + SHARED_BY_NAME = new HashMap<>(); SHARED_BY_URL = new HashMap<>(); SHARED_SHUTDOWN_HOOK_THREAD = new Thread("Reusables-Shutdown-Hook") { @Override public void run() { - for (SharedServer rs : SHARED_BY_URL.values()) { + for (SharedServer rs : SHARED_BY_NAME.values()) { rs.shutdown(); } + SHARED_BY_NAME.clear(); SHARED_BY_URL.clear(); } }; @@ -59,11 +65,16 @@ public void run() { public final String serverUrl; public static SharedServer getInstance(String name) throws IOException { + return getInstance(name, null); + } + + public static SharedServer getInstance(String name, String confFile) throws IOException { STATIC_LOCK.lock(); try { - SharedServer shared = SHARED_BY_URL.get(name); + SharedServer shared = SHARED_BY_NAME.get(name); if (shared == null) { - shared = new SharedServer(); + shared = new SharedServer(name, confFile); + SHARED_BY_NAME.put(name, shared); SHARED_BY_URL.put(shared.serverUrl, shared); } return shared; @@ -73,19 +84,40 @@ public static SharedServer getInstance(String name) throws IOException { } } - private SharedServer() throws IOException { + public static void shutdown(String... names) { + for (String name : names) { + SharedServer shared = SHARED_BY_NAME.get(name); + if (shared != null) { + SHARED_BY_NAME.remove(name); + SHARED_BY_URL.remove(shared.serverUrl); + shared.shutdown(); + } + } + } + + private SharedServer(@NonNull String name, @Nullable String confFile) throws IOException { instanceLock = new ReentrantLock(); reusableConnectionPrefix = new NUID().next(); connectionMap = new HashMap<>(); currentReusableId = new AtomicInteger(-1); - natsTestServer = new NatsTestServer( - NatsTestServer.builder() - .jetstream(true) - .customName("Reusable") - ); + if (confFile == null) { + natsTestServer = new NatsTestServer( + NatsTestServer.builder() + .jetstream(true) + .customName(name) + ); + } + else { + natsTestServer = new NatsTestServer(configFileBuilder(confFile) + .customName(name)); + } serverUrl = natsTestServer.getServerUri(); } + public NatsTestServer getServer() { + return natsTestServer; + } + public Connection getSharedConnection() { int id = currentReusableId.incrementAndGet(); if (id >= NUM_REUSABLE_CONNECTIONS) { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index cec9f0bd5..bddf43c55 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -20,15 +20,14 @@ import io.nats.client.api.StreamConfiguration; import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.function.Executable; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.time.Duration; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -45,6 +44,16 @@ import static org.junit.jupiter.api.Assertions.*; public class TestBase { + public static final String TLS_CONF = "tls.conf"; + public static final String TLSVERIFY_CONF = "tlsverify.conf"; + public static final String TLS_FIRST_CONF = "tls_first.conf"; + + public static final String WS = "ws"; + public static final String WSS = "wss"; + public static final String WS_CONF = "ws.conf"; + public static final String WSS_CONF = "wss.conf"; + public static final String WSSVERIFY_CONF = "wssverify.conf"; + public static final String STAR_SEGMENT = "*.star.*.segment.*"; public static final String GT_NOT_LAST_SEGMENT = "gt.>.notlast"; public static final String GT_LAST_SEGMENT = "gt.last.>"; @@ -91,6 +100,29 @@ public static ServerInfo ensureVersionServerInfo() throws Exception { return VERSION_SERVER_INFO; } + // ---------------------------------------------------------------------------------------------------- + // shared config server helpers + // ---------------------------------------------------------------------------------------------------- + static Set SharedConfigServers = new HashSet(); + + @AfterAll + public static void afterAll() { + if (SharedConfigServers.size() > 0) { + SharedServer.shutdown(SharedConfigServers.toArray(new String[0])); + } + } + + public static NatsTestServer sharedConfigServer(String nameAndConfFile) throws IOException { + SharedConfigServers.add(nameAndConfFile); + return SharedServer.getInstance(nameAndConfFile, nameAndConfFile).getServer(); + } + + public static NatsTestServer sharedConfigServer(String confFile, int version) throws IOException { + String name = confFile + "-" + version; + SharedConfigServers.add(name); + return SharedServer.getInstance(name, confFile).getServer(); + } + // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- @@ -197,7 +229,7 @@ private static void _runInShared( return; // had vc, already had run server info and fails check } - SharedServer shared = SharedServer.getInstance("shared"); + SharedServer shared = SharedServer.getInstance("SHARED"); // no builder, we can use the long-running connection since it's totally generic // with a builder, just make a fresh connection and close it at the end. From 04fcd08985225b42d3b59ed08426893b8a7eaee3 Mon Sep 17 00:00:00 2001 From: scottf Date: Tue, 2 Dec 2025 11:12:12 -0500 Subject: [PATCH 27/51] more refactoring --- src/test/java/io/nats/client/AuthTests.java | 240 +++++++-------- .../java/io/nats/client/ConnectTests.java | 278 ++++++++---------- src/test/java/io/nats/client/EchoTests.java | 26 +- .../java/io/nats/client/NatsTestServer.java | 12 - .../java/io/nats/client/PublishTests.java | 108 +++---- .../java/io/nats/client/SubscriberTests.java | 33 +-- .../io/nats/client/api/PublishAckTests.java | 4 +- .../nats/client/impl/AuthAndConnectTests.java | 2 +- .../client/impl/ConnectionListenerTests.java | 9 +- .../java/io/nats/client/impl/DrainTests.java | 23 +- .../nats/client/impl/ErrorListenerTests.java | 45 ++- .../client/impl/JetStreamGeneralTests.java | 46 +-- .../JetStreamManagementWithConfTests.java | 145 ++++----- .../impl/JetStreamMirrorAndSourcesTests.java | 63 ++-- .../nats/client/impl/JetStreamPullTests.java | 7 +- .../io/nats/client/impl/KeyValueTests.java | 13 +- .../nats/client/impl/MessageContentTests.java | 20 +- .../nats/client/impl/MessageManagerTests.java | 7 +- .../client/impl/NatsConnectionImplTests.java | 12 +- .../io/nats/client/impl/NatsMessageTests.java | 44 +-- .../nats/client/impl/NatsStatisticsTests.java | 35 ++- .../java/io/nats/client/impl/ParseTests.java | 2 - .../java/io/nats/client/impl/PingTests.java | 61 ++-- .../io/nats/client/impl/ReconnectTests.java | 91 +++--- .../io/nats/client/impl/RequestTests.java | 92 +++--- .../nats/client/impl/SimplificationTests.java | 14 +- .../io/nats/client/impl/TLSConnectTests.java | 104 ++++--- .../client/impl/WebsocketConnectTests.java | 56 ++-- .../client/{impl => support}/Listener.java | 24 +- .../{impl => support}/ListenerFuture.java | 2 +- .../{impl => support}/ListenerStatusType.java | 2 +- .../support/WebsocketSupportClassesTests.java | 64 ++-- .../io/nats/client/utils/ConnectionUtils.java | 114 +++---- .../io/nats/client/utils/OptionsUtils.java | 4 + .../io/nats/client/utils/SharedServer.java | 2 +- .../java/io/nats/client/utils/TestBase.java | 66 +++-- .../java/io/nats/service/ServiceTests.java | 166 ++++++----- src/test/resources/basic_account_js.conf | 5 +- ...mConfigurationSourcedSubjectTransform.json | 4 +- src/test/resources/js_authorization.conf | 5 +- .../js_authorization_no_service.conf | 5 +- .../resources/js_authorization_token.conf | 5 +- src/test/resources/js_prefix.conf | 5 +- src/test/resources/pagination.conf | 2 + 44 files changed, 1005 insertions(+), 1062 deletions(-) rename src/test/java/io/nats/client/{impl => support}/Listener.java (92%) rename src/test/java/io/nats/client/{impl => support}/ListenerFuture.java (98%) rename src/test/java/io/nats/client/{impl => support}/ListenerStatusType.java (95%) diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 931a2abdc..daece4210 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -17,10 +17,10 @@ import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; -import io.nats.client.impl.Listener; import io.nats.client.impl.ListenerForTesting; -import io.nats.client.impl.ListenerFuture; import io.nats.client.support.JwtUtils; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -35,8 +35,9 @@ import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.ResourceUtils.jwtResource; @@ -72,20 +73,23 @@ public void testUserPass() throws Exception { Options badUser = optionsBuilder(ts).maxReconnects(0) .userInfo("zzz".toCharArray(), "ppp".toCharArray()).build(); - assertThrows(AuthenticationException.class, () -> Nats.connect(badUser)); + //noinspection resource + assertThrows(AuthenticationException.class, () -> standardConnect(badUser, AuthenticationException.class)); Options badPass = optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); - assertThrows(AuthenticationException.class, () -> Nats.connect(badPass)); + //noinspection resource + assertThrows(AuthenticationException.class, () -> standardConnect(badPass, AuthenticationException.class)); Options missingUserPass = optionsNoReconnect(ts); - assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPass)); + //noinspection resource + assertThrows(AuthenticationException.class, () -> standardConnect(missingUserPass, AuthenticationException.class)); } } @Test public void testEncodedPassword() throws Exception { - try (NatsTestServer ts = configFileServer("encoded_pass.conf")) { + runInConfiguredServer("encoded_pass.conf", ts -> { int port = ts.getPort(); assertEncoded("space%20space", port); assertEncoded("colon%3Acolon", port); @@ -112,7 +116,7 @@ public void testEncodedPassword() throws Exception { // a plus sign in a user or pass is a plus sign, not a space assertThrows(AuthenticationException.class, () -> assertEncoded("space+space", port)); - } + }); } private void assertEncoded(String encoded, int port) throws IOException, InterruptedException { @@ -163,7 +167,7 @@ public void testUserPassOnReconnect() throws Exception { // See config file for user/pass Options options = optionsBuilder(ts).maxReconnects(-1) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).connectionListener(listener).build(); - nc = standardConnectionWait(options); + nc = standardConnect(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -181,7 +185,7 @@ public void testUserPassOnReconnect() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - listenerConnectionWait(nc, listener); + waitUntilConnected(nc); // wait for reconnect nc.publish("test", null); flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); @@ -221,7 +225,7 @@ public void testUserPassInURLOnReconnect() throws Exception { // See config file for user/pass Options options = new Options.Builder().server(userPassInUrl("uuu", "ppp", ts.getPort())) .maxReconnects(-1).connectionListener(listener).errorListener(NOOP_EL).build(); - nc = standardConnectionWait(options); + nc = standardConnect(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -241,7 +245,7 @@ public void testUserPassInURLOnReconnect() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - listenerConnectionWait(nc, listener); + waitUntilConnected(nc); // wait for reconnect nc.publish("test", null); flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); Message msg = sub.nextMessage(Duration.ofSeconds(5)); @@ -265,14 +269,14 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { .connectionListener(listener) .pingInterval(Duration.ofMillis(100)) .build(); - Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); - ts1.close(); - listenerConnectionWait(nc, listener); - assertEquals(nc.getConnectedUrl(), url2); - standardCloseConnection(nc); + try (Connection nc = standardConnect(options)) { + assertEquals(nc.getConnectedUrl(), url1); + listener.prepForStatusChange(Events.RESUBSCRIBED); + ts1.close(); + waitUntilConnected(nc); // wait for reconnect + assertEquals(nc.getConnectedUrl(), url2); + } } } @@ -290,15 +294,15 @@ public void testUserPassInURLWithFallback() throws Exception { .noRandomize() .connectionListener(listener) .pingInterval(Duration.ofMillis(100)).build(); - Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), url1); + try (Connection nc = standardConnect(options)) { + assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); - ts1.close(); - listener.waitForStatusChange(10, TimeUnit.SECONDS); - assertConnected(nc); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + listener.prepForStatusChange(Events.RESUBSCRIBED); + ts1.close(); + listener.waitForStatusChange(10, TimeUnit.SECONDS); + assertConnected(nc); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + } } } @@ -317,16 +321,16 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { .connectionListener(listener) .pingInterval(Duration.ofMillis(100)) .build(); - Connection nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), url1); + try (Connection nc = standardConnect(options)) { + assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); - ts1.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); + listener.prepForStatusChange(Events.RESUBSCRIBED); + ts1.close(); + listener.waitForStatusChange(2, TimeUnit.SECONDS); - standardConnectionWait(nc); - assertEquals(nc.getConnectedUrl(), url2); - standardCloseConnection(nc); + waitUntilConnected(nc); // wait for reconnect + assertEquals(nc.getConnectedUrl(), url2); + } } } @@ -335,7 +339,6 @@ public void testTokenInURLWithFallback() throws Exception { String[] customArgs1 = { "--auth", "token_one" }; String[] customArgs2 = { "--auth", "token_two" }; ListenerForTesting listener = new ListenerForTesting(); - Connection nc; try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); @@ -346,16 +349,17 @@ public void testTokenInURLWithFallback() throws Exception { .connectionListener(listener) .pingInterval(Duration.ofMillis(100)) .build(); - nc = standardConnectionWait(options); - assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); - ts1.close(); + try (Connection nc = standardConnect(options)) { + assertEquals(nc.getConnectedUrl(), url1); - listener.waitForStatusChange(STANDARD_CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); - listenerConnectionWait(nc, listener); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + listener.prepForStatusChange(Events.RESUBSCRIBED); + ts1.close(); + + listener.waitForStatusChange(CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); + waitUntilConnected(nc); // wait for reconnect + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + } } } @@ -432,8 +436,7 @@ public void testNKeyAuth() throws Exception { // direct through Nats.connect Connection nc = Nats.connect(ts.getServerUri(), Nats.staticCredentials(null, theKey.getSeed())); - standardConnectionWait(nc); - standardCloseConnection(nc); + standardCloseConnection(waitUntilConnected(nc)); // fails with no nkey Options noNkey = optionsBuilder(ts).maxReconnects(0) @@ -445,7 +448,7 @@ public void testNKeyAuth() throws Exception { @Test public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path - NatsTestServer ts = sharedConfigServer("operator.conf"); + NatsTestServer ts = sharedConfigServer( "operator.conf"); Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(getUserCredsAuthHander()) .build(); @@ -458,23 +461,21 @@ public void testJWTAuthWithCredsFile() throws Exception { //test Nats.connect method Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); - standardConnectionWait(nc); - standardCloseConnection(nc); + standardCloseConnection(waitUntilConnected(nc)); } @Test public void testJWTAuthWithCredsFileAlso() throws Exception { //test Nats.connect method - try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { + runInConfiguredServer("operatorJnatsTest.conf", ts -> { Connection nc = Nats.connect(ts.getServerUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); - standardConnectionWait(nc); - standardCloseConnection(nc); - } + standardCloseConnection(waitUntilConnected(nc)); + }); } @Test public void testWsJWTAuthWithCredsFile() throws Exception { - try (NatsTestServer ts = NatsTestServer.configFileServer("ws_operator.conf")) { + runInConfiguredServer("ws_operator.conf", ts -> { String uri = ts.getLocalhostUri(WS); // in options Options options = optionsBuilder(uri).maxReconnects(0) @@ -483,21 +484,19 @@ public void testWsJWTAuthWithCredsFile() throws Exception { // directly Nats.connect Connection nc = Nats.connect(uri, getUserCredsAuthHander()); - standardConnectionWait(nc); - standardCloseConnection(nc); - } + standardCloseConnection(waitUntilConnected(nc)); + }); } @Test public void testWssJWTAuthWithCredsFile() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); - try (NatsTestServer ts = NatsTestServer.configFileServer("wss_operator.conf")) - { + runInConfiguredServer("wss_operator.conf", ts -> { String uri = ts.getLocalhostUri("wss"); Options options = optionsBuilder(uri).maxReconnects(0).sslContext(ctx) .authHandler(getUserCredsAuthHander()).build(); assertCanConnect(options); - } + }); } @Test @@ -506,7 +505,7 @@ public void testStaticJWTAuth() throws Exception { String jwt = "eyJ0eXAiOiJqd3QiLCJhbGciOiJlZDI1NTE5In0.eyJqdGkiOiI3UE1GTkc0R1c1WkE1NEg3N09TUUZKNkJNQURaSUQ2NTRTVk1XMkRFQVZINVIyUVU0MkhBIiwiaWF0IjoxNTY1ODg5ODk4LCJpc3MiOiJBQUhWU0k1NVlQTkJRWjVQN0Y2NzZDRkFPNFBIQlREWUZRSUVHVEtMUVRJUEVZUEZEVEpOSEhPNCIsIm5hbWUiOiJkZW1vIiwic3ViIjoiVUMzT01MSlhUWVBZN0ZUTVVZNUNaNExHRVdRSTNZUzZKVFZXU0VGRURBMk9MTEpZSVlaVFo3WTMiLCJ0eXBlIjoidXNlciIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fX19.ROSJ7D9ETt9c8ZVHxsM4_FU2dBRLh5cNfb56MxPQth74HAxxtGMl0nn-9VVmWjXgFQn4JiIbwrGfFDBRMzxsAA"; String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; - NatsTestServer ts = sharedConfigServer("operator.conf"); + NatsTestServer ts = sharedConfigServer( "operator.conf"); Options options = optionsBuilder(ts).maxReconnects(0) .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); assertCanConnect(options); @@ -516,23 +515,26 @@ public void testStaticJWTAuth() throws Exception { public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 - try (NatsTestServer ts = NatsTestServer.configFileServer("operator.conf")) { // closed in test, so cannot be shared + runInConfiguredServer("operator.conf", ts1 -> { // closed in test, so cannot be shared NatsTestServer ts2 = sharedConfigServer("operator.conf"); // do not auto close this!! - Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) - .noRandomize().maxReconnects(-1).authHandler(getUserCredsAuthHander()).build(); - Connection nc = newConnection(options); - assertEquals(ts.getServerUri(), nc.getConnectedUrl()); + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) + .noRandomize() + .maxReconnects(-1) + .authHandler(getUserCredsAuthHander()) + .build(); + Connection nc = standardConnect(options); + assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); - ts.close(); + ts1.close(); // Reconnect will fail because ts has the same auth error listener.waitForStatusChange(5, TimeUnit.SECONDS); assertConnected(nc); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); - } + }); } @Test @@ -540,12 +542,15 @@ public void testCloseOnReconnectWithSameError() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts1 - try (NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { // closed in test, so cannot be shared - NatsTestServer ts1 = sharedConfigServer("operator_noacct.conf"); // do not auto close this!!! + runInConfiguredServer("operator.conf", ts2 -> { // closed in test, so cannot be shared + NatsTestServer ts1 = sharedConfigServer(OPERATOR_NOACCT_CONF); // do not auto close this!!! Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) - .maxReconnects(-1).connectionTimeout(Duration.ofSeconds(2)).noRandomize() - .authHandler(getUserCredsAuthHander()).build(); - Connection nc = newConnection(options); + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(2)) + .noRandomize() + .authHandler(getUserCredsAuthHander()) + .build(); + Connection nc = standardConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.CLOSED); @@ -555,57 +560,38 @@ public void testCloseOnReconnectWithSameError() throws Exception { // Reconnect will fail because ts has the same auth error listener.waitForStatusChange(6, TimeUnit.SECONDS); standardCloseConnection(nc); - } + }); } @Test public void testThatAuthErrorIsCleared() throws Exception { - // this test can't use any of the shared servers since it closes servers - // Connect should fail on ts1 - try (NatsTestServer ts1 = NatsTestServer.configFileServer("operator_noacct.conf"); - NatsTestServer ts2 = NatsTestServer.configFileServer("operator.conf")) { - - Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) - .noRandomize() - .maxReconnects(-1) - .connectionTimeout(Duration.ofSeconds(5)) - .reconnectWait(Duration.ofSeconds(1)) // wait a tad to allow restarts - .authHandler(getUserCredsAuthHander()) - .errorListener(new ListenerForTesting()) - .build(); - Connection nc = standardConnectionWait(options); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - - String tsURI = ts1.getServerUri(); - int port1 = ts1.getPort(); - int port2 = ts2.getPort(); - - ts1.close(); - // ts3 will be at the same port that ts was - try (NatsTestServer ts3 = configFileServer("operator.conf", port1)) { - ListenerForTesting listener = new ListenerForTesting(); - listener.prepForStatusChange(Events.RECONNECTED); - - ts2.close(); - - // reconnect should work because we are now running with the good config - listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - - assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); - assertEquals(tsURI, ts3.getServerUri()); - - // Close this and go back to the bad config on that port, should be ok 1x - listener.prepForStatusChange(Events.RECONNECTED); - ts3.close(); - - try (NatsTestServer ignored = configFileServer("operator_noacct.conf", port1); - NatsTestServer ts5 = configFileServer("operator.conf", port2)) { - listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - assertEquals(ts5.getServerUri(), nc.getConnectedUrl()); - } - } - standardCloseConnection(nc); - } + AtomicReference ncRef = new AtomicReference<>(); + AtomicReference server2Ref = new AtomicReference<>(); + AtomicInteger port2Ref = new AtomicInteger(); + + runInConfiguredServer(OPERATOR_NOACCT_CONF, ts1 -> { + runInConfiguredServer( "operator.conf", ts2 -> { + String server1 = ts1.getServerUri(); + String server2 = ts2.getServerUri(); + server2Ref.set(server2); + port2Ref.set(ts2.getPort()); + Options options = optionsBuilder(server1, server2) + .noRandomize() + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(5)) + .reconnectWait(Duration.ofSeconds(1)) // wait a tad to allow restarts + .authHandler(getUserCredsAuthHander()) + .build(); + Connection nc = standardConnect(options); + ncRef.set(nc); + assertEquals(server2, nc.getConnectedUrl()); + }); + + runInConfiguredServer( "operator.conf", port2Ref.get(), ts2 -> { + waitUntilConnected(ncRef.get()); + assertEquals(server2Ref.get(), ncRef.get().getConnectedUrl()); + }); + }); } @Test @@ -642,7 +628,7 @@ private static void _testReconnectAfter(String errText) throws Exception { // Connect should fail on ts1 try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true)) { - NatsTestServer ts2 = sharedConfigServer("operator.conf"); + NatsTestServer ts2 = sharedConfigServer( "operator.conf"); Options options = optionsBuilder(mockTs, ts2) .maxReconnects(-1) @@ -654,7 +640,7 @@ private static void _testReconnectAfter(String errText) throws Exception { ListenerFuture f = listener.prepForConnectionEvent(Events.RECONNECTED); - try (Connection nc = newConnection(options)) { + try (Connection nc = standardConnect(options)) { assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); fMock.complete(true); listener.validateReceived(f); @@ -688,7 +674,7 @@ public void testRealUserAuthenticationExpired() throws Exception { String creds = String.format(JwtUtils.NATS_USER_JWT_FORMAT, jwt, new String(nKeyUser.getSeed())); String credsFile = ResourceUtils.createTempFile("nats_java_test", ".creds", creds.split("\\Q\\n\\E")); - try (NatsTestServer ts = NatsTestServer.configFileServer("operatorJnatsTest.conf")) { + runInConfiguredServer("operatorJnatsTest.conf", ts -> { Options options = Options.builder() .server(ts.getServerUri()) .credentialPath(credsFile) @@ -696,12 +682,14 @@ public void testRealUserAuthenticationExpired() throws Exception { .errorListener(listener) .maxReconnects(5) .build(); - try (Connection ignored = newConnection(options)) { + try (Connection ignored = standardConnect(options)) { listener.validateReceived(fExpired); } catch (RuntimeException e) { - assertTrue(e.getMessage().contains("Authorization Violation")); + if (!e.getMessage().contains("Authorization Violation")) { + fail(e); + } } - } + }); } } diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index a7b7f4016..6ace0a930 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -18,8 +18,9 @@ import io.nats.client.api.ServerInfo; import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.SimulateSocketDataPortException; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.net.InetAddress; @@ -39,27 +40,72 @@ import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; -@Isolated public class ConnectTests { + @Test - public void testConnection() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - try (Connection nc = Nats.connect(ts.getServerUri())) { - assertEquals(ts.getPort(), nc.getServerInfo().getPort()); - - // coverage for getClientAddress - InetAddress inetAddress = nc.getClientInetAddress(); - assertNotNull(inetAddress); - assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) - || inetAddress.equals(InetAddress.getLocalHost())); - } - } + public void testConnectWithConfig() throws Exception { + runInConfiguredServer("simple.conf", ts -> assertCanConnect(optionsBuilder(ts).build())); } @Test - public void testConnectionWithOptions() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - assertCanConnect(options(ts)); + public void testConnectVariants() throws Exception { + try (NatsTestServer ts1 = new NatsTestServer()) { + try (NatsTestServer ts2 = new NatsTestServer()) { + // commas in one server url + Options options = optionsBuilder().server(ts1.getServerUri() + "," + ts2.getServerUri()).build(); + try (Connection nc = standardConnect(options)) { + // coverage for getClientAddress + InetAddress inetAddress = nc.getClientInetAddress(); + assertNotNull(inetAddress); + assertTrue(inetAddress.equals(InetAddress.getLoopbackAddress()) + || inetAddress.equals(InetAddress.getLocalHost())); + } + + // Randomize + boolean needOne = true; + boolean needTwo = true; + int tries = 20; + options = options(ts1, ts2); + while (tries-- > 0 && (needOne || needTwo)) { + try (Connection nc = standardConnect(options)) { + Collection servers = nc.getServers(); + assertTrue(servers.contains(ts1.getServerUri())); + assertTrue(servers.contains(ts2.getServerUri())); + if (ts1.getServerUri().equals(nc.getConnectedUrl())) { + needOne = false; + } + else { + needTwo = false; + } + } + } + assertFalse(needOne); + assertFalse(needTwo); + + // noRandomize + tries = 3; + int gotOne = 0; + int gotTwo = 0; + + // should never get a two + options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()).noRandomize().build(); + for (int i = 0; i < tries; i++) { + try (Connection nc = standardConnect(options)) { + Collection servers = nc.getServers(); + assertTrue(servers.contains(ts1.getServerUri())); + assertTrue(servers.contains(ts2.getServerUri())); + if (ts1.getServerUri().equals(nc.getConnectedUrl())) { + gotOne++; + } + else { + gotTwo++; + } + } + } + + assertEquals(tries, gotOne, "should always ge one"); + assertEquals(0, gotTwo, "should never get two"); + } } } @@ -82,7 +128,7 @@ public void testFullFakeConnectWithTabs() throws Exception { public void testConnectExitBeforeInfo() throws IOException { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_BEFORE_INFO)) { Options options = optionsBuilder(mockTs).noReconnect().build(); - assertThrows(IOException.class, () -> assertCanConnect(options)); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @@ -90,7 +136,7 @@ public void testConnectExitBeforeInfo() throws IOException { public void testConnectExitAfterInfo() throws IOException { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_INFO)) { Options options = optionsBuilder(mockTs).noReconnect().build(); - assertThrows(IOException.class, () -> assertCanConnect(options)); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @@ -98,7 +144,7 @@ public void testConnectExitAfterInfo() throws IOException { public void testConnectExitAfterConnect() throws IOException { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_CONNECT)) { Options options = optionsBuilder(mockTs).noReconnect().build(); - assertThrows(IOException.class, () -> assertCanConnect(options)); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @@ -106,7 +152,7 @@ public void testConnectExitAfterConnect() throws IOException { public void testConnectExitAfterPing() throws IOException { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.EXIT_AFTER_PING)) { Options options = optionsBuilder(mockTs).noReconnect().build(); - assertThrows(IOException.class, () -> assertCanConnect(options)); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @@ -123,118 +169,42 @@ public void testConnectionFailureWithFallback() throws Exception { } @Test - public void testConnectWithConfig() throws Exception { - try (NatsTestServer ts = NatsTestServer.configFileServer("simple.conf")) { - assertCanConnect(options(ts)); + public void testFailWithMissingLineFeedAfterInfo() throws Exception { + String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @Test - public void testConnectWithCommas() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer()) { - try (NatsTestServer ts2 = new NatsTestServer()) { - Options options = optionsBuilder().server(ts1.getServerUri() + "," + ts2.getServerUri()).build(); - assertCanConnect(options); - } + public void testFailWithStuffAfterInitialInfo() throws Exception { + String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @Test - public void testConnectRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer()) { - try (NatsTestServer ts2 = new NatsTestServer()) { - boolean needOne = true; - boolean needTwo = true; - int count = 0; - int maxTries = 100; - while (count++ < maxTries && (needOne || needTwo)) { - Connection nc = standardConnectionWait(options(ts1, ts2)); - if (ts1.getServerUri().equals(nc.getConnectedUrl())) { - needOne = false; - } else { - needTwo = false; - } - Collection servers = nc.getServers(); - assertTrue(servers.contains(ts1.getServerUri())); - assertTrue(servers.contains(ts2.getServerUri())); - standardCloseConnection(nc); - } - assertFalse(needOne); - assertFalse(needTwo); - } + public void testFailWrongInitialInfoOP() throws Exception { + String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + mockTs.useCustomInfoAsFullInfo(); + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } } @Test - public void testConnectNoRandomize() throws Exception { - try (NatsTestServer ts1 = new NatsTestServer()) { - try (NatsTestServer ts2 = new NatsTestServer()) { - int one = 0; - int two = 0; - - // should get at least 1 for each - for (int i = 0; i < 10; i++) { - Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()).noRandomize().build(); - Connection nc = standardConnectionWait(options); - if (ts1.getServerUri().equals(nc.getConnectedUrl())) { - one++; - } else { - two++; - } - standardCloseConnection(nc); - } - - assertEquals(10, one, "always got one"); - assertEquals(0, two, "never got two"); - } + public void testIncompleteInitialInfo() throws Exception { + String badInfo = "{\"server_id\"\r\n"; + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { + Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); } } - @Test - public void testFailWithMissingLineFeedAfterInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\rmore stuff"; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testFailWithStuffAfterInitialInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\nmore stuff"; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testFailWrongInitialInfoOP() { - assertThrows(IOException.class, () -> { - String badInfo = "PING {\"server_id\":\"test\", \"version\":\"9.9.99\"}\r\n"; // wrong op code - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - mockTs.useCustomInfoAsFullInfo(); - Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - - @Test - public void testIncompleteInitialInfo() { - assertThrows(IOException.class, () -> { - String badInfo = "{\"server_id\"\r\n"; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, badInfo)) { - Options options = optionsBuilder(mockTs).reconnectWait(Duration.ofDays(1)).build(); - Nats.connect(options); - } - }); - } - @Test public void testAsyncConnection() throws Exception { ListenerForTesting listener = new ListenerForTesting(); @@ -269,52 +239,48 @@ public void testAsyncConnectionWithReconnect() throws Exception { listener.prepForStatusChange(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { - listenerConnectionWait(nc, listener); - standardCloseConnection(nc); + standardCloseConnection(waitUntilConnected(nc)); } } @Test public void testThrowOnAsyncWithoutListener() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).build(); - assertThrows(IllegalArgumentException.class, () -> Nats.connectAsynchronously(options, false)); - } + Options options = optionsBuilder(NatsTestServer.nextPort()).build(); + assertThrows(IllegalArgumentException.class, () -> Nats.connectAsynchronously(options, false)); } - @Test public void testErrorOnAsync() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); Options options = optionsBuilder(NatsTestServer.nextPort()) - .connectionListener(listener).errorListener(listener).noReconnect().build(); - listener.prepForStatusChange(Events.CLOSED); + .connectionListener(listener) + .errorListener(listener) + .noReconnect() + .build(); + ListenerFuture fClosed = listener.prepForConnectionEvent(Events.CLOSED); Nats.connectAsynchronously(options, false); - listener.waitForStatusChange(10, TimeUnit.SECONDS); - + listener.validateReceived(fClosed); assertTrue(listener.getExceptionCount() > 0); - assertTrue(listener.getEventCount(Events.CLOSED) > 0); } @Test - public void testConnectionTimeout() { - assertThrows(IOException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 - Options options = optionsBuilder(mockTs).noReconnect().traceConnection() - .connectionTimeout(Duration.ofSeconds(2)). // 2 is also the default but explicit for test - build(); - Connection nc = Nats.connect(options); - assertNotSame(Connection.Status.CONNECTED, nc.getStatus()); - } - }); + public void testConnectionTimeout() throws Exception { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { // will sleep for 3 + Options options = optionsBuilder(mockTs) + .noReconnect() + .connectionTimeout(Duration.ofSeconds(2)) // 2 is also the default but explicit for test + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + } } @Test public void testSlowConnectionNoTimeout() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.SLEEP_BEFORE_INFO)) { - Options options = optionsBuilder(mockTs).noReconnect() - .connectionTimeout(Duration.ofSeconds(6)). // longer than the sleep - build(); + Options options = optionsBuilder(mockTs) + .noReconnect() + .connectionTimeout(Duration.ofSeconds(6)) // longer than the sleep + .build(); assertCanConnect(options); } } @@ -371,7 +337,7 @@ public void testReconnectLogging() throws Exception { .connectionTimeout(Duration.ofSeconds(2)) .build(); - try (Connection nc = Nats.connect(options)) { + try (Connection nc = standardConnect(options)) { assertConnected(nc); ts.close(); Thread.sleep(3000); @@ -395,7 +361,7 @@ public void testConnectExceptionHasURLS() { @Test public void testFlushBuffer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(options(ts)); + Connection nc = standardConnect(options(ts)); // test connected nc.flushBuffer(); @@ -417,7 +383,7 @@ public void testFlushBuffer() throws Exception { @Test public void testFlushBufferThreadSafety() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnectionWait(options(ts)); + Connection nc = standardConnect(options(ts)); // use two latches to sync the threads as close as // possible. @@ -435,8 +401,9 @@ public void run() { } catch (Exception e) { // NOOP } + String subject = random(); for (int i = 1; i <= 50000; i++) { - nc.publish("foo", payload); + nc.publish(subject, payload); if (i % 2000 == 0) { try { nc.flushBuffer(); @@ -468,7 +435,7 @@ public void run() { nc.flushBuffer(); } - // cleanup and doublecheck the thread is done. + // cleanup and double-check the thread is done. t.join(2000); // make sure the publisher actually completed. @@ -611,20 +578,13 @@ void testLowConnectionTimeoutResultsInIOException() { Options options = Options.builder() .connectionTimeout(Duration.ZERO) .build(); - - assertThrows(IOException.class, () -> { - Connection nc = Nats.connect(options); - nc.close(); - }); + assertThrows(IOException.class, () -> Nats.connect(options)); } @Test void testConnectWithFastFallback() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).enableFastFallback().build(); - Connection nc = standardConnectionWait(options); - standardCloseConnection(nc); - } + // this is pretty much a coverage test + runInSharedOwnNc(optionsBuilder().enableFastFallback(), nc -> {}); } @Test diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 352c6ec5f..fd55c90a9 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -22,28 +22,18 @@ import java.time.Duration; import static io.nats.client.utils.ConnectionUtils.assertClosed; -import static io.nats.client.utils.ConnectionUtils.newConnection; +import static io.nats.client.utils.ConnectionUtils.standardConnect; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class EchoTests extends TestBase { @Test - public void testFailWithBadServerProtocol() { - assertThrows(IOException.class, () -> { - Connection nc = null; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options opt = optionsBuilder(mockTs).noEcho().noReconnect().build(); - try { - nc = Nats.connect(opt); // Should fail - } - finally { - if (nc != null) { - nc.close(); - assertClosed(nc); - } - } - } - }); + public void testFailWithBadServerProtocol() throws Exception { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options opt = optionsBuilder(mockTs).noEcho().noReconnect().build(); + assertThrows(IOException.class, () -> Nats.connect(opt)); + } } @Test @@ -65,7 +55,7 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { runInShared(nc1 -> { - try (Connection nc2 = newConnection(optionsBuilder(nc1).build())) { + try (Connection nc2 = standardConnect(options(nc1))) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/NatsTestServer.java b/src/test/java/io/nats/client/NatsTestServer.java index 8c3fa77f9..b713deb06 100644 --- a/src/test/java/io/nats/client/NatsTestServer.java +++ b/src/test/java/io/nats/client/NatsTestServer.java @@ -43,18 +43,6 @@ public static Builder configFileBuilder(String configFilePath) { return NatsServerRunner.builder().configFilePath(configResource(configFilePath)); } - public static NatsTestServer configFileServer(String configFilePath) throws IOException { - return new NatsTestServer(configFileBuilder(configFilePath)); - } - - public static NatsTestServer configFileServer(String configFilePath, int port) throws IOException { - return new NatsTestServer(configFileBuilder(configFilePath).port(port)); - } - - public static NatsTestServer configuredJsServer(String configFilePath) throws IOException { - return new NatsTestServer(configFileBuilder(configFilePath).jetstream()); - } - public NatsTestServer() throws IOException { this(builder()); } diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 18edf95d7..203431e43 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -14,7 +14,11 @@ package io.nats.client; import io.nats.client.ConnectionListener.Events; -import io.nats.client.impl.*; +import io.nats.client.impl.Headers; +import io.nats.client.impl.JetStreamTestingContext; +import io.nats.client.impl.NatsMessage; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -40,7 +44,7 @@ public void throwsIfClosed() throws Exception { runInSharedOwnNc(nc -> { nc.close(); // can't publish after close - assertThrows(IllegalStateException.class, () -> nc.publish("subject", "replyto", null)); + assertThrows(IllegalStateException.class, () -> nc.publish(random(), random(), null)); // flush after close always times out assertThrows(TimeoutException.class, () -> nc.flush(null)); @@ -60,29 +64,27 @@ public void testThrowsWithoutSubject() throws Exception { @Test public void testThrowsIfTooBig() throws Exception { - try (NatsTestServer ts = NatsTestServer.configFileServer("max_payload.conf")) { - Connection nc = standardConnectionWait(options(ts)); - - byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 - assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); - nc.close(); - Thread.sleep(1000); + byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 + runInConfiguredServer("max_payload.conf", ts -> { + try (Connection nc = standardConnect(options(ts))) { + assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); + } Listener listener = new Listener(); Options options = optionsBuilder(ts) .clientSideLimitChecks(false) .errorListener(listener) .build(); - Connection nc2 = standardConnectionWait(options); - - ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); - ListenerFuture fException = listener.prepForException(SocketException.class); + try (Connection nc = standardConnect(options)) { + ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); + ListenerFuture fException = listener.prepForException(SocketException.class); - nc2.publish(random(), null, null, body); + nc.publish(random(), null, null, body); - // sometimes the exception comes in before the error and the error never comes, so validate for either. - listener.validateReceived(fError, fException); - } + // sometimes the exception comes in before the error and the error never comes, so validate for either. + listener.validateAnyReceived(fError, fException); + } + }); } @Test @@ -166,45 +168,47 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header } }; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(options(mockTs))) { - - byte[] bodyBytes; - if (bodyString == null || bodyString.isEmpty()) { - bodyBytes = EMPTY_BODY; - bodyString = ""; - } - else { - bodyBytes = bodyString.getBytes(StandardCharsets.UTF_8); - } + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) { + try (Connection nc = standardConnect(options(mockTs))) { + byte[] bodyBytes; + if (bodyString == null || bodyString.isEmpty()) { + bodyBytes = EMPTY_BODY; + bodyString = ""; + } + else { + bodyBytes = bodyString.getBytes(StandardCharsets.UTF_8); + } - nc.publish(NatsMessage.builder().subject(subject).replyTo(replyTo).headers(headers).data(bodyBytes).build()); + nc.publish(NatsMessage.builder().subject(subject).replyTo(replyTo).headers(headers).data(bodyBytes).build()); - assertTrue(gotPub.get(), "Got " + proto + "."); //wait for receipt to close up - standardCloseConnection(nc); + assertTrue(gotPub.get(), "Got " + proto + "."); //wait for receipt to close up + standardCloseConnection(nc); - if (proto.equals(OP_PUB)) { - String expectedProtocol; - if (replyTo == null) { - expectedProtocol = proto + " " + subject + " " + bodyBytes.length; - } else { - expectedProtocol = proto + " " + subject + " " + replyTo + " " + bodyBytes.length; + if (proto.equals(OP_PUB)) { + String expectedProtocol; + if (replyTo == null) { + expectedProtocol = proto + " " + subject + " " + bodyBytes.length; + } + else { + expectedProtocol = proto + " " + subject + " " + replyTo + " " + bodyBytes.length; + } + assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); + assertEquals(bodyString, body.get(), "Body matches"); } - assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); - assertEquals(bodyString, body.get(), "Body matches"); - } - else { - String expectedProtocol; - int hdrLen = headers.serializedLength(); - int totLen = hdrLen + bodyBytes.length; - if (replyTo == null) { - expectedProtocol = proto + " " + subject + " " + hdrLen + " " + totLen; - } else { - expectedProtocol = proto + " " + subject + " " + replyTo + " " + hdrLen + " " + totLen; + else { + String expectedProtocol; + int hdrLen = headers.serializedLength(); + int totLen = hdrLen + bodyBytes.length; + if (replyTo == null) { + expectedProtocol = proto + " " + subject + " " + hdrLen + " " + totLen; + } + else { + expectedProtocol = proto + " " + subject + " " + replyTo + " " + hdrLen + " " + totLen; + } + assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); + assertEquals(bodyString, body.get(), "Body matches"); + assertEquals(new String(headers.getSerialized()), hdrProto.get()); } - assertEquals(expectedProtocol, protocol.get(), "Protocol matches"); - assertEquals(bodyString, body.get(), "Body matches"); - assertEquals(new String(headers.getSerialized()), hdrProto.get()); } } } @@ -254,7 +258,7 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); - try (Connection ncSupported = newConnection(ncSupportedOptions)) { + try (Connection ncSupported = standardConnect(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { ctxNotSupported.createOrReplaceStream(jsSubject); JetStream jsNotSupported = ncNotSupported.jetStream(); diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index e3d6e18c1..624a8618f 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -19,8 +19,7 @@ import java.util.HashSet; import java.util.concurrent.CompletableFuture; -import static io.nats.client.utils.ConnectionUtils.standardCloseConnection; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; @@ -108,25 +107,23 @@ public void testTabInProtocolLine() throws Exception { w.flush(); }; - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer); - Connection nc = standardConnectionWait(options(mockTs))) { + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) { + try (Connection nc = standardConnect(options(mockTs))) { + String subject = random(); + Subscription sub = nc.subscribe(subject); - String subject = random(); - Subscription sub = nc.subscribe(subject); - - gotSub.get(); - sendMsg.complete(Boolean.TRUE); + gotSub.get(); + sendMsg.complete(Boolean.TRUE); - Message msg = sub.nextMessage(Duration.ZERO);//Duration.ofMillis(1000)); + Message msg = sub.nextMessage(Duration.ZERO);//Duration.ofMillis(1000)); - assertTrue(sub.isActive()); - assertNotNull(msg); - assertEquals(subject, msg.getSubject()); - assertEquals(sub, msg.getSubscription()); - assertNull(msg.getReplyTo()); - assertEquals(0, msg.getData().length); - - standardCloseConnection(nc); + assertTrue(sub.isActive()); + assertNotNull(msg); + assertEquals(subject, msg.getSubject()); + assertEquals(sub, msg.getSubscription()); + assertNull(msg.getReplyTo()); + assertEquals(0, msg.getData().length); + } } } diff --git a/src/test/java/io/nats/client/api/PublishAckTests.java b/src/test/java/io/nats/client/api/PublishAckTests.java index e184bbbe2..64407b0e7 100644 --- a/src/test/java/io/nats/client/api/PublishAckTests.java +++ b/src/test/java/io/nats/client/api/PublishAckTests.java @@ -69,9 +69,7 @@ public void testRequiredFieldsSet() { @Test public void testThrowsOnGarbage() { - assertThrows(JetStreamApiException.class, () -> { - new PublishAck(getDataMessage("notjson")); - }); + assertThrows(JetStreamApiException.class, () -> new PublishAck(getDataMessage("notjson"))); } @Test diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 74bd7dea2..1683f88a9 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -76,7 +76,7 @@ public void errorOccurred(Connection conn, String error) { .errorListener(noopErrorListener) .build(); - try (NatsConnection nc = (NatsConnection) newConnection(options)) { + try (NatsConnection nc = (NatsConnection) standardConnect(options)) { // After we've connected, shut down, so we can attempt reconnecting. ts.shutdown(true); diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 90a76ec36..b3d5d10af 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -15,6 +15,8 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -62,8 +64,7 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception { .connectionListener(listener) .build(); - listener.prepForStatusChange(Events.CONNECTED); - standardCloseConnection( listenerConnectionWait(options, listener) ); + standardCloseConnection( standardConnect(options) ); assertEquals(1, listener.getEventCount(Events.DISCOVERED_SERVERS)); } } @@ -81,7 +82,7 @@ public void testDisconnectReconnectCount() throws Exception { .connectionListener(listener) .build(); port = ts.getPort(); - nc = standardConnectionWait(options); + nc = standardConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -93,7 +94,7 @@ public void testDisconnectReconnectCount() throws Exception { assertNull(nc.getConnectedUrl()); try (NatsTestServer ts = new NatsTestServer(port)) { - standardConnectionWait(nc); + waitUntilConnected(nc); // wait for reconnect assertEquals(1, listener.getEventCount(Events.RECONNECTED)); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index f6e5cf510..52c70628f 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -15,6 +15,8 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import io.nats.client.utils.SharedServer; import org.junit.jupiter.api.Test; @@ -37,8 +39,7 @@ public class DrainTests { @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - //noinspection resource - final Connection nc = standardConnectionWait(optionsNoReconnect(ts)); + final Connection nc = standardConnect(optionsNoReconnect(ts)); nc.subscribe(random()); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do @@ -46,6 +47,8 @@ public void testCloseOnDrainFailure() throws Exception { ts.shutdown(); // shut down the server to fail drain and subsequent close assertThrows(Exception.class, () -> nc.drain(Duration.ofSeconds(1))); + + standardCloseConnection(nc); } } @@ -572,15 +575,17 @@ public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { @Test public void testThrowIfCantFlush() throws Exception { Listener listener = new Listener(); - try (NatsTestServer ts = new NatsTestServer(); - Connection subCon = standardConnectionWait(optionsBuilder(ts).connectionListener(listener).build())) { - subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server + try (NatsTestServer ts = new NatsTestServer()) { + Options options = optionsBuilder(ts).connectionListener(listener).build(); + try (Connection subCon = standardConnect(options)) { + subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); - ts.close(); // make the drain flush fail - listener.validateReceived(f); + ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); + ts.close(); // make the drain flush fail + listener.validateReceived(f); - assertThrows(TimeoutException.class, () -> subCon.drain(Duration.ofSeconds(1))); + assertThrows(TimeoutException.class, () -> subCon.drain(Duration.ofSeconds(1))); + } } } diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 756e3e6b5..4e1d292b9 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -16,8 +16,8 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Status; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.time.Duration; @@ -32,8 +32,7 @@ import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; -@Isolated -public class ErrorListenerTests { +public class ErrorListenerTests extends TestBase { @Test public void testLastError() throws Exception { @@ -71,7 +70,7 @@ public void testLastError() throws Exception { assertTrue(listener.errorsEventually("Authorization Violation", 3000)); - longConnectionWait(nc); + waitUntilConnected(nc); // wait for reconnect assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); } } @@ -162,8 +161,9 @@ public void testExceptionOnBadDispatcher() throws Exception { Dispatcher d = nc.createDispatcher(msg -> { throw new ArithmeticException(); }); - d.subscribe("subject"); - Future incoming = nc.request("subject", null); + String subject = random(); + d.subscribe(subject); + Future incoming = nc.request(subject, null); Message msg; @@ -202,13 +202,14 @@ public void testExceptionInSlowConsumerHandler() throws Exception { try (NatsTestServer ts = new NatsTestServer(); Connection nc = Nats.connect(optionsBuilder(ts).errorListener(listener).build())) { - Subscription sub = nc.subscribe("subject"); + String subject = random(); + Subscription sub = nc.subscribe(subject); sub.setPendingLimits(1, -1); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); - nc.publish("subject", null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); + nc.publish(subject, null); nc.flush(Duration.ofMillis(5000)); @@ -230,8 +231,9 @@ public void testExceptionInExceptionHandler() throws Exception { Dispatcher d = nc.createDispatcher(msg -> { throw new ArithmeticException(); }); - d.subscribe("subject"); - Future incoming = nc.request("subject", null); + String subject = random(); + d.subscribe(subject); + Future incoming = nc.request(subject, null); Message msg; @@ -251,6 +253,7 @@ public void testExceptionInExceptionHandler() throws Exception { @Test public void testDiscardedMessageFastProducer() throws Exception { + String subject = random(); int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { @@ -264,10 +267,9 @@ public void testDiscardedMessageFastProducer() throws Exception { try { nc.flush(Duration.ofSeconds(2)); - nc.getWriter().stop().get(2, TimeUnit.SECONDS); for (int i = 0; i < maxMessages + 1; i++) { - nc.publish("subject" + i, ("message" + i).getBytes()); + nc.publish(subject + i, ("message" + i).getBytes()); } nc.getWriter().start(nc.getDataPortFuture()); @@ -280,12 +282,13 @@ public void testDiscardedMessageFastProducer() throws Exception { List discardedMessages = listener.getDiscardedMessages(); assertFalse(discardedMessages.isEmpty(), "expected discardedMessages > 0, got " + discardedMessages.size()); int offset = maxMessages + 1 - discardedMessages.size(); - assertEquals("subject" + offset, discardedMessages.get(0).getSubject()); + assertEquals(subject + offset, discardedMessages.get(0).getSubject()); assertEquals("message" + offset, new String(discardedMessages.get(0).getData())); } @Test public void testDiscardedMessageServerClosed() throws Exception { + String subject = random(); int maxMessages = 10; ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { @@ -295,9 +298,7 @@ public void testDiscardedMessageServerClosed() throws Exception { .errorListener(listener) .pingInterval(Duration.ofSeconds(100)) // make this long so we don't ping during test .build(); - Connection nc = standardConnectionWait(options); - - try { + try (Connection nc = standardConnect(options)) { nc.flush(Duration.ofSeconds(1)); // Get the sub to the server listener.prepForStatusChange(Events.DISCONNECTED); @@ -305,16 +306,14 @@ public void testDiscardedMessageServerClosed() throws Exception { listener.waitForStatusChange(2, TimeUnit.SECONDS); // make sure the connection is down for (int i = 0; i < maxMessages + 1; i++) { - nc.publish("subject" + i, ("message" + i).getBytes()); + nc.publish(subject + i, ("message" + i).getBytes()); } - } finally { - standardCloseConnection(nc); } } List discardedMessages = listener.getDiscardedMessages(); assertFalse(discardedMessages.isEmpty(), "At least one message discarded"); - assertTrue(discardedMessages.get(0).getSubject().startsWith("subject"), "Message subject"); + assertTrue(discardedMessages.get(0).getSubject().startsWith(subject), "Message subject"); assertTrue(new String(discardedMessages.get(0).getData()).startsWith("message"), "Message data"); } diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 751450876..5290d2141 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -28,11 +28,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import static io.nats.client.NatsTestServer.configuredJsServer; import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.*; -import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -60,18 +59,6 @@ public void testJetNotEnabled() throws Exception { }); } - @Test - public void testJetEnabledGoodAccount() throws Exception { - try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options options = optionsBuilder(ts) - .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); - try (Connection nc = longConnectionWait(options)) { - nc.jetStreamManagement(); - nc.jetStream(); - } - } - } - @Test public void testJetStreamPublishDefaultOptions() throws Exception { runInShared((nc, ctx) -> { @@ -393,16 +380,15 @@ public void testPrefix() throws Exception { String streamMadeByTar = "stream-made-by-tar"; String subjectMadeBySrc = "sub-made-by.src"; String subjectMadeByTar = "sub-made-by.tar"; - - try (NatsTestServer ts = configuredJsServer("js_prefix.conf")) { + runInConfiguredServer("js_prefix.conf", ts -> { Options optionsSrc = optionsBuilder(ts) - .userInfo("src".toCharArray(), "spass".toCharArray()).build(); + .userInfo("src".toCharArray(), "spass".toCharArray()).build(); Options optionsTar = optionsBuilder(ts) - .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); + .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); - try (Connection ncSrc = standardConnectionWait(optionsSrc); - Connection ncTar = standardConnectionWait(optionsTar) + try (Connection ncSrc = standardConnect(optionsSrc); + Connection ncTar = standardConnect(optionsTar) ) { // Setup JetStreamOptions. SOURCE does not need prefix JetStreamOptions jsoSrc = JetStreamOptions.builder().build(); @@ -414,17 +400,17 @@ public void testPrefix() throws Exception { // add streams with both account StreamConfiguration scSrc = StreamConfiguration.builder() - .name(streamMadeBySrc) - .storageType(StorageType.Memory) - .subjects(subjectMadeBySrc) - .build(); + .name(streamMadeBySrc) + .storageType(StorageType.Memory) + .subjects(subjectMadeBySrc) + .build(); jsmSrc.addStream(scSrc); StreamConfiguration scTar = StreamConfiguration.builder() - .name(streamMadeByTar) - .storageType(StorageType.Memory) - .subjects(subjectMadeByTar) - .build(); + .name(streamMadeByTar) + .storageType(StorageType.Memory) + .subjects(subjectMadeByTar) + .build(); jsmTar.addStream(scTar); JetStream jsSrc = ncSrc.jetStream(jsoSrc); @@ -441,7 +427,7 @@ public void testPrefix() throws Exception { readPrefixMessages(ncTar, jsTar, subjectMadeBySrc, "src"); readPrefixMessages(ncTar, jsTar, subjectMadeByTar, "tar"); } - } + }); } private void readPrefixMessages(Connection nc, JetStream js, String subject, String dest) throws InterruptedException, IOException, JetStreamApiException, TimeoutException { @@ -1107,7 +1093,7 @@ public void testNatsJetStreamUtil() { public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); - try (Connection ncReport = newConnection(optReport)) { + try (Connection ncReport = standardConnect(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); assertInstanceOf(JetStreamStatusException.class, ee.getCause()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index c010a169d..19c5518ee 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -14,16 +14,15 @@ package io.nats.client.impl; import io.nats.client.Connection; +import io.nats.client.JetStream; import io.nats.client.JetStreamManagement; -import io.nats.client.NatsTestServer; -import io.nats.client.Options; import io.nats.client.api.*; import org.junit.jupiter.api.Test; import java.util.List; -import static io.nats.client.NatsTestServer.configuredJsServer; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnect; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -31,80 +30,85 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { - runInOwnJsServer("pagination.conf", (nc, jsm, js) -> { - String stream1 = random(); - String stream2 = random(); - long rounds = 101; - long size = 1000; - long count = rounds * size; - jsm.addStream(StreamConfiguration.builder() - .name(stream1) - .storageType(StorageType.Memory) - .subjects("s.*.*") - .build()); - - jsm.addStream(StreamConfiguration.builder() - .name(stream2) - .storageType(StorageType.Memory) - .subjects("t.*.*") - .build()); - - for (int x = 1; x <= rounds; x++) { - for (int y = 1; y <= size; y++) { - js.publish("s." + x + "." + y, null); + runInConfiguredServer("pagination.conf", ts -> { + try (Connection nc = standardConnect(options(ts))) { + JetStreamManagement jsm = nc.jetStreamManagement(); + JetStream js = jsm.jetStream(); + + String stream1 = random(); + String stream2 = random(); + long rounds = 101; + long size = 1000; + long count = rounds * size; + jsm.addStream(StreamConfiguration.builder() + .name(stream1) + .storageType(StorageType.Memory) + .subjects("s.*.*") + .build()); + + jsm.addStream(StreamConfiguration.builder() + .name(stream2) + .storageType(StorageType.Memory) + .subjects("t.*.*") + .build()); + + for (int x = 1; x <= rounds; x++) { + for (int y = 1; y <= size; y++) { + js.publish("s." + x + "." + y, null); + } } - } - for (int y = 1; y <= size; y++) { - js.publish("t.7." + y, null); - } + for (int y = 1; y <= size; y++) { + js.publish("t.7." + y, null); + } - StreamInfo si = jsm.getStreamInfo(stream1); - validateStreamInfo(si.getStreamState(), 0, 0, count); + StreamInfo si = jsm.getStreamInfo(stream1); + validateStreamInfo(si.getStreamState(), 0, 0, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); - validateStreamInfo(si.getStreamState(), count, count, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.allSubjects()); + validateStreamInfo(si.getStreamState(), count, count, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); - validateStreamInfo(si.getStreamState(), size, size, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.*")); + validateStreamInfo(si.getStreamState(), size, size, count); - si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, count); + si = jsm.getStreamInfo(stream1, StreamInfoOptions.filterSubjects("s.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, count); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); - validateStreamInfo(si.getStreamState(), size, size, size); + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.*")); + validateStreamInfo(si.getStreamState(), size, size, size); - si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); - validateStreamInfo(si.getStreamState(), 1L, 1, size); + si = jsm.getStreamInfo(stream2, StreamInfoOptions.filterSubjects("t.7.1")); + validateStreamInfo(si.getStreamState(), 1L, 1, size); - List infos = jsm.getStreams(); - assertEquals(2, infos.size()); - si = infos.get(0); - if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { - validateStreamInfo(si.getStreamState(), 0, 0, count); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); - } - else { - validateStreamInfo(si.getStreamState(), 0, 0, size); - validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); - } + List infos = jsm.getStreams(); + assertEquals(2, infos.size()); + si = infos.get(0); + if (si.getConfiguration().getSubjects().get(0).equals("s.*.*")) { + validateStreamInfo(si.getStreamState(), 0, 0, count); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, size); + } + else { + validateStreamInfo(si.getStreamState(), 0, 0, size); + validateStreamInfo(infos.get(1).getStreamState(), 0, 0, count); + } - infos = jsm.getStreams(">"); - assertEquals(2, infos.size()); + infos = jsm.getStreams(">"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("*.7.*"); - assertEquals(2, infos.size()); + infos = jsm.getStreams("*.7.*"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("*.7.1"); - assertEquals(2, infos.size()); + infos = jsm.getStreams("*.7.1"); + assertEquals(2, infos.size()); - infos = jsm.getStreams("s.7.*"); - assertEquals(1, infos.size()); - assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + infos = jsm.getStreams("s.7.*"); + assertEquals(1, infos.size()); + assertEquals("s.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); - infos = jsm.getStreams("t.7.1"); - assertEquals(1, infos.size()); - assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + infos = jsm.getStreams("t.7.1"); + assertEquals(1, infos.size()); + assertEquals("t.*.*", infos.get(0).getConfiguration().getSubjects().get(0)); + } }); } @@ -115,14 +119,11 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long } @Test - public void testAuthCreateUpdateStream() throws Exception { - try (NatsTestServer ts = configuredJsServer("js_authorization.conf")) { - Options optionsSrc = optionsBuilder(ts) - .userInfo("serviceup".toCharArray(), "uppass".toCharArray()).build(); - - try (Connection nc = standardConnectionWait(optionsSrc)) { + public void testJsStuffOnGoodAuthAccount() throws Exception { + runInConfiguredServer("js_authorization.conf", ts -> { + try (Connection nc = standardConnect(optionsBuilder(ts).userInfo("serviceup", "uppass").build())) { JetStreamManagement jsm = nc.jetStreamManagement(); - + JetStream js = jsm.jetStream(); // add streams with both account String stream = random(); String subject1 = random(); @@ -140,6 +141,6 @@ public void testAuthCreateUpdateStream() throws Exception { jsm.updateStream(sc); } - } + }); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java index fe9798e38..d1ca38b9a 100644 --- a/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamMirrorAndSourcesTests.java @@ -286,42 +286,41 @@ public void testSourceBasics() throws Exception { @Test public void testSourceAndTransformsRoundTrips() throws Exception { runInOwnJsServer(VersionUtils::atLeast2_10, (nc, jsm, js) -> { - StreamConfiguration scSource = StreamConfigurationTests.getStreamConfigurationFromJson( + StreamConfiguration sc = StreamConfigurationTests.getStreamConfigurationFromJson( "StreamConfigurationSourcedSubjectTransform.json"); - StreamInfo si = jsm.addStream(scSource); - assertNull(scSource.getMirror()); - assertNull(si.getMirrorInfo()); + assertNotNull(sc.getSources()); + assertNull(sc.getMirror()); - assertNotNull(scSource.getSources()); - assertNotNull(si.getSourceInfos()); - Source source = scSource.getSources().get(0); - SourceInfo info = si.getSourceInfos().get(0); - assertNotNull(info); - assertNotNull(info.getSubjectTransforms()); - assertEquals(1, info.getSubjectTransforms().size()); - - assertEquals(source.getName(), info.getName()); - assertNotNull(source.getSubjectTransforms()); - assertEquals(1, source.getSubjectTransforms().size()); - - SubjectTransform st = source.getSubjectTransforms().get(0); - SubjectTransform infoSt = info.getSubjectTransforms().get(0); - assertEquals(st.getSource(), infoSt.getSource()); - assertEquals(st.getDestination(), infoSt.getDestination()); - - source = scSource.getSources().get(1); - info = si.getSourceInfos().get(1); - assertNotNull(scSource.getSources()); + Source sourceFoo = sc.getSources().get(0); + Source sourceBar = sc.getSources().get(1); + + StreamInfo si = jsm.addStream(sc); assertNotNull(si.getSourceInfos()); - assertEquals(source.getName(), info.getName()); - assertNotNull(info.getSubjectTransforms()); - assertEquals(1, info.getSubjectTransforms().size()); - assertNotNull(source.getSubjectTransforms()); - st = source.getSubjectTransforms().get(0); - infoSt = info.getSubjectTransforms().get(0); - assertEquals(st.getSource(), infoSt.getSource()); - assertEquals(st.getDestination(), infoSt.getDestination()); + assertNull(si.getMirrorInfo()); + + for (SourceInfo info : si.getSourceInfos()) { + assertNotNull(info); + assertNotNull(info.getSubjectTransforms()); + assertEquals(1, info.getSubjectTransforms().size()); + + String which = info.getName().substring(7); // sourcedfoo --> foo sourcebar --> bar + Source source; + if (which.equals("foo")) { + source = sourceFoo; + } + else { + source = sourceBar; + } + assertEquals(source.getName(), info.getName()); + assertNotNull(source.getSubjectTransforms()); + assertEquals(1, source.getSubjectTransforms().size()); + + SubjectTransform st = source.getSubjectTransforms().get(0); + SubjectTransform infoSt = info.getSubjectTransforms().get(0); + assertEquals(st.getSource(), infoSt.getSource()); + assertEquals(st.getDestination(), infoSt.getDestination()); + } }); } diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index ba0e3123f..593837bd5 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -18,6 +18,9 @@ import io.nats.client.api.ConsumerConfiguration; import io.nats.client.api.PriorityPolicy; import io.nats.client.support.JsonUtils; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; +import io.nats.client.support.ListenerStatusType; import io.nats.client.utils.SharedServer; import io.nats.client.utils.VersionUtils; import io.nats.client.utils.VersionUtils.VersionCheck; @@ -39,9 +42,9 @@ import java.util.concurrent.atomic.AtomicInteger; import static io.nats.client.api.ConsumerConfiguration.builder; -import static io.nats.client.impl.ListenerStatusType.PullError; -import static io.nats.client.impl.ListenerStatusType.PullWarning; import static io.nats.client.support.ApiConstants.*; +import static io.nats.client.support.ListenerStatusType.PullError; +import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java index 75a7e69ff..7024042ba 100644 --- a/src/test/java/io/nats/client/impl/KeyValueTests.java +++ b/src/test/java/io/nats/client/impl/KeyValueTests.java @@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.JetStreamOptions.DEFAULT_JS_OPTIONS; -import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.api.KeyValuePurgeOptions.DEFAULT_THRESHOLD_MILLIS; import static io.nats.client.api.KeyValueWatchOption.*; import static io.nats.client.support.NatsConstants.DOT; @@ -1089,13 +1088,12 @@ else if (expected instanceof String) { @Test public void testWithAccount() throws Exception { - try (NatsTestServer ts = configFileServer("kv_account.conf")) { + runInConfiguredServer("kv_account.conf", ts -> { Options acctA = optionsBuilder(ts).userInfo("a", "a").build(); Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build(); try (Connection connUserA = Nats.connect(acctA); - Connection connUserI = Nats.connect(acctI)) - { + Connection connUserI = Nats.connect(acctI)) { // some prep KeyValueOptions jsOpt_UserI_BucketA_WithPrefix = KeyValueOptions.builder().jsPrefix("FromA").build(); @@ -1185,7 +1183,7 @@ public void testWithAccount() throws Exception { validateWatcher(expecteds, watcher_connI_BucketA); validateWatcher(expecteds, watcher_connI_BucketI); } - } + }); } private void assertKvAccountBucketNames(List bnames, String bucketA, String bucketI) { @@ -1247,7 +1245,7 @@ private void assertKveAccountGet(KeyValue kvUserA, KeyValue kvUserI, String key, assertEquals(KeyValueOperation.PUT, kveUserA.getOperation()); } - @SuppressWarnings({"SimplifiableAssertion", "ConstantConditions", "EqualsWithItself"}) + @SuppressWarnings({"SimplifiableAssertion", "ConstantConditions"}) @Test public void testCoverBucketAndKey() { String bucket = random(); @@ -1304,7 +1302,6 @@ public void testKeyValueEntryEqualsImpl() throws Exception { KeyValueEntry kve1_2 = kv1.get(key2); KeyValueEntry kve2_1 = kv2.get(key1); - //noinspection EqualsWithItself assertEquals(kve1_1, kve1_1); assertEquals(kve1_1, kv1.get(key1)); assertNotEquals(kve1_1, kve1_2); @@ -1418,7 +1415,7 @@ public void testEntryCoercion() throws Exception { runInShared((nc, ctx) -> { // create bucket String bucket = random(); - KeyValueStatus status = ctx.kvCreate(bucket); + ctx.kvCreate(bucket); KeyValue kv = nc.keyValue(bucket); kv.put("a", "a"); diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 482ad811a..e06a89e9f 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -35,11 +35,12 @@ public class MessageContentTests extends TestBase { public void testSimpleString() throws Exception { runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); String body = "hello world"; byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8); - Future incoming = nc.request("subject", bodyBytes); + Future incoming = nc.request(subject, bodyBytes); Message msg = incoming.get(50000, TimeUnit.MILLISECONDS); assertNotNull(msg); @@ -52,11 +53,12 @@ public void testSimpleString() throws Exception { public void testUTF8String() throws Exception { runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); String body = "??????"; byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8); - Future incoming = nc.request("subject", bodyBytes); + Future incoming = nc.request(subject, bodyBytes); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); @@ -69,13 +71,14 @@ public void testUTF8String() throws Exception { public void testDifferentSizes() throws Exception { runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); String body = "hello world"; for (int i=0;i<10;i++) { byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8); - Future incoming = nc.request("subject", bodyBytes); + Future incoming = nc.request(subject, bodyBytes); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); @@ -91,10 +94,11 @@ public void testDifferentSizes() throws Exception { public void testZeros() throws Exception { runInShared(nc -> { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); byte[] data = new byte[17]; - Future incoming = nc.request("subject", data); + Future incoming = nc.request(subject, data); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index eb5e7132d..7e9ff8d1d 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -16,6 +16,9 @@ import io.nats.client.*; import io.nats.client.api.ConsumerConfiguration; import io.nats.client.support.IncomingHeadersProcessor; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; +import io.nats.client.support.ListenerStatusType; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; @@ -24,10 +27,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import static io.nats.client.impl.ListenerStatusType.PullError; -import static io.nats.client.impl.ListenerStatusType.PullWarning; import static io.nats.client.impl.MessageManager.ManageResult; import static io.nats.client.impl.MessageManager.ManageResult.*; +import static io.nats.client.support.ListenerStatusType.PullError; +import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; import static io.nats.client.support.NatsJetStreamConstants.CONSUMER_STALLED_HDR; import static io.nats.client.support.Status.*; diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index 81ae1e0a4..d56904c1c 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -17,7 +17,7 @@ import io.nats.client.Options; import org.junit.jupiter.api.Test; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.NOOP_EL; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,23 +31,23 @@ public void testConnectionClosedProperly() throws Exception { Options options = Options.builder().server(ts.getServerUri()).errorListener(NOOP_EL).build(); - verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); + verifyInternalExecutors((NatsConnection) standardConnect(options)); // using the same options to demonstrate the executors came // from the internal factory and were not reused - verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); + verifyInternalExecutors((NatsConnection) standardConnect(options)); // using options copied from options to demonstrate the executors // came from the internal factory and were not reused options = new Options.Builder(options).build(); - verifyInternalExecutors((NatsConnection) standardConnectionWait(options)); + verifyInternalExecutors((NatsConnection) standardConnect(options)); // the test options builder has all its own executors so none are "internal" options = optionsBuilder(ts).build(); - verifyExternalExecutors((NatsConnection) standardConnectionWait(options)); + verifyExternalExecutors((NatsConnection) standardConnect(options)); // same options just because - verifyExternalExecutors((NatsConnection) standardConnectionWait(options)); + verifyExternalExecutors((NatsConnection) standardConnect(options)); } } diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index 9af94e7fd..79d4815ae 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -24,7 +24,8 @@ import static io.nats.client.support.NatsConstants.OP_PING; import static io.nats.client.support.NatsConstants.OP_PING_BYTES; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnect; +import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; import static org.junit.jupiter.api.Assertions.*; @@ -121,45 +122,30 @@ public void testCustomMaxControlLine() throws Exception { subject.append(subject); } - try (NatsTestServer ts = new NatsTestServer()) { - Options options = optionsBuilder(ts).maxReconnects(0).maxControlLine(maxControlLine).build(); - Connection nc = Nats.connect(options); - standardConnectionWait(nc); + runInSharedOwnNc(optionsBuilder().maxReconnects(0).maxControlLine(maxControlLine), nc -> { assertThrows(IllegalArgumentException.class, () -> nc.request(subject.toString(), body)); - } - } - - @Test - public void testBigProtocolLineWithoutBody() throws Exception { - StringBuilder subject = new StringBuilder(random()); - while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { - subject.append(subject); - } - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { - standardConnectionWait(nc); - assertThrows(IllegalArgumentException.class, () -> nc.subscribe(subject.toString())); - } + }); } @Test - public void testBigProtocolLineWithBody() throws Exception { - byte[] body = new byte[10]; - String replyTo = "reply"; - + public void testBigProtocolLine() throws Exception { StringBuilder subject = new StringBuilder(random()); while (subject.length() <= Options.DEFAULT_MAX_CONTROL_LINE) { subject.append(subject); } - - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT); - NatsConnection nc = (NatsConnection) Nats.connect(mockTs.getServerUri())) { - standardConnectionWait(nc); - assertThrows(IllegalArgumentException.class, () -> nc.publish(subject.toString(), replyTo, body)); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + try (Connection nc = standardConnect(options(mockTs))) { + // Without Body + assertThrows(IllegalArgumentException.class, () -> nc.subscribe(subject.toString())); + + // With Body + byte[] body = new byte[10]; + String replyTo = "reply"; + assertThrows(IllegalArgumentException.class, () -> nc.publish(subject.toString(), replyTo, body)); + } } } - @Test public void notJetStream() throws Exception { NatsMessage m = testMessage(); diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index d62ccf9a0..66a4c81fe 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -17,6 +17,7 @@ import io.nats.client.Message; import io.nats.client.MessageHandler; import io.nats.client.Statistics; +import io.nats.client.support.DebugReadListener; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -36,10 +37,11 @@ public void testHumanReadableString() throws Exception { Dispatcher d = nc.createDispatcher(msg -> { nc.publish(msg.getReplyTo(), new byte[16]); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); nc.flush(Duration.ofMillis(500)); - Future incoming = nc.request("subject", new byte[8]); + Future incoming = nc.request(subject, new byte[8]); nc.flush(Duration.ofMillis(500)); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); @@ -54,26 +56,29 @@ public void testHumanReadableString() throws Exception { @Test public void testInOutOKRequestStats() throws Exception { - runInSharedOwnNc(optionsBuilder().verbose(), nc -> { + runInSharedOwnNc(optionsBuilder().verbose() + .readListener(new DebugReadListener()) + , nc -> { Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) - .data(new byte[16]) + .data("replyreplyreply!") // 16 bytes .headers(new Headers().put("header", "reply")) .build(); nc.publish(m); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); Message m = NatsMessage.builder() - .subject("subject") - .data(new byte[8]) + .subject(subject) + .data("request!") // 8 bytes .headers(new Headers().put("header", "request")) .build(); - Future incoming = nc.request(m); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - + Future fRequest = nc.request(m); + Message msg = fRequest.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); + Statistics stats = nc.getStatistics(); assertEquals(0, stats.getOutstandingRequests(), "outstanding"); assertTrue(stats.getInBytes() > 200, "bytes in"); @@ -95,10 +100,11 @@ public void testReadWriteAdvancedStatsEnabled() throws Exception { .build(); nc.publish(m); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); Message m = NatsMessage.builder() - .subject("subject") + .subject(subject) .data(new byte[8]) .headers(new Headers().put("header", "request")) .build(); @@ -133,10 +139,11 @@ public void testReadWriteAdvancedStatsDisabled() throws Exception { .build(); nc.publish(m); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); Message m = NatsMessage.builder() - .subject("subject") + .subject(subject) .data(new byte[8]) .headers(new Headers().put("header", "request")) .build(); diff --git a/src/test/java/io/nats/client/impl/ParseTests.java b/src/test/java/io/nats/client/impl/ParseTests.java index 436aca5b7..1335d2d82 100644 --- a/src/test/java/io/nats/client/impl/ParseTests.java +++ b/src/test/java/io/nats/client/impl/ParseTests.java @@ -17,7 +17,6 @@ import io.nats.client.NatsTestServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -27,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -@Isolated public class ParseTests extends TestBase { @Test diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index cfbc006fd..2e34bc72c 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.NatsServerProtocolMock.ExitAt; +import io.nats.client.support.Listener; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -90,16 +91,9 @@ public void testPingFailsWhenClosed() throws Exception { maxPingsOut(5). maxReconnects(0). build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - try { - assertConnected(nc); - } finally { - nc.close(); - } - + NatsConnection nc = (NatsConnection) standardConnect(options); + standardCloseConnection(nc); Future pong = nc.sendPing(); - assertFalse(pong.get(10,TimeUnit.MILLISECONDS)); } } @@ -112,39 +106,28 @@ public void testMaxPingsOut() throws Exception { .maxPingsOut(2) .maxReconnects(0) .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - //noinspection TryFinallyCanBeTryWithResources - try { - assertConnected(nc); + try (NatsConnection nc = (NatsConnection) standardConnect(options)) { nc.sendPing(); nc.sendPing(); assertNull(nc.sendPing(), "No future returned when past max"); - } finally { - nc.close(); } } } @Test - public void testFlushTimeout() { - assertThrows(TimeoutException.class, () -> { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder(mockTs) - .maxReconnects(0) - .build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - - //noinspection TryFinallyCanBeTryWithResources - try { - assertConnected(nc); - // fake server so flush will time out - nc.flush(Duration.ofMillis(50)); - } finally { - nc.close(); - } + public void testFlushTimeout() throws Exception { + Listener listener = new Listener(true); + try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { + Options options = optionsBuilder(mockTs) + .maxReconnects(0) + .connectionListener(listener) + .errorListener(listener) + .build(); + try (Connection nc = standardConnect(options)) { + // fake server so flush will time out + assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofMillis(50))); } - }); + } } @Test @@ -152,19 +135,13 @@ public void testFlushTimeoutDisconnected() throws Exception { ListenerForTesting listener = new ListenerForTesting(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts).connectionListener(listener).build(); - NatsConnection nc = (NatsConnection) Nats.connect(options); - try { - assertConnected(nc); + try (Connection nc = standardConnect(options)) { nc.flush(Duration.ofSeconds(2)); listener.prepForStatusChange(Events.DISCONNECTED); ts.close(); listener.waitForStatusChange(2, TimeUnit.SECONDS); assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofSeconds(2))); } - finally { - nc.close(); - assertClosed(nc); - } } } @@ -178,8 +155,8 @@ public void testPingTimerThroughReconnect() throws Exception { .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test .build(); - try (NatsConnection nc = (NatsConnection) standardConnectionWait(options)) { - StatisticsCollector stats = nc.getStatisticsCollector(); + try (Connection nc = standardConnect(options)) { + Statistics stats = nc.getStatistics(); sleep(200); long pings = stats.getPings(); assertTrue(pings > 10, "got pings"); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index ff1f6b027..93c967c04 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -17,8 +17,10 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.api.ServerInfo; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.net.URI; @@ -45,7 +47,6 @@ import static io.nats.client.utils.VersionUtils.initVersionServerInfo; import static org.junit.jupiter.api.Assertions.*; -@Isolated public class ReconnectTests { void checkNotConnected(Connection nc) { @@ -60,10 +61,10 @@ public void testSimpleReconnect() throws Exception { //Includes test for subscri @Test public void testWsReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - _testReconnect(configFileBuilder("ws_operator.conf"), + _testReconnect(configFileBuilder( "ws_operator.conf"), (ts, optionsBuilder) -> optionsBuilder - .server(ts.getLocalhostUri("ws")) + .server(ts.getLocalhostUri(WS)) .authHandler(getUserCredsAuthHander())); } @@ -75,6 +76,8 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer nnc.publish(msg.getReplyTo(), msg.getData()) ); - d.subscribe("dispatchSubject"); + d.subscribe(dispatchSubject); flushConnection(nc); - Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); + Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); Message msg = inc.get(); assertNotNull(msg); - nc.publish("subsubject", null); + nc.publish(subsubject, null); msg = sub.nextMessage(Duration.ofMillis(100)); assertNotNull(msg); @@ -110,19 +113,19 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer 1000, "reconnect wait"); // Make sure dispatcher and subscription are still there - Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); + Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); Message msg = inc.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); // make sure the subscription survived - nc.publish("subsubject", null); + nc.publish(subsubject, null); msg = sub.nextMessage(Duration.ofMillis(100)); assertNotNull(msg); } @@ -146,31 +149,33 @@ public void testSubscribeDuringReconnect() throws Exception { .connectionListener(listener) .build(); port = ts.getPort(); - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); listener.prepForStatusChange(Events.DISCONNECTED); } flushAndWaitLong(nc, listener); checkNotConnected(nc); - sub = nc.subscribe("subsubject"); + String subsubject = random(); + String dispatchSubject = random(); + sub = nc.subscribe(subsubject); final NatsConnection nnc = nc; Dispatcher d = nc.createDispatcher(msg -> nnc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("dispatchSubject"); + d.subscribe(dispatchSubject); listener.prepForStatusChange(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { - listenerConnectionWait(nc, listener); + waitUntilConnected(nc); // wait for reconnect // Make sure the dispatcher and subscription are still there - Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); + Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); Message msg = inc.get(); assertNotNull(msg); // make sure the subscription survived - nc.publish("subsubject", null); + nc.publish(subsubject, null); msg = sub.nextMessage(Duration.ofMillis(100)); assertNotNull(msg); } @@ -189,6 +194,8 @@ public void testReconnectBuffer() throws Exception { long start; long end; String[] customArgs = {"--user","stephen","--pass","password"}; + String subsubject = random(); + String dispatchSubject = random(); try (NatsTestServer ts = new NatsTestServer(customArgs, port)) { Options options = optionsBuilder(ts) @@ -197,20 +204,20 @@ public void testReconnectBuffer() throws Exception { .reconnectWait(Duration.ofMillis(1000)) .connectionListener(listener) .build(); - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); - sub = nc.subscribe("subsubject"); + sub = nc.subscribe(subsubject); final NatsConnection nnc = nc; Dispatcher d = nc.createDispatcher(msg -> nnc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("dispatchSubject"); + d.subscribe(dispatchSubject); nc.flush(Duration.ofMillis(1000)); - Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); + Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); Message msg = inc.get(); assertNotNull(msg); - nc.publish("subsubject", null); + nc.publish(subsubject, null); msg = sub.nextMessage(Duration.ofMillis(100)); assertNotNull(msg); @@ -223,14 +230,14 @@ public void testReconnectBuffer() throws Exception { // Send a message to the dispatcher and one to the subscriber // These should be sent on reconnect - Future inc = nc.request("dispatchSubject", "test".getBytes(StandardCharsets.UTF_8)); - nc.publish("subsubject", null); - nc.publish("subsubject", null); + Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); + nc.publish(subsubject, null); + nc.publish(subsubject, null); listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - listenerConnectionWait(nc, listener); + waitUntilConnected(nc); // wait for reconnect end = System.nanoTime(); @@ -265,7 +272,7 @@ public void testMaxReconnects() throws Exception { .connectionListener(listener) .reconnectWait(Duration.ofMillis(10)) .build(); - nc = standardConnectionWait(options); + nc = standardConnect(options); listener.prepForStatusChange(Events.CLOSED); } @@ -287,7 +294,7 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { .connectionListener(listener) .maxReconnects(-1) .build(); - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -312,7 +319,7 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { .connectionListener(listener) .maxReconnects(-1) .build(); - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -340,7 +347,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) .build(); - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); assertEquals(mockTs2.getServerUri(), nc.getConnectedUrl()); listener.prepForStatusChange(Events.RECONNECTED); } @@ -364,7 +371,7 @@ public void testOverflowReconnectBuffer() throws Exception { .reconnectBufferSize(4*512) .reconnectWait(Duration.ofSeconds(480)) .build(); - nc = standardConnectionWait(options); + nc = standardConnect(options); } listener.validateReceived(f); @@ -375,7 +382,7 @@ public void testOverflowReconnectBuffer() throws Exception { } }); - nc.close(); + standardCloseConnection(nc); } @Test @@ -389,7 +396,7 @@ public void testInfiniteReconnectBuffer() throws Exception { .reconnectBufferSize(-1) .reconnectWait(Duration.ofSeconds(30)) .build(); - nc = standardConnectionWait(options); + nc = standardConnect(options); listener.prepForStatusChange(Events.DISCONNECTED); } @@ -465,8 +472,8 @@ public void testReconnectDropOnLineFeed() throws Exception { // connect good then bad listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(port)) { - listenerConnectionWait(nc, listener); - listener.prepForStatusChange(Events.DISCONNECTED); + waitUntilConnected(nc); // wait for reconnect + listener.prepForStatusChange(Events.DISCONNECTED); // do it here because we are about to disconnect } flushAndWaitLong(nc, listener); // nats won't close until we tell it, so put this outside the curly @@ -479,7 +486,7 @@ public void testReconnectDropOnLineFeed() throws Exception { listener.prepForStatusChange(Events.RESUBSCRIBED); try (NatsServerProtocolMock ignored = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - listenerConnectionWait(nc, listener); + waitUntilConnected(nc); // wait for reconnect subRef.get().get(); listener.prepForStatusChange(Events.DISCONNECTED); sendRef.get().complete(true); @@ -524,8 +531,8 @@ public void testTlsNoIpConnection() throws Exception { SslTestingHelper.setKeystoreSystemParameters(); // Regular tls for first connection, then no ip for second - try (NatsTestServer ts = new NatsTestServer("tls_noip.conf", tsInserts, tsPort); - NatsTestServer ts2 = new NatsTestServer("tls_noip.conf", ts2Inserts, ts2Port) ) { + try (NatsTestServer ts = new NatsTestServer( "tls_noip.conf", tsInserts, tsPort); + NatsTestServer ts2 = new NatsTestServer( "tls_noip.conf", ts2Inserts, ts2Port) ) { // Test 1. tls Scheme Options options = optionsBuilder(ts, "tls") @@ -551,7 +558,7 @@ public void testTlsNoIpConnection() throws Exception { .build(); listener.prepForStatusChange(Events.DISCOVERED_SERVERS); - nc = (NatsConnection) longConnectionWait(options); + nc = (NatsConnection) ConnectionUtils.standardConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); flushAndWaitLong(nc, listener); // make sure we get the new server via info @@ -744,7 +751,7 @@ private static void _testForceReconnect(Connection nc0, ListenerForTesting liste String connectedServer = si.getServerId(); nc0.forceReconnect(); - standardConnectionWait(nc0); + waitUntilConnected(nc0); // wait for reconnect si = nc0.getServerInfo(); assertNotEquals(connectedServer, si.getServerId()); @@ -935,7 +942,7 @@ public void testSocketDataPortTimeout() throws Exception { getLocalhostUri(port1), getLocalhostUri(port2) }; - Connection nc = newConnection(builder.servers(servers).build()); + Connection nc = standardConnect(builder.servers(servers).build()); String subject = random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index f292087a6..381e6b034 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -27,8 +27,7 @@ import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.OptionsUtils.optionsNoReconnect; +import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -49,9 +48,10 @@ public void testSimpleRequest() throws Exception { nc.publish(msg.getReplyTo(), null); } }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); - Future incoming = nc.request("subject", null); + Future incoming = nc.request(subject, null); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertEquals(0, nc.getStatistics().getOutstandingRequests()); @@ -59,7 +59,7 @@ public void testSimpleRequest() throws Exception { assertEquals(0, msg.getData().length); assertTrue(msg.getSubject().indexOf('.') < msg.getSubject().lastIndexOf('.')); - incoming = nc.request("subject", new Headers().put("foo", "bar"), null); + incoming = nc.request(subject, new Headers().put("foo", "bar"), null); msg = incoming.get(500, TimeUnit.MILLISECONDS); assertEquals(0, nc.getStatistics().getOutstandingRequests()); @@ -131,9 +131,10 @@ public void testSimpleResponseMessageHasConnection() throws Exception { assertTrue(msg.getReplyTo().startsWith(Options.DEFAULT_INBOX_PREFIX)); msg.getConnection().publish(msg.getReplyTo(), null); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); - Future incoming = nc.request("subject", null); + Future incoming = nc.request(subject, null); Message msg = incoming.get(5000, TimeUnit.MILLISECONDS); assertEquals(0, nc.getStatistics().getOutstandingRequests()); @@ -151,9 +152,10 @@ public void testSafeRequest() throws Exception { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); - Message msg = nc.request("subject", null, Duration.ofMillis(1000)); + Message msg = nc.request(subject, null, Duration.ofMillis(1000)); assertEquals(0, nc.getStatistics().getOutstandingRequests()); assertNotNull(msg); @@ -169,10 +171,11 @@ public void testMultipleRequest() throws Exception { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); for (int i=0; i<10; i++) { - Future incoming = nc.request("subject", new byte[11]); + Future incoming = nc.request(subject, new byte[11]); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertEquals(0, nc.getStatistics().getOutstandingRequests()); @@ -271,9 +274,10 @@ public void testRequestWithCustomInboxPrefix() throws Exception { assertTrue(msg.getReplyTo().startsWith("myinbox")); nc.publish(msg.getReplyTo(), null); }); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); - Future incoming = nc.request("subject", null); + Future incoming = nc.request(subject, null); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertEquals(0, nc.getStatistics().getOutstandingRequests()); @@ -295,7 +299,7 @@ public void testRequireCleanupOnTimeoutNoNoResponders() throws Exception { assertConnected(nc); assertThrows(TimeoutException.class, - () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); + () -> nc.request(random(), null).get(100, TimeUnit.MILLISECONDS)); assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { @@ -406,7 +410,7 @@ public void testSimpleRequestWithTimeoutSlowProducer() throws Exception { String subject = random(); d.subscribe(subject); - CompletableFuture incoming = nc.requestWithTimeout("subject", null, Duration.ofMillis(cleanupInterval)); + CompletableFuture incoming = nc.requestWithTimeout(subject, null, Duration.ofMillis(cleanupInterval)); assertThrows(CancellationException.class, () -> incoming.get(delay, TimeUnit.MILLISECONDS)); } @@ -426,7 +430,7 @@ public void testRequireCleanupOnCancelFromNoResponders() throws Exception { Connection nc = Nats.connect(options); try { assertConnected(nc); - assertThrows(CancellationException.class, () -> nc.request("subject", null).get(100, TimeUnit.MILLISECONDS)); + assertThrows(CancellationException.class, () -> nc.request(random(), null).get(100, TimeUnit.MILLISECONDS)); assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { @@ -446,7 +450,7 @@ public void testRequireCleanupWithTimeoutNoResponders() throws Exception { Connection nc = Nats.connect(options); try { assertConnected(nc); - assertThrows(CancellationException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); + assertThrows(CancellationException.class, () -> nc.requestWithTimeout(random(), null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); assertEquals(0, nc.getStatistics().getOutstandingRequests()); } finally { nc.close(); @@ -468,7 +472,7 @@ public void testRequireCleanupWithTimeoutNoNoResponders() throws Exception { assertConnected(nc); assertConnected(nc); - assertThrows(TimeoutException.class, () -> nc.requestWithTimeout("subject", null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); + assertThrows(TimeoutException.class, () -> nc.requestWithTimeout(random(), null, Duration.ofMillis(100)).get(100, TimeUnit.MILLISECONDS)); assertEquals(1, nc.getStatistics().getOutstandingRequests()); } finally { @@ -485,7 +489,7 @@ public void testRequireCleanupOnCancel() throws Exception { Connection nc = Nats.connect(options); try { assertConnected(nc); - NatsRequestCompletableFuture incoming = (NatsRequestCompletableFuture)nc.request("subject", null); + NatsRequestCompletableFuture incoming = (NatsRequestCompletableFuture)nc.request(random(), null); incoming.cancel(true); NatsStatistics stats = (NatsStatistics)nc.getStatistics(); // sometimes if the machine is very fast, the request gets a reply (even if it's no responders) @@ -507,12 +511,13 @@ public void testCleanupTimerWorks() throws Exception { Connection nc = Nats.connect(options); try { assertConnected(nc); - - Future incoming = nc.request("subject", null); + + String subject = random(); + Future incoming = nc.request(subject, null); incoming.cancel(true); - incoming = nc.request("subject", null); + incoming = nc.request(subject, null); incoming.cancel(true); - incoming = nc.request("subject", null); + incoming = nc.request(subject, null); incoming.cancel(true); long sleep = 2 * cleanupInterval; @@ -522,11 +527,11 @@ public void testCleanupTimerWorks() throws Exception { assertTrueByTimeout(timeout, () -> nc.getStatistics().getOutstandingRequests() == 0); // Make sure it is still running - incoming = nc.request("subject", null); + incoming = nc.request(subject, null); incoming.cancel(true); - incoming = nc.request("subject", null); + incoming = nc.request(subject, null); incoming.cancel(true); - incoming = nc.request("subject", null); + incoming = nc.request(subject, null); incoming.cancel(true); sleep(sleep); @@ -544,19 +549,17 @@ public void testRequestsVsCleanup() throws Exception { long cleanupInterval = 50; int msgCount = 100; Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); - Connection nc = Nats.connect(options); - try { - assertConnected(nc); - + try (Connection nc = standardConnect(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); long start = System.nanoTime(); long end = start; while ((end-start) <= 2 * cleanupInterval * 1_000_000) { for (int i=0;i incoming = nc.request("subject", null); + Future incoming = nc.request(subject, null); Message msg = incoming.get(500, TimeUnit.MILLISECONDS); assertNotNull(msg); assertEquals(0, msg.getData().length); @@ -566,9 +569,6 @@ public void testRequestsVsCleanup() throws Exception { assertTrue((end-start) > 2 * cleanupInterval * 1_000_000); assertTrue(0 >= nc.getStatistics().getOutstandingRequests()); - } finally { - nc.close(); - assertClosed(nc); } } } @@ -578,15 +578,13 @@ public void testDelayInPickingUpFuture() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int msgCount = 100; ArrayList> messages = new ArrayList<>(); - Connection nc = Nats.connect(ts.getServerUri()); - try { - assertConnected(nc); - + try (Connection nc = standardConnect(options(ts))) { + String subject = random(); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[1])); - d.subscribe("subject"); + d.subscribe(subject); for (int i=0;i incoming = nc.request("subject", null); + Future incoming = nc.request(subject, null); messages.add(incoming); } nc.flush(Duration.ofMillis(1000)); @@ -598,9 +596,6 @@ public void testDelayInPickingUpFuture() throws Exception { } assertEquals(0, nc.getStatistics().getOutstandingRequests()); - } finally { - nc.close(); - assertClosed(nc); } } } @@ -632,11 +627,12 @@ public void testBuffersResize() throws Exception { int initialSize = 128; int messageSize = 1024; Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); - try (Connection nc = standardConnectionWait(options)) { + try (Connection nc = standardConnect(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); - d.subscribe("subject"); + String subject = random(); + d.subscribe(subject); - Future incoming = nc.request("subject", new byte[messageSize]); // force the buffers to resize + Future incoming = nc.request(subject, new byte[messageSize]); // force the buffers to resize Message msg = null; try { @@ -659,7 +655,7 @@ public void testRequestErrors() throws Exception { assertThrows(IllegalArgumentException.class, () -> nc.request((String)null, null)); // null subject bad assertThrows(IllegalArgumentException.class, () -> nc.request("", null)); // empty subject bad nc.close(); - assertThrows(IllegalStateException.class, () -> nc.request("subject", null)); // can't request after close + assertThrows(IllegalStateException.class, () -> nc.request(random(), null)); // can't request after close }); } diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 040443c34..32cf6e88b 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -19,7 +19,6 @@ import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.io.*; import java.time.Duration; @@ -35,12 +34,12 @@ import static io.nats.client.BaseConsumeOptions.*; import static io.nats.client.support.NatsConstants.GREATER_THAN; -import static io.nats.client.utils.ConnectionUtils.standardConnectionWait; +import static io.nats.client.utils.ConnectionUtils.standardConnect; +import static io.nats.client.utils.ConnectionUtils.waitUntilConnected; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; -@Isolated public class SimplificationTests extends JetStreamTestBase { @Test @@ -1720,7 +1719,6 @@ public void testReconnectOverOrdered() throws Exception { AtomicLong nextExpectedSequence = new AtomicLong(0); MessageHandler handler = msg -> { -// Debug.info("H", msg); if (msg.metaData().streamSequence() != nextExpectedSequence.incrementAndGet()) { allInOrder.set(false); } @@ -1737,7 +1735,7 @@ public void testReconnectOverOrdered() throws Exception { //noinspection unused try (NatsTestServer ts = new NatsTestServer(port, true)) { - nc = (NatsConnection) standardConnectionWait(options); + nc = (NatsConnection) standardConnect(options); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.File) // file since we are killing the server and bringing it back up. @@ -1757,7 +1755,6 @@ public void testReconnectOverOrdered() throws Exception { assertNull(orderedConsumerContext.getConsumerName()); mcon = orderedConsumerContext.consume(consumeOptions, handler); firstConsumerName = validateConsumerNameForOrdered(orderedConsumerContext, mcon, null); -// Debug.info("FCN", firstConsumerName); sleep(500); // time enough to get some messages } @@ -1769,11 +1766,10 @@ public void testReconnectOverOrdered() throws Exception { // reconnect and get some more messages try (NatsTestServer ignored = new NatsTestServer(port, true)) { - standardConnectionWait(nc); + waitUntilConnected(nc); // wait for reconnect sleep(10000); // long enough to get messages and for the hb alarm to have tripped } -// Debug.info("XCN", orderedConsumerContext.getConsumerName()); assertNotEquals(firstConsumerName, orderedConsumerContext.getConsumerName()); assertTrue(allInOrder.get()); @@ -1783,7 +1779,7 @@ public void testReconnectOverOrdered() throws Exception { sleep(6000); // enough delay before reconnect to trip hb alarm again try (NatsTestServer ignored = new NatsTestServer(port, true)) { - standardConnectionWait(nc); + waitUntilConnected(nc); // wait for reconnect sleep(6000); // long enough to get messages and for the hb alarm to have tripped try { diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 767b96fc9..c32072a49 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -15,6 +15,8 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.support.Listener; +import io.nats.client.support.ListenerFuture; import io.nats.client.utils.CloseOnUpgradeAttempt; import org.junit.jupiter.api.Test; @@ -26,8 +28,8 @@ import java.util.Properties; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; -import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; @@ -74,7 +76,7 @@ private static Options createTestOptionsViaFactoryClassName(String... servers) { @Test public void testSimpleTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + NatsTestServer ts = sharedConfigServer( "tls.conf", 1); String servers = ts.getServerUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -84,8 +86,8 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testMultipleUrlTLSConnectionSetContext() throws Exception { - NatsTestServer server1 = sharedConfigServer(TLS_CONF, 1); - NatsTestServer server2 = sharedConfigServer(TLS_CONF, 2); + NatsTestServer server1 = sharedConfigServer( "tls.conf", 1); + NatsTestServer server2 = sharedConfigServer( "tls.conf", 2); String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -95,7 +97,7 @@ public void testMultipleUrlTLSConnectionSetContext() throws Exception { @Test public void testSimpleIPTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + NatsTestServer ts = sharedConfigServer( "tls.conf", 1); String servers = "127.0.0.1:" + ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -105,7 +107,7 @@ public void testSimpleIPTLSConnection() throws Exception { @Test public void testURISchemeOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + NatsTestServer ts = sharedConfigServer( "tls.conf", 1); String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); Options options = optionsBuilder(servers) .maxReconnects(0) @@ -122,8 +124,8 @@ public void testURISchemeOpenTLSConnection() throws Exception { @Test public void testMultipleUrlOpenTLSConnection() throws Exception { - NatsTestServer server1 = sharedConfigServer(TLS_CONF, 1); - NatsTestServer server2 = sharedConfigServer(TLS_CONF, 2); + NatsTestServer server1 = sharedConfigServer( "tls.conf", 1); + NatsTestServer server2 = sharedConfigServer( "tls.conf", 2); String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); Options options = optionsBuilder(servers) .maxReconnects(0) @@ -140,7 +142,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { @Test public void testProxyNotTlsFirst() throws Exception { - NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + NatsTestServer ts = sharedConfigServer( "tls.conf", 1); // 1. client regular secure | secure proxy | server insecure -> mismatch exception ListenerForTesting listener = new ListenerForTesting(); ProxyConnection connRI = new ProxyConnection(ts.getServerUri(), false, listener, SERVER_INSECURE); @@ -152,17 +154,17 @@ public void testProxyNotTlsFirst() throws Exception { // 2. client regular secure | secure proxy | server tls required -> connects ProxyConnection connRR = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_REQUIRED); connRR.connect(false); - closeConnection(standardConnectionWait(connRR), 1000); + closeConnection(waitUntilConnected(connRR), 1000); // 3. client regular secure | secure proxy | server tls available -> connects ProxyConnection connRA = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_AVAILABLE); connRA.connect(false); - closeConnection(standardConnectionWait(connRA), 1000); + closeConnection(waitUntilConnected(connRA), 1000); } @Test public void testOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLS_CONF, 1); + NatsTestServer ts = sharedConfigServer( "tls.conf", 1); String servers = ts.getServerUri(); Options options = optionsBuilder() .server(servers) @@ -181,7 +183,7 @@ public void testOpenTLSConnection() throws Exception { @Test public void testSimpleTlsFirstConnection() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { - NatsTestServer ts = sharedConfigServer(TLS_FIRST_CONF); + NatsTestServer ts = sharedConfigServer( "tls_first.conf"); Options options = optionsBuilder(ts) .maxReconnects(0) .tlsFirst() @@ -193,7 +195,7 @@ public void testSimpleTlsFirstConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); String servers = ts.getServerUri(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -203,7 +205,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testURISchemeTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); String servers = "tls://localhost:" + ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -213,7 +215,7 @@ public void testURISchemeTLSConnection() throws Exception { @Test public void testURISchemeIPTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); String servers = "tls://127.0.0.1:" + ts.getPort(); assertCanConnectAndPubSub(createTestOptionsManually(servers)); assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); @@ -223,37 +225,39 @@ public void testURISchemeIPTLSConnection() throws Exception { @Test public void testTLSMessageFlow() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; Options options = optionsBuilder(ts) .maxReconnects(0) .sslContext(ctx) .build(); - Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher( - msg -> nc.publish(msg.getReplyTo(), new byte[16])); - d.subscribe("subject"); - - for (int i = 0; i < msgCount; i++) { - Future incoming = nc.request("subject", null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); + try (Connection nc = standardConnect(options)) { + Dispatcher d = nc.createDispatcher( + msg -> nc.publish(msg.getReplyTo(), new byte[16])); + String subject = random(); + d.subscribe(subject); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); + } } - - standardCloseConnection(nc); } @Test public void testTLSOnReconnect() throws Exception { - Connection nc; - ListenerForTesting listener = new ListenerForTesting(); + AtomicReference ncRef = new AtomicReference<>(); + Listener listener = new Listener(true); + + // Use two server ports to avoid port release timing issues int port = NatsTestServer.nextPort(); int newPort = NatsTestServer.nextPort(); - // Use two server ports to avoid port release timing issues - try (NatsTestServer ts = configFileServer(TLSVERIFY_CONF, port)) { + AtomicReference fRef = new AtomicReference<>(); + runInConfiguredServer( "tlsverify.conf", port, ts -> { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) @@ -261,24 +265,26 @@ public void testTLSOnReconnect() throws Exception { .connectionListener(listener) .reconnectWait(Duration.ofMillis(10)) .build(); - nc = standardConnectionWait(options); - assertInstanceOf(SocketDataPort.class, ((NatsConnection) nc).getDataPort(), "Correct data port class"); - listener.prepForStatusChange(Events.DISCONNECTED); - } + ncRef.set((NatsConnection)standardConnect(options)); + assertInstanceOf(SocketDataPort.class, ncRef.get().getDataPort(), "Correct data port class"); + fRef.set(listener.prepForConnectionEvent(Events.DISCONNECTED)); + }); - flushAndWaitLong(nc, listener); - listener.prepForStatusChange(Events.RESUBSCRIBED); + NatsConnection nc = ncRef.get(); + flushConnection(nc); + listener.validateReceived(fRef.get()); - try (NatsTestServer ignored = configFileServer(TLSVERIFY_CONF, newPort)) { - listenerConnectionWait(nc, listener, VERY_LONG_CONNECTION_WAIT_MS); - } + ListenerFuture fRe = listener.prepForConnectionEvent(Events.RESUBSCRIBED); + runInConfiguredServer( "tlsverify.conf", newPort, ts -> { + listener.validateReceived(fRe); + }); standardCloseConnection(nc); } @Test public void testDisconnectOnUpgrade() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = optionsBuilder(ts) .maxReconnects(0) @@ -290,7 +296,7 @@ public void testDisconnectOnUpgrade() throws Exception { @Test public void testServerSecureClientNotMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); Options options = optionsNoReconnect(ts); assertThrows(IOException.class, () -> Nats.connect(options)); } @@ -308,7 +314,7 @@ public void testClientSecureServerNotMismatch() throws Exception { public void testClientServerCertMismatch() throws Exception { Listener listener = new Listener(); ListenerFuture f = listener.prepForException(CertificateException.class); - NatsTestServer ts = sharedConfigServer(TLSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); SSLContext ctx = SslTestingHelper.createEmptySSLContext(); Options options = optionsBuilder(ts) .maxReconnects(0) @@ -394,22 +400,22 @@ void handleInfo(String infoJson) { public void testProxyTlsFirst() throws Exception { if (atLeast2_10_3(ensureVersionServerInfo())) { // cannot check connect b/c tls first - NatsTestServer ts = sharedConfigServer(TLS_FIRST_CONF); + NatsTestServer ts = sharedConfigServer( "tls_first.conf"); // 1. client tls first | secure proxy | server insecure -> connects ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); connTI.connect(false); - closeConnection(standardConnectionWait(connTI), 1000); + closeConnection(waitUntilConnected(connTI), 1000); // 2. client tls first | secure proxy | server tls required -> connects ProxyConnection connTR = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_REQUIRED); connTR.connect(false); - closeConnection(standardConnectionWait(connTR), 1000); + closeConnection(waitUntilConnected(connTR), 1000); // 3. client tls first | secure proxy | server tls available -> connects ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); connTA.connect(false); - closeConnection(standardConnectionWait(connTA), 1000); + closeConnection(waitUntilConnected(connTA), 1000); } } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 1d46d9f74..be9b4682b 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -42,7 +42,7 @@ public class WebsocketConnectTests extends TestBase { @Test public void testRequestReply() throws Exception { - NatsTestServer ts = sharedConfigServer(WS_CONF); + NatsTestServer ts = sharedConfigServer("ws.conf"); standardRequestReply(Options.builder() .server(getLocalhostUri(ts.getPort())) .maxReconnects(0).build()); @@ -53,7 +53,7 @@ public void testRequestReply() throws Exception { } private static void standardRequestReply(Options options) throws InterruptedException, IOException { - try (Connection connection = standardConnectionWait(options)) { + try (Connection connection = standardConnect(options)) { Dispatcher dispatcher = connection.createDispatcher( msg -> connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes())); try { @@ -68,7 +68,7 @@ private static void standardRequestReply(Options options) throws InterruptedExce @Test public void testTLSRequestReply() throws Exception { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); java.util.function.Consumer interceptor = req -> { // Ideally we could validate that this header was sent to NATS server @@ -92,7 +92,7 @@ public void testProxyRequestReply() throws Exception { RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); executor.submit(proxy); - NatsTestServer ts = sharedConfigServer(WS_CONF); + NatsTestServer ts = sharedConfigServer("ws.conf"); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) .maxReconnects(0) @@ -104,7 +104,7 @@ public void testProxyRequestReply() throws Exception { @Test public void testSimpleTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) @@ -117,7 +117,7 @@ public void testSimpleTLSConnection() throws Exception { @Test public void testSimpleWSSIPConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server("wss://127.0.0.1:" + ts.getPort(WSS)) @@ -130,7 +130,7 @@ public void testSimpleWSSIPConnection() throws Exception { @Test public void testVerifiedTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) @@ -143,7 +143,7 @@ public void testVerifiedTLSConnection() throws Exception { @Test public void testOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) .maxReconnects(0) @@ -156,7 +156,7 @@ public void testOpenTLSConnection() throws Exception { public void testURIWSSHostConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one @@ -174,7 +174,7 @@ public void testURIWSSHostConnection() throws Exception { public void testURIWSSIPConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); Options options = Options.builder() .server("wss://127.0.0.1:" + ts.getPort(WSS)) .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one @@ -191,7 +191,7 @@ public void testURIWSSIPConnection() throws Exception { public void testURISchemeWSSConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) @@ -208,7 +208,7 @@ public void testURISchemeWSSConnection() throws Exception { public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer(WSS_CONF); + NatsTestServer ts = sharedConfigServer("wss.conf"); SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) @@ -225,7 +225,7 @@ public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Excepti @Test public void testTLSMessageFlow() throws Exception { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); int msgCount = 100; Options options = Options.builder() @@ -233,18 +233,18 @@ public void testTLSMessageFlow() throws Exception { .maxReconnects(0) .sslContext(ctx) .build(); - Connection nc = standardConnectionWait(options); - Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); - String subject = random(); - d.subscribe(subject); - - for (int i = 0; i < msgCount; i++) { - Future incoming = nc.request(subject, null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); + try (Connection nc = standardConnect(options)) { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); + String subject = random(); + d.subscribe(subject); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); + } } - standardCloseConnection(nc); } @Test @@ -255,7 +255,7 @@ public void testTLSOnReconnect() throws Exception { int wssPort = nextPort(); // can't use shared b/c custom ports - NatsServerRunner.Builder builder = configFileBuilder(WSSVERIFY_CONF) + NatsServerRunner.Builder builder = configFileBuilder( "wssverify.conf") .port(port) .port(WSS, wssPort); SSLContext ctx = SslTestingHelper.createTestSSLContext(); @@ -288,7 +288,7 @@ public void testTLSOnReconnect() throws Exception { @Test public void testDisconnectOnUpgrade() throws Exception { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(ts.getLocalhostUri(WSS)) @@ -302,7 +302,7 @@ public void testDisconnectOnUpgrade() throws Exception { @Test public void testServerSecureClientNotMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); Options options = Options.builder() .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) .maxReconnects(0) @@ -328,7 +328,7 @@ public void testClientSecureServerNotMismatch() throws Exception { @Test public void testClientServerCertMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer(WSSVERIFY_CONF); + NatsTestServer ts = sharedConfigServer( "wssverify.conf"); SSLContext ctx = SslTestingHelper.createEmptySSLContext(); Options options = Options.builder() .server(ts.getLocalhostUri(WSS)) diff --git a/src/test/java/io/nats/client/impl/Listener.java b/src/test/java/io/nats/client/support/Listener.java similarity index 92% rename from src/test/java/io/nats/client/impl/Listener.java rename to src/test/java/io/nats/client/support/Listener.java index 566b66fe8..0c6bfb15f 100644 --- a/src/test/java/io/nats/client/impl/Listener.java +++ b/src/test/java/io/nats/client/support/Listener.java @@ -11,11 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client.impl; +package io.nats.client.support; import io.nats.client.*; -import io.nats.client.support.DateTimeUtils; -import io.nats.client.support.Status; import org.junit.jupiter.api.Assertions; import java.time.format.DateTimeFormatter; @@ -34,6 +32,7 @@ public class Listener implements ErrorListener, ConnectionListener { private final boolean verbose; private final List futures; + private int exceptionCount; public Listener() { this(false, false); @@ -53,7 +52,19 @@ public void reset() { futures.clear(); } - public void validateReceived(ListenerFuture... futuresToTry) { + public void validateReceived(ListenerFuture f) { + try { + f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + // future was completed, it and all the rest can be cancelled and removed from tracking + futures.remove(f); + } + catch (TimeoutException | ExecutionException | InterruptedException e) { + futures.remove(f); // removed from tracking + f.cancel(true); + } + } + + public void validateAnyReceived(ListenerFuture... futuresToTry) { int len = futuresToTry.length; int lastIx = len - 1; for (int ix = 0; ix < len; ix++) { @@ -123,6 +134,10 @@ public ListenerFuture prepForFlowControl(String fcSubject, FlowControlSource fcS return prepFor("FlowControl", new ListenerFuture(fcSubject, fcSource)); } + public int getExceptionCount() { + return exceptionCount; + } + // ---------------------------------------------------------------------------------------------------- // Connection Listener // ---------------------------------------------------------------------------------------------------- @@ -163,6 +178,7 @@ public void errorOccurred(Connection conn, String error) { @Override public void exceptionOccurred(Connection conn, Exception exp) { + exceptionCount++; if (printExceptions) { System.err.print("exceptionOccurred:"); exp.printStackTrace(); diff --git a/src/test/java/io/nats/client/impl/ListenerFuture.java b/src/test/java/io/nats/client/support/ListenerFuture.java similarity index 98% rename from src/test/java/io/nats/client/impl/ListenerFuture.java rename to src/test/java/io/nats/client/support/ListenerFuture.java index 059ed9580..dfb6480f8 100644 --- a/src/test/java/io/nats/client/impl/ListenerFuture.java +++ b/src/test/java/io/nats/client/support/ListenerFuture.java @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client.impl; +package io.nats.client.support; import io.nats.client.ConnectionListener; import io.nats.client.ErrorListener; diff --git a/src/test/java/io/nats/client/impl/ListenerStatusType.java b/src/test/java/io/nats/client/support/ListenerStatusType.java similarity index 95% rename from src/test/java/io/nats/client/impl/ListenerStatusType.java rename to src/test/java/io/nats/client/support/ListenerStatusType.java index f0e57a9ab..373fb5ceb 100644 --- a/src/test/java/io/nats/client/impl/ListenerStatusType.java +++ b/src/test/java/io/nats/client/support/ListenerStatusType.java @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client.impl; +package io.nats.client.support; public enum ListenerStatusType { Unhandled, PullWarning, PullError, None diff --git a/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java b/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java index 921e16d80..675995dde 100644 --- a/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java +++ b/src/test/java/io/nats/client/support/WebsocketSupportClassesTests.java @@ -13,7 +13,7 @@ package io.nats.client.support; -import io.nats.client.NatsTestServer; +import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.io.*; @@ -28,30 +28,28 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; -import static io.nats.client.NatsTestServer.configFileServer; import static io.nats.client.support.WebsocketFrameHeader.OpCode; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.*; -public class WebsocketSupportClassesTests { - private int[] testSizes = new int[] { 1, 2, 3, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1432, // WebsocketOutputStream - // buffer threshold, - // will fragment after - // this. - 1433, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144 }; +public class WebsocketSupportClassesTests extends TestBase { + private final int[] testSizes = new int[] { 1, 2, 3, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1432, + // 1432 is WebsocketOutputStream buffer threshold, will fragment after this. + 1433, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144 }; @Test public void testInputStreamMaskedBinaryFin() throws IOException { - for (int i = 0; i < testSizes.length; i++) { - byte[] fuzz = getFuzz(testSizes[i]); + for (int testSize : testSizes) { + byte[] fuzz = getFuzz(testSize); int maskingKey = new SecureRandom().nextInt(); InputStream in = websocketInputStream( - new WebsocketFrameHeader().withMask(maskingKey).withOp(OpCode.BINARY, true), fuzz); + new WebsocketFrameHeader().withMask(maskingKey).withOp(OpCode.BINARY, true), fuzz); WebsocketInputStream win = new WebsocketInputStream(in); - byte[] got = new byte[testSizes[i]]; + byte[] got = new byte[testSize]; if (fuzz.length == 1) { got[0] = (byte) (win.read() & 0xFF); - } else { + } + else { assertEquals(got.length, win.read(got)); } assertArrayEquals(fuzz, got); @@ -61,12 +59,12 @@ public void testInputStreamMaskedBinaryFin() throws IOException { @Test public void testInputStreamUnMaskedBinaryFin() throws IOException { - for (int i = 0; i < testSizes.length; i++) { - byte[] fuzz = getFuzz(testSizes[i]); + for (int testSize : testSizes) { + byte[] fuzz = getFuzz(testSize); InputStream in = websocketInputStream(new WebsocketFrameHeader().withNoMask().withOp(OpCode.BINARY, true), - fuzz); + fuzz); WebsocketInputStream win = new WebsocketInputStream(in); - byte[] got = new byte[testSizes[i]]; + byte[] got = new byte[testSize]; assertEquals(got.length, win.read(got)); assertArrayEquals(fuzz, got); win.close(); @@ -75,13 +73,14 @@ public void testInputStreamUnMaskedBinaryFin() throws IOException { @Test public void testOutputStreamMaskedBinaryFin() throws IOException { - for (int i = 0; i < testSizes.length; i++) { - byte[] fuzz = getFuzz(testSizes[i]); + for (int testSize : testSizes) { + byte[] fuzz = getFuzz(testSize); ByteArrayOutputStream out = new ByteArrayOutputStream(); WebsocketOutputStream wout = new WebsocketOutputStream(out, true); if (1 == fuzz.length) { wout.write(fuzz[0]); - } else { + } + else { // NOTE: this API will modify fuzz, so we need to take a copy: wout.write(Arrays.copyOf(fuzz, fuzz.length)); } @@ -107,8 +106,8 @@ public void testOutputStreamMaskedBinaryFin() throws IOException { @Test public void testOutputStreamUnMaskedBinaryFin() throws IOException { - for (int i = 0; i < testSizes.length; i++) { - byte[] fuzz = getFuzz(testSizes[i]); + for (int testSize : testSizes) { + byte[] fuzz = getFuzz(testSize); ByteArrayOutputStream out = new ByteArrayOutputStream(); WebsocketOutputStream wout = new WebsocketOutputStream(out, false); wout.write(fuzz); @@ -159,7 +158,7 @@ public void testInputCoverage() throws IOException { } @Test - public void testFrameHeaderCoverage() throws IOException { + public void testFrameHeaderCoverage() { assertEquals(OpCode.CONTINUATION, OpCode.of(0)); assertEquals(OpCode.TEXT, OpCode.of(1)); assertEquals(OpCode.BINARY, OpCode.of(2)); @@ -214,7 +213,7 @@ public void testHandshakeFailures() throws Exception { OutputStreamWriter writer = new OutputStreamWriter(out, UTF_8); writer.append("HTTP/1.1 101 Switching Protocols\r\n"); for (int i = 0; i < 1000; i++) { - writer.append("a-" + i + ": Test\r\n"); + writer.append("a-").append(String.valueOf(i)).append(": Test\r\n"); } writer.close(); }, "Exceeded max HTTP headers"); @@ -260,7 +259,7 @@ public void testHandshakeFailures() throws Exception { @FunctionalInterface interface OutputStreamWrite { - public void write(OutputStream out) throws IOException; + void write(OutputStream out) throws IOException; } private void testWithWriter(OutputStreamWrite writer, String msgStartsWith) throws Exception { @@ -272,9 +271,10 @@ private void testWithWriter(OutputStreamWrite writer, String msgStartsWith) thro Future readFuture = executor.submit(() -> { byte[] buffer = new byte[1024]; try { - while (in.read(buffer) >= 0) { - } - } catch (SocketException ex) { + //noinspection StatementWithEmptyBody + while (in.read(buffer) >= 0) {} + } + catch (SocketException ex) { // Expect this failure: if (!"Connection reset".equals(ex.getMessage()) && !"Socket closed".equals(ex.getMessage())) { throw ex; @@ -322,8 +322,8 @@ private void testWithWriter(OutputStreamWrite writer, String msgStartsWith) thro @Test public void testWebSocketCoverage() throws Exception { AtomicReference lastMethod = new AtomicReference<>(); - try (NatsTestServer ts = configFileServer("ws.conf")) { - try (Socket tcpSocket = new Socket("localhost", ts.getPort("ws"))) { + runInConfiguredServer("ws.conf", ts -> { + try (Socket tcpSocket = new Socket("localhost", ts.getPort(WS))) { WebSocket webSocket = new WebSocket(new Socket() { @Override public InputStream getInputStream() throws IOException { @@ -538,7 +538,7 @@ public void setPerformancePreferences(int connectionTime, int latency, int bandw assertThrows(UnsupportedOperationException.class, () -> webSocket.connect(null)); assertThrows(UnsupportedOperationException.class, () -> webSocket.connect(null, 0)); assertThrows(UnsupportedOperationException.class, () -> webSocket.bind(null)); - assertThrows(UnsupportedOperationException.class, () -> webSocket.getChannel()); + assertThrows(UnsupportedOperationException.class, webSocket::getChannel); // Delegated methods: webSocket.getInetAddress(); @@ -640,7 +640,7 @@ public void setPerformancePreferences(int connectionTime, int latency, int bandw webSocket.setPerformancePreferences(1, 1, 1); assertEquals("setPerformancePreferences", lastMethod.get()); } - } + }); } /** diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index 9b223d909..d8e5b53b5 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -16,68 +16,74 @@ import io.nats.client.Connection; import io.nats.client.Nats; import io.nats.client.Options; -import io.nats.client.impl.ListenerForTesting; -import io.nats.client.support.Debug; +import org.jspecify.annotations.Nullable; import org.opentest4j.AssertionFailedError; import java.io.IOException; -import java.util.concurrent.TimeUnit; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.assertSame; public abstract class ConnectionUtils { - public static final long STANDARD_CONNECTION_WAIT_MS = 5000; - public static final long LONG_CONNECTION_WAIT_MS = 7500; - public static final long VERY_LONG_CONNECTION_WAIT_MS = 10000; + public static final long CONNECTION_WAIT_MS = 10000; public static final long STANDARD_FLUSH_TIMEOUT_MS = 2000; public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000; public static final long LONG_TIMEOUT_MS = 15000; // ---------------------------------------------------------------------------------------------------- - // connect or wait for a connection + // standardConnect // ---------------------------------------------------------------------------------------------------- - public static Connection connectionWait(Connection conn, long millis) { - return waitUntilStatus(conn, millis, Connection.Status.CONNECTED); - } - - public static Connection standardConnectionWait(Options options) throws IOException, InterruptedException { - return connectionWait(Nats.connect(options), STANDARD_CONNECTION_WAIT_MS); - } - - public static Connection standardConnectionWait(Connection conn) { - return connectionWait(conn, STANDARD_CONNECTION_WAIT_MS); - } - - public static Connection longConnectionWait(Options options) throws IOException, InterruptedException { - return connectionWait(Nats.connect(options), LONG_CONNECTION_WAIT_MS); - } - - public static Connection longConnectionWait(Connection conn) { - return connectionWait(conn, LONG_CONNECTION_WAIT_MS); - } + private static final int RETRY_DELAY_INCREMENT = 50; + private static final int CONNECTION_RETRIES = 10; + private static final long RETRY_DELAY = 100; - public static Connection listenerConnectionWait(Options options, ListenerForTesting listener) throws IOException, InterruptedException { - Connection conn = Nats.connect(options); - listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); - return conn; + public static Connection standardConnect(Options options) { + try { + return standardConnect(options, null); + } + catch (Exception e) { + throw new RuntimeException("Unable to make a connection.", e); + } } - public static void listenerConnectionWait(Connection conn, ListenerForTesting listener) { - listenerConnectionWait(conn, listener, LONG_CONNECTION_WAIT_MS); + public static Connection standardConnect(Options options, @Nullable Class throwImmediately) throws IOException, InterruptedException { + IOException last = null; + long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; + for (int x = 1; x <= CONNECTION_RETRIES; x++) { + if (x > 1) { + delay += RETRY_DELAY_INCREMENT; + sleep(delay); + } + try { + return waitUntilConnected(Nats.connect(options)); + } + catch (IOException ioe) { + if (throwImmediately != null && throwImmediately.isAssignableFrom(ioe.getClass())) { + throw ioe; + } + last = ioe; + } + catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + throw ie; + } + } + throw last; } - public static void listenerConnectionWait(Connection conn, ListenerForTesting listener, long millis) { - listener.waitForStatusChange(millis, TimeUnit.MILLISECONDS); - assertConnected(conn); + // ---------------------------------------------------------------------------------------------------- + // connect or wait for a connection + // ---------------------------------------------------------------------------------------------------- + public static Connection waitUntilConnected(Connection conn) { + return waitUntilStatus(conn, CONNECTION_WAIT_MS, Connection.Status.CONNECTED); } // ---------------------------------------------------------------------------------------------------- // close // ---------------------------------------------------------------------------------------------------- public static void standardCloseConnection(Connection conn) { - closeConnection(conn, STANDARD_CONNECTION_WAIT_MS); + closeConnection(conn, CONNECTION_WAIT_MS); } public static void closeConnection(Connection conn, long millis) { @@ -89,7 +95,10 @@ public static void closeConnection(Connection conn, long millis) { } public static void close(Connection conn) { - try { conn.close(); } catch (InterruptedException e) { /* ignored */ } + try { + conn.close(); + } + catch (InterruptedException e) { /* ignored */ } } // ---------------------------------------------------------------------------------------------------- @@ -121,39 +130,10 @@ public static void assertClosed(Connection conn) { } public static void assertCanConnect(Options options) throws IOException, InterruptedException { - standardCloseConnection( standardConnectionWait(options) ); + standardCloseConnection(standardConnect(options)); } private static String expectingMessage(Connection conn, Connection.Status expecting) { return "Failed expecting Connection Status " + expecting.name() + " but was " + conn.getStatus(); } - - // ---------------------------------------------------------------------------------------------------- - // new connection better for java 21 - // ---------------------------------------------------------------------------------------------------- - private static final int RETRY_DELAY_INCREMENT = 50; - private static final int CONNECTION_RETRIES = 10; - private static final long RETRY_DELAY = 100; - public static Connection newConnection(Options options) { - IOException last = null; - long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; - for (int x = 1; x <= CONNECTION_RETRIES; x++) { - if (x > 1) { - delay += RETRY_DELAY_INCREMENT; - sleep(delay); - } - try { - return Nats.connect(options); - } - catch (IOException ioe) { - Debug.info("newConnection", ioe.getMessage()); - last = ioe; - } - catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - throw new RuntimeException("Unable to open a new connection to reusable sever.", ie); - } - } - throw new RuntimeException("Unable to open a new connection to reusable sever.", last); - } } diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index fd9cd65f8..466383541 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -71,6 +71,10 @@ public static Options options() { return optionsBuilder().build(); } + public static Options options(Connection nc) { + return optionsBuilder(nc).build(); + } + public static Options options(int port) { return optionsBuilder(port).build(); } diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index a95af598d..8b0d094eb 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -174,7 +174,7 @@ else if (ncs.getStatus() != Connection.Status.CONNECTED) { } public Connection newConnection(Options.Builder builder) { - return ConnectionUtils.newConnection(builder.server(serverUrl).build()); + return ConnectionUtils.standardConnect(builder.server(serverUrl).build()); } public void shutdown() { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index bddf43c55..3817b5ed7 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -44,15 +44,8 @@ import static org.junit.jupiter.api.Assertions.*; public class TestBase { - public static final String TLS_CONF = "tls.conf"; - public static final String TLSVERIFY_CONF = "tlsverify.conf"; - public static final String TLS_FIRST_CONF = "tls_first.conf"; - public static final String WS = "ws"; public static final String WSS = "wss"; - public static final String WS_CONF = "ws.conf"; - public static final String WSS_CONF = "wss.conf"; - public static final String WSSVERIFY_CONF = "wssverify.conf"; public static final String STAR_SEGMENT = "*.star.*.segment.*"; public static final String GT_NOT_LAST_SEGMENT = "gt.>.notlast"; @@ -88,6 +81,7 @@ public class TestBase { public static final String META_KEY = "meta-test-key"; public static final String META_VALUE = "meta-test-value"; + public static final String OPERATOR_NOACCT_CONF = "operator_noacct.conf"; public static String[] BAD_SUBJECTS_OR_QUEUES = new String[] { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY @@ -126,6 +120,10 @@ public static NatsTestServer sharedConfigServer(String confFile, int version) th // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- + public interface InServerTest { + void test(NatsTestServer ts) throws Exception; + } + public interface OneConnectionTest { void test(Connection nc) throws Exception; } @@ -153,13 +151,38 @@ public interface JetStreamTestingContextTest { void test(Connection nc, JetStreamTestingContext ctx) throws Exception; } + // -------------------------------------------------- + // Configured Server + // -------------------------------------------------- + private static void _runConfiguredServer( + String configFilePath, + int customPort, + InServerTest inServerTest + ) throws Exception { + NatsServerRunner.Builder nsrb = NatsServerRunner.builder() + .configFilePath(configResource(configFilePath)); + if (customPort > 0) { + nsrb.port(customPort); + } + try (NatsTestServer ts = new NatsTestServer(nsrb)) { + inServerTest.test(ts); + } + } + + public static void runInConfiguredServer(String configFilePath, InServerTest inServerTest) throws Exception { + _runConfiguredServer(configFilePath, -1, inServerTest); + } + + public static void runInConfiguredServer(String configFilePath, int customPort, InServerTest inServerTest) throws Exception { + _runConfiguredServer(configFilePath, customPort, inServerTest); + } + // ---------------------------------------------------------------------------------------------------- // runners -> own server // ---------------------------------------------------------------------------------------------------- private static void _runInOwnServer( @SuppressWarnings("SameParameterValue") Options.Builder optionsBuilder, VersionCheck vc, - String configFilePath, OneConnectionTest oneNcTest, JetStreamTest jsTest ) throws Exception { @@ -168,15 +191,12 @@ private static void _runInOwnServer( } NatsServerRunner.Builder nsrb = NatsServerRunner.builder().jetstream(jsTest != null); - if (configFilePath != null) { - nsrb.configFilePath(configResource(configFilePath)); - } try (NatsTestServer ts = new NatsTestServer(nsrb)) { Options options = (optionsBuilder == null ? optionsBuilder(ts) : optionsBuilder.server(ts.getServerUri())) .build(); - try (Connection nc = standardConnectionWait(options)) { + try (Connection nc = standardConnect(options)) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { if (jsTest == null) { @@ -196,22 +216,18 @@ private static void _runInOwnServer( // Not using JetStream // -------------------------------------------------- public static void runInOwnServer(OneConnectionTest oneNcTest) throws Exception { - _runInOwnServer(null, null, null, oneNcTest, null); + _runInOwnServer(null, null, oneNcTest, null); } // -------------------------------------------------- // JetStream needing isolation // -------------------------------------------------- public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(null, null, null, null, jetStreamTest); - } - - public static void runInOwnJsServer(String configFilePath, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(null, null, configFilePath, null, jetStreamTest); + _runInOwnServer(null, null, null, jetStreamTest); } public static void runInOwnJsServer(VersionCheck vc, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(null, vc, null, null, jetStreamTest); + _runInOwnServer(null, vc, null, jetStreamTest); } // ---------------------------------------------------------------------------------------------------- @@ -406,9 +422,9 @@ public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Ex }; try (NatsTestServer hub = new NatsTestServer(hubPort, true, null, hubInserts, null); - Connection nchub = standardConnectionWait(options(hub)); + Connection nchub = standardConnect(options(hub)); NatsTestServer leaf = new NatsTestServer(leafPort, true, null, leafInserts, null); - Connection ncleaf = standardConnectionWait(options(leaf)) + Connection ncleaf = standardConnect(options(leaf)) ) { twoConnectionTest.test(nchub, ncleaf); } @@ -444,9 +460,9 @@ public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeConnectionT try (NatsTestServer srv1 = new NatsTestServer(port1, tstOpts.jetStream(), null, server1Inserts, null); NatsTestServer srv2 = new NatsTestServer(port2, tstOpts.jetStream(), null, server2Inserts, null); NatsTestServer srv3 = new NatsTestServer(port3, tstOpts.jetStream(), null, server3Inserts, null); - Connection nc1 = standardConnectionWait(makeOptions(0, tstOpts, srv1, srv2, srv3)); - Connection nc2 = standardConnectionWait(makeOptions(1, tstOpts, srv2, srv1, srv3)); - Connection nc3 = standardConnectionWait(makeOptions(2, tstOpts, srv3, srv1, srv2)) + Connection nc1 = standardConnect(makeOptions(0, tstOpts, srv1, srv2, srv3)); + Connection nc2 = standardConnect(makeOptions(1, tstOpts, srv2, srv1, srv3)); + Connection nc3 = standardConnect(makeOptions(2, tstOpts, srv3, srv1, srv2)) ) { threeServerTest.test(nc1, nc2, nc3); } @@ -561,7 +577,7 @@ public static NatsMessage getDataMessage(String data) { // assertions // ---------------------------------------------------------------------------------------------------- public static void assertCanConnectAndPubSub(Options options) throws IOException, InterruptedException { - Connection conn = newConnection(options); + Connection conn = standardConnect(options); assertPubSub(conn); standardCloseConnection(conn); } diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 8207cf741..242dd6dfb 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -29,7 +29,6 @@ import nl.jqno.equalsverifier.EqualsVerifier; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -56,45 +55,50 @@ import static io.nats.service.ServiceMessage.NATS_SERVICE_ERROR_CODE; import static org.junit.jupiter.api.Assertions.*; -@Isolated public class ServiceTests extends JetStreamTestBase { - public static final String SERVICE_NAME_1 = "Service1"; - public static final String SERVICE_NAME_2 = "Service2"; - public static final String ECHO_ENDPOINT_NAME = "EchoEndpoint"; - public static final String ECHO_ENDPOINT_SUBJECT = "echo"; - public static final String SORT_GROUP = "sort"; - public static final String SORT_ENDPOINT_ASCENDING_NAME = "SortEndpointAscending"; - public static final String SORT_ENDPOINT_DESCENDING_NAME = "SortEndpointDescending"; - public static final String SORT_ENDPOINT_ASCENDING_SUBJECT = "ascending"; - public static final String SORT_ENDPOINT_DESCENDING_SUBJECT = "descending"; - public static final String REVERSE_ENDPOINT_NAME = "ReverseEndpoint"; - public static final String REVERSE_ENDPOINT_SUBJECT = "reverse"; - public static final String CUSTOM_QGROUP = "customQ"; - @Test public void testServiceWorkflow() throws Exception { + String serviceName1 = "Service1" + random(); + String serviceName2 = "Service2" + random(); + String echoEndpointName = "EchoEndpoint" + random(); + String echoEndpointSubject = "echo" + random(); + String sortGroupName = "sort" + random(); + String sortEndpointAscendingName = "SortEndpointAscending" + random(); + String sortEndpointDescendingName = "SortEndpointDescending" + random(); + String sortEndpointAscendingSubject = "ascending" + random(); + String sortEndpointDescendingSubject = "descending" + random(); + String reverseEndpointName = "ReverseEndpoint" + random(); + String reverseEndpointSubject = "reverse" + random(); + String customQgroup = "customQ" + random(); + + Map verifyMap = new HashMap<>(); + verifyMap.put(echoEndpointName, "echoEndpointName"); + verifyMap.put(sortEndpointAscendingName, "sortEndpointAscendingName"); + verifyMap.put(sortEndpointDescendingName, "sortEndpointDescendingName"); + verifyMap.put(reverseEndpointName, "reverseEndpointName"); + runInShared(clientNc -> { Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); Endpoint endEcho = Endpoint.builder() - .name(ECHO_ENDPOINT_NAME) - .subject(ECHO_ENDPOINT_SUBJECT) - .queueGroup(CUSTOM_QGROUP) + .name(echoEndpointName) + .subject(echoEndpointSubject) + .queueGroup(customQgroup) .build(); Endpoint endSortA = Endpoint.builder() - .name(SORT_ENDPOINT_ASCENDING_NAME) - .subject(SORT_ENDPOINT_ASCENDING_SUBJECT) + .name(sortEndpointAscendingName) + .subject(sortEndpointAscendingSubject) .build(); // constructor coverage Endpoint endSortD = new Endpoint( - SORT_ENDPOINT_DESCENDING_NAME, - SORT_ENDPOINT_DESCENDING_SUBJECT); + sortEndpointDescendingName, + sortEndpointDescendingSubject); // sort is going to be grouped - Group sortGroup = new Group(SORT_GROUP); + Group sortGroup = new Group(sortGroupName); ServiceEndpoint seEcho1 = ServiceEndpoint.builder() .endpoint(endEcho) @@ -136,7 +140,7 @@ public void testServiceWorkflow() throws Exception { .build(); Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) + .name(serviceName1) .version("1.0.0") .connection(serviceNc1) .addServiceEndpoint(seEcho1) @@ -147,7 +151,7 @@ public void testServiceWorkflow() throws Exception { CompletableFuture serviceStoppedFuture1 = service1.startService(); Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) + .name(serviceName2) .version("1.0.0") .connection(serviceNc2) .addServiceEndpoint(seEcho2) @@ -164,9 +168,9 @@ public void testServiceWorkflow() throws Exception { // service request execution int requestCount = 10; for (int x = 0; x < requestCount; x++) { - verifyServiceExecution(clientNc, ECHO_ENDPOINT_NAME, ECHO_ENDPOINT_SUBJECT, null); - verifyServiceExecution(clientNc, SORT_ENDPOINT_ASCENDING_NAME, SORT_ENDPOINT_ASCENDING_SUBJECT, sortGroup); - verifyServiceExecution(clientNc, SORT_ENDPOINT_DESCENDING_NAME, SORT_ENDPOINT_DESCENDING_SUBJECT, sortGroup); + verifyServiceExecution(clientNc, echoEndpointName, echoEndpointSubject, null, verifyMap); + verifyServiceExecution(clientNc, sortEndpointAscendingName, sortEndpointAscendingSubject, sortGroup, verifyMap); + verifyServiceExecution(clientNc, sortEndpointDescendingName, sortEndpointDescendingSubject, sortGroup, verifyMap); } PingResponse pingResponse1 = service1.getPingResponse(); @@ -176,14 +180,14 @@ public void testServiceWorkflow() throws Exception { StatsResponse statsResponse1 = service1.getStatsResponse(); StatsResponse statsResponse2 = service2.getStatsResponse(); EndpointStats[] endpointStatsArray1 = new EndpointStats[]{ - service1.getEndpointStats(ECHO_ENDPOINT_NAME), - service1.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), - service1.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) + service1.getEndpointStats(echoEndpointName), + service1.getEndpointStats(sortEndpointAscendingName), + service1.getEndpointStats(sortEndpointDescendingName) }; EndpointStats[] endpointStatsArray2 = new EndpointStats[]{ - service2.getEndpointStats(ECHO_ENDPOINT_NAME), - service2.getEndpointStats(SORT_ENDPOINT_ASCENDING_NAME), - service2.getEndpointStats(SORT_ENDPOINT_DESCENDING_NAME) + service2.getEndpointStats(echoEndpointName), + service2.getEndpointStats(sortEndpointAscendingName), + service2.getEndpointStats(sortEndpointDescendingName) }; assertNull(service1.getEndpointStats("notAnEndpoint")); @@ -207,15 +211,15 @@ public void testServiceWorkflow() throws Exception { } // discovery - wait at most 500 millis for responses, 5 total responses max - Discovery discovery = new Discovery(clientNc, 500, 5); + Discovery discovery = new Discovery(clientNc, 1500, 5); // ping discovery Verifier pingVerifier = (expected, response) -> assertInstanceOf(PingResponse.class, response); verifyDiscovery(discovery.ping(), pingVerifier, pingResponse1, pingResponse2); - verifyDiscovery(discovery.ping(SERVICE_NAME_1), pingVerifier, pingResponse1); - verifyDiscovery(discovery.ping(SERVICE_NAME_2), pingVerifier, pingResponse2); - verifyDiscovery(discovery.ping(SERVICE_NAME_1, serviceId1), pingVerifier, pingResponse1); - assertNull(discovery.ping(SERVICE_NAME_1, "badId")); + verifyDiscovery(discovery.ping(serviceName1), pingVerifier, pingResponse1); + verifyDiscovery(discovery.ping(serviceName2), pingVerifier, pingResponse2); + verifyDiscovery(discovery.ping(serviceName1, serviceId1), pingVerifier, pingResponse1); + assertNull(discovery.ping(serviceName1, "badId")); assertNull(discovery.ping("bad", "badId")); // info discovery @@ -227,10 +231,10 @@ public void testServiceWorkflow() throws Exception { assertEquals(exp.getEndpoints(), r.getEndpoints()); }; verifyDiscovery(discovery.info(), infoVerifier, infoResponse1, infoResponse2); - verifyDiscovery(discovery.info(SERVICE_NAME_1), infoVerifier, infoResponse1); - verifyDiscovery(discovery.info(SERVICE_NAME_2), infoVerifier, infoResponse2); - verifyDiscovery(discovery.info(SERVICE_NAME_1, serviceId1), infoVerifier, infoResponse1); - assertNull(discovery.info(SERVICE_NAME_1, "badId")); + verifyDiscovery(discovery.info(serviceName1), infoVerifier, infoResponse1); + verifyDiscovery(discovery.info(serviceName2), infoVerifier, infoResponse2); + verifyDiscovery(discovery.info(serviceName1, serviceId1), infoVerifier, infoResponse1); + assertNull(discovery.info(serviceName1, "badId")); assertNull(discovery.info("bad", "badId")); // stats discovery @@ -241,7 +245,7 @@ public void testServiceWorkflow() throws Exception { assertEquals(exp.getStarted(), sr.getStarted()); for (int x = 0; x < 3; x++) { EndpointStats er = exp.getEndpointStatsList().get(x); - if (!er.getName().equals(ECHO_ENDPOINT_NAME)) { + if (!er.getName().equals(echoEndpointName)) { // echo endpoint has data that will vary assertEquals(er, sr.getEndpointStatsList().get(x)); } @@ -249,18 +253,18 @@ public void testServiceWorkflow() throws Exception { }; discovery = new Discovery(clientNc); // coverage for the simple constructor verifyDiscovery(discovery.stats(), statsVerifier, statsResponse1, statsResponse2); - verifyDiscovery(discovery.stats(SERVICE_NAME_1), statsVerifier, statsResponse1); - verifyDiscovery(discovery.stats(SERVICE_NAME_2), statsVerifier, statsResponse2); - verifyDiscovery(discovery.stats(SERVICE_NAME_1, serviceId1), statsVerifier, statsResponse1); - assertNull(discovery.stats(SERVICE_NAME_1, "badId")); + verifyDiscovery(discovery.stats(serviceName1), statsVerifier, statsResponse1); + verifyDiscovery(discovery.stats(serviceName2), statsVerifier, statsResponse2); + verifyDiscovery(discovery.stats(serviceName1, serviceId1), statsVerifier, statsResponse1); + assertNull(discovery.stats(serviceName1, "badId")); assertNull(discovery.stats("bad", "badId")); // --------------------------------------------------------------------------- // TEST ADDING AN ENDPOINT TO A RUNNING SERVICE // --------------------------------------------------------------------------- Endpoint endReverse = Endpoint.builder() - .name(REVERSE_ENDPOINT_NAME) - .subject(REVERSE_ENDPOINT_SUBJECT) + .name(reverseEndpointName) + .subject(reverseEndpointSubject) .build(); ServiceEndpoint seRev1 = ServiceEndpoint.builder() @@ -272,12 +276,12 @@ public void testServiceWorkflow() throws Exception { sleep(100); // give the service some time to get running. remember it's got to subscribe on the server for (int x = 0; x < requestCount; x++) { - verifyServiceExecution(clientNc, REVERSE_ENDPOINT_NAME, REVERSE_ENDPOINT_SUBJECT, null); + verifyServiceExecution(clientNc, reverseEndpointName, reverseEndpointSubject, null, verifyMap); } infoResponse1 = service1.getInfoResponse(); boolean found = false; for (Endpoint e : infoResponse1.getEndpoints()) { - if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { + if (e.getName().equals(reverseEndpointName)) { found = true; break; } @@ -287,7 +291,7 @@ public void testServiceWorkflow() throws Exception { statsResponse1 = service1.getStatsResponse(); found = false; for (EndpointStats e : statsResponse1.getEndpointStatsList()) { - if (e.getName().equals(REVERSE_ENDPOINT_NAME)) { + if (e.getName().equals(reverseEndpointName)) { found = true; break; } @@ -307,7 +311,7 @@ public void testServiceWorkflow() throws Exception { assertEquals(0, er.getProcessingTime()); assertEquals(0, er.getAverageProcessingTime()); assertNull(er.getLastError()); - if (er.getName().equals(ECHO_ENDPOINT_NAME)) { + if (er.getName().equals(echoEndpointName)) { assertNotNull(er.getData()); assertNotNull(er.getDataAsJson()); } @@ -334,15 +338,17 @@ interface Verifier { @SuppressWarnings("unchecked") private static void verifyDiscovery(Object oResponse, Verifier v, ServiceResponse... expectedResponses) { List responses = oResponse instanceof List ? (List) oResponse : Collections.singletonList(oResponse); - assertEquals(expectedResponses.length, responses.size()); + assertTrue(responses.size() >= expectedResponses.length); for (Object response : responses) { ServiceResponse sr = (ServiceResponse) response; ServiceResponse exp = find(expectedResponses, sr); - assertNotNull(exp); - assertEquals(exp.getType(), sr.getType()); - assertEquals(exp.getName(), sr.getName()); - assertEquals(exp.getVersion(), sr.getVersion()); - v.verify(exp, response); + if (exp != null) { + // there may be additional response, still not sure why + assertEquals(exp.getType(), sr.getType()); + assertEquals(exp.getName(), sr.getName()); + assertEquals(exp.getVersion(), sr.getVersion()); + v.verify(exp, response); + } } } @@ -355,24 +361,26 @@ private static ServiceResponse find(ServiceResponse[] expectedResponses, Service return null; } - private static void verifyServiceExecution(Connection nc, String endpointName, String serviceSubject, Group group) { + private static void verifyServiceExecution( + Connection nc, String endpointName, String serviceSubject, Group group, Map verifyMap) { try { String request = Long.toHexString(System.currentTimeMillis()) + Long.toHexString(System.nanoTime()); // just some random text String subject = group == null ? serviceSubject : group.getSubject() + DOT + serviceSubject; CompletableFuture future = nc.request(subject, request.getBytes()); Message m = future.get(); String response = new String(m.getData()); - switch (endpointName) { - case ECHO_ENDPOINT_NAME: + String which = verifyMap.get(endpointName); + switch (which) { + case "echoEndpointName": assertEquals(echo(request), response); break; - case SORT_ENDPOINT_ASCENDING_NAME: + case "sortEndpointAscendingName": assertEquals(sortA(request), response); break; - case SORT_ENDPOINT_DESCENDING_NAME: + case "sortEndpointDescendingName": assertEquals(sortD(request), response); break; - case REVERSE_ENDPOINT_NAME: + case "reverseEndpointName": assertEquals(reverse(request), response); break; } @@ -472,6 +480,9 @@ private static String reverse(byte[] data) { @Test public void testQueueGroup() throws Exception { + String serviceName1 = "Service1" + random(); + String serviceName2 = "Service2" + random(); + runInShared(clientNc -> { Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); @@ -515,7 +526,7 @@ public void testQueueGroup() throws Exception { .build(); Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) + .name(serviceName1) .version("1.0.0") .connection(serviceNc1) .addServiceEndpoint(service1Ep1) @@ -523,7 +534,7 @@ public void testQueueGroup() throws Exception { .build(); Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) + .name(serviceName2) .version("1.0.0") .connection(serviceNc2) .addServiceEndpoint(service2Ep1) @@ -571,6 +582,9 @@ public void testQueueGroup() throws Exception { @Test public void testResponsesFromAllInstances() throws Exception { + String serviceName1 = "Service1" + random(); + String serviceName2 = "Service2" + random(); + runInShared(clientNc -> { Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); @@ -594,14 +608,14 @@ public void testResponsesFromAllInstances() throws Exception { .build(); Service service1 = new ServiceBuilder() - .name(SERVICE_NAME_1) + .name(serviceName1) .version("1.0.0") .connection(serviceNc1) .addServiceEndpoint(service1Ep1) .build(); Service service2 = new ServiceBuilder() - .name(SERVICE_NAME_2) + .name(serviceName2) .version("1.0.0") .connection(serviceNc2) .addServiceEndpoint(service2Ep1) @@ -619,10 +633,10 @@ public void testResponsesFromAllInstances() throws Exception { boolean one = false; boolean two = false; for (PingResponse response : prs) { - if (response.getName().equals(SERVICE_NAME_1)) { + if (response.getName().equals(serviceName1)) { one = true; } - else if (response.getName().equals(SERVICE_NAME_2)) { + else if (response.getName().equals(serviceName2)) { two = true; } } @@ -633,10 +647,10 @@ else if (response.getName().equals(SERVICE_NAME_2)) { one = false; two = false; for (InfoResponse response : irs) { - if (response.getName().equals(SERVICE_NAME_1)) { + if (response.getName().equals(serviceName1)) { one = true; } - else if (response.getName().equals(SERVICE_NAME_2)) { + else if (response.getName().equals(serviceName2)) { two = true; } } @@ -647,10 +661,10 @@ else if (response.getName().equals(SERVICE_NAME_2)) { one = false; two = false; for (StatsResponse response : srs) { - if (response.getName().equals(SERVICE_NAME_1)) { + if (response.getName().equals(serviceName1)) { one = true; } - else if (response.getName().equals(SERVICE_NAME_2)) { + else if (response.getName().equals(serviceName2)) { two = true; } } diff --git a/src/test/resources/basic_account_js.conf b/src/test/resources/basic_account_js.conf index fb0ac38ba..a7c92a999 100644 --- a/src/test/resources/basic_account_js.conf +++ b/src/test/resources/basic_account_js.conf @@ -1,4 +1,7 @@ -jetstream: {max_mem_store: 1GB, max_file_store: 1GB} +jetstream: { + max_mem_store: 1GB, + max_file_store: 1GB +} authorization { BASIC = { diff --git a/src/test/resources/data/StreamConfigurationSourcedSubjectTransform.json b/src/test/resources/data/StreamConfigurationSourcedSubjectTransform.json index e0e4fdbda..ed89c4da3 100644 --- a/src/test/resources/data/StreamConfigurationSourcedSubjectTransform.json +++ b/src/test/resources/data/StreamConfigurationSourcedSubjectTransform.json @@ -13,7 +13,7 @@ "duplicate_window": 120000000000, "sources": [ { - "name": "sourcedstream", + "name": "sourcedfoo", "subject_transforms": [ { "src": "foo", @@ -22,7 +22,7 @@ ] }, { - "name": "sourcedstream", + "name": "sourcedbar", "subject_transforms": [ { "src": "bar", diff --git a/src/test/resources/js_authorization.conf b/src/test/resources/js_authorization.conf index 66f9dcf24..b68e0dcd4 100644 --- a/src/test/resources/js_authorization.conf +++ b/src/test/resources/js_authorization.conf @@ -1,6 +1,9 @@ port: 4222 -jetstream: {max_mem_store: 1GB, max_file_store: 1GB} +jetstream: { + max_mem_store: 1GB, + max_file_store: 1GB +} authorization { SERVICE = { diff --git a/src/test/resources/js_authorization_no_service.conf b/src/test/resources/js_authorization_no_service.conf index e20b8676c..0c6b005e4 100644 --- a/src/test/resources/js_authorization_no_service.conf +++ b/src/test/resources/js_authorization_no_service.conf @@ -1,6 +1,9 @@ port: 4222 -jetstream: {max_mem_store: 1GB, max_file_store: 1GB} +jetstream: { + max_mem_store: 1GB, + max_file_store: 1GB +} authorization { SERVICE = { diff --git a/src/test/resources/js_authorization_token.conf b/src/test/resources/js_authorization_token.conf index b8d6d6034..3a84e0e1c 100644 --- a/src/test/resources/js_authorization_token.conf +++ b/src/test/resources/js_authorization_token.conf @@ -1,6 +1,9 @@ port: 4222 -jetstream: {max_mem_store: 1GB, max_file_store: 1GB} +jetstream: { + max_mem_store: 1GB, + max_file_store: 1GB +} authorization { token: servicetoken diff --git a/src/test/resources/js_prefix.conf b/src/test/resources/js_prefix.conf index 7764e7f73..73c6f57e0 100644 --- a/src/test/resources/js_prefix.conf +++ b/src/test/resources/js_prefix.conf @@ -1,6 +1,9 @@ port: 4222 -jetstream: {max_mem_store: 1GB, max_file_store: 1GB} +jetstream: { + max_mem_store: 1GB, + max_file_store: 1GB +} accounts: { SOURCE: { diff --git a/src/test/resources/pagination.conf b/src/test/resources/pagination.conf index 9fae64f83..9223e7275 100644 --- a/src/test/resources/pagination.conf +++ b/src/test/resources/pagination.conf @@ -1 +1,3 @@ max_payload: 67108864 +jetstream: { +} \ No newline at end of file From 1ba8e1295a9475178a40aecc3c6c6a05604a57c3 Mon Sep 17 00:00:00 2001 From: scottf Date: Tue, 2 Dec 2025 21:23:28 -0500 Subject: [PATCH 28/51] ListenerForTesting refactoring --- src/test/java/io/nats/client/AuthTests.java | 152 ++++----- .../java/io/nats/client/ConnectTests.java | 5 +- .../java/io/nats/client/OptionsTests.java | 18 +- .../java/io/nats/client/PublishTests.java | 17 +- .../client/impl/ConnectionListenerTests.java | 27 +- .../java/io/nats/client/impl/DrainTests.java | 7 +- .../client/impl/JetStreamConsumerTests.java | 16 +- .../nats/client/impl/JetStreamPullTests.java | 17 +- .../client/impl/JetStreamPushAsyncTests.java | 5 +- .../nats/client/impl/JetStreamPushTests.java | 6 +- .../nats/client/impl/MessageManagerTests.java | 21 +- .../nats/client/impl/NatsStatisticsTests.java | 5 +- .../java/io/nats/client/impl/PingTests.java | 14 +- .../io/nats/client/impl/ReconnectTests.java | 134 ++++---- .../nats/client/impl/SimplificationTests.java | 15 +- .../nats/client/impl/SlowConsumerTests.java | 49 ++- .../io/nats/client/impl/TLSConnectTests.java | 311 +++++++++--------- .../client/impl/WebsocketConnectTests.java | 308 +++++++++-------- .../java/io/nats/client/support/Listener.java | 111 +++++-- .../nats/client/support/ListenerFuture.java | 6 + .../java/io/nats/client/utils/TestBase.java | 135 ++++---- 21 files changed, 730 insertions(+), 649 deletions(-) diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index daece4210..26dd74695 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -20,7 +20,6 @@ import io.nats.client.impl.ListenerForTesting; import io.nats.client.support.JwtUtils; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.ResourceUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -448,20 +447,21 @@ public void testNKeyAuth() throws Exception { @Test public void testJWTAuthWithCredsFile() throws Exception { // manual auth handler or credential path - NatsTestServer ts = sharedConfigServer( "operator.conf"); - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(getUserCredsAuthHander()) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("operator.conf", ts -> { + Options options = optionsBuilder(ts).maxReconnects(0) + .authHandler(getUserCredsAuthHander()) + .build(); + assertCanConnect(options); - options = optionsBuilder(ts).maxReconnects(0) - .credentialPath(jwtResource("user.creds")) - .build(); - assertCanConnect(options); + options = optionsBuilder(ts).maxReconnects(0) + .credentialPath(jwtResource("user.creds")) + .build(); + assertCanConnect(options); - //test Nats.connect method - Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); - standardCloseConnection(waitUntilConnected(nc)); + //test Nats.connect method + Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); + standardCloseConnection(waitUntilConnected(nc)); + }); } @Test @@ -505,61 +505,65 @@ public void testStaticJWTAuth() throws Exception { String jwt = "eyJ0eXAiOiJqd3QiLCJhbGciOiJlZDI1NTE5In0.eyJqdGkiOiI3UE1GTkc0R1c1WkE1NEg3N09TUUZKNkJNQURaSUQ2NTRTVk1XMkRFQVZINVIyUVU0MkhBIiwiaWF0IjoxNTY1ODg5ODk4LCJpc3MiOiJBQUhWU0k1NVlQTkJRWjVQN0Y2NzZDRkFPNFBIQlREWUZRSUVHVEtMUVRJUEVZUEZEVEpOSEhPNCIsIm5hbWUiOiJkZW1vIiwic3ViIjoiVUMzT01MSlhUWVBZN0ZUTVVZNUNaNExHRVdRSTNZUzZKVFZXU0VGRURBMk9MTEpZSVlaVFo3WTMiLCJ0eXBlIjoidXNlciIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fX19.ROSJ7D9ETt9c8ZVHxsM4_FU2dBRLh5cNfb56MxPQth74HAxxtGMl0nn-9VVmWjXgFQn4JiIbwrGfFDBRMzxsAA"; String nkey = "SUAFYHVVQVOIDOOQ4MTOCTLGNZCJ5PZ4HPV5WAPROGTEIOF672D3R7GBY4"; - NatsTestServer ts = sharedConfigServer( "operator.conf"); - Options options = optionsBuilder(ts).maxReconnects(0) - .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); - assertCanConnect(options); + runInSharedConfiguredServer("operator.conf", ts -> { + Options options = optionsBuilder(ts).maxReconnects(0) + .authHandler(Nats.staticCredentials(jwt.toCharArray(), nkey.toCharArray())).build(); + assertCanConnect(options); + }); } @Test public void testReconnectWithAuth() throws Exception { ListenerForTesting listener = new ListenerForTesting(); // Connect should fail on ts2 - runInConfiguredServer("operator.conf", ts1 -> { // closed in test, so cannot be shared - NatsTestServer ts2 = sharedConfigServer("operator.conf"); // do not auto close this!! - Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) - .noRandomize() - .maxReconnects(-1) - .authHandler(getUserCredsAuthHander()) - .build(); - Connection nc = standardConnect(options); - assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); + runInConfiguredServer("operator.conf", ts1 -> { // closed as part of test, so cannot be shared + runInSharedConfiguredServer("operator.conf", ts2 -> { + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) + .noRandomize() + .maxReconnects(-1) + .authHandler(getUserCredsAuthHander()) + .build(); + Connection nc = standardConnect(options); + assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.RECONNECTED); + listener.prepForStatusChange(Events.RECONNECTED); - ts1.close(); + ts1.close(); - // Reconnect will fail because ts has the same auth error - listener.waitForStatusChange(5, TimeUnit.SECONDS); - assertConnected(nc); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + // Reconnect will fail because ts has the same auth error + listener.waitForStatusChange(5, TimeUnit.SECONDS); + assertConnected(nc); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + standardCloseConnection(nc); + }); }); } @Test public void testCloseOnReconnectWithSameError() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - // Connect should fail on ts1 runInConfiguredServer("operator.conf", ts2 -> { // closed in test, so cannot be shared - NatsTestServer ts1 = sharedConfigServer(OPERATOR_NOACCT_CONF); // do not auto close this!!! - Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) - .maxReconnects(-1) - .connectionTimeout(Duration.ofSeconds(2)) - .noRandomize() - .authHandler(getUserCredsAuthHander()) - .build(); - Connection nc = standardConnect(options); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + runInSharedConfiguredServer("operator_noacct.conf", ts1 -> { + Listener listener = new Listener(); + Options options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()) + .maxReconnects(-1) + .connectionTimeout(Duration.ofSeconds(2)) + .connectionListener(listener) + .noRandomize() + .authHandler(getUserCredsAuthHander()) + .build(); + Connection nc = standardConnect(options); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.CLOSED); + listener.queueConnectionEvent(Events.CLOSED); - ts2.close(); + ts2.close(); - // Reconnect will fail because ts has the same auth error - listener.waitForStatusChange(6, TimeUnit.SECONDS); - standardCloseConnection(nc); + // Reconnect will fail because ts has the same auth error + listener.validate(); + + standardCloseConnection(nc); + }); }); } @@ -569,8 +573,8 @@ public void testThatAuthErrorIsCleared() throws Exception { AtomicReference server2Ref = new AtomicReference<>(); AtomicInteger port2Ref = new AtomicInteger(); - runInConfiguredServer(OPERATOR_NOACCT_CONF, ts1 -> { - runInConfiguredServer( "operator.conf", ts2 -> { + runInConfiguredServer("operator_noacct.conf", ts1 -> { + runInConfiguredServer("operator.conf", ts2 -> { String server1 = ts1.getServerUri(); String server2 = ts2.getServerUri(); server2Ref.set(server2); @@ -587,7 +591,7 @@ public void testThatAuthErrorIsCleared() throws Exception { assertEquals(server2, nc.getConnectedUrl()); }); - runInConfiguredServer( "operator.conf", port2Ref.get(), ts2 -> { + runInConfiguredServer("operator.conf", port2Ref.get(), ts2 -> { waitUntilConnected(ncRef.get()); assertEquals(server2Ref.get(), ncRef.get().getConnectedUrl()); }); @@ -628,35 +632,35 @@ private static void _testReconnectAfter(String errText) throws Exception { // Connect should fail on ts1 try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(timeoutCustomizer, port, true)) { - NatsTestServer ts2 = sharedConfigServer( "operator.conf"); - - Options options = optionsBuilder(mockTs, ts2) - .maxReconnects(-1) - .noRandomize() - .authHandler(getUserCredsAuthHander()) - .errorListener(listener) - .connectionListener(listener) - .build(); + runInSharedConfiguredServer("operator.conf", ts2 -> { + Options options = optionsBuilder(mockTs, ts2) + .maxReconnects(-1) + .noRandomize() + .authHandler(getUserCredsAuthHander()) + .errorListener(listener) + .connectionListener(listener) + .build(); - ListenerFuture f = listener.prepForConnectionEvent(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); - try (Connection nc = standardConnect(options)) { - assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); - fMock.complete(true); - listener.validateReceived(f); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); + try (Connection nc = standardConnect(options)) { + assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); + fMock.complete(true); + listener.validate(); + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - String err = nc.getLastError(); - assertNotNull(err); - assertTrue(err.toLowerCase().contains(errText)); - } + String err = nc.getLastError(); + assertNotNull(err); + assertTrue(err.toLowerCase().contains(errText)); + } + }); } } @Test public void testRealUserAuthenticationExpired() throws Exception { - Listener listener = new Listener(false); - ListenerFuture fExpired = listener.prepForError("User Authentication Expired"); + Listener listener = new Listener(); + listener.queueError("User Authentication Expired"); String accountSeed = "SAAPXJRFMUYDUH3NOZKE7BS2ZDO2P4ND7G6W743MTNA3KCSFPX3HNN6AX4"; String accountId = "ACPWDUYSZRRF7XAEZKUAGPUH6RPICWEHSTFELYKTOWUVZ4R2XMP4QJJX"; @@ -683,7 +687,7 @@ public void testRealUserAuthenticationExpired() throws Exception { .maxReconnects(5) .build(); try (Connection ignored = standardConnect(options)) { - listener.validateReceived(fExpired); + listener.validate(); } catch (RuntimeException e) { if (!e.getMessage().contains("Authorization Violation")) { diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 6ace0a930..52bf0bdab 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -19,7 +19,6 @@ import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.SimulateSocketDataPortException; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -257,9 +256,9 @@ public void testErrorOnAsync() throws Exception { .errorListener(listener) .noReconnect() .build(); - ListenerFuture fClosed = listener.prepForConnectionEvent(Events.CLOSED); + listener.queueConnectionEvent(Events.CLOSED); Nats.connectAsynchronously(options, false); - listener.validateReceived(fClosed); + listener.validate(); assertTrue(listener.getExceptionCount() > 0); } diff --git a/src/test/java/io/nats/client/OptionsTests.java b/src/test/java/io/nats/client/OptionsTests.java index c694f8a76..acffb2c91 100644 --- a/src/test/java/io/nats/client/OptionsTests.java +++ b/src/test/java/io/nats/client/OptionsTests.java @@ -16,6 +16,7 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.impl.*; import io.nats.client.support.HttpRequest; +import io.nats.client.support.Listener; import io.nats.client.support.NatsUri; import io.nats.client.utils.CloseOnUpgradeAttempt; import io.nats.client.utils.CoverageServerPool; @@ -685,31 +686,38 @@ private static void _testPropertyDurationOptions(Options o) { @Test public void testPropertyErrorListener() { Properties props = new Properties(); - props.setProperty(Options.PROP_ERROR_LISTENER, ListenerForTesting.class.getCanonicalName()); + props.setProperty(Options.PROP_ERROR_LISTENER, Listener.class.getCanonicalName()); Options o = new Options.Builder(props).build(); assertFalse(o.isVerbose(), "default verbose"); // One from a different type assertNotNull(o.getErrorListener(), "property error listener"); o.getErrorListener().errorOccurred(null, "bad subject"); - assertEquals(1, ((ListenerForTesting) o.getErrorListener()).getCount(), "property error listener class"); + assertEquals(0, ((Listener) o.getErrorListener()).getExceptionCount(), "property error listener class"); } @SuppressWarnings("deprecation") @Test public void testPropertyConnectionListeners() { Properties props = new Properties(); - props.setProperty(Options.PROP_CONNECTION_CB, ListenerForTesting.class.getCanonicalName()); + props.setProperty(Options.PROP_CONNECTION_CB, Listener.class.getCanonicalName()); Options o = new Options.Builder(props).build(); assertFalse(o.isVerbose(), "default verbose"); // One from a different type assertNotNull(o.getConnectionListener(), "property connection listener"); + Listener listener = ((Listener) o.getConnectionListener()); + listener.queueConnectionEvent(Events.DISCONNECTED); o.getConnectionListener().connectionEvent(null, Events.DISCONNECTED); + listener.validate(); + + listener.queueConnectionEvent(Events.RECONNECTED); o.getConnectionListener().connectionEvent(null, Events.RECONNECTED); - o.getConnectionListener().connectionEvent(null, Events.CLOSED); + listener.validate(); - assertEquals(3, ((ListenerForTesting) o.getConnectionListener()).getCount(), "property connect listener class"); + listener.queueConnectionEvent(Events.CLOSED); + o.getConnectionListener().connectionEvent(null, Events.CLOSED); + listener.validate(); } @Test diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index 203431e43..c7d2ca172 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -18,7 +18,6 @@ import io.nats.client.impl.JetStreamTestingContext; import io.nats.client.impl.NatsMessage; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -76,13 +75,10 @@ public void testThrowsIfTooBig() throws Exception { .errorListener(listener) .build(); try (Connection nc = standardConnect(options)) { - ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); - ListenerFuture fException = listener.prepForException(SocketException.class); - + listener.queueError("Maximum Payload Violation"); + listener.queueException(SocketException.class); nc.publish(random(), null, null, body); - - // sometimes the exception comes in before the error and the error never comes, so validate for either. - listener.validateAnyReceived(fError, fException); + listener.validateForAny(); // sometimes the exception comes in before the error and the error never comes, so validate for either. } }); } @@ -232,12 +228,11 @@ public void testMaxPayloadNoClientSideLimitChecks() throws Exception { .connectionListener(listener); runInSharedOwnNc(builder, nc -> { - ListenerFuture fError = listener.prepForError("Maximum Payload Violation"); - ListenerFuture fEvent = listener.prepForConnectionEvent(Events.DISCONNECTED); + listener.queueError("Maximum Payload Violation"); + listener.queueConnectionEvent(Events.DISCONNECTED); int maxPayload = (int)nc.getServerInfo().getMaxPayload(); nc.publish(random(), new byte[maxPayload + 1]); - listener.validateReceived(fError); - listener.validateReceived(fEvent); + listener.validateAll(); }); } diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index b3d5d10af..96652abf3 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -25,7 +24,6 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.utils.ConnectionUtils.*; @@ -43,29 +41,28 @@ public void testToString() { @Test public void testCloseEvent() throws Exception { Listener listener = new Listener(); - ListenerFuture fEvent = listener.prepForConnectionEvent(Events.CLOSED); + listener.queueConnectionEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { standardCloseConnection(nc); assertNull(nc.getConnectedUrl()); }); - listener.validateReceived(fEvent); + listener.validate(); } @Test public void testDiscoveredServersCountAndListenerInOptions() throws Exception { - try (NatsTestServer ts = new NatsTestServer()) { String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getServerUri()+"\"]}"; try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); Options options = optionsBuilder(mockTs2) .maxReconnects(0) .connectionListener(listener) .build(); - + listener.queueConnectionEvent(Events.DISCOVERED_SERVERS); standardCloseConnection( standardConnect(options) ); - assertEquals(1, listener.getEventCount(Events.DISCOVERED_SERVERS)); + listener.validate(); } } } @@ -74,7 +71,7 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception { public void testDisconnectReconnectCount() throws Exception { int port; Connection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .reconnectWait(Duration.ofMillis(100)) @@ -84,18 +81,18 @@ public void testDisconnectReconnectCount() throws Exception { port = ts.getPort(); nc = standardConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); } try { nc.flush(Duration.ofMillis(250)); } catch (Exception exp) { /* ignored */ } - listener.waitForStatusChange(1000, TimeUnit.MILLISECONDS); - assertTrue(listener.getEventCount(Events.DISCONNECTED) >= 1); + listener.validate(); assertNull(nc.getConnectedUrl()); + listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ts = new NatsTestServer(port)) { waitUntilConnected(nc); // wait for reconnect - assertEquals(1, listener.getEventCount(Events.RECONNECTED)); + listener.validate(); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); } @@ -115,7 +112,7 @@ public void testExceptionInConnectionListener() throws Exception { public void testMultipleConnectionListeners() throws Exception { Set capturedEvents = ConcurrentHashMap.newKeySet(); Listener listener = new Listener(); - ListenerFuture fClosed = listener.prepForConnectionEvent(Events.CLOSED); + listener.queueConnectionEvent(Events.CLOSED); AtomicReference stats = new AtomicReference<>(); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { @@ -140,7 +137,7 @@ public void testMultipleConnectionListeners() throws Exception { }); assertTrue(stats.get().getExceptions() > 0); - listener.validateReceived(fClosed); + listener.validate(); Set expectedEvents = new HashSet<>(Arrays.asList( "CL1-CLOSED", diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 52c70628f..606b81746 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.SharedServer; import org.junit.jupiter.api.Test; @@ -536,7 +535,7 @@ public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { @Test public void testSlowAsyncDuringDrainCanBeInterrupted() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(optionsBuilder().errorListener(listener).maxReconnects(0), subCon -> { Connection pubCon = SharedServer.sharedConnectionForSameServer(subCon); AtomicInteger count = new AtomicInteger(); @@ -580,9 +579,9 @@ public void testThrowIfCantFlush() throws Exception { try (Connection subCon = standardConnect(options)) { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server - ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); ts.close(); // make the drain flush fail - listener.validateReceived(f); + listener.validate(); assertThrows(TimeoutException.class, () -> subCon.drain(Duration.ofSeconds(1))); } diff --git a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java index 643d4fde3..89b286a2d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamConsumerTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.api.ConsumerConfiguration; +import io.nats.client.support.Listener; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; @@ -254,7 +255,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) { @Test public void testHeartbeatError() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); @@ -284,7 +285,9 @@ public void testHeartbeatError() throws Exception { }); } - private static void validate(JetStreamSubscription sub, ListenerForTesting listener, SimulatorState state, Dispatcher d) throws InterruptedException { + private static void validate(JetStreamSubscription sub, Listener listener, SimulatorState state, Dispatcher d) throws InterruptedException { + listener.reset(); + //noinspection ResultOfMethodCallIgnored state.latch.await(2, TimeUnit.SECONDS); if (d == null) { @@ -297,14 +300,13 @@ private static void validate(JetStreamSubscription sub, ListenerForTesting liste assertTrue(state.hbCounter.get() > 0); boolean gotHbAlarm = false; for (int x = 0; x < 50; x++) { - gotHbAlarm = !listener.getHeartbeatAlarms().isEmpty(); + gotHbAlarm = listener.getHeartbeatAlarmCount() > 0; if (gotHbAlarm) { break; } sleep(10); } assertTrue(gotHbAlarm); - listener.reset(); } private static SimulatorState setupFactory(JetStream js) { @@ -398,7 +400,7 @@ private static void validateMultipleSubjectFilterSub(JetStreamSubscription sub, @Test public void testRaiseStatusWarnings1194() throws Exception { - ListenerForTesting listener = new ListenerForTesting(false, false); + Listener listener = new Listener(false, false); runInSharedOwnNc(listener, (nc, ctx) -> { // Setup StreamContext streamContext = nc.getStreamContext(ctx.stream); @@ -423,7 +425,7 @@ public void testRaiseStatusWarnings1194() throws Exception { } } assertEquals(0, count); - assertEquals(0, listener.getPullStatusWarnings().size()); + assertEquals(0, listener.getPullStatusWarningsCount()); fco = FetchConsumeOptions.builder() .maxMessages(100) @@ -438,7 +440,7 @@ public void testRaiseStatusWarnings1194() throws Exception { } } assertEquals(0, count); - assertEquals(1, listener.getPullStatusWarnings().size()); + assertEquals(1, listener.getPullStatusWarningsCount()); }); } } diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 593837bd5..c3b781d0c 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -19,7 +19,6 @@ import io.nats.client.api.PriorityPolicy; import io.nats.client.support.JsonUtils; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.support.ListenerStatusType; import io.nats.client.utils.SharedServer; import io.nats.client.utils.VersionUtils; @@ -753,7 +752,9 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt } try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(tcsNc, 1)) { JetStreamSubscription sub = setup.setup(tcsNc, tcsCtx, tcsListener); - ListenerFuture f = statusType == null ? null : tcsListener.prepForStatus(statusType, statusCode); + if (statusType != null) { + tcsListener.queueStatus(statusType, statusCode); + } if (sub.getDispatcher() == null) { if (statusType == PullError) { JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE_TIMEOUT)); @@ -766,8 +767,8 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt sub.nextMessage(NEXT_MESSAGE_TIMEOUT); } } - if (f != null) { - tcsListener.validateReceived(f); + if (statusType != null) { + tcsListener.validate(); } } }); @@ -1033,7 +1034,7 @@ public String toJson() { public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { Listener listener = new Listener(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { - ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); + listener.queueStatus(PullWarning, CONFLICT_CODE); String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(ctx.subject()).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -1051,7 +1052,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { assertNotNull(sub.nextMessage(500)); assertNotNull(sub.nextMessage(500)); assertNull(sub.nextMessage(500)); - listener.validateReceived(f); + listener.validate(); }); } @@ -1059,7 +1060,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception { public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception { Listener listener = new Listener(); runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> { - ListenerFuture f = listener.prepForStatus(PullWarning, CONFLICT_CODE); + listener.queueStatus(PullWarning, CONFLICT_CODE); ctx.stream = randomWide(6); // six letters so I can count String subject = randomWide(5); // five letters so I can count String durable = randomWide(10); // short keeps under max bytes @@ -1081,7 +1082,7 @@ public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception { assertNotNull(sub.nextMessage(500)); assertNotNull(sub.nextMessage(500)); assertNull(sub.nextMessage(500)); // there are no more messages - listener.validateNotReceived(f); + listener.validateNotReceived(); }); } diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java index d88864fd0..88234970c 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java @@ -15,6 +15,7 @@ import io.nats.client.*; import io.nats.client.api.*; +import io.nats.client.support.Listener; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -139,7 +140,7 @@ public void testCantNextMessageOnAsyncPushSub() throws Exception { @Test public void testPushAsyncFlowControl() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, (nc, ctx) -> { byte[] data = new byte[8192]; @@ -179,7 +180,7 @@ public void testPushAsyncFlowControl() throws Exception { awaitAndAssert(msgLatch); assertEquals(MSG_COUNT, count.get()); - assertFalse(listener.getFlowControlProcessedEvents().isEmpty()); + assertTrue(listener.getFlowControlCount() > 0); }); } diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java index 48fbad452..2aa69c582 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPushTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPushTests.java @@ -17,6 +17,7 @@ import io.nats.client.api.ConsumerConfiguration; import io.nats.client.api.DeliverPolicy; import io.nats.client.api.PublishAck; +import io.nats.client.support.Listener; import io.nats.client.support.NatsJetStreamConstants; import org.junit.jupiter.api.Test; @@ -571,9 +572,8 @@ private void assertMessage(Message m, int i) { @Test public void testPushSyncFlowControl() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, (nc, ctx) -> { - byte[] data = new byte[1024*10]; int MSG_COUNT = 1000; @@ -598,7 +598,7 @@ public void testPushSyncFlowControl() throws Exception { } assertEquals(MSG_COUNT, set.size()); - assertFalse(listener.getFlowControlProcessedEvents().isEmpty()); + assertTrue(listener.getFlowControlCount() > 0); // coverage for subscribe options heartbeat directly cc = ConsumerConfiguration.builder().idleHeartbeat(100).build(); diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index 7e9ff8d1d..b01d3dada 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -17,7 +17,6 @@ import io.nats.client.api.ConsumerConfiguration; import io.nats.client.support.IncomingHeadersProcessor; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.support.ListenerStatusType; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -101,25 +100,25 @@ private void _testPushBqpAndManageRetriable(Connection nc, Listener listener, Pu assertTrue(manager.beforeQueueProcessorImpl(getFlowControl(1, sid))); assertTrue(manager.beforeQueueProcessorImpl(getFcHeartbeat(1, sid))); if (manager.fc) { - ListenerFuture f = listener.prepForFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); + listener.queueFlowControl(getFcSubject(1), ErrorListener.FlowControlSource.FLOW_CONTROL); assertEquals(STATUS_HANDLED, manager.manage(getFlowControl(1, sid))); assertEquals(STATUS_HANDLED, manager.manage(getFcHeartbeat(1, sid))); - listener.validateReceived(f); + listener.validate(); } else { - ListenerFuture f = listener.prepForStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + listener.queueStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFlowControl(1, sid))); - listener.validateReceived(f); + listener.validate(); - f = listener.prepForStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); + listener.queueStatus(ListenerStatusType.Unhandled, FLOW_OR_HEARTBEAT_STATUS_CODE); assertEquals(STATUS_ERROR, manager.manage(getFcHeartbeat(1, sid))); - listener.validateReceived(f); + listener.validate(); } assertTrue(manager.beforeQueueProcessorImpl(getUnkownStatus(sid))); - ListenerFuture f = listener.prepForStatus(ListenerStatusType.Unhandled, 999); + listener.queueStatus(ListenerStatusType.Unhandled, 999); assertEquals(STATUS_ERROR, manager.manage(getUnkownStatus(sid))); - listener.validateReceived(f); + listener.validate(); } @Test @@ -173,9 +172,9 @@ private void _testPullBqpAndManage(Connection nc, Listener listener, PullRequest } private static void assertManageResult(Listener listener, ListenerStatusType expectedType, int expectedStatusCode, ManageResult expecteManageResult, PullMessageManager manager, NatsMessage message) { - ListenerFuture f = listener.prepForStatus(expectedType, expectedStatusCode); + listener.queueStatus(expectedType, expectedStatusCode); assertEquals(expecteManageResult, manager.manage(message)); - listener.validateReceived(f); + listener.validate(); } @Test diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java index 66a4c81fe..fb3621543 100644 --- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java +++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java @@ -17,7 +17,6 @@ import io.nats.client.Message; import io.nats.client.MessageHandler; import io.nats.client.Statistics; -import io.nats.client.support.DebugReadListener; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -56,9 +55,7 @@ public void testHumanReadableString() throws Exception { @Test public void testInOutOKRequestStats() throws Exception { - runInSharedOwnNc(optionsBuilder().verbose() - .readListener(new DebugReadListener()) - , nc -> { + runInSharedOwnNc(optionsBuilder().verbose(), nc -> { Dispatcher d = nc.createDispatcher(msg -> { Message m = NatsMessage.builder() .subject(msg.getReplyTo()) diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 2e34bc72c..9b53d79e1 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -116,7 +116,7 @@ public void testMaxPingsOut() throws Exception { @Test public void testFlushTimeout() throws Exception { - Listener listener = new Listener(true); + Listener listener = new Listener(); try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { Options options = optionsBuilder(mockTs) .maxReconnects(0) @@ -132,14 +132,14 @@ public void testFlushTimeout() throws Exception { @Test public void testFlushTimeoutDisconnected() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts).connectionListener(listener).build(); try (Connection nc = standardConnect(options)) { nc.flush(Duration.ofSeconds(2)); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); ts.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); + listener.validate(); assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofSeconds(2))); } } @@ -147,7 +147,7 @@ public void testFlushTimeoutDisconnected() throws Exception { @Test public void testPingTimerThroughReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) @@ -160,9 +160,9 @@ public void testPingTimerThroughReconnect() throws Exception { sleep(200); long pings = stats.getPings(); assertTrue(pings > 10, "got pings"); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); ts.close(); - listener.waitForStatusChange(5, TimeUnit.SECONDS); + listener.validate(); pings = stats.getPings(); sleep(250); // should get more pings assertTrue(stats.getPings() > pings, "more pings"); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 93c967c04..894e671ad 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -18,7 +18,6 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.api.ServerInfo; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; @@ -61,17 +60,14 @@ public void testSimpleReconnect() throws Exception { //Includes test for subscri @Test public void testWsReconnect() throws Exception { //Includes test for subscriptions and dispatchers across reconnect - _testReconnect(configFileBuilder( "ws_operator.conf"), - (ts, optionsBuilder) -> - optionsBuilder - .server(ts.getLocalhostUri(WS)) - .authHandler(getUserCredsAuthHander())); + _testReconnect(configFileBuilder("ws_operator.conf"), + (ts, optionsBuilder) -> optionsBuilder.server(ts.getLocalhostUri(WS)).authHandler(getUserCredsAuthHander())); } private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer optSetter) throws Exception { int port = NatsTestServer.nextPort(); nsrb.port(port); // set the port into the builder - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); NatsConnection nc; Subscription sub; long start; @@ -103,17 +99,18 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer nnc.publish(msg.getReplyTo(), msg.getData())); d.subscribe(dispatchSubject); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { waitUntilConnected(nc); // wait for reconnect + listener.validate(); // Make sure the dispatcher and subscription are still there Future inc = nc.request(dispatchSubject, "test".getBytes(StandardCharsets.UTF_8)); @@ -188,7 +186,7 @@ public void testSubscribeDuringReconnect() throws Exception { @Test public void testReconnectBuffer() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port = NatsTestServer.nextPort(); Subscription sub; long start; @@ -221,12 +219,12 @@ public void testReconnectBuffer() throws Exception { msg = sub.nextMessage(Duration.ofMillis(100)); assertNotNull(msg); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); start = System.nanoTime(); } - flushAndWaitLong(nc, listener); - checkNotConnected(nc); + flushConnection(nc); + listener.validate(); // Send a message to the dispatcher and one to the subscriber // These should be sent on reconnect @@ -234,10 +232,11 @@ public void testReconnectBuffer() throws Exception { nc.publish(subsubject, null); nc.publish(subsubject, null); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { waitUntilConnected(nc); // wait for reconnect + listener.validate(); end = System.nanoTime(); @@ -263,7 +262,7 @@ public void testReconnectBuffer() throws Exception { @Test public void testMaxReconnects() throws Exception { Connection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port)) { @@ -273,19 +272,16 @@ public void testMaxReconnects() throws Exception { .reconnectWait(Duration.ofMillis(10)) .build(); nc = standardConnect(options); - listener.prepForStatusChange(Events.CLOSED); + listener.queueConnectionEvent(Events.CLOSED); } - - flushAndWaitLong(nc, listener); - assertClosed(nc); - standardCloseConnection(nc); + flushConnection(nc); + listener.validate(); } @Test public void testReconnectToSecondServerInBootstrap() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); NatsConnection nc; - + Listener listener = new Listener(); try (NatsTestServer ts1 = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { // need both in bootstrap b/c these are not clustered @@ -296,11 +292,11 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { .build(); nc = (NatsConnection) standardConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); } - flushAndWaitLong(nc, listener); - + flushConnection(nc); + listener.validate(); assertConnected(nc); assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); @@ -310,8 +306,7 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { @Test public void testNoRandomizeReconnectToSecondServer() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); - + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { Options options = optionsBuilder(ts2.getServerUri(), ts.getServerUri()) @@ -321,11 +316,11 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { .build(); nc = (NatsConnection) standardConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); } - flushAndWaitLong(nc, listener); - + flushConnection(nc); + listener.validate(); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); @@ -335,8 +330,7 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { @Test public void testReconnectToSecondServerFromInfo() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); - + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { String striped = ts.getServerUri().substring("nats://".length()); // info doesn't have protocol String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}"; @@ -349,11 +343,11 @@ public void testReconnectToSecondServerFromInfo() throws Exception { .build(); nc = (NatsConnection) standardConnect(options); assertEquals(mockTs2.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); } - flushAndWaitLong(nc, listener); - + flushConnection(nc); + listener.validate(); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); @@ -362,9 +356,9 @@ public void testReconnectToSecondServerFromInfo() throws Exception { @Test public void testOverflowReconnectBuffer() throws Exception { - Listener listener = new Listener(); - ListenerFuture f = listener.prepForConnectionEvent(Events.DISCONNECTED); Connection nc; + Listener listener = new Listener(); + listener.queueConnectionEvent(Events.DISCONNECTED); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .connectionListener(listener) @@ -374,7 +368,7 @@ public void testOverflowReconnectBuffer() throws Exception { nc = standardConnect(options); } - listener.validateReceived(f); + listener.validate(); assertThrows(IllegalStateException.class, () -> { for (int i = 0; i < 20; i++) { @@ -388,7 +382,7 @@ public void testOverflowReconnectBuffer() throws Exception { @Test public void testInfiniteReconnectBuffer() throws Exception { Connection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .maxReconnects(5) @@ -397,24 +391,25 @@ public void testInfiniteReconnectBuffer() throws Exception { .reconnectWait(Duration.ofSeconds(30)) .build(); nc = standardConnect(options); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); } - flushAndWaitLong(nc, listener); - checkNotConnected(nc); + flushConnection(nc); + listener.validate(); byte[] payload = new byte[1024]; for (int i=0;i<1_000;i++) { nc.publish("test", payload); } + checkNotConnected(nc); standardCloseConnection(nc); } @Test public void testReconnectDropOnLineFeed() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port = NatsTestServer.nextPort(); Duration reconnectWait = Duration.ofMillis(100); // thrash int thrashCount = 5; @@ -459,9 +454,10 @@ public void testReconnectDropOnLineFeed() throws Exception { assertConnected(nc); nc.subscribe("test"); subRef.get().get(); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); sendRef.get().complete(true); - flushAndWaitLong(nc, listener); // mock server will close so we do this inside the curly + flushConnection(nc); // mock server will close so we do this inside the curly + listener.validate(); } // Thrash in and out of connect status @@ -470,31 +466,33 @@ public void testReconnectDropOnLineFeed() throws Exception { checkNotConnected(nc); // connect good then bad - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(port)) { waitUntilConnected(nc); // wait for reconnect - listener.prepForStatusChange(Events.DISCONNECTED); // do it here because we are about to disconnect + listener.validate(); + listener.queueConnectionEvent(Events.DISCONNECTED); // do it here because we are about to disconnect } - flushAndWaitLong(nc, listener); // nats won't close until we tell it, so put this outside the curly - checkNotConnected(nc); + flushConnection(nc); // client won't close until we tell it, so put this outside the curly + listener.validate(); gotSub = new CompletableFuture<>(); subRef.set(gotSub); sendMsg = new CompletableFuture<>(); sendRef.set(sendMsg); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsServerProtocolMock ignored = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { waitUntilConnected(nc); // wait for reconnect + listener.validate(); subRef.get().get(); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); sendRef.get().complete(true); - flushAndWaitLong(nc, listener); // mock server will close so we do this inside the curly + flushConnection(nc); // mock server will close so we do this inside the curly + listener.validate(); } } - assertEquals(2 * thrashCount, nc.getStatisticsCollector().getReconnects(), "reconnect count"); standardCloseConnection(nc); } @@ -502,7 +500,7 @@ public void testReconnectDropOnLineFeed() throws Exception { @Test public void testTlsNoIpConnection() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int tsPort = NatsTestServer.nextPort(); int ts2Port = NatsTestServer.nextPort(); @@ -557,17 +555,21 @@ public void testTlsNoIpConnection() throws Exception { .noRandomize() .build(); - listener.prepForStatusChange(Events.DISCOVERED_SERVERS); + listener.queueConnectionEvent(Events.DISCOVERED_SERVERS); nc = (NatsConnection) ConnectionUtils.standardConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - flushAndWaitLong(nc, listener); // make sure we get the new server via info + flushConnection(nc); // make sure we get the new server via info + listener.validate(); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueConnectionEvent(Events.CONNECTED); ts.close(); - flushAndWaitLong(nc, listener); - assertConnected(nc); + + flushConnection(nc); + listener.validate(); + listener.validate(20000); // it takes a little while for it to become reconnected URI uri = options.createURIForServer(nc.getConnectedUrl()); assertEquals(ts2.getPort(), uri.getPort()); // full uri will have some ip address, just check port diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 32cf6e88b..4b73cbec1 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -1518,8 +1518,7 @@ private void _overflowFetch(String cname, ConsumerContext cctx, FetchConsumeOpti @Test public void testOverflowIterate() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, ctx) -> { + runInShared(VersionUtils::atLeast2_11, (nc, ctx) -> { jsPublish(ctx.js, ctx.subject(), 100); // Testing min ack pending @@ -1604,8 +1603,7 @@ public void testOverflowIterate() throws Exception { @Test public void testOverflowConsume() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, VersionUtils::atLeast2_11, (nc, ctx) -> { + runInShared(VersionUtils::atLeast2_11, (nc, ctx) -> { jsPublish(ctx.js, ctx.subject(), 1000); // Testing min ack pending @@ -1670,8 +1668,7 @@ public void testOverflowConsume() throws Exception { @Test public void testFinishEmptyStream() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); - runInSharedOwnNc(listener, (nc, ctx) -> { + runInShared((nc, ctx) -> { String name = random(); ConsumerConfiguration cc = ConsumerConfiguration.builder() .name(name) @@ -1704,10 +1701,10 @@ public void testReconnectOverOrdered() throws Exception { // to make sure the consumer continues after that condition // ------------------------------------------------------------ int port = NatsTestServer.nextPort(); - ListenerForTesting lft = new ListenerForTesting(true); + Listener listener = new Listener(true); Options options = optionsBuilder() - .connectionListener(lft) - .errorListener(lft) + .connectionListener(listener) + .errorListener(listener) .server(NatsTestServer.getLocalhostUri(port)).build(); NatsConnection nc; diff --git a/src/test/java/io/nats/client/impl/SlowConsumerTests.java b/src/test/java/io/nats/client/impl/SlowConsumerTests.java index eebc0d036..825a61715 100644 --- a/src/test/java/io/nats/client/impl/SlowConsumerTests.java +++ b/src/test/java/io/nats/client/impl/SlowConsumerTests.java @@ -13,17 +13,14 @@ package io.nats.client.impl; -import io.nats.client.Consumer; -import io.nats.client.Dispatcher; -import io.nats.client.Message; -import io.nats.client.Subscription; +import io.nats.client.*; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; import java.time.Duration; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -191,15 +188,32 @@ public void testSlowSDispatcherByBytes() throws Exception { }); } + static class SlowConsumerListener implements ErrorListener { + public CompletableFuture future; + public final List consumers = new ArrayList<>(); + + public void waitForSlow() { + future = new CompletableFuture<>(); + } + + @Override + public void slowConsumerDetected(Connection conn, Consumer consumer) { + consumers.add(consumer); + if (future != null) { + future.complete(true); + } + } + } + @Test public void testSlowSubscriberNotification() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + SlowConsumerListener listener = new SlowConsumerListener(); runInSharedOwnNc(listener, nc -> { String subject = random(); - Subscription sub = nc.subscribe(subject); + NatsSubscription sub = (NatsSubscription)nc.subscribe(subject); sub.setPendingLimits(1, -1); - Future waitForSlow = listener.waitForSlow(); + listener.waitForSlow(); nc.publish(subject, null); nc.publish(subject, null); @@ -208,19 +222,18 @@ public void testSlowSubscriberNotification() throws Exception { nc.flush(Duration.ofMillis(5000)); // Notification is in another thread, wait for it, or fail - waitForSlow.get(3000, TimeUnit.MILLISECONDS); + listener.future.get(3000, TimeUnit.MILLISECONDS); - List slow = listener.getSlowConsumers(); - assertEquals(1, slow.size()); // should only appear once - assertEquals(sub, slow.get(0)); - slow.clear(); + assertEquals(1, listener.consumers.size()); // should only appear once + assertEquals(sub, listener.consumers.get(0)); + listener.consumers.clear(); nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); - assertEquals(0, slow.size()); // no renotify + assertEquals(0, listener.consumers.size()); // no renotify - waitForSlow = listener.waitForSlow(); + listener.waitForSlow(); // Clear the queue, we should become a non-slow consumer sub.nextMessage(Duration.ofMillis(1000)); // only 1 to get @@ -229,10 +242,10 @@ public void testSlowSubscriberNotification() throws Exception { nc.publish(subject, null); nc.flush(Duration.ofMillis(1000)); - waitForSlow.get(3000, TimeUnit.MILLISECONDS); + listener.future.get(3000, TimeUnit.MILLISECONDS); - assertEquals(1, slow.size()); // should only appear once - assertEquals(sub, slow.get(0)); + assertEquals(1, listener.consumers.size()); // should only appear once + assertEquals(sub, listener.consumers.get(0)); }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index c32072a49..6b0317013 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Listener; -import io.nats.client.support.ListenerFuture; import io.nats.client.utils.CloseOnUpgradeAttempt; import org.junit.jupiter.api.Test; @@ -36,7 +35,6 @@ import static io.nats.client.utils.OptionsUtils.optionsNoReconnect; import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; -import static io.nats.client.utils.VersionUtils.atLeast2_10_3; import static org.junit.jupiter.api.Assertions.*; public class TLSConnectTests { @@ -76,175 +74,185 @@ private static Options createTestOptionsViaFactoryClassName(String... servers) { @Test public void testSimpleTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tls.conf", 1); - String servers = ts.getServerUri(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> { + String servers = ts1.getServerUri(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + }); } @Test public void testMultipleUrlTLSConnectionSetContext() throws Exception { - NatsTestServer server1 = sharedConfigServer( "tls.conf", 1); - NatsTestServer server2 = sharedConfigServer( "tls.conf", 2); - String[] servers = NatsTestServer.getLocalhostUris("tls", server1, server2); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> + runInSharedConfiguredServer("tls.conf", 2, ts2 -> { + String[] servers = NatsTestServer.getLocalhostUris("tls", ts1, ts2); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + })); } @Test public void testSimpleIPTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tls.conf", 1); - String servers = "127.0.0.1:" + ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> { + String servers = "127.0.0.1:" + ts1.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + }); } @Test public void testURISchemeOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tls.conf", 1); - String[] servers = NatsTestServer.getLocalhostUris("opentls", ts); - Options options = optionsBuilder(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> { + String[] servers = NatsTestServer.getLocalhostUris("opentls", ts1); + Options options = optionsBuilder(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); + }); } @Test public void testMultipleUrlOpenTLSConnection() throws Exception { - NatsTestServer server1 = sharedConfigServer( "tls.conf", 1); - NatsTestServer server2 = sharedConfigServer( "tls.conf", 2); - String[] servers = NatsTestServer.getLocalhostUris("opentls", server1, server2); - Options options = optionsBuilder(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); - - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> + runInSharedConfiguredServer("tls.conf", 2, ts2 -> { + String[] servers = NatsTestServer.getLocalhostUris("opentls", ts1, ts2); + Options options = optionsBuilder(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); + + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, String.join(",", servers)); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); + })); } @Test public void testProxyNotTlsFirst() throws Exception { - NatsTestServer ts = sharedConfigServer( "tls.conf", 1); - // 1. client regular secure | secure proxy | server insecure -> mismatch exception - ListenerForTesting listener = new ListenerForTesting(); - ProxyConnection connRI = new ProxyConnection(ts.getServerUri(), false, listener, SERVER_INSECURE); - assertThrows(Exception.class, () -> connRI.connect(false)); - sleep(100); // give time for listener to get message - assertEquals(1, listener.getExceptions().size()); - assertTrue(listener.getExceptions().get(0).getMessage().contains("SSL connection wanted by client")); - - // 2. client regular secure | secure proxy | server tls required -> connects - ProxyConnection connRR = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_REQUIRED); - connRR.connect(false); - closeConnection(waitUntilConnected(connRR), 1000); - - // 3. client regular secure | secure proxy | server tls available -> connects - ProxyConnection connRA = new ProxyConnection(ts.getServerUri(), false, null, SERVER_TLS_AVAILABLE); - connRA.connect(false); - closeConnection(waitUntilConnected(connRA), 1000); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> { + // 1. client regular secure | secure proxy | server insecure -> mismatch exception + Listener listener = new Listener(true); + ProxyConnection connRI = new ProxyConnection(ts1.getServerUri(), false, listener, SERVER_INSECURE); + listener.queueException(IOException.class, "SSL connection wanted by client"); + assertThrows(Exception.class, () -> connRI.connect(false)); + sleep(100); // give time for listener to get message + assertEquals(1, listener.getExceptionCount()); + + // 2. client regular secure | secure proxy | server tls required -> connects + ProxyConnection connRR = new ProxyConnection(ts1.getServerUri(), false, null, SERVER_TLS_REQUIRED); + connRR.connect(false); + closeConnection(waitUntilConnected(connRR), 1000); + + // 3. client regular secure | secure proxy | server tls available -> connects + ProxyConnection connRA = new ProxyConnection(ts1.getServerUri(), false, null, SERVER_TLS_AVAILABLE); + connRA.connect(false); + closeConnection(waitUntilConnected(connRA), 1000); + }); } @Test public void testOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tls.conf", 1); - String servers = ts.getServerUri(); - Options options = optionsBuilder() - .server(servers) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnectAndPubSub(options); + runInSharedConfiguredServer("tls.conf", 1, ts1 -> { + String servers = ts1.getServerUri(); + Options options = optionsBuilder() + .server(servers) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnectAndPubSub(options); - Properties props = new Properties(); - props.setProperty(Options.PROP_SERVERS, servers); - props.setProperty(Options.PROP_MAX_RECONNECT, "0"); - props.setProperty(Options.PROP_OPENTLS, "true"); - assertCanConnectAndPubSub(new Options.Builder(props).build()); + Properties props = new Properties(); + props.setProperty(Options.PROP_SERVERS, servers); + props.setProperty(Options.PROP_MAX_RECONNECT, "0"); + props.setProperty(Options.PROP_OPENTLS, "true"); + assertCanConnectAndPubSub(new Options.Builder(props).build()); + }); } @Test public void testSimpleTlsFirstConnection() throws Exception { - if (atLeast2_10_3(ensureVersionServerInfo())) { - NatsTestServer ts = sharedConfigServer( "tls_first.conf"); + runInSharedConfiguredServer("tls_first.conf", ts -> { Options options = optionsBuilder(ts) .maxReconnects(0) .tlsFirst() .sslContext(SslTestingHelper.createTestSSLContext()) .build(); assertCanConnectAndPubSub(options); - } + }); } @Test public void testVerifiedTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - String servers = ts.getServerUri(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + String servers = ts.getServerUri(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + }); } @Test public void testURISchemeTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - String servers = "tls://localhost:" + ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + String servers = "tls://localhost:" + ts.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + }); } @Test public void testURISchemeIPTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - String servers = "tls://127.0.0.1:" + ts.getPort(); - assertCanConnectAndPubSub(createTestOptionsManually(servers)); - assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); - assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + String servers = "tls://127.0.0.1:" + ts.getPort(); + assertCanConnectAndPubSub(createTestOptionsManually(servers)); + assertCanConnectAndPubSub(createTestOptionsViaProperties(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryInstance(servers)); + assertCanConnectAndPubSub(createTestOptionsViaFactoryClassName(servers)); + }); } @Test public void testTLSMessageFlow() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - int msgCount = 100; - Options options = optionsBuilder(ts) - .maxReconnects(0) - .sslContext(ctx) - .build(); - try (Connection nc = standardConnect(options)) { - Dispatcher d = nc.createDispatcher( - msg -> nc.publish(msg.getReplyTo(), new byte[16])); - String subject = random(); - d.subscribe(subject); - - for (int i = 0; i < msgCount; i++) { - Future incoming = nc.request(subject, null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + int msgCount = 100; + Options options = optionsBuilder(ts) + .maxReconnects(0) + .sslContext(ctx) + .build(); + try (Connection nc = standardConnect(options)) { + Dispatcher d = nc.createDispatcher( + msg -> nc.publish(msg.getReplyTo(), new byte[16])); + String subject = random(); + d.subscribe(subject); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); + } } - } + }); } @Test @@ -256,8 +264,7 @@ public void testTLSOnReconnect() throws Exception { int port = NatsTestServer.nextPort(); int newPort = NatsTestServer.nextPort(); - AtomicReference fRef = new AtomicReference<>(); - runInConfiguredServer( "tlsverify.conf", port, ts -> { + runInConfiguredServer("tlsverify.conf", port, ts -> { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = optionsBuilder(ts.getServerUri(), NatsTestServer.getLocalhostUri(newPort)) .maxReconnects(-1) @@ -267,38 +274,37 @@ public void testTLSOnReconnect() throws Exception { .build(); ncRef.set((NatsConnection)standardConnect(options)); assertInstanceOf(SocketDataPort.class, ncRef.get().getDataPort(), "Correct data port class"); - fRef.set(listener.prepForConnectionEvent(Events.DISCONNECTED)); + listener.queueConnectionEvent(Events.DISCONNECTED); }); NatsConnection nc = ncRef.get(); flushConnection(nc); - listener.validateReceived(fRef.get()); - - ListenerFuture fRe = listener.prepForConnectionEvent(Events.RESUBSCRIBED); - runInConfiguredServer( "tlsverify.conf", newPort, ts -> { - listener.validateReceived(fRe); - }); + listener.validate(); + listener.queueConnectionEvent(Events.RESUBSCRIBED); + runInConfiguredServer("tlsverify.conf", newPort, ts -> listener.validate()); standardCloseConnection(nc); } @Test public void testDisconnectOnUpgrade() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = optionsBuilder(ts) - .maxReconnects(0) - .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) - .sslContext(ctx) - .build(); - assertThrows(IOException.class, () -> Nats.connect(options)); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) + .sslContext(ctx) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); } @Test public void testServerSecureClientNotMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - Options options = optionsNoReconnect(ts); - assertThrows(IOException.class, () -> Nats.connect(options)); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + Options options = optionsNoReconnect(ts); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); } @Test @@ -313,16 +319,17 @@ public void testClientSecureServerNotMismatch() throws Exception { @Test public void testClientServerCertMismatch() throws Exception { Listener listener = new Listener(); - ListenerFuture f = listener.prepForException(CertificateException.class); - NatsTestServer ts = sharedConfigServer( "tlsverify.conf"); - SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = optionsBuilder(ts) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(listener) - .build(); - assertThrows(IOException.class, () -> Nats.connect(options)); - listener.validateReceived(f); + listener.queueException(CertificateException.class); + runInSharedConfiguredServer("tlsverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createEmptySSLContext(); + Options options = optionsBuilder(ts) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(listener) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + listener.validate(); + }); } @Test @@ -398,10 +405,8 @@ void handleInfo(String infoJson) { */ @Test public void testProxyTlsFirst() throws Exception { - if (atLeast2_10_3(ensureVersionServerInfo())) { - // cannot check connect b/c tls first - NatsTestServer ts = sharedConfigServer( "tls_first.conf"); - + // cannot check connect b/c tls first + runInSharedConfiguredServer("tls_first.conf", ts -> { // 1. client tls first | secure proxy | server insecure -> connects ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); connTI.connect(false); @@ -416,6 +421,6 @@ public void testProxyTlsFirst() throws Exception { ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); connTA.connect(false); closeConnection(waitUntilConnected(connTA), 1000); - } + }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index be9b4682b..767e9a3c4 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -16,6 +16,7 @@ import io.nats.NatsServerRunner; import io.nats.client.*; import io.nats.client.support.HttpRequest; +import io.nats.client.support.Listener; import io.nats.client.utils.CloseOnUpgradeAttempt; import io.nats.client.utils.RunProxy; import io.nats.client.utils.TestBase; @@ -32,6 +33,7 @@ import java.util.concurrent.TimeUnit; import static io.nats.client.ConnectionListener.Events.CONNECTED; +import static io.nats.client.ConnectionListener.Events.RECONNECTED; import static io.nats.client.NatsTestServer.*; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.NOOP_EL; @@ -42,14 +44,15 @@ public class WebsocketConnectTests extends TestBase { @Test public void testRequestReply() throws Exception { - NatsTestServer ts = sharedConfigServer("ws.conf"); - standardRequestReply(Options.builder() - .server(getLocalhostUri(ts.getPort())) - .maxReconnects(0).build()); - - standardRequestReply(Options.builder(). - server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) - .maxReconnects(0).build()); + runInSharedConfiguredServer("ws.conf", ts -> { + standardRequestReply(Options.builder() + .server(getLocalhostUri(ts.getPort())) + .maxReconnects(0).build()); + + standardRequestReply(Options.builder(). + server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) + .maxReconnects(0).build()); + }); } private static void standardRequestReply(Options options) throws InterruptedException, IOException { @@ -68,22 +71,22 @@ private static void standardRequestReply(Options options) throws InterruptedExce @Test public void testTLSRequestReply() throws Exception { - NatsTestServer ts = sharedConfigServer("wss.conf"); + runInSharedConfiguredServer("wss.conf", ts -> { + java.util.function.Consumer interceptor = req -> { + // Ideally we could validate that this header was sent to NATS server + req.getHeaders().add("X-Ignored", "VALUE"); + }; - java.util.function.Consumer interceptor = req -> { - // Ideally we could validate that this header was sent to NATS server - req.getHeaders().add("X-Ignored", "VALUE"); - }; + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .httpRequestInterceptor(interceptor) + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .build(); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .httpRequestInterceptor(interceptor) - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - - standardRequestReply(options); + standardRequestReply(options); + }); } @Test @@ -92,78 +95,84 @@ public void testProxyRequestReply() throws Exception { RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); executor.submit(proxy); - NatsTestServer ts = sharedConfigServer("ws.conf"); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) - .maxReconnects(0) - .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) - .errorListener(NOOP_EL) - .build(); - standardRequestReply(options); + runInSharedConfiguredServer("ws.conf", ts -> { + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) + .maxReconnects(0) + .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) + .errorListener(NOOP_EL) + .build(); + standardRequestReply(options); + }); } @Test public void testSimpleTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer("wss.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wss.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); + }); } @Test public void testSimpleWSSIPConnection() throws Exception { - NatsTestServer ts = sharedConfigServer("wss.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server("wss://127.0.0.1:" + ts.getPort(WSS)) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wss.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server("wss://127.0.0.1:" + ts.getPort(WSS)) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); + }); } @Test public void testVerifiedTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wssverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); + }); } @Test public void testOpenTLSConnection() throws Exception { - NatsTestServer ts = sharedConfigServer("wss.conf"); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wss.conf", ts -> { + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .opentls() + .build(); + assertCanConnect(options); + }); } @Test public void testURIWSSHostConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one - .maxReconnects(0) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wssverify.conf", ts -> { + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one + .maxReconnects(0) + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); + }); } finally { SSLContext.setDefault(originalDefault); @@ -174,13 +183,14 @@ public void testURIWSSHostConnection() throws Exception { public void testURIWSSIPConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - Options options = Options.builder() - .server("wss://127.0.0.1:" + ts.getPort(WSS)) - .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one - .maxReconnects(0) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wssverify.conf", ts -> { + Options options = Options.builder() + .server("wss://127.0.0.1:" + ts.getPort(WSS)) + .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one + .maxReconnects(0) + .build(); + assertCanConnect(options); + }); } finally { SSLContext.setDefault(originalDefault); @@ -191,13 +201,14 @@ public void testURIWSSIPConnection() throws Exception { public void testURISchemeWSSConnection() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer("wss.conf"); - SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wss.conf", ts -> { + SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .build(); + assertCanConnect(options); + }); } finally { SSLContext.setDefault(originalDefault); @@ -208,15 +219,16 @@ public void testURISchemeWSSConnection() throws Exception { public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Exception { SSLContext originalDefault = SSLContext.getDefault(); try { - NatsTestServer ts = sharedConfigServer("wss.conf"); - SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .tlsFirst() - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + runInSharedConfiguredServer("wss.conf", ts -> { + SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .tlsFirst() + .errorListener(NOOP_EL) + .build(); + assertCanConnect(options); + }); } finally { SSLContext.setDefault(originalDefault); @@ -225,37 +237,38 @@ public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Excepti @Test public void testTLSMessageFlow() throws Exception { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - int msgCount = 100; - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - try (Connection nc = standardConnect(options)) { - Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); - String subject = random(); - d.subscribe(subject); - - for (int i = 0; i < msgCount; i++) { - Future incoming = nc.request(subject, null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); + runInSharedConfiguredServer("wssverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + int msgCount = 100; + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .maxReconnects(0) + .sslContext(ctx) + .build(); + try (Connection nc = standardConnect(options)) { + Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); + String subject = random(); + d.subscribe(subject); + + for (int i = 0; i < msgCount; i++) { + Future incoming = nc.request(subject, null); + Message msg = incoming.get(500, TimeUnit.MILLISECONDS); + assertNotNull(msg); + assertEquals(16, msg.getData().length); + } } - } + }); } @Test public void testTLSOnReconnect() throws Exception { Connection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(true); int port = nextPort(); int wssPort = nextPort(); // can't use shared b/c custom ports - NatsServerRunner.Builder builder = configFileBuilder( "wssverify.conf") + NatsServerRunner.Builder builder = configFileBuilder("wssverify.conf") .port(port) .port(WSS, wssPort); SSLContext ctx = SslTestingHelper.createTestSSLContext(); @@ -272,43 +285,45 @@ public void testTLSOnReconnect() throws Exception { .reconnectWait(Duration.ofMillis(10)) .build(); - listener.prepForStatusChange(CONNECTED); + listener.queueConnectionEvent(CONNECTED); nc = Nats.connect(options); assertInstanceOf(SocketDataPort.class, ((NatsConnection) nc).getDataPort(), "Correct data port class"); - listener.waitForStatusChange(1, TimeUnit.SECONDS); + listener.validate(); assertConnected(nc); } - listener.prepForStatusChange(CONNECTED); + listener.queueConnectionEvent(RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(builder)) { - listener.waitForStatusChange(1, TimeUnit.SECONDS); + listener.validate(); assertConnected(nc); } } @Test public void testDisconnectOnUpgrade() throws Exception { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri(WSS)) - .maxReconnects(0) - .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertThrows(IOException.class, () -> Nats.connect(options)); + runInSharedConfiguredServer("wssverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createTestSSLContext(); + Options options = Options.builder() + .server(ts.getLocalhostUri(WSS)) + .maxReconnects(0) + .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); } @Test public void testServerSecureClientNotMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) - .maxReconnects(0) - .errorListener(NOOP_EL) - .build(); - assertThrows(IOException.class, () -> Nats.connect(options)); + runInSharedConfiguredServer("wssverify.conf", ts -> { + Options options = Options.builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) + .maxReconnects(0) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); } @Test @@ -328,14 +343,15 @@ public void testClientSecureServerNotMismatch() throws Exception { @Test public void testClientServerCertMismatch() throws Exception { - NatsTestServer ts = sharedConfigServer( "wssverify.conf"); - SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri(WSS)) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertThrows(IOException.class, () -> Nats.connect(options)); + runInSharedConfiguredServer("wssverify.conf", ts -> { + SSLContext ctx = SslTestingHelper.createEmptySSLContext(); + Options options = Options.builder() + .server(ts.getLocalhostUri(WSS)) + .maxReconnects(0) + .sslContext(ctx) + .errorListener(NOOP_EL) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/support/Listener.java b/src/test/java/io/nats/client/support/Listener.java index 0c6bfb15f..800c0bb9b 100644 --- a/src/test/java/io/nats/client/support/Listener.java +++ b/src/test/java/io/nats/client/support/Listener.java @@ -33,6 +33,9 @@ public class Listener implements ErrorListener, ConnectionListener { private final List futures; private int exceptionCount; + private int heartbeatAlarmCount; + private int flowControlCount; + private int pullStatusWarningsCount; public Listener() { this(false, false); @@ -49,31 +52,55 @@ public Listener(boolean printExceptions, boolean verbose) { } public void reset() { + for (ListenerFuture f : futures) { + f.cancel(true); + } futures.clear(); + exceptionCount = 0; + heartbeatAlarmCount = 0; + flowControlCount = 0; + pullStatusWarningsCount = 0; + } + + public void validate() { + _validate(futures.get(0), VALIDATE_TIMEOUT); + } + + public void validate(long customTimeout) { + _validate(futures.get(0), customTimeout); + } + + public void validateAll() { + List copy = new ArrayList<>(futures); + for (ListenerFuture future : copy) { + _validate(future, VALIDATE_TIMEOUT); + } } - public void validateReceived(ListenerFuture f) { + private void _validate(ListenerFuture f, long timeout) { try { - f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + f.get(timeout, TimeUnit.MILLISECONDS); // future was completed, it and all the rest can be cancelled and removed from tracking futures.remove(f); } catch (TimeoutException | ExecutionException | InterruptedException e) { futures.remove(f); // removed from tracking f.cancel(true); + Assertions.fail("'Validate Received' Failed " + f.getDetails(), e); } } - public void validateAnyReceived(ListenerFuture... futuresToTry) { - int len = futuresToTry.length; + public void validateForAny() { + List futuresToTry = new ArrayList<>(futures); + int len = futuresToTry.size(); int lastIx = len - 1; for (int ix = 0; ix < len; ix++) { - ListenerFuture f = futuresToTry[ix]; + ListenerFuture f = futuresToTry.get(ix); try { f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); // future was completed, it and all the rest can be cancelled and removed from tracking while (ix < len) { - f = futuresToTry[ix++]; + f = futuresToTry.get(ix++); futures.remove(f); f.cancel(true); } @@ -89,7 +116,8 @@ public void validateAnyReceived(ListenerFuture... futuresToTry) { } } - public void validateNotReceived(ListenerFuture f) { + public void validateNotReceived() { + ListenerFuture f = futures.get(0); futures.remove(f); // removed from tracking try { f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); @@ -106,57 +134,70 @@ public void validateNotReceived(ListenerFuture f) { } } - private ListenerFuture prepFor(String label, ListenerFuture f) { + private void queue(String label, ListenerFuture f) { if (verbose) { - report("Future For " + label, f.getDetails()); + report("Queue For " + label, f.getDetails()); } futures.add(f); - return f; } - public ListenerFuture prepForConnectionEvent(Events type) { - return prepFor("Event", new ListenerFuture(type)); + public void queueConnectionEvent(Events type) { + queue("Event", new ListenerFuture(type)); } - public ListenerFuture prepForException(Class exceptionClass) { - return prepFor("Exception", new ListenerFuture(exceptionClass)); + public void queueException(Class exceptionClass) { + queue("Exception", new ListenerFuture(exceptionClass)); } - public ListenerFuture prepForError(String errorText) { - return prepFor("Error", new ListenerFuture(errorText)); + public void queueException(Class exceptionClass, String contains) { + queue("Exception", new ListenerFuture(exceptionClass, contains)); } - public ListenerFuture prepForStatus(ListenerStatusType type, int statusCode) { - return prepFor("Status", new ListenerFuture(type, statusCode)); + public void queueError(String errorText) { + queue("Error", new ListenerFuture(errorText)); } - public ListenerFuture prepForFlowControl(String fcSubject, FlowControlSource fcSource) { - return prepFor("FlowControl", new ListenerFuture(fcSubject, fcSource)); + public void queueStatus(ListenerStatusType type, int statusCode) { + queue("Status", new ListenerFuture(type, statusCode)); + } + + public void queueFlowControl(String fcSubject, FlowControlSource fcSource) { + queue("FlowControl", new ListenerFuture(fcSubject, fcSource)); } public int getExceptionCount() { return exceptionCount; } - // ---------------------------------------------------------------------------------------------------- - // Connection Listener - // ---------------------------------------------------------------------------------------------------- - @Override - public void connectionEvent(Connection conn, Events type) { - // deprecated + public int getHeartbeatAlarmCount() { + return heartbeatAlarmCount; + } + + public int getFlowControlCount() { + return flowControlCount; + } + + public int getPullStatusWarningsCount() { + return pullStatusWarningsCount; } private void tryToComplete(List futures, Predicate predicate) { - for (int i = 0; i < futures.size(); i++) { - ListenerFuture f = futures.get(i); + for (ListenerFuture f : futures) { if (predicate.test(f)) { f.complete(null); - futures.remove(i); return; } } } + // ---------------------------------------------------------------------------------------------------- + // Connection Listener + // ---------------------------------------------------------------------------------------------------- + @Override + public void connectionEvent(Connection conn, Events type) { + connectionEvent(conn, type, 0L, null); + } + @Override public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) { if (verbose) { @@ -190,9 +231,11 @@ else if (verbose) { Throwable t = exp; while (t != null) { if (t.getClass().equals(f.exceptionClass)) { - f.complete(null); - f.receivedException = exp; - return true; + if (f.exContains == null || exp.getMessage().contains(f.exContains)) { + f.complete(null); + f.receivedException = exp; + return true; + } } t = t.getCause(); } @@ -202,6 +245,7 @@ else if (verbose) { @Override public void slowConsumerDetected(Connection conn, Consumer consumer) { + // see SlowConsumerTests.SlowConsumerListener } @Override @@ -213,6 +257,7 @@ public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long last if (verbose) { report("Heartbeat Alarm", lastStreamSequence + " " + lastConsumerSequence); } + heartbeatAlarmCount++; } private void statusReceived(ListenerStatusType type, Status status) { @@ -230,6 +275,7 @@ public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status s @Override public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { statusReceived(ListenerStatusType.PullWarning, status); + pullStatusWarningsCount++; } @Override @@ -242,6 +288,7 @@ public void flowControlProcessed(Connection conn, JetStreamSubscription sub, Str if (verbose) { report("flowControlProcessed", subject + " " + source); } + flowControlCount++; tryToComplete(futures, f -> subject.equals(f.fcSubject) && f.fcSource == source); } diff --git a/src/test/java/io/nats/client/support/ListenerFuture.java b/src/test/java/io/nats/client/support/ListenerFuture.java index dfb6480f8..cf478c902 100644 --- a/src/test/java/io/nats/client/support/ListenerFuture.java +++ b/src/test/java/io/nats/client/support/ListenerFuture.java @@ -27,6 +27,7 @@ public class ListenerFuture extends CompletableFuture { public ConnectionListener.Events eventType; public String error; public Class exceptionClass; + public String exContains; public ListenerStatusType lbfStatusType; public int statusCode = -1; public String fcSubject; @@ -42,6 +43,11 @@ public ListenerFuture(Class exceptionClass) { this.exceptionClass = exceptionClass; } + public ListenerFuture(Class exceptionClass, String contains) { + this.exceptionClass = exceptionClass; + this.exContains = contains; + } + public ListenerFuture(String errorText) { error = errorText; } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 3817b5ed7..211c97b01 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -15,11 +15,14 @@ import io.nats.NatsServerRunner; import io.nats.client.*; -import io.nats.client.api.ServerInfo; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; -import io.nats.client.impl.*; +import io.nats.client.impl.JetStreamTestingContext; +import io.nats.client.impl.NatsJetStream; +import io.nats.client.impl.NatsJetStreamManagement; +import io.nats.client.impl.NatsMessage; import io.nats.client.support.NatsJetStreamClientError; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.function.Executable; @@ -28,7 +31,6 @@ import java.nio.file.Files; import java.time.Duration; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import static io.nats.client.support.NatsConstants.DOT; @@ -81,23 +83,12 @@ public class TestBase { public static final String META_KEY = "meta-test-key"; public static final String META_VALUE = "meta-test-value"; - public static final String OPERATOR_NOACCT_CONF = "operator_noacct.conf"; public static String[] BAD_SUBJECTS_OR_QUEUES = new String[] { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; - public static ServerInfo ensureVersionServerInfo() throws Exception { - if (VERSION_SERVER_INFO == null) { - runInShared(VersionUtils::initVersionServerInfo); - } - return VERSION_SERVER_INFO; - } - - // ---------------------------------------------------------------------------------------------------- - // shared config server helpers - // ---------------------------------------------------------------------------------------------------- - static Set SharedConfigServers = new HashSet(); + static Set SharedConfigServers = new HashSet<>(); @AfterAll public static void afterAll() { @@ -106,17 +97,6 @@ public static void afterAll() { } } - public static NatsTestServer sharedConfigServer(String nameAndConfFile) throws IOException { - SharedConfigServers.add(nameAndConfFile); - return SharedServer.getInstance(nameAndConfFile, nameAndConfFile).getServer(); - } - - public static NatsTestServer sharedConfigServer(String confFile, int version) throws IOException { - String name = confFile + "-" + version; - SharedConfigServers.add(name); - return SharedServer.getInstance(name, confFile).getServer(); - } - // ---------------------------------------------------------------------------------------------------- // runners / test interfaces // ---------------------------------------------------------------------------------------------------- @@ -154,7 +134,7 @@ public interface JetStreamTestingContextTest { // -------------------------------------------------- // Configured Server // -------------------------------------------------- - private static void _runConfiguredServer( + private static void _runInConfiguredServer( String configFilePath, int customPort, InServerTest inServerTest @@ -170,64 +150,86 @@ private static void _runConfiguredServer( } public static void runInConfiguredServer(String configFilePath, InServerTest inServerTest) throws Exception { - _runConfiguredServer(configFilePath, -1, inServerTest); + _runInConfiguredServer(configFilePath, -1, inServerTest); } public static void runInConfiguredServer(String configFilePath, int customPort, InServerTest inServerTest) throws Exception { - _runConfiguredServer(configFilePath, customPort, inServerTest); + _runInConfiguredServer(configFilePath, customPort, inServerTest); + } + + // -------------------------------------------------- + // Shared Configured Server + // -------------------------------------------------- + private static void _runInSharedConfiguredServer( + String nameAndConfFile, + String confFile, + int version, + InServerTest inServerTest + ) throws Exception { + NatsTestServer ts; + if (nameAndConfFile == null) { + String name = confFile + "-" + version; + SharedConfigServers.add(name); + ts = SharedServer.getInstance(name, confFile).getServer(); + } + else { + SharedConfigServers.add(nameAndConfFile); + ts = SharedServer.getInstance(nameAndConfFile, nameAndConfFile).getServer(); + } + inServerTest.test(ts); + } + + public static void runInSharedConfiguredServer(String nameAndConfFile, InServerTest inServerTest) throws Exception { + _runInSharedConfiguredServer(nameAndConfFile, null, -1, inServerTest); + } + + public static void runInSharedConfiguredServer(String confFile, int version, InServerTest inServerTest) throws Exception { + _runInSharedConfiguredServer(null, confFile, version, inServerTest); } // ---------------------------------------------------------------------------------------------------- - // runners -> own server + // runners -> own server, not jetstream // ---------------------------------------------------------------------------------------------------- - private static void _runInOwnServer( - @SuppressWarnings("SameParameterValue") Options.Builder optionsBuilder, - VersionCheck vc, - OneConnectionTest oneNcTest, - JetStreamTest jsTest - ) throws Exception { + private static void _runInOwnServer(@NonNull OneConnectionTest oneNcTest) throws Exception { + try (NatsTestServer ts = new NatsTestServer()) { + try (Connection nc = standardConnect(options(ts))) { + initVersionServerInfo(nc); + oneNcTest.test(nc); + } + } + } + + public static void runInOwnServer(OneConnectionTest oneNcTest) throws Exception { + _runInOwnServer(oneNcTest); + } + + // ---------------------------------------------------------------------------------------------------- + // runners -> own server, yes jetstream + // ---------------------------------------------------------------------------------------------------- + private static void _runInOwnJsServer(VersionCheck vc, @NonNull JetStreamTest jsTest) throws Exception { if (vc != null && VERSION_SERVER_INFO != null && !vc.runTest(VERSION_SERVER_INFO)) { return; // had vc, already had run server info and fails check } - NatsServerRunner.Builder nsrb = NatsServerRunner.builder().jetstream(jsTest != null); + NatsServerRunner.Builder nsrb = NatsServerRunner.builder().jetstream(true); try (NatsTestServer ts = new NatsTestServer(nsrb)) { - Options options = (optionsBuilder == null - ? optionsBuilder(ts) - : optionsBuilder.server(ts.getServerUri())) - .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = standardConnect(options(ts))) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { - if (jsTest == null) { - oneNcTest.test(nc); - } - else { - NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); - NatsJetStream js = (NatsJetStream) nc.jetStream(); - jsTest.test(nc, jsm, js); - } + NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); + NatsJetStream js = (NatsJetStream) nc.jetStream(); + jsTest.test(nc, jsm, js); } } } } - // -------------------------------------------------- - // Not using JetStream - // -------------------------------------------------- - public static void runInOwnServer(OneConnectionTest oneNcTest) throws Exception { - _runInOwnServer(null, null, oneNcTest, null); - } - - // -------------------------------------------------- - // JetStream needing isolation - // -------------------------------------------------- public static void runInOwnJsServer(JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(null, null, null, jetStreamTest); + _runInOwnJsServer(null, jetStreamTest); } public static void runInOwnJsServer(VersionCheck vc, JetStreamTest jetStreamTest) throws Exception { - _runInOwnServer(null, vc, null, jetStreamTest); + _runInOwnJsServer(vc, jetStreamTest); } // ---------------------------------------------------------------------------------------------------- @@ -619,15 +621,6 @@ public static void flushConnection(Connection conn, Duration timeout) { try { conn.flush(timeout); } catch (Exception exp) { /* ignored */ } } - public static void flushAndWait(Connection conn, ListenerForTesting listener, long flushTimeoutMillis, long waitForStatusMillis) { - flushConnection(conn, flushTimeoutMillis); - listener.waitForStatusChange(waitForStatusMillis, TimeUnit.MILLISECONDS); - } - - public static void flushAndWaitLong(Connection conn, ListenerForTesting listener) { - flushAndWait(conn, listener, STANDARD_FLUSH_TIMEOUT_MS, LONG_TIMEOUT_MS); - } - public static void assertTrueByTimeout(long millis, Supplier test) { long times = (millis + 99) / 100; for (long x = 0; x < times; x++) { From 4e91f5ff0c0d8e0c52beb1d910f54edfd4179ed4 Mon Sep 17 00:00:00 2001 From: scottf Date: Tue, 2 Dec 2025 22:28:34 -0500 Subject: [PATCH 29/51] This should not be failing --- .../nats/client/impl/JetStreamPullTests.java | 70 +++++++++---------- .../io/nats/client/impl/ReconnectTests.java | 5 +- .../io/nats/client/utils/SharedServer.java | 10 +++ .../java/io/nats/client/utils/TestBase.java | 39 +++++++---- .../java/io/nats/service/ServiceTests.java | 37 ++++++---- 5 files changed, 95 insertions(+), 66 deletions(-) diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index c3b781d0c..c63873f41 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -20,9 +20,7 @@ import io.nats.client.support.JsonUtils; import io.nats.client.support.Listener; import io.nats.client.support.ListenerStatusType; -import io.nats.client.utils.SharedServer; import io.nats.client.utils.VersionUtils; -import io.nats.client.utils.VersionUtils.VersionCheck; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -46,20 +44,22 @@ import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; +import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class JetStreamPullTests extends JetStreamTestBase { - static Connection tcsNc; - static Listener tcsListener; + static Connection conflictNc; + static Listener conflictListener; @AfterAll public static void afterAll() { - if (tcsNc != null) { + testBaseAfterAll(); + if (conflictNc != null) { try { - tcsNc.close(); + conflictNc.close(); } catch (InterruptedException ignore) { Thread.currentThread().interrupt(); @@ -740,20 +740,20 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) { static final long NEXT_MESSAGE_TIMEOUT = 2000; static final long INACTIVE_THRESHOLD = 30_000; - private void _testConflictStatuses(int statusCode, String statusText, ListenerStatusType statusType, VersionCheck vc, ConflictSetup setup) throws Exception { - runInSharedCustom(vc, (ignoredNc, ctx) -> { - if (tcsNc == null) { - tcsListener = new Listener(); - Options.Builder builder = optionsBuilder(tcsListener); - tcsNc = SharedServer.connectionForSameServer(ignoredNc, builder); + private void _testConflictStatuses(int statusCode, String statusText, ListenerStatusType statusType, ConflictSetup setup) throws Exception { + runInSharedNamed("conflict", ts -> { + if (conflictNc == null) { + conflictListener = new Listener(); + conflictNc = standardConnect( + optionsBuilder(ts).errorListener(conflictListener).connectionListener(conflictListener).build()); } else { - tcsListener.reset(); + conflictListener.reset(); } - try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(tcsNc, 1)) { - JetStreamSubscription sub = setup.setup(tcsNc, tcsCtx, tcsListener); + try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(conflictNc, 1)) { + JetStreamSubscription sub = setup.setup(conflictNc, tcsCtx, conflictListener); if (statusType != null) { - tcsListener.queueStatus(statusType, statusCode); + conflictListener.queueStatus(statusType, statusCode); } if (sub.getDispatcher() == null) { if (statusType == PullError) { @@ -768,7 +768,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt } } if (statusType != null) { - tcsListener.validate(); + conflictListener.validate(); } } }); @@ -776,7 +776,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt @Test public void testExceededMaxWaitingSync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -789,7 +789,7 @@ public void testExceededMaxWaitingSync() throws Exception { @Test public void testExceededMaxWaitingAsync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); @@ -802,7 +802,7 @@ public void testExceededMaxWaitingAsync() throws Exception { @Test public void testExceedsMaxRequestBatchSync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -814,7 +814,7 @@ public void testExceedsMaxRequestBatchSync() throws Exception { @Test public void testExceedsMaxRequestBatchAsync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); @@ -827,7 +827,7 @@ public void testExceedsMaxRequestBatchAsync() throws Exception { @Test public void testMessageSizeExceedsMaxBytesSync() throws Exception { - _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); ctx.js.publish(ctx.subject(), new byte[1000]); @@ -840,7 +840,7 @@ public void testMessageSizeExceedsMaxBytesSync() throws Exception { @Test public void testMessageSizeExceedsMaxBytesAsync() throws Exception { - _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); @@ -854,7 +854,7 @@ public void testMessageSizeExceedsMaxBytesAsync() throws Exception { @Test public void testExceedsMaxRequestExpiresSync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -866,7 +866,7 @@ public void testExceedsMaxRequestExpiresSync() throws Exception { @Test public void testExceedsMaxRequestExpiresAsync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); @@ -879,7 +879,7 @@ public void testExceedsMaxRequestExpiresAsync() throws Exception { @Test public void testConsumerIsPushBasedSync() throws Exception { - _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); @@ -895,7 +895,7 @@ public void testConsumerIsPushBasedSync() throws Exception { @Test public void testConsumerIsPushBasedAsync() throws Exception { - _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); @@ -913,7 +913,7 @@ public void testConsumerIsPushBasedAsync() throws Exception { @Test public void testConsumerDeletedSyncSub() throws Exception { - _testConflictStatuses(409, CONSUMER_DELETED, PullError, VersionUtils::atLeast2_9_6, + _testConflictStatuses(409, CONSUMER_DELETED, PullError, (nc, ctx, listener) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); @@ -928,7 +928,7 @@ public void testConsumerDeletedSyncSub() throws Exception { @Test public void testConsumerDeletedAsyncSub() throws Exception { - _testConflictStatuses(409, CONSUMER_DELETED, PullError, VersionUtils::atLeast2_9_6, + _testConflictStatuses(409, CONSUMER_DELETED, PullError, // Async (nc, ctx, listener) -> { String dur = random(); @@ -946,7 +946,7 @@ public void testConsumerDeletedAsyncSub() throws Exception { @Test public void testBadRequestSync() throws Exception { - _testConflictStatuses(400, BAD_REQUEST, PullError, VersionUtils::atLeast2_9_0, + _testConflictStatuses(400, BAD_REQUEST, PullError, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -957,7 +957,7 @@ public void testBadRequestSync() throws Exception { @Test public void testBadRequestAsync() throws Exception { - _testConflictStatuses(400, BAD_REQUEST, PullError, VersionUtils::atLeast2_9_0, + _testConflictStatuses(400, BAD_REQUEST, PullError, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); @@ -969,7 +969,7 @@ public void testBadRequestAsync() throws Exception { @Test public void testNotFoundSync() throws Exception { - _testConflictStatuses(404, NO_MESSAGES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(404, NO_MESSAGES, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -981,7 +981,7 @@ public void testNotFoundSync() throws Exception { @Test public void testNotFoundAsync() throws Exception { - _testConflictStatuses(404, NO_MESSAGES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(404, NO_MESSAGES, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); @@ -993,7 +993,7 @@ public void testNotFoundAsync() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageSync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, (nc, ctx, listener) -> { PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -1004,7 +1004,7 @@ public void testExceedsMaxRequestBytes1stMessageSync() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageAsync() throws Exception { - _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, VersionUtils::atLeast2_9_0, + _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, (nc, ctx, listener) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 894e671ad..4191a41d9 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -563,13 +563,12 @@ public void testTlsNoIpConnection() throws Exception { listener.validate(); listener.queueConnectionEvent(Events.RECONNECTED); - listener.queueConnectionEvent(Events.CONNECTED); ts.close(); flushConnection(nc); - listener.validate(); - listener.validate(20000); // it takes a little while for it to become reconnected + + listener.validate(20000); URI uri = options.createURIForServer(nc.getConnectedUrl()); assertEquals(ts2.getPort(), uri.getPort()); // full uri will have some ip address, just check port diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/utils/SharedServer.java index 8b0d094eb..244fc6e86 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/utils/SharedServer.java @@ -127,6 +127,16 @@ public Connection getSharedConnection() { return getSharedConnection(reusableConnectionPrefix + "-" + id); } + public static Connection sharedConnectionForServer(NatsTestServer ts) { + for (Map.Entry entry : SHARED_BY_NAME.entrySet()) { + SharedServer shared = entry.getValue(); + if (shared.natsTestServer == ts) { + return shared.getSharedConnection(); + } + } + throw new RuntimeException("No shared matching server."); + } + public static Connection sharedConnectionForSameServer(Connection nc) { SharedServer shared = SHARED_BY_URL.get(nc.getConnectedUrl()); if (shared == null) { diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 211c97b01..215c4a8a2 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -88,12 +88,12 @@ public class TestBase { HAS_SPACE, HAS_CR, HAS_LF, HAS_TAB, STARTS_SPACE, ENDS_SPACE, null, EMPTY }; - static Set SharedConfigServers = new HashSet<>(); + public static Set SharedNamedServers = new HashSet<>(); @AfterAll - public static void afterAll() { - if (SharedConfigServers.size() > 0) { - SharedServer.shutdown(SharedConfigServers.toArray(new String[0])); + public static void testBaseAfterAll() { + if (SharedNamedServers.size() > 0) { + SharedServer.shutdown(SharedNamedServers.toArray(new String[0])); } } @@ -160,31 +160,40 @@ public static void runInConfiguredServer(String configFilePath, int customPort, // -------------------------------------------------- // Shared Configured Server // -------------------------------------------------- - private static void _runInSharedConfiguredServer( + private static void _runInSharedNamedServer( + String name, String nameAndConfFile, String confFile, int version, InServerTest inServerTest ) throws Exception { NatsTestServer ts; - if (nameAndConfFile == null) { - String name = confFile + "-" + version; - SharedConfigServers.add(name); - ts = SharedServer.getInstance(name, confFile).getServer(); + if (name != null) { + SharedNamedServers.add(name); + ts = SharedServer.getInstance(name).getServer(); } - else { - SharedConfigServers.add(nameAndConfFile); + else if (nameAndConfFile != null) { + SharedNamedServers.add(nameAndConfFile); ts = SharedServer.getInstance(nameAndConfFile, nameAndConfFile).getServer(); } + else { + name = confFile + "-" + version; + SharedNamedServers.add(name); + ts = SharedServer.getInstance(name, confFile).getServer(); + } inServerTest.test(ts); } + public static void runInSharedNamed(String name, InServerTest inServerTest) throws Exception { + _runInSharedNamedServer(name, null, null, -1, inServerTest); + } + public static void runInSharedConfiguredServer(String nameAndConfFile, InServerTest inServerTest) throws Exception { - _runInSharedConfiguredServer(nameAndConfFile, null, -1, inServerTest); + _runInSharedNamedServer(null, nameAndConfFile, null, -1, inServerTest); } public static void runInSharedConfiguredServer(String confFile, int version, InServerTest inServerTest) throws Exception { - _runInSharedConfiguredServer(null, confFile, version, inServerTest); + _runInSharedNamedServer(null, null, confFile, version, inServerTest); } // ---------------------------------------------------------------------------------------------------- @@ -235,6 +244,8 @@ public static void runInOwnJsServer(VersionCheck vc, JetStreamTest jetStreamTest // ---------------------------------------------------------------------------------------------------- // runners -> shared // ---------------------------------------------------------------------------------------------------- + static final String SHARED_NAME = "SHARED"; + private static void _runInShared( Options.Builder optionsBuilder, VersionCheck vc, @@ -247,7 +258,7 @@ private static void _runInShared( return; // had vc, already had run server info and fails check } - SharedServer shared = SharedServer.getInstance("SHARED"); + SharedServer shared = SharedServer.getInstance(SHARED_NAME); // no builder, we can use the long-running connection since it's totally generic // with a builder, just make a fresh connection and close it at the end. diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 242dd6dfb..331378099 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -56,6 +56,9 @@ import static org.junit.jupiter.api.Assertions.*; public class ServiceTests extends JetStreamTestBase { + + public static final String SERVICE_TESTS_SHARED_NAME = "ServiceTests"; + @Test public void testServiceWorkflow() throws Exception { String serviceName1 = "Service1" + random(); @@ -77,9 +80,10 @@ public void testServiceWorkflow() throws Exception { verifyMap.put(sortEndpointDescendingName, "sortEndpointDescendingName"); verifyMap.put(reverseEndpointName, "reverseEndpointName"); - runInShared(clientNc -> { - Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); - Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection clientNc = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc1 = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc2 = SharedServer.sharedConnectionForServer(ts); Endpoint endEcho = Endpoint.builder() .name(echoEndpointName) @@ -483,9 +487,11 @@ public void testQueueGroup() throws Exception { String serviceName1 = "Service1" + random(); String serviceName2 = "Service2" + random(); - runInShared(clientNc -> { - Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); - Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection clientNc = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc1 = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc2 = SharedServer.sharedConnectionForServer(ts); + String yesQueueSubject = "subjyes"; String noQueueSubject = "subjno"; @@ -585,9 +591,10 @@ public void testResponsesFromAllInstances() throws Exception { String serviceName1 = "Service1" + random(); String serviceName2 = "Service2" + random(); - runInShared(clientNc -> { - Connection serviceNc1 = SharedServer.sharedConnectionForSameServer(clientNc); - Connection serviceNc2 = SharedServer.sharedConnectionForSameServer(clientNc); + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection clientNc = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc1 = SharedServer.sharedConnectionForServer(ts); + Connection serviceNc2 = SharedServer.sharedConnectionForServer(ts); Endpoint ep = Endpoint.builder() .name("ep") @@ -675,8 +682,7 @@ else if (response.getName().equals(serviceName2)) { @Test public void testDispatchers() throws Exception { - runInSharedOwnNc(nc -> { - + runInOwnServer(nc -> { Map dispatchers = getDispatchers(nc); assertEquals(0, dispatchers.size()); @@ -920,7 +926,8 @@ public void testAddingEndpointAfterServiceBuilderConstruction() { @Test public void testHandlerException() throws Exception { - runInShared(nc -> { + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection nc = SharedServer.sharedConnectionForServer(ts); ServiceEndpoint exServiceEndpoint = ServiceEndpoint.builder() .endpointName("exEndpoint") .endpointSubject("exSubject") @@ -951,7 +958,8 @@ public void testHandlerException() throws Exception { @Test public void testServiceMessage() throws Exception { - runInShared(nc -> { + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection nc = SharedServer.sharedConnectionForServer(ts); AtomicInteger which = new AtomicInteger(); ServiceEndpoint se = ServiceEndpoint.builder() .endpointName("testServiceMessage") @@ -1590,7 +1598,8 @@ public String get() { @Test public void testInboxSupplier() throws Exception { - runInShared(nc -> { + runInSharedNamed(SERVICE_TESTS_SHARED_NAME, ts -> { + Connection nc = SharedServer.sharedConnectionForServer(ts); Discovery discovery = new Discovery(nc, 100, 1); TestInboxSupplier supplier = new TestInboxSupplier(); discovery.setInboxSupplier(supplier); From f85fa15f25c28203346c86bca3948521037cfa9b Mon Sep 17 00:00:00 2001 From: scottf Date: Wed, 3 Dec 2025 06:59:43 -0500 Subject: [PATCH 30/51] This should not be failing --- src/test/java/io/nats/client/impl/SimplificationTests.java | 2 +- src/test/java/io/nats/client/impl/TLSConnectTests.java | 4 ++-- src/test/java/io/nats/client/impl/WebsocketConnectTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 4b73cbec1..5d735613d 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -1701,7 +1701,7 @@ public void testReconnectOverOrdered() throws Exception { // to make sure the consumer continues after that condition // ------------------------------------------------------------ int port = NatsTestServer.nextPort(); - Listener listener = new Listener(true); + Listener listener = new Listener(); Options options = optionsBuilder() .connectionListener(listener) .errorListener(listener) diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 6b0317013..24291e722 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -147,7 +147,7 @@ public void testMultipleUrlOpenTLSConnection() throws Exception { public void testProxyNotTlsFirst() throws Exception { runInSharedConfiguredServer("tls.conf", 1, ts1 -> { // 1. client regular secure | secure proxy | server insecure -> mismatch exception - Listener listener = new Listener(true); + Listener listener = new Listener(); ProxyConnection connRI = new ProxyConnection(ts1.getServerUri(), false, listener, SERVER_INSECURE); listener.queueException(IOException.class, "SSL connection wanted by client"); assertThrows(Exception.class, () -> connRI.connect(false)); @@ -258,7 +258,7 @@ public void testTLSMessageFlow() throws Exception { @Test public void testTLSOnReconnect() throws Exception { AtomicReference ncRef = new AtomicReference<>(); - Listener listener = new Listener(true); + Listener listener = new Listener(); // Use two server ports to avoid port release timing issues int port = NatsTestServer.nextPort(); diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 767e9a3c4..6ced7dce6 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -263,7 +263,7 @@ public void testTLSMessageFlow() throws Exception { @Test public void testTLSOnReconnect() throws Exception { Connection nc; - Listener listener = new Listener(true); + Listener listener = new Listener(); int port = nextPort(); int wssPort = nextPort(); From 7987829eabb6d64dc40b4dceae95b0b8f866c328 Mon Sep 17 00:00:00 2001 From: scottf Date: Wed, 3 Dec 2025 10:34:04 -0500 Subject: [PATCH 31/51] keep on digging --- src/test/java/io/nats/client/EchoTests.java | 2 +- .../java/io/nats/client/impl/DrainTests.java | 1 - .../client/{utils => impl}/SharedServer.java | 26 +++++++++++++--- .../io/nats/client/utils/OptionsUtils.java | 31 +++++++++++-------- .../java/io/nats/client/utils/TestBase.java | 5 +-- .../java/io/nats/service/ServiceTests.java | 6 +--- 6 files changed, 42 insertions(+), 29 deletions(-) rename src/test/java/io/nats/client/{utils => impl}/SharedServer.java (90%) diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index fd55c90a9..8005cd2fc 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -14,7 +14,7 @@ package io.nats.client; import io.nats.client.NatsServerProtocolMock.ExitAt; -import io.nats.client.utils.SharedServer; +import io.nats.client.impl.SharedServer; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index 606b81746..fa0502beb 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -16,7 +16,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Listener; -import io.nats.client.utils.SharedServer; import org.junit.jupiter.api.Test; import java.time.Duration; diff --git a/src/test/java/io/nats/client/utils/SharedServer.java b/src/test/java/io/nats/client/impl/SharedServer.java similarity index 90% rename from src/test/java/io/nats/client/utils/SharedServer.java rename to src/test/java/io/nats/client/impl/SharedServer.java index 244fc6e86..034412ba5 100644 --- a/src/test/java/io/nats/client/utils/SharedServer.java +++ b/src/test/java/io/nats/client/impl/SharedServer.java @@ -11,12 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.nats.client.utils; +package io.nats.client.impl; import io.nats.client.Connection; import io.nats.client.NUID; import io.nats.client.NatsTestServer; import io.nats.client.Options; +import io.nats.client.utils.ConnectionUtils; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -31,6 +32,10 @@ import static io.nats.client.utils.ThreadUtils.sleep; import static io.nats.client.utils.VersionUtils.initVersionServerInfo; +/** + * This class is in the impl package instead of the support package + * so it can access the package scope class NatsConnection + */ public class SharedServer { private static final int NUM_REUSABLE_CONNECTIONS = 3; @@ -190,14 +195,25 @@ public Connection newConnection(Options.Builder builder) { public void shutdown() { instanceLock.lock(); try { + for (Connection nc : connectionMap.values()) { + try { + ((NatsConnection)nc).close(false, true); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } if (natsTestServer != null) { - natsTestServer.shutdown(false); + try { + natsTestServer.shutdown(false); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } } } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } finally { + connectionMap.clear(); natsTestServer = null; instanceLock.unlock(); } diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index 466383541..e907d6ce0 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -79,16 +79,16 @@ public static Options options(int port) { return optionsBuilder(port).build(); } - public static Options options(NatsTestServer... tses) { - return optionsBuilder(tses).build(); + public static Options options(NatsTestServer... testServers) { + return optionsBuilder(testServers).build(); } - public static Options optionsNoReconnect(NatsTestServer ts) { - return optionsBuilder(ts).maxReconnects(0).build(); + public static Options optionsNoReconnect(NatsTestServer testServer) { + return optionsBuilder(testServer).maxReconnects(0).build(); } - public static Options options(NatsServerProtocolMock... mockTses) { - return optionsBuilder(mockTses).build(); + public static Options options(NatsServerProtocolMock... testServers) { + return optionsBuilder(testServers).build(); } public static Options options(String... servers) { @@ -97,13 +97,13 @@ public static Options options(String... servers) { public static Options.Builder optionsBuilder() { if (EX == null) { - EX = new ThreadPoolExecutor(8, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, + EX = new ThreadPoolExecutor(6, Integer.MAX_VALUE, 30, TimeUnit.SECONDS, new SynchronousQueue<>(), - new TestThreadFactory("ex")); + new TestThreadFactory("EX")); } if (SC == null) { - SC = new ScheduledThreadPoolExecutor(4, new TestThreadFactory("sc")); + SC = new ScheduledThreadPoolExecutor(3, new TestThreadFactory("SC")); SC.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); SC.setRemoveOnCancelPolicy(true); } @@ -112,9 +112,14 @@ public static Options.Builder optionsBuilder() { .connectionTimeout(Duration.ofSeconds(4)) .executor(EX) .scheduledExecutor(SC) - .callbackExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("cb"))) - .connectExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("cn"))) - .errorListener(NOOP_EL); + .callbackExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("CB"))) + .connectExecutor(Executors.newSingleThreadExecutor(new TestThreadFactory("CN"))) + .errorListener(NOOP_EL) + + // This forces to use the plain SocketDataPort instead of + // SocketDataPortWithWriteTimeout, we just don't need it for testing. + // This saves running the scheduled task in the SocketDataPortWithWriteTimeout + .socketWriteTimeout(null); } static class TestThreadFactory implements ThreadFactory { @@ -127,7 +132,7 @@ public TestThreadFactory(String name) { } public Thread newThread(@NonNull Runnable r) { - String threadName = "test." + name + "." + threadNumber.incrementAndGet(); + String threadName = "TST." + name + "." + threadNumber.incrementAndGet(); Thread t = new Thread(r, threadName); if (t.isDaemon()) { t.setDaemon(false); diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index 215c4a8a2..a62c124cf 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -17,10 +17,7 @@ import io.nats.client.*; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; -import io.nats.client.impl.JetStreamTestingContext; -import io.nats.client.impl.NatsJetStream; -import io.nats.client.impl.NatsJetStreamManagement; -import io.nats.client.impl.NatsMessage; +import io.nats.client.impl.*; import io.nats.client.support.NatsJetStreamClientError; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterAll; diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java index 331378099..289216b02 100644 --- a/src/test/java/io/nats/service/ServiceTests.java +++ b/src/test/java/io/nats/service/ServiceTests.java @@ -17,15 +17,11 @@ import io.nats.client.Dispatcher; import io.nats.client.Message; import io.nats.client.Options; -import io.nats.client.impl.Headers; -import io.nats.client.impl.JetStreamTestBase; -import io.nats.client.impl.MockNatsConnection; -import io.nats.client.impl.NatsMessage; +import io.nats.client.impl.*; import io.nats.client.support.DateTimeUtils; import io.nats.client.support.JsonSerializable; import io.nats.client.support.JsonUtils; import io.nats.client.support.JsonValue; -import io.nats.client.utils.SharedServer; import nl.jqno.equalsverifier.EqualsVerifier; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; From d03c8e0608cef00ba65e0d9545a4b38ef0bca853 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 4 Dec 2025 16:26:30 -0500 Subject: [PATCH 32/51] Replaced old listener test harness --- src/test/java/io/nats/client/AuthTests.java | 72 +- .../java/io/nats/client/ConnectTests.java | 50 +- .../nats/client/impl/ErrorListenerTests.java | 67 +- .../client/impl/JetStreamManagementTests.java | 14 +- .../nats/client/impl/ListenerForTesting.java | 618 ------------------ .../nats/client/impl/MessageContentTests.java | 22 +- .../nats/client/impl/MessageManagerTests.java | 44 +- .../io/nats/client/impl/ReconnectTests.java | 30 +- .../java/io/nats/client/support/Listener.java | 127 +++- .../nats/client/support/ListenerFuture.java | 28 +- .../io/nats/client/utils/ConnectionUtils.java | 2 +- 11 files changed, 266 insertions(+), 808 deletions(-) delete mode 100644 src/test/java/io/nats/client/impl/ListenerForTesting.java diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 26dd74695..acc7040cd 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -17,7 +17,6 @@ import io.nats.NatsServerRunner; import io.nats.client.Connection.Status; import io.nats.client.ConnectionListener.Events; -import io.nats.client.impl.ListenerForTesting; import io.nats.client.support.JwtUtils; import io.nats.client.support.Listener; import io.nats.client.utils.ResourceUtils; @@ -33,10 +32,10 @@ import java.nio.file.Files; import java.time.Duration; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import static io.nats.client.support.Listener.LONG_VALIDATE_TIMEOUT; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; import static io.nats.client.utils.ResourceUtils.jwtResource; @@ -155,7 +154,7 @@ private static void assertNeedsJsonEncoding(String test) throws Exception { @Test public void testUserPassOnReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); Connection nc; Subscription sub; String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; @@ -173,21 +172,22 @@ public void testUserPassOnReconnect() throws Exception { flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); Message msg = sub.nextMessage(Duration.ofSeconds(5)); assertNotNull(msg); - listener.prepForStatusChange(Events.DISCONNECTED); + + listener.queueConnectionEvent(Events.DISCONNECTED); } TestBase.flushConnection(nc); + listener.validate(); - listener.waitForStatusChange(5, TimeUnit.SECONDS); - assertTrue( - Connection.Status.RECONNECTING == nc.getStatus() || Connection.Status.DISCONNECTED == nc.getStatus(), "Reconnecting status"); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { waitUntilConnected(nc); // wait for reconnect + listener.validate(); nc.publish("test", null); - flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); +// flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); + Message msg = sub.nextMessage(Duration.ofSeconds(5)); assertNotNull(msg); @@ -213,7 +213,7 @@ public void testUserBCryptPass() throws Exception { @Test public void testUserPassInURLOnReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port; Connection nc; Subscription sub; @@ -231,17 +231,17 @@ public void testUserPassInURLOnReconnect() throws Exception { flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); Message msg = sub.nextMessage(Duration.ofSeconds(5)); assertNotNull(msg); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); } TestBase.flushConnection(nc); - listener.waitForStatusChange(5, TimeUnit.SECONDS); + listener.validate(); Status status = nc.getStatus(); assertTrue( Connection.Status.RECONNECTING == status || Connection.Status.DISCONNECTED == status, "Reconnecting status"); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { waitUntilConnected(nc); // wait for reconnect @@ -257,7 +257,7 @@ public void testUserPassInURLOnReconnect() throws Exception { public void testUserPassInURLClusteredWithDifferentUser() throws Exception { String[] customArgs1 = { "--user", "uuu", "--pass", "ppp" }; String[] customArgs2 = { "--user", "uuu2", "--pass", "ppp2" }; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); @@ -271,7 +271,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { try (Connection nc = standardConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); waitUntilConnected(nc); // wait for reconnect assertEquals(nc.getConnectedUrl(), url2); @@ -283,7 +283,7 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { public void testUserPassInURLWithFallback() throws Exception { String[] customArgs1 = { "--user", "uuu", "--pass", "ppp" }; String[] customArgs2 = { "--user", "uuu2", "--pass", "ppp2" }; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = userPassInUrl("uuu", "ppp", ts1.getPort()); @@ -296,9 +296,9 @@ public void testUserPassInURLWithFallback() throws Exception { try (Connection nc = standardConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED, LONG_VALIDATE_TIMEOUT); ts1.close(); - listener.waitForStatusChange(10, TimeUnit.SECONDS); + listener.validate(); assertConnected(nc); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); } @@ -309,7 +309,7 @@ public void testUserPassInURLWithFallback() throws Exception { public void testTokenInURLClusteredWithDifferentUser() throws Exception { String[] customArgs1 = { "--auth", "token_one" }; String[] customArgs2 = { "--auth", "token_two" }; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); @@ -323,9 +323,9 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { try (Connection nc = standardConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); + listener.validate(); waitUntilConnected(nc); // wait for reconnect assertEquals(nc.getConnectedUrl(), url2); @@ -337,7 +337,7 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { public void testTokenInURLWithFallback() throws Exception { String[] customArgs1 = { "--auth", "token_one" }; String[] customArgs2 = { "--auth", "token_two" }; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts1 = new NatsTestServer(customArgs1); NatsTestServer ts2 = new NatsTestServer(customArgs2)) { String url1 = tokenInUrl("token_one", ts1.getPort()); @@ -352,10 +352,10 @@ public void testTokenInURLWithFallback() throws Exception { try (Connection nc = standardConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); - listener.prepForStatusChange(Events.RESUBSCRIBED); + listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); + listener.validate(); - listener.waitForStatusChange(CONNECTION_WAIT_MS, TimeUnit.MILLISECONDS); waitUntilConnected(nc); // wait for reconnect assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); } @@ -514,7 +514,7 @@ public void testStaticJWTAuth() throws Exception { @Test public void testReconnectWithAuth() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); // Connect should fail on ts2 runInConfiguredServer("operator.conf", ts1 -> { // closed as part of test, so cannot be shared runInSharedConfiguredServer("operator.conf", ts2 -> { @@ -522,16 +522,18 @@ public void testReconnectWithAuth() throws Exception { .noRandomize() .maxReconnects(-1) .authHandler(getUserCredsAuthHander()) + .connectionListener(listener) + .errorListener(listener) .build(); Connection nc = standardConnect(options); assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); ts1.close(); // Reconnect will fail because ts has the same auth error - listener.waitForStatusChange(5, TimeUnit.SECONDS); + listener.validate(); assertConnected(nc); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); standardCloseConnection(nc); @@ -552,17 +554,17 @@ public void testCloseOnReconnectWithSameError() throws Exception { .noRandomize() .authHandler(getUserCredsAuthHander()) .build(); - Connection nc = standardConnect(options); - assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - listener.queueConnectionEvent(Events.CLOSED); + try (Connection nc = standardConnect(options)) { + assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - ts2.close(); + listener.queueConnectionEvent(Events.CLOSED, LONG_VALIDATE_TIMEOUT); - // Reconnect will fail because ts has the same auth error - listener.validate(); + ts2.close(); - standardCloseConnection(nc); + // Reconnect will fail because ts has the same auth error + listener.validate(); + } }); }); } @@ -659,7 +661,7 @@ private static void _testReconnectAfter(String errText) throws Exception { @Test public void testRealUserAuthenticationExpired() throws Exception { - Listener listener = new Listener(); + Listener listener = new Listener(true); listener.queueError("User Authentication Expired"); String accountSeed = "SAAPXJRFMUYDUH3NOZKE7BS2ZDO2P4ND7G6W743MTNA3KCSFPX3HNN6AX4"; diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 52bf0bdab..10db05295 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -16,7 +16,6 @@ import io.nats.client.ConnectionListener.Events; import io.nats.client.NatsServerProtocolMock.ExitAt; import io.nats.client.api.ServerInfo; -import io.nats.client.impl.ListenerForTesting; import io.nats.client.impl.SimulateSocketDataPortException; import io.nats.client.support.Listener; import org.junit.jupiter.api.Test; @@ -206,16 +205,14 @@ public void testIncompleteInitialInfo() throws Exception { @Test public void testAsyncConnection() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts).connectionListener(listener).build(); - listener.prepForStatusChange(Events.CONNECTED); - + listener.queueConnectionEvent(Events.CONNECTED); Nats.connectAsynchronously(options, false); + listener.validate(); - listener.waitForStatusChange(1, TimeUnit.SECONDS); - - Connection nc = listener.getLastEventConnection(); + Connection nc = listener.getLastConnectionEventConnection(); assertNotNull(nc); assertConnected(nc); standardCloseConnection(nc); @@ -224,7 +221,7 @@ public void testAsyncConnection() throws Exception { @Test public void testAsyncConnectionWithReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port = NatsTestServer.nextPort(); Options options = optionsBuilder(port).maxReconnects(-1) .reconnectWait(Duration.ofMillis(100)).connectionListener(listener).build(); @@ -233,10 +230,10 @@ public void testAsyncConnectionWithReconnect() throws Exception { sleep(5000); // No server at this point, let it fail and try to start over - Connection nc = listener.getLastEventConnection(); // will be disconnected, but should be there + Connection nc = listener.getLastConnectionEventConnection(); // will be disconnected, but should be there assertNotNull(nc); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { standardCloseConnection(waitUntilConnected(nc)); } @@ -450,7 +447,7 @@ public void testSocketLevelException() throws Exception { int port = NatsTestServer.nextPort(); AtomicBoolean simExReceived = new AtomicBoolean(); - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); ErrorListener el = new ErrorListener() { @Override public void exceptionOccurred(Connection conn, Exception exp) { @@ -488,38 +485,33 @@ public void exceptionOccurred(Connection conn, Exception exp) { try (NatsTestServer ts = new NatsTestServer(port)) { try { SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); connection = Nats.connectReconnectOnConnect(options); - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.validate(); + listener.queueConnectionEvent(Events.DISCONNECTED); } catch (Exception e) { fail("should have connected " + e); } } - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); + listener.validate(); assertTrue(simExReceived.get()); simExReceived.set(false); // 2. NORMAL RECONNECT - listener.prepForStatusChange(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ts = new NatsTestServer(port)) { SimulateSocketDataPortException.THROW_ON_CONNECT.set(true); - try { - assertTrue(listener.waitForStatusChange(5, TimeUnit.SECONDS)); - } - catch (Exception e) { - fail("should have reconnected " + e); - } + listener.validate(); } } @Test public void testRunInJsCluster() throws Exception { - ListenerForTesting[] listeners = new ListenerForTesting[3]; - listeners[0] = new ListenerForTesting(); - listeners[1] = new ListenerForTesting(); - listeners[2] = new ListenerForTesting(); + Listener[] listeners = new Listener[3]; + listeners[0] = new Listener(); + listeners[1] = new Listener(); + listeners[2] = new Listener(); ThreeServerTestOptions tstOpts = new ThreeServerTestOptions() { @Override @@ -540,9 +532,9 @@ public boolean includeAllServers() { runInCluster(ConnectTests::validateRunInJsCluster); - listeners[0] = new ListenerForTesting(); - listeners[1] = new ListenerForTesting(); - listeners[2] = new ListenerForTesting(); + listeners[0] = new Listener(); + listeners[1] = new Listener(); + listeners[2] = new Listener(); runInCluster(tstOpts, ConnectTests::validateRunInJsCluster); } diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 4e1d292b9..471b3e19e 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -15,6 +15,8 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.support.Debug; +import io.nats.client.support.Listener; import io.nats.client.support.Status; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -27,9 +29,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; +import static io.nats.client.support.Listener.LONG_VALIDATE_TIMEOUT; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; public class ErrorListenerTests extends TestBase { @@ -37,7 +39,7 @@ public class ErrorListenerTests extends TestBase { @Test public void testLastError() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); String[] customArgs = {"--user", "stephen", "--pass", "password"}; try (NatsTestServer ts = new NatsTestServer(); @@ -52,7 +54,9 @@ public void testLastError() throws Exception { nc = (NatsConnection) Nats.connect(options); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueError("Authorization Violation"); ts.close(); @@ -63,12 +67,7 @@ public void testLastError() throws Exception { // this usually fails } - listener.waitForStatusChange(5, TimeUnit.SECONDS); - - listener.prepForStatusChange(Events.RECONNECTED); - listener.waitForStatusChange(5, TimeUnit.SECONDS); - - assertTrue(listener.errorsEventually("Authorization Violation", 3000)); + listener.validateAll(); waitUntilConnected(nc); // wait for reconnect assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); @@ -78,7 +77,7 @@ public void testLastError() throws Exception { @Test public void testClearLastError() throws Exception { NatsConnection nc = null; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); String[] customArgs = {"--user", "stephen", "--pass", "password"}; try (NatsTestServer ts = new NatsTestServer(); @@ -93,7 +92,10 @@ public void testClearLastError() throws Exception { nc = (NatsConnection) Nats.connect(options); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - listener.prepForStatusChange(Events.DISCONNECTED); + + listener.queueConnectionEvent(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueError("Authorization Violation", LONG_VALIDATE_TIMEOUT); ts.close(); @@ -104,12 +106,7 @@ public void testClearLastError() throws Exception { // this usually fails } - listener.waitForStatusChange(5, TimeUnit.SECONDS); - - listener.prepForStatusChange(Events.RECONNECTED); - listener.waitForStatusChange(5, TimeUnit.SECONDS); - - assertTrue(listener.errorsEventually("Authorization Violation", 2000)); + listener.validateAll(); assertConnected(nc); assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); @@ -125,9 +122,8 @@ public void testClearLastError() throws Exception { @Test public void testErrorOnNoAuth() throws Exception { String[] customArgs = {"--user", "stephen", "--pass", "password"}; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer(customArgs)) { - sleep(1000); // give the server time to get ready, otherwise sometimes this test flaps // See config file for user/pass // no or wrong u/p in the options is an error Options options = optionsBuilder(ts) @@ -144,20 +140,18 @@ public void testErrorOnNoAuth() throws Exception { } fail(); } - assertTrue(listener.errorsEventually("Authorization Violation", 10000)); } } @Test public void testExceptionOnBadDispatcher() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .maxReconnects(0) .errorListener(listener) .build(); - Connection nc = Nats.connect(options); - try { + try (Connection nc = Nats.connect(options)) { Dispatcher d = nc.createDispatcher(msg -> { throw new ArithmeticException(); }); @@ -169,14 +163,12 @@ public void testExceptionOnBadDispatcher() throws Exception { try { msg = incoming.get(200, TimeUnit.MILLISECONDS); - } catch (TimeoutException te) { - msg = null; + fail(); } - - assertNull(msg); - assertEquals(1, listener.getCount()); - } finally { - standardCloseConnection(nc); + catch (TimeoutException te) { + // expected + } + assertEquals(1, listener.getExceptionCount()); } } } @@ -255,7 +247,7 @@ public void testExceptionInExceptionHandler() throws Exception { public void testDiscardedMessageFastProducer() throws Exception { String subject = random(); int maxMessages = 10; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) @@ -290,20 +282,23 @@ public void testDiscardedMessageFastProducer() throws Exception { public void testDiscardedMessageServerClosed() throws Exception { String subject = random(); int maxMessages = 10; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts) .maxMessagesInOutgoingQueue(maxMessages) .discardMessagesWhenOutgoingQueueFull() + .connectionListener(listener) .errorListener(listener) .pingInterval(Duration.ofSeconds(100)) // make this long so we don't ping during test .build(); + Debug.info("O", options.getServers()); + listener.queueConnectionEvent(Events.CONNECTED, LONG_VALIDATE_TIMEOUT); + listener.queueConnectionEvent(Events.DISCONNECTED, LONG_VALIDATE_TIMEOUT); try (Connection nc = standardConnect(options)) { - nc.flush(Duration.ofSeconds(1)); // Get the sub to the server - - listener.prepForStatusChange(Events.DISCONNECTED); + nc.flush(Duration.ofSeconds(1)); + listener.validate(); ts.close(); - listener.waitForStatusChange(2, TimeUnit.SECONDS); // make sure the connection is down + listener.validate(); for (int i = 0; i < maxMessages + 1; i++) { nc.publish(subject + i, ("message" + i).getBytes()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java index 8011cac4e..85fe358ba 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.DateTimeUtils; +import io.nats.client.support.Listener; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Test; @@ -1352,7 +1353,7 @@ public void testCreateConsumerUpdateConsumer() throws Exception { @Test public void testNoRespondersWhenConsumerDeleted() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, VersionUtils::atLeast2_10_26, (nc, ctx) -> { String subject = ctx.subject(); for (int x = 0; x < 5; x++) { @@ -1406,13 +1407,18 @@ public void testNoRespondersWhenConsumerDeleted() throws Exception { }); } - private static void validate1026(Message m, ListenerForTesting listener, boolean empty) { + private static void validate1026(Message m, Listener listener, boolean empty) { assertNull(m); sleep(250); // give time for the message to get there - assertEquals(empty, listener.getPullStatusWarnings().isEmpty()); + if (empty) { + assertEquals(0, listener.getPullStatusWarningsCount()); + } + else { + assertTrue(listener.getPullStatusWarningsCount() > 0); + } } - private static ConsumerContext setupFor1026Simplification(Connection nc, JetStreamManagement jsm, ListenerForTesting listener, String stream, String subject) throws IOException, JetStreamApiException { + private static ConsumerContext setupFor1026Simplification(Connection nc, JetStreamManagement jsm, Listener listener, String stream, String subject) throws IOException, JetStreamApiException { listener.reset(); String consumer = create1026Consumer(jsm, stream, subject); ConsumerContext cCtx = nc.getConsumerContext(stream, consumer); diff --git a/src/test/java/io/nats/client/impl/ListenerForTesting.java b/src/test/java/io/nats/client/impl/ListenerForTesting.java deleted file mode 100644 index 325fbf5a6..000000000 --- a/src/test/java/io/nats/client/impl/ListenerForTesting.java +++ /dev/null @@ -1,618 +0,0 @@ -// Copyright 2015-2018 The NATS Authors -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package io.nats.client.impl; - -import io.nats.client.*; -import io.nats.client.support.DateTimeUtils; -import io.nats.client.support.Status; - -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Predicate; -import java.util.function.Supplier; - -@SuppressWarnings("CallToPrintStackTrace") -public class ListenerForTesting implements ErrorListener, ConnectionListener { - private final ReentrantLock prepLock = new ReentrantLock(); - - private final AtomicInteger count = new AtomicInteger(); - private final AtomicInteger exceptionCount = new AtomicInteger(); - private final HashMap eventCounts = new HashMap<>(); - private final HashMap errorCounts = new HashMap<>(); - private final AtomicBoolean exitOnDisconnect = new AtomicBoolean(false); - private final AtomicBoolean exitOnHeartbeatError = new AtomicBoolean(false); - - private Connection lastEventConnection; - - private CompletableFuture statusChanged; - private CompletableFuture slowSubscriber; - private CompletableFuture errorWaitFuture; - private CompletableFuture heartbeatAlarmEventWaitFuture; - private CompletableFuture pullStatusWarningWaitFuture; - private CompletableFuture pullStatusErrorWaitFuture; - private Events eventToWaitFor; - private String errorToWaitFor; - - private final List connectionEvents = new ArrayList<>(); - private final List errors = new ArrayList<>(); - private final List exceptions = new ArrayList<>(); - private final List slowConsumers = new ArrayList<>(); - private final List discardedMessages = new ArrayList<>(); - private final List unhandledStatuses = new ArrayList<>(); - private final List pullStatusWarnings = new ArrayList<>(); - private final List pullStatusErrors = new ArrayList<>(); - private final List heartbeatAlarms = new ArrayList<>(); - private final List flowControlProcessedEvents = new ArrayList<>(); - public final AtomicInteger socketWriteTimeoutCount = new AtomicInteger(); - - private final boolean printExceptions; - private final boolean verbose; - - public ListenerForTesting() { - this(false, false); - } - - public ListenerForTesting(boolean verbose) { - this(false, verbose); - } - - public ListenerForTesting(boolean printExceptions, boolean verbose) { - this.printExceptions = printExceptions; - this.verbose = verbose; - } - - public void reset() { - count.set(0); - exceptionCount.set(0); - eventCounts.clear(); - errorCounts.clear(); - exitOnDisconnect.set(false); - exitOnHeartbeatError.set(false); - lastEventConnection = null; - statusChanged = null; - slowSubscriber = null; - errorWaitFuture = null; - heartbeatAlarmEventWaitFuture = null; - pullStatusWarningWaitFuture = null; - pullStatusErrorWaitFuture = null; - eventToWaitFor = null; - errorToWaitFor = null; - connectionEvents.clear(); - errors.clear(); - exceptions.clear(); - slowConsumers.clear(); - discardedMessages.clear(); - unhandledStatuses.clear(); - pullStatusWarnings.clear(); - pullStatusErrors.clear(); - heartbeatAlarms.clear(); - flowControlProcessedEvents.clear(); - socketWriteTimeoutCount.set(0); - } - - private boolean waitForBooleanFuture(CompletableFuture future, long timeout, TimeUnit units) { - try { - return future.get(timeout, units); - } catch (TimeoutException | ExecutionException | InterruptedException e) { - maybePrintException("waitForBooleanFuture", e); - return false; - } - } - - private T waitForFuture(CompletableFuture future, long waitInMillis) { - try { - return future.get(waitInMillis, TimeUnit.MILLISECONDS); - } catch (TimeoutException | ExecutionException | InterruptedException e) { - maybePrintException("waitForFuture", e); - return null; - } - } - - private void maybePrintException(String label, Exception e) { - if (printExceptions) { - System.err.print("LFT " + label + ": "); - e.printStackTrace(); - } - } - - public void setExitOnDisconnect() { - exitOnDisconnect.set(true); - } - - public void setExitOnHeartbeatError() { - exitOnHeartbeatError.set(true); - } - - public void prepForStatusChange(Events waitFor) { - prepLock.lock(); - try { - statusChanged = new CompletableFuture<>(); - eventToWaitFor = waitFor; - if (verbose) { - report("prepForStatusChange", waitFor); - } - } finally { - prepLock.unlock(); - } - } - - public boolean waitForStatusChange(long timeout, TimeUnit units) { - return waitForBooleanFuture(statusChanged, timeout, units); - } - - public void exceptionOccurred(Connection conn, Exception exp) { - lastEventConnection = conn; - exceptions.add(exp); - count.incrementAndGet(); - exceptionCount.incrementAndGet(); - - if (exp != null) { - if (verbose) { - report("exceptionOccurred", "conn:" + conn.hashCode() + ", " + exp); - } - maybePrintException("exceptionOccurred", exp); - } - } - - public boolean _eventually(long timeout, Supplier> listSupplier, Predicate predicate) { - long start = System.currentTimeMillis(); - int i = 0; - do { - List list = listSupplier.get(); - int size = list.size(); - for (; i < size; i++) { - if (predicate.test(list.get(i))) { - return true; - } - } - } - while (System.currentTimeMillis() - start <= timeout); - return false; - } - - public void prepForError(String waitFor) { - prepLock.lock(); - try { - errorWaitFuture = new CompletableFuture<>(); - errorToWaitFor = waitFor; - if (verbose) { - report("prepForError", waitFor); - } - } finally { - prepLock.unlock(); - } - } - - public boolean errorsEventually(String contains, long timeout) { - return _eventually(timeout, () -> copy(errors), (s) -> s.contains(contains)); - } - - public void errorOccurred(Connection conn, String errorText) { - lastEventConnection = conn; - add(errors, errorText); - count.incrementAndGet(); - - prepLock.lock(); - try { - AtomicInteger counter = errorCounts.computeIfAbsent(errorText, k -> new AtomicInteger()); - counter.incrementAndGet(); - if (errorWaitFuture != null && errorText.contains(errorToWaitFor)) { - errorWaitFuture.complete(Boolean.TRUE); - } - if (verbose) { - report("errorOccurred", errorText); - } - } finally { - prepLock.unlock(); - } - } - - public void messageDiscarded(Connection conn, Message msg) { - lastEventConnection = conn; - count.incrementAndGet(); - - prepLock.lock(); - try { - discardedMessages.add(msg); - if (verbose) { - report("messageDiscarded", msg); - } - } finally { - prepLock.unlock(); - } - } - - @Override - public void connectionEvent(Connection conn, Events type) { - connectionEvent(conn, type, null, null); - } - - @Override - public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) { - lastEventConnection = conn; - connectionEvents.add(type); - count.incrementAndGet(); - - if (exitOnDisconnect.get() && type == Events.DISCONNECTED) { - System.exit(-1); - } - - prepLock.lock(); - try { - AtomicInteger counter = eventCounts.computeIfAbsent(type, k -> new AtomicInteger()); - counter.incrementAndGet(); - if (statusChanged != null && type == eventToWaitFor) { - statusChanged.complete(Boolean.TRUE); - } - if (verbose) { - report("connectionEvent", type); - } - } finally { - prepLock.unlock(); - } - } - - public Future waitForSlow() { - slowSubscriber = new CompletableFuture<>(); - return slowSubscriber; - } - - public void slowConsumerDetected(Connection conn, Consumer consumer) { - count.incrementAndGet(); - - prepLock.lock(); - try { - slowConsumers.add(consumer); - if (slowSubscriber != null) { - slowSubscriber.complete(true); - } - if (verbose) { - String msg; - if (consumer instanceof NatsSubscription) { - NatsSubscription nats = (NatsSubscription)consumer; - msg = "Subscription " + nats.getSID() + " for " + nats.getSubject(); - } - else if (consumer instanceof NatsDispatcher) { - NatsDispatcher nats = (NatsDispatcher)consumer; - msg = "Dispatcher " + nats.getId(); - } - else { - msg = consumer.toString(); - } - report("slowConsumerDetected", msg); - } - } finally { - prepLock.unlock(); - } - } - - public static final DateTimeFormatter SIMPLE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); - - public static String simpleTime() { - return SIMPLE_TIME_FORMATTER.format(DateTimeUtils.gmtNow()); - } - - private void report(String func, Object message) { - System.out.println("[" + simpleTime() + " ListenerForTesting." + func + "] " + message); - } - - private final ReentrantLock listLock = new ReentrantLock(); - private List copy(List list) { - listLock.lock(); - try { - return new ArrayList<>(list); - } - finally { - listLock.unlock(); - } - } - - private void add(List list, T t) { - listLock.lock(); - try { - list.add(t); - } - finally { - listLock.unlock(); - } - } - - public List getConnectionEvents() { - return connectionEvents; - } - - public List getErrors() { - return errors; - } - - public List getExceptions() { - return exceptions; - } - - public List getSlowConsumers() { - return slowConsumers; - } - - public List getDiscardedMessages() { - return discardedMessages; - } - - public List getUnhandledStatuses() { - return unhandledStatuses; - } - - public List getPullStatusWarnings() { - return pullStatusWarnings; - } - - public List getPullStatusErrors() { - return pullStatusErrors; - } - - public List getHeartbeatAlarms() { - return heartbeatAlarms; - } - - public List getFlowControlProcessedEvents() { - return flowControlProcessedEvents; - } - - public int getSocketWriteTimeoutCount() { - return socketWriteTimeoutCount.get(); - } - - public int getCount() { - return count.get(); - } - - public int getExceptionCount() { - return exceptionCount.get(); - } - - public int getEventCount(Events type) { - int retVal = 0; - prepLock.lock(); - try { - AtomicInteger counter = eventCounts.get(type); - if (counter != null) { - retVal = counter.get(); - } - } finally { - prepLock.unlock(); - } - return retVal; - } - - public int getErrorCount(String type) { - int retVal = 0; - prepLock.lock(); - try { - AtomicInteger counter = errorCounts.get(type); - if (counter != null) { - retVal = counter.get(); - } - } finally { - prepLock.unlock(); - } - return retVal; - } - - public void dumpErrorCountsToStdOut() { - prepLock.lock(); - try { - System.out.println("#### Test Handler Error Counts ####"); - for (String key : errorCounts.keySet()) { - int count = errorCounts.get(key).get(); - System.out.println(key+": "+count); - } - } finally { - prepLock.unlock(); - } - } - - public Connection getLastEventConnection() { - return lastEventConnection; - } - - @Override - public void unhandledStatus(Connection conn, JetStreamSubscription sub, Status status) { - unhandledStatuses.add(new StatusEvent(sub, status)); - } - - public void prepForPullStatusWarning() { - prepLock.lock(); - try { - pullStatusWarningWaitFuture = new CompletableFuture<>(); - } - finally { - prepLock.unlock(); - } - } - - public StatusEvent waitForPullStatusWarning(long waitInMillis) { - return waitForFuture(pullStatusWarningWaitFuture, waitInMillis); - } - - public boolean pullStatusWarningEventually(String contains, long timeout) { - return _eventually(timeout, () -> copy(pullStatusWarnings), - (se) -> se.status.getMessage().contains(contains)); - } - - @Override - public void pullStatusWarning(Connection conn, JetStreamSubscription sub, Status status) { - prepLock.lock(); - try { - StatusEvent event = new StatusEvent(sub, status); - if (verbose) { - report("pullStatusWarning", event); - } - add(pullStatusWarnings, event); - if (pullStatusWarningWaitFuture != null) { - pullStatusWarningWaitFuture.complete(event); - } - } finally { - prepLock.unlock(); - } - } - - public void prepForPullStatusError() { - prepLock.lock(); - try { - pullStatusErrorWaitFuture = new CompletableFuture<>(); - } - finally { - prepLock.unlock(); - } - } - - public StatusEvent waitForPullStatusError(long waitInMillis) { - return waitForFuture(pullStatusErrorWaitFuture, waitInMillis); - } - - public boolean pullStatusErrorOrWait(String contains, long timeout) { - return _eventually(timeout, () -> copy(pullStatusErrors), - (se) -> se.status.getMessage().contains(contains)); - } - - @Override - public void pullStatusError(Connection conn, JetStreamSubscription sub, Status status) { - prepLock.lock(); - try { - StatusEvent event = new StatusEvent(sub, status); - if (verbose) { - report("pullStatusError", event); - } - add(pullStatusErrors, event); - if (pullStatusErrorWaitFuture != null) { - pullStatusErrorWaitFuture.complete(event); - } - } finally { - prepLock.unlock(); - } - } - - public void prepForHeartbeatAlarm() { - prepLock.lock(); - try { - heartbeatAlarmEventWaitFuture = new CompletableFuture<>(); - } - finally { - prepLock.unlock(); - } - } - - public HeartbeatAlarmEvent waitForHeartbeatAlarm(long waitInMillis) { - return waitForFuture(heartbeatAlarmEventWaitFuture, waitInMillis); - } - - @Override - public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { - prepLock.lock(); - try { - if (exitOnHeartbeatError.get()) { - System.exit(-2); - } - HeartbeatAlarmEvent event = new HeartbeatAlarmEvent(sub, lastStreamSequence, lastConsumerSequence); - if (verbose) { - report("heartbeatAlarm", event); - } - heartbeatAlarms.add(event); - if (heartbeatAlarmEventWaitFuture != null) { - heartbeatAlarmEventWaitFuture.complete(event); - } - } finally { - prepLock.unlock(); - } - } - - @Override - public void flowControlProcessed(Connection conn, JetStreamSubscription sub, String subject, FlowControlSource source) { - flowControlProcessedEvents.add(new FlowControlProcessedEvent(sub, subject, source)); - } - - @Override - public void socketWriteTimeout(Connection conn) { - socketWriteTimeoutCount.incrementAndGet(); - } - - public static class StatusEvent { - String sid; - Status status; - - public StatusEvent(JetStreamSubscription sub, Status status) { - this.sid = extractSid(sub); - this.status = status; - } - - @Override - public String toString() { - return "StatusEvent{" + - "sid='" + sid + '\'' + - ", status=" + status + - '}'; - } - } - - public static class HeartbeatAlarmEvent { - String sid; - long lastStreamSequence; - long lastConsumerSequence; - - public HeartbeatAlarmEvent(JetStreamSubscription sub, long lastStreamSequence, long lastConsumerSequence) { - this.sid = extractSid(sub); - this.lastStreamSequence = lastStreamSequence; - this.lastConsumerSequence = lastConsumerSequence; - } - - @Override - public String toString() { - return "HeartbeatAlarmEvent{" + - "sid='" + sid + '\'' + - ", lastStreamSequence=" + lastStreamSequence + - ", lastConsumerSequence=" + lastConsumerSequence + - '}'; - } - } - - public static class FlowControlProcessedEvent { - String sid; - String subject; - FlowControlSource source; - - public FlowControlProcessedEvent(JetStreamSubscription sub, String subject, FlowControlSource source) { - this.sid = extractSid(sub); - this.subject = subject; - this.source = source; - } - - @Override - public String toString() { - return "FlowControlEvent{" + - "sid='" + sid + '\'' + - ", subject='" + subject + '\'' + - ", source=" + source + - '}'; - } - } - - private static String extractSid(JetStreamSubscription sub) { - return ((NatsJetStreamSubscription)sub).getSID(); - } -} diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index e06a89e9f..46917008d 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; +import io.nats.client.support.Listener; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -24,8 +25,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import static io.nats.client.utils.ConnectionUtils.assertClosed; -import static io.nats.client.utils.ConnectionUtils.assertConnected; +import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -187,7 +187,7 @@ public void testDisconnectOnBadProtocol() throws Exception { } void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableFuture ready) throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(badServer, null)) { Options options = optionsBuilder(mockTs) @@ -195,20 +195,10 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF .errorListener(listener) .connectionListener(listener) .build(); - Connection nc = Nats.connect(options); - try { - assertConnected(nc); - - listener.prepForStatusChange(Events.DISCONNECTED); + try (Connection nc = standardConnect(options)) { + listener.queueConnectionEvent(Events.DISCONNECTED); ready.complete(Boolean.TRUE); - listener.waitForStatusChange(200, TimeUnit.MILLISECONDS); - - assertTrue(listener.getExceptionCount() > 0); - assertTrue(Connection.Status.DISCONNECTED == nc.getStatus() - || Connection.Status.CLOSED == nc.getStatus(), "Disconnected Status"); - } finally { - nc.close(); - assertClosed(nc); + listener.validate(); } } } diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java index b01d3dada..994042d16 100644 --- a/src/test/java/io/nats/client/impl/MessageManagerTests.java +++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java @@ -28,6 +28,7 @@ import static io.nats.client.impl.MessageManager.ManageResult; import static io.nats.client.impl.MessageManager.ManageResult.*; +import static io.nats.client.support.Listener.SHORT_VALIDATE_TIMEOUT; import static io.nats.client.support.ListenerStatusType.PullError; import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsConstants.NANOS_PER_MILLI; @@ -179,71 +180,64 @@ private static void assertManageResult(Listener listener, ListenerStatusType exp @Test public void testPushManagerHeartbeats() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, nc -> { PushMessageManager pushMgr = getPushManager(nc, push_xhb_xfc(), null, false, true, false); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pushMgr); - listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pushMgr.startup(sub); - ListenerForTesting.HeartbeatAlarmEvent event = listener.waitForHeartbeatAlarm(1000); - assertNull(event); + listener.validateNotReceived(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pushMgr = getPushManager(nc, push_xhb_xfc(), null, false, false, false); sub = mockSub((NatsConnection)nc, pushMgr); pushMgr.startup(sub); - event = listener.waitForHeartbeatAlarm(1000); - assertNull(event); + listener.validateNotReceived(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); PushSubscribeOptions pso = ConsumerConfiguration.builder().idleHeartbeat(100).buildPushSubscribeOptions(); pushMgr = getPushManager(nc, pso, null, false, true, false); sub = mockSub((NatsConnection)nc, pushMgr); pushMgr.startup(sub); - event = listener.waitForHeartbeatAlarm(1000); - assertNotNull(event); + listener.validate(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pushMgr = getPushManager(nc, pso, null, false, false, false); sub = mockSub((NatsConnection)nc, pushMgr); pushMgr.startup(sub); - event = listener.waitForHeartbeatAlarm(1000); - assertNotNull(event); + pushMgr.startup(sub); }); } @Test public void testPullManagerHeartbeats() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); runInSharedOwnNc(listener, nc -> { + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); PullMessageManager pullMgr = getPullManager(nc, null, true); NatsJetStreamSubscription sub = mockSub((NatsConnection)nc, pullMgr); pullMgr.startup(sub); pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).build(), false, null); - assertEquals(0, listener.getHeartbeatAlarms().size()); + listener.validateNotReceived(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build(), false, null); - ListenerForTesting.HeartbeatAlarmEvent event = listener.waitForHeartbeatAlarm(1000); - assertNotNull(event); + listener.validate(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build(), false, null); - event = listener.waitForHeartbeatAlarm(1000); - assertNotNull(event); + listener.validate(); listener.reset(); - listener.prepForHeartbeatAlarm(); + listener.queueHeartbeat(SHORT_VALIDATE_TIMEOUT); pullMgr.startPullRequest("pullSubject", PullRequestOptions.builder(1).build(), false, null); - event = listener.waitForHeartbeatAlarm(1000); - assertNull(event); + listener.validateNotReceived(); }); } diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 4191a41d9..0088014c2 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -37,6 +37,7 @@ import static io.nats.client.AuthTests.getUserCredsAuthHander; import static io.nats.client.NatsTestServer.configFileBuilder; import static io.nats.client.NatsTestServer.getLocalhostUri; +import static io.nats.client.support.Listener.VERY_LONG_VALIDATE_TIMEOUT; import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.*; @@ -562,13 +563,13 @@ public void testTlsNoIpConnection() throws Exception { flushConnection(nc); // make sure we get the new server via info listener.validate(); - listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED, VERY_LONG_VALIDATE_TIMEOUT); ts.close(); flushConnection(nc); - listener.validate(20000); + listener.validate(); URI uri = options.createURIForServer(nc.getConnectedUrl()); assertEquals(ts2.getPort(), uri.getPort()); // full uri will have some ip address, just check port @@ -579,7 +580,7 @@ public void testTlsNoIpConnection() throws Exception { @Test public void testWriterFilterTiming() throws Exception { NatsConnection nc; - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); int port = NatsTestServer.nextPort(); try (NatsTestServer ts = new NatsTestServer(port)) { @@ -735,32 +736,33 @@ public void testForceReconnectOptionsBuilder() { @Test public void testForceReconnect() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); ThreeServerTestOptions tstOpts = makeThreeServerTestOptions(listener, false); runInCluster(tstOpts, (nc0, nc1, nc2) -> _testForceReconnect(nc0, listener)); } @Test public void testForceReconnectWithAccount() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); ThreeServerTestOptions tstOpts = makeThreeServerTestOptions(listener, true); runInCluster(tstOpts, (nc0, nc1, nc2) -> _testForceReconnect(nc0, listener)); } - private static void _testForceReconnect(Connection nc0, ListenerForTesting listener) throws IOException, InterruptedException { + private static void _testForceReconnect(Connection nc0, Listener listener) throws IOException, InterruptedException { ServerInfo si = nc0.getServerInfo(); String connectedServer = si.getServerId(); + listener.queueConnectionEvent(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); nc0.forceReconnect(); waitUntilConnected(nc0); // wait for reconnect si = nc0.getServerInfo(); assertNotEquals(connectedServer, si.getServerId()); - assertTrue(listener.getConnectionEvents().contains(Events.DISCONNECTED)); - assertTrue(listener.getConnectionEvents().contains(Events.RECONNECTED)); + listener.validateAll(); } - private static ThreeServerTestOptions makeThreeServerTestOptions(ListenerForTesting listener, final boolean configureAccount) { + private static ThreeServerTestOptions makeThreeServerTestOptions(Listener listener, final boolean configureAccount) { return new ThreeServerTestOptions() { @Override public void append(int index, Options.Builder builder) { @@ -925,7 +927,7 @@ public void run() { @Test public void testSocketDataPortTimeout() throws Exception { - ListenerForTesting listener = new ListenerForTesting(); + Listener listener = new Listener(); Options.Builder builder = optionsBuilder() .socketWriteTimeout(5000) .pingInterval(Duration.ofSeconds(1)) @@ -934,6 +936,10 @@ public void testSocketDataPortTimeout() throws Exception { .connectionListener(listener) .errorListener(listener); + listener.queueConnectionEvent(Events.DISCONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueSocketWriteTimeout(); + AtomicBoolean gotOutputQueueIsFull = new AtomicBoolean(); runInOwnServer(nc1 -> runInOwnServer(nc2 -> { int port1 = nc1.getServerInfo().getPort(); @@ -965,8 +971,6 @@ public void testSocketDataPortTimeout() throws Exception { })); assertTrue(gotOutputQueueIsFull.get()); - assertTrue(listener.getSocketWriteTimeoutCount() > 0); - assertTrue(listener.getConnectionEvents().contains(Events.DISCONNECTED)); - assertTrue(listener.getConnectionEvents().contains(Events.RECONNECTED)); + listener.validateAll(); } } diff --git a/src/test/java/io/nats/client/support/Listener.java b/src/test/java/io/nats/client/support/Listener.java index 800c0bb9b..907108017 100644 --- a/src/test/java/io/nats/client/support/Listener.java +++ b/src/test/java/io/nats/client/support/Listener.java @@ -26,16 +26,22 @@ @SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) public class Listener implements ErrorListener, ConnectionListener { - private static final int VALIDATE_TIMEOUT = 5000; + public static final int SHORT_VALIDATE_TIMEOUT = 10000; + public static final int DEFAULT_VALIDATE_TIMEOUT = 5000; + public static final int LONG_VALIDATE_TIMEOUT = 10000; + public static final int VERY_LONG_VALIDATE_TIMEOUT = 20000; private final boolean printExceptions; private final boolean verbose; private final List futures; + private final List discardedMessages; + private Connection lastConnectionEventConnection; private int exceptionCount; private int heartbeatAlarmCount; private int flowControlCount; private int pullStatusWarningsCount; + private int socketWriteTimeoutCount; public Listener() { this(false, false); @@ -49,6 +55,7 @@ public Listener(boolean printExceptions, boolean verbose) { this.printExceptions = printExceptions; this.verbose = verbose; futures = new ArrayList<>(); + discardedMessages = new ArrayList<>(); } public void reset() { @@ -56,30 +63,32 @@ public void reset() { f.cancel(true); } futures.clear(); + discardedMessages.clear(); + lastConnectionEventConnection = null; exceptionCount = 0; heartbeatAlarmCount = 0; flowControlCount = 0; pullStatusWarningsCount = 0; + socketWriteTimeoutCount = 0; } + // ---------------------------------------------------------------------------------------------------- + // Valdiate + // ---------------------------------------------------------------------------------------------------- public void validate() { - _validate(futures.get(0), VALIDATE_TIMEOUT); - } - - public void validate(long customTimeout) { - _validate(futures.get(0), customTimeout); + _validate(futures.get(0)); } public void validateAll() { List copy = new ArrayList<>(futures); for (ListenerFuture future : copy) { - _validate(future, VALIDATE_TIMEOUT); + _validate(future); } } - private void _validate(ListenerFuture f, long timeout) { + private void _validate(ListenerFuture f) { try { - f.get(timeout, TimeUnit.MILLISECONDS); + f.get(f.validateTimeout, TimeUnit.MILLISECONDS); // future was completed, it and all the rest can be cancelled and removed from tracking futures.remove(f); } @@ -97,7 +106,7 @@ public void validateForAny() { for (int ix = 0; ix < len; ix++) { ListenerFuture f = futuresToTry.get(ix); try { - f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + f.get(f.validateTimeout, TimeUnit.MILLISECONDS); // future was completed, it and all the rest can be cancelled and removed from tracking while (ix < len) { f = futuresToTry.get(ix++); @@ -120,7 +129,7 @@ public void validateNotReceived() { ListenerFuture f = futures.get(0); futures.remove(f); // removed from tracking try { - f.get(VALIDATE_TIMEOUT, TimeUnit.MILLISECONDS); + f.get(f.validateTimeout, TimeUnit.MILLISECONDS); Assertions.fail("'Validate Not Received' Failed " + f.getDetails()); } catch (TimeoutException ignore) { @@ -134,6 +143,9 @@ public void validateNotReceived() { } } + // ---------------------------------------------------------------------------------------------------- + // Queue + // ---------------------------------------------------------------------------------------------------- private void queue(String label, ListenerFuture f) { if (verbose) { report("Queue For " + label, f.getDetails()); @@ -142,27 +154,78 @@ private void queue(String label, ListenerFuture f) { } public void queueConnectionEvent(Events type) { - queue("Event", new ListenerFuture(type)); + queue("Event", new ListenerFuture(type, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueConnectionEvent(Events type, int validateTimeout) { + queue("Event", new ListenerFuture(type, validateTimeout)); } public void queueException(Class exceptionClass) { - queue("Exception", new ListenerFuture(exceptionClass)); + queue("Exception", new ListenerFuture(exceptionClass, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueException(Class exceptionClass, int validateTimeout) { + queue("Exception", new ListenerFuture(exceptionClass, validateTimeout)); } public void queueException(Class exceptionClass, String contains) { - queue("Exception", new ListenerFuture(exceptionClass, contains)); + queue("Exception", new ListenerFuture(exceptionClass, contains, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueException(Class exceptionClass, String contains, int validateTimeout) { + queue("Exception", new ListenerFuture(exceptionClass, contains, validateTimeout)); } public void queueError(String errorText) { - queue("Error", new ListenerFuture(errorText)); + queue("Error", new ListenerFuture(errorText, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueError(String errorText, int validateTimeout) { + queue("Error", new ListenerFuture(errorText, validateTimeout)); } public void queueStatus(ListenerStatusType type, int statusCode) { - queue("Status", new ListenerFuture(type, statusCode)); + queue("Status", new ListenerFuture(type, statusCode, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueStatus(ListenerStatusType type, int statusCode, int validateTimeout) { + queue("Status", new ListenerFuture(type, statusCode, validateTimeout)); } public void queueFlowControl(String fcSubject, FlowControlSource fcSource) { - queue("FlowControl", new ListenerFuture(fcSubject, fcSource)); + queue("FlowControl", new ListenerFuture(fcSubject, fcSource, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueFlowControl(String fcSubject, FlowControlSource fcSource, int validateTimeout) { + queue("FlowControl", new ListenerFuture(fcSubject, fcSource, validateTimeout)); + } + + public void queueHeartbeat() { + queue("Heartbeat", new ListenerFuture(true, false, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueHeartbeat(int validateTimeout) { + queue("Heartbeat", new ListenerFuture(true, false, validateTimeout)); + } + + public void queueSocketWriteTimeout() { + queue("SocketWriteTimeout", new ListenerFuture(false, true, DEFAULT_VALIDATE_TIMEOUT)); + } + + public void queueSocketWriteTimeout(int validateTimeout) { + queue("SocketWriteTimeout", new ListenerFuture(false, true, validateTimeout)); + } + + // ---------------------------------------------------------------------------------------------------- + // Getters + // ---------------------------------------------------------------------------------------------------- + public List getDiscardedMessages() { + return discardedMessages; + } + + public Connection getLastConnectionEventConnection() { + return lastConnectionEventConnection; } public int getExceptionCount() { @@ -181,14 +244,7 @@ public int getPullStatusWarningsCount() { return pullStatusWarningsCount; } - private void tryToComplete(List futures, Predicate predicate) { - for (ListenerFuture f : futures) { - if (predicate.test(f)) { - f.complete(null); - return; - } - } - } + public int getSocketWriteTimeoutCount() { return socketWriteTimeoutCount; } // ---------------------------------------------------------------------------------------------------- // Connection Listener @@ -203,6 +259,7 @@ public void connectionEvent(Connection conn, Events type, Long time, String uriD if (verbose) { report("connectionEvent", type); } + lastConnectionEventConnection = conn; tryToComplete(futures, f -> type.equals(f.eventType)); } @@ -250,6 +307,7 @@ public void slowConsumerDetected(Connection conn, Consumer consumer) { @Override public void messageDiscarded(Connection conn, Message msg) { + discardedMessages.add(msg); } @Override @@ -258,6 +316,7 @@ public void heartbeatAlarm(Connection conn, JetStreamSubscription sub, long last report("Heartbeat Alarm", lastStreamSequence + " " + lastConsumerSequence); } heartbeatAlarmCount++; + tryToComplete(futures, f -> f.forHeartbeat); } private void statusReceived(ListenerStatusType type, Status status) { @@ -294,17 +353,35 @@ public void flowControlProcessed(Connection conn, JetStreamSubscription sub, Str @Override public void socketWriteTimeout(Connection conn) { + if (verbose) { + report("Socket Write Timeout"); + } + socketWriteTimeoutCount++; + tryToComplete(futures, f -> f.forSocketWriteTimeout); } // ---------------------------------------------------------------------------------------------------- // Helpers // ---------------------------------------------------------------------------------------------------- + private void tryToComplete(List futures, Predicate predicate) { + for (ListenerFuture f : futures) { + if (predicate.test(f)) { + f.complete(null); + return; + } + } + } public static final DateTimeFormatter SIMPLE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); public static String simpleTime() { return SIMPLE_TIME_FORMATTER.format(DateTimeUtils.gmtNow()); } + @SuppressWarnings("SameParameterValue") + private void report(String func) { + System.out.println("[" + simpleTime() + " " + func + "]"); + } + private void report(String func, Object message) { System.out.println("[" + simpleTime() + " " + func + "] " + message); } diff --git a/src/test/java/io/nats/client/support/ListenerFuture.java b/src/test/java/io/nats/client/support/ListenerFuture.java index cf478c902..b0766e706 100644 --- a/src/test/java/io/nats/client/support/ListenerFuture.java +++ b/src/test/java/io/nats/client/support/ListenerFuture.java @@ -32,34 +32,50 @@ public class ListenerFuture extends CompletableFuture { public int statusCode = -1; public String fcSubject; public ErrorListener.FlowControlSource fcSource; + public boolean forHeartbeat; + public boolean forSocketWriteTimeout; public Throwable receivedException; - public ListenerFuture(ConnectionListener.Events type) { + public int validateTimeout; + + ListenerFuture(ConnectionListener.Events type, int validateTimeout) { this.eventType = type; + this.validateTimeout = validateTimeout; } - public ListenerFuture(Class exceptionClass) { + ListenerFuture(Class exceptionClass, int validateTimeout) { this.exceptionClass = exceptionClass; + this.validateTimeout = validateTimeout; } - public ListenerFuture(Class exceptionClass, String contains) { + ListenerFuture(Class exceptionClass, String contains, int validateTimeout) { this.exceptionClass = exceptionClass; this.exContains = contains; + this.validateTimeout = validateTimeout; } - public ListenerFuture(String errorText) { + ListenerFuture(String errorText, int validateTimeout) { error = errorText; + this.validateTimeout = validateTimeout; } - public ListenerFuture(ListenerStatusType type, int statusCode) { + ListenerFuture(ListenerStatusType type, int statusCode, int validateTimeout) { lbfStatusType = type; this.statusCode = statusCode; + this.validateTimeout = validateTimeout; } - public ListenerFuture(String fcSubject, ErrorListener.FlowControlSource fcSource) { + ListenerFuture(String fcSubject, ErrorListener.FlowControlSource fcSource, int validateTimeout) { this.fcSubject = fcSubject; this.fcSource = fcSource; + this.validateTimeout = validateTimeout; + } + + public ListenerFuture(boolean forHeartbeat, boolean forSocketWriteTimeout, int validateTimeout) { + this.forHeartbeat = forHeartbeat; + this.forSocketWriteTimeout = forSocketWriteTimeout; + this.validateTimeout = validateTimeout; } @Override diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index d8e5b53b5..e627dc45c 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -129,7 +129,7 @@ public static void assertClosed(Connection conn) { () -> expectingMessage(conn, Connection.Status.CLOSED)); } - public static void assertCanConnect(Options options) throws IOException, InterruptedException { + public static void assertCanConnect(Options options) { standardCloseConnection(standardConnect(options)); } From c4cd4ecae0b08b87d0e58ea996234dfad59a6ff1 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 5 Dec 2025 07:01:25 -0500 Subject: [PATCH 33/51] fix after merge --- .../client/impl/NatsConnectionImplTests.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index 5ad71ff50..7d42f5d5b 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -17,18 +17,21 @@ import io.nats.client.Options; import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; + import static io.nats.client.utils.ConnectionUtils.standardConnect; -import static io.nats.client.utils.OptionsUtils.NOOP_EL; -import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class NatsConnectionImplTests { @Test public void testConnectionClosedProperly() throws Exception { - try (NatsTestServer server = new NatsTestServer(true)) { - Options options = standardOptions(server.getNatsLocalhostUri()); + try (NatsTestServer server = new NatsTestServer()) { + Options options = Options.builder().server(server.getNatsLocalhostUri()).build(); verifyInternalExecutors(options); // using options copied from options to demonstrate the executors @@ -43,7 +46,7 @@ public void testConnectionClosedProperly() throws Exception { assertFalse(es.isShutdown()); assertFalse(ses.isShutdown()); - options = standardOptionsBuilder(server.getNatsLocalhostUri()) + options = Options.builder().server(server.getNatsLocalhostUri()) .executor(es) .scheduledExecutor(ses) .callbackExecutor(callbackEs) @@ -56,7 +59,7 @@ public void testConnectionClosedProperly() throws Exception { ThreadFactory callbackThreadFactory = r -> new Thread(r, "callback"); ThreadFactory connectThreadFactory = r -> new Thread(r, "connect"); - options = standardOptionsBuilder(server.getNatsLocalhostUri()) + options = Options.builder().server(server.getNatsLocalhostUri()) .executor(es) .scheduledExecutor(ses) .callbackThreadFactory(callbackThreadFactory) @@ -75,8 +78,8 @@ public void testConnectionClosedProperly() throws Exception { } } - private static void verifyInternalExecutors(Options options) throws InterruptedException, IOException { - try (NatsConnection nc = (NatsConnection)standardConnection(options)) { + private static void verifyInternalExecutors(Options options) throws InterruptedException { + try (NatsConnection nc = (NatsConnection)standardConnect(options)) { ExecutorService es = options.getExecutor(); ScheduledExecutorService ses = options.getScheduledExecutor(); ExecutorService callbackEs = options.getCallbackExecutor(); @@ -117,7 +120,7 @@ private static void verifyExternalExecutors(Options options, ExecutorService userEs, ScheduledExecutorService userSes, ExecutorService userCallbackEs, ExecutorService userConnectEs ) throws InterruptedException, IOException { - try (NatsConnection nc = (NatsConnection)standardConnection(options)) { + try (NatsConnection nc = (NatsConnection)standardConnect(options)) { ExecutorService es = options.getExecutor(); ScheduledExecutorService ses = options.getScheduledExecutor(); ExecutorService callbackEs = options.getCallbackExecutor(); From 48cd331832284eea82eecaa3355f68a6bc76429c Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 5 Dec 2025 07:18:39 -0500 Subject: [PATCH 34/51] fix after merge --- src/test/java/io/nats/client/impl/ErrorListenerTests.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 471b3e19e..26206c7fe 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -15,7 +15,6 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; -import io.nats.client.support.Debug; import io.nats.client.support.Listener; import io.nats.client.support.Status; import io.nats.client.utils.TestBase; @@ -291,7 +290,6 @@ public void testDiscardedMessageServerClosed() throws Exception { .errorListener(listener) .pingInterval(Duration.ofSeconds(100)) // make this long so we don't ping during test .build(); - Debug.info("O", options.getServers()); listener.queueConnectionEvent(Events.CONNECTED, LONG_VALIDATE_TIMEOUT); listener.queueConnectionEvent(Events.DISCONNECTED, LONG_VALIDATE_TIMEOUT); try (Connection nc = standardConnect(options)) { From 0ffbfbabd0da18c60b9fcc2d12c13439cf62adcb Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 5 Dec 2025 12:08:41 -0500 Subject: [PATCH 35/51] almost done --- src/test/java/io/nats/client/AuthTests.java | 74 +++++++++---------- .../java/io/nats/client/ConnectTests.java | 20 ++--- src/test/java/io/nats/client/EchoTests.java | 4 +- .../java/io/nats/client/PublishTests.java | 10 +-- .../java/io/nats/client/SubscriberTests.java | 4 +- .../nats/client/impl/AuthAndConnectTests.java | 4 +- .../client/impl/ConnectionListenerTests.java | 15 ++-- .../java/io/nats/client/impl/DrainTests.java | 44 +++++------ .../nats/client/impl/ErrorListenerTests.java | 10 +-- .../client/impl/JetStreamGeneralTests.java | 8 +- .../JetStreamManagementWithConfTests.java | 6 +- .../nats/client/impl/JetStreamPullTests.java | 7 +- .../nats/client/impl/MessageContentTests.java | 4 +- .../client/impl/NatsConnectionImplTests.java | 6 +- .../io/nats/client/impl/NatsMessageTests.java | 4 +- .../java/io/nats/client/impl/PingTests.java | 25 ++++--- .../io/nats/client/impl/ReconnectTests.java | 56 +++++++------- .../io/nats/client/impl/RequestTests.java | 15 ++-- .../io/nats/client/impl/SharedServer.java | 2 +- .../nats/client/impl/SimplificationTests.java | 9 +-- .../io/nats/client/impl/TLSConnectTests.java | 19 +++-- .../client/impl/WebsocketConnectTests.java | 4 +- .../java/io/nats/client/support/Listener.java | 7 +- .../io/nats/client/utils/ConnectionUtils.java | 50 +++++++++---- .../io/nats/client/utils/OptionsUtils.java | 8 -- .../java/io/nats/client/utils/TestBase.java | 18 ++--- 26 files changed, 222 insertions(+), 211 deletions(-) diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java index 934987690..750c4625e 100644 --- a/src/test/java/io/nats/client/AuthTests.java +++ b/src/test/java/io/nats/client/AuthTests.java @@ -38,7 +38,8 @@ import static io.nats.client.support.Listener.LONG_VALIDATE_TIMEOUT; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.*; +import static io.nats.client.utils.OptionsUtils.NOOP_EL; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.jwtResource; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.condition.OS.WINDOWS; @@ -63,27 +64,24 @@ public void testUserPass() throws Exception { String[] customArgs = { "--user", "uuu", "--pass", "ppp" }; try (NatsTestServer ts = new NatsTestServer(customArgs)) { // u/p in url - Options inUrl = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); - assertCanConnect(inUrl); + Options upInUrlOpts = optionsBuilder(userPassInUrl("uuu", "ppp", ts.getPort())).maxReconnects(0).build(); + assertCanConnect(upInUrlOpts); // u/p in options - Options inOptions = optionsBuilder(ts).maxReconnects(0) + Options upInOptionsOpts = optionsBuilder(ts).maxReconnects(0) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).build(); - assertCanConnect(inOptions); + assertCanConnect(upInOptionsOpts); - Options badUser = optionsBuilder(ts).maxReconnects(0) + Options badUserOpts = optionsBuilder(ts).maxReconnects(0).connectionTimeout(10000) .userInfo("zzz".toCharArray(), "ppp".toCharArray()).build(); - //noinspection resource - assertThrows(AuthenticationException.class, () -> standardConnect(badUser, AuthenticationException.class)); + assertThrows(AuthenticationException.class, () -> Nats.connect(badUserOpts)); - Options badPass = optionsBuilder(ts).maxReconnects(0) + Options badPassOpts = optionsBuilder(ts).maxReconnects(0).connectionTimeout(10000) .userInfo("uuu".toCharArray(), "zzz".toCharArray()).build(); - //noinspection resource - assertThrows(AuthenticationException.class, () -> standardConnect(badPass, AuthenticationException.class)); + assertThrows(AuthenticationException.class, () -> Nats.connect(badPassOpts)); - Options missingUserPass = optionsNoReconnect(ts); - //noinspection resource - assertThrows(AuthenticationException.class, () -> standardConnect(missingUserPass, AuthenticationException.class)); + Options missingUserPassOpts = optionsBuilder(ts).maxReconnects(0).connectionTimeout(10000).build(); + assertThrows(AuthenticationException.class, () -> Nats.connect(missingUserPassOpts)); } } @@ -167,7 +165,7 @@ public void testUserPassOnReconnect() throws Exception { // See config file for user/pass Options options = optionsBuilder(ts).maxReconnects(-1) .userInfo("uuu".toCharArray(), "ppp".toCharArray()).connectionListener(listener).build(); - nc = standardConnect(options); + nc = managedConnect(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -184,7 +182,7 @@ public void testUserPassOnReconnect() throws Exception { listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); nc.publish("test", null); @@ -193,7 +191,7 @@ public void testUserPassOnReconnect() throws Exception { Message msg = sub.nextMessage(Duration.ofSeconds(5)); assertNotNull(msg); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -226,7 +224,7 @@ public void testUserPassInURLOnReconnect() throws Exception { // See config file for user/pass Options options = new Options.Builder().server(userPassInUrl("uuu", "ppp", ts.getPort())) .maxReconnects(-1).connectionListener(listener).errorListener(NOOP_EL).build(); - nc = standardConnect(options); + nc = managedConnect(options); sub = nc.subscribe("test"); nc.publish("test", null); @@ -246,12 +244,12 @@ public void testUserPassInURLOnReconnect() throws Exception { listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect nc.publish("test", null); flushConnection(nc, MEDIUM_FLUSH_TIMEOUT_MS); Message msg = sub.nextMessage(Duration.ofSeconds(5)); assertNotNull(msg); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -271,11 +269,11 @@ public void testUserPassInURLClusteredWithDifferentUser() throws Exception { .pingInterval(Duration.ofMillis(100)) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect assertEquals(nc.getConnectedUrl(), url2); } } @@ -295,7 +293,7 @@ public void testUserPassInURLWithFallback() throws Exception { .noRandomize() .connectionListener(listener) .pingInterval(Duration.ofMillis(100)).build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); listener.queueConnectionEvent(Events.RESUBSCRIBED, LONG_VALIDATE_TIMEOUT); @@ -322,14 +320,14 @@ public void testTokenInURLClusteredWithDifferentUser() throws Exception { .connectionListener(listener) .pingInterval(Duration.ofMillis(100)) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); listener.validate(); - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect assertEquals(nc.getConnectedUrl(), url2); } } @@ -351,14 +349,14 @@ public void testTokenInURLWithFallback() throws Exception { .pingInterval(Duration.ofMillis(100)) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(nc.getConnectedUrl(), url1); listener.queueConnectionEvent(Events.RESUBSCRIBED); ts1.close(); listener.validate(); - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); } } @@ -437,7 +435,7 @@ public void testNKeyAuth() throws Exception { // direct through Nats.connect Connection nc = Nats.connect(ts.getServerUri(), Nats.staticCredentials(null, theKey.getSeed())); - standardCloseConnection(waitUntilConnected(nc)); + confirmConnectedThenClosed(nc); // fails with no nkey Options noNkey = optionsBuilder(ts).maxReconnects(0) @@ -462,7 +460,7 @@ public void testJWTAuthWithCredsFile() throws Exception { //test Nats.connect method Connection nc = Nats.connect(ts.getServerUri(), getUserCredsAuthHander()); - standardCloseConnection(waitUntilConnected(nc)); + confirmConnectedThenClosed(nc); }); } @@ -471,7 +469,7 @@ public void testJWTAuthWithCredsFileAlso() throws Exception { //test Nats.connect method runInConfiguredServer("operatorJnatsTest.conf", ts -> { Connection nc = Nats.connect(ts.getServerUri(), Nats.credentials(jwtResource("userJnatsTest.creds"))); - standardCloseConnection(waitUntilConnected(nc)); + confirmConnectedThenClosed(nc); }); } @@ -486,7 +484,7 @@ public void testWsJWTAuthWithCredsFile() throws Exception { // directly Nats.connect Connection nc = Nats.connect(uri, getUserCredsAuthHander()); - standardCloseConnection(waitUntilConnected(nc)); + confirmConnectedThenClosed(nc); }); } @@ -527,7 +525,7 @@ public void testReconnectWithAuth() throws Exception { .connectionListener(listener) .errorListener(listener) .build(); - Connection nc = standardConnect(options); + Connection nc = managedConnect(options); assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.RECONNECTED); @@ -538,7 +536,7 @@ public void testReconnectWithAuth() throws Exception { listener.validate(); assertConnected(nc); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + closeAndConfirm(nc); }); }); } @@ -557,7 +555,7 @@ public void testCloseOnReconnectWithSameError() throws Exception { .authHandler(getUserCredsAuthHander()) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.CLOSED, LONG_VALIDATE_TIMEOUT); @@ -590,13 +588,13 @@ public void testThatAuthErrorIsCleared() throws Exception { .reconnectWait(Duration.ofSeconds(1)) // wait a tad to allow restarts .authHandler(getUserCredsAuthHander()) .build(); - Connection nc = standardConnect(options); + Connection nc = managedConnect(options); ncRef.set(nc); assertEquals(server2, nc.getConnectedUrl()); }); runInConfiguredServer("operator.conf", port2Ref.get(), ts2 -> { - waitUntilConnected(ncRef.get()); + confirmConnected(ncRef.get()); assertEquals(server2Ref.get(), ncRef.get().getConnectedUrl()); }); }); @@ -647,7 +645,7 @@ private static void _testReconnectAfter(String errText) throws Exception { listener.queueConnectionEvent(Events.RECONNECTED); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertEquals(mockTs.getServerUri(), nc.getConnectedUrl()); fMock.complete(true); listener.validate(); @@ -690,7 +688,7 @@ public void testRealUserAuthenticationExpired() throws Exception { .errorListener(listener) .maxReconnects(5) .build(); - try (Connection ignored = standardConnect(options)) { + try (Connection ignored = managedConnect(options)) { listener.validate(); } catch (RuntimeException e) { diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java index 8e74b897e..5be11cba7 100644 --- a/src/test/java/io/nats/client/ConnectTests.java +++ b/src/test/java/io/nats/client/ConnectTests.java @@ -52,7 +52,7 @@ public void testConnectVariants() throws Exception { try (NatsTestServer ts2 = new NatsTestServer()) { // commas in one server url Options options = optionsBuilder().server(ts1.getServerUri() + "," + ts2.getServerUri()).build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { // coverage for getClientAddress InetAddress inetAddress = nc.getClientInetAddress(); assertNotNull(inetAddress); @@ -66,7 +66,7 @@ public void testConnectVariants() throws Exception { int tries = 20; options = options(ts1, ts2); while (tries-- > 0 && (needOne || needTwo)) { - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Collection servers = nc.getServers(); assertTrue(servers.contains(ts1.getServerUri())); assertTrue(servers.contains(ts2.getServerUri())); @@ -89,7 +89,7 @@ public void testConnectVariants() throws Exception { // should never get a two options = optionsBuilder(ts1.getServerUri(), ts2.getServerUri()).noRandomize().build(); for (int i = 0; i < tries; i++) { - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Collection servers = nc.getServers(); assertTrue(servers.contains(ts1.getServerUri())); assertTrue(servers.contains(ts2.getServerUri())); @@ -216,7 +216,7 @@ public void testAsyncConnection() throws Exception { Connection nc = listener.getLastConnectionEventConnection(); assertNotNull(nc); assertConnected(nc); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -236,7 +236,7 @@ public void testAsyncConnectionWithReconnect() throws Exception { listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { - standardCloseConnection(waitUntilConnected(nc)); + confirmConnectedThenClosed(nc); } } @@ -334,7 +334,7 @@ public void testReconnectLogging() throws Exception { .connectionTimeout(Duration.ofSeconds(2)) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { assertConnected(nc); ts.close(); Thread.sleep(3000); @@ -358,7 +358,7 @@ public void testConnectExceptionHasURLS() { @Test public void testFlushBuffer() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnect(options(ts)); + Connection nc = managedConnect(options(ts)); // test connected nc.flushBuffer(); @@ -370,7 +370,7 @@ public void testFlushBuffer() throws Exception { // test while reconnecting assertThrows(IllegalStateException.class, nc::flushBuffer); - standardCloseConnection(nc); + closeAndConfirm(nc); // test when closed. assertThrows(IllegalStateException.class, nc::flushBuffer); @@ -380,7 +380,7 @@ public void testFlushBuffer() throws Exception { @Test public void testFlushBufferThreadSafety() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - Connection nc = standardConnect(options(ts)); + Connection nc = managedConnect(options(ts)); // use two latches to sync the threads as close as // possible. @@ -438,7 +438,7 @@ public void run() { // make sure the publisher actually completed. assertTrue(completedLatch.await(10, TimeUnit.SECONDS)); - standardCloseConnection(nc); + closeAndConfirm(nc); } } diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java index 8005cd2fc..f6b648b95 100644 --- a/src/test/java/io/nats/client/EchoTests.java +++ b/src/test/java/io/nats/client/EchoTests.java @@ -15,6 +15,7 @@ import io.nats.client.NatsServerProtocolMock.ExitAt; import io.nats.client.impl.SharedServer; +import io.nats.client.utils.ConnectionUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -22,7 +23,6 @@ import java.time.Duration; import static io.nats.client.utils.ConnectionUtils.assertClosed; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -55,7 +55,7 @@ public void testConnectToOldServerWithEcho() throws Exception { @Test public void testWithEcho() throws Exception { runInShared(nc1 -> { - try (Connection nc2 = standardConnect(options(nc1))) { + try (Connection nc2 = ConnectionUtils.managedConnect(options(nc1))) { // Echo is on so both sub should get messages from both pub String subject = random(); Subscription sub1 = nc1.subscribe(subject); diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java index c7d2ca172..39ae3e5ae 100644 --- a/src/test/java/io/nats/client/PublishTests.java +++ b/src/test/java/io/nats/client/PublishTests.java @@ -65,7 +65,7 @@ public void testThrowsWithoutSubject() throws Exception { public void testThrowsIfTooBig() throws Exception { byte[] body = new byte[1024]; // 1024 is > than max_payload.conf max_payload: 1000 runInConfiguredServer("max_payload.conf", ts -> { - try (Connection nc = standardConnect(options(ts))) { + try (Connection nc = managedConnect(options(ts))) { assertThrows(IllegalArgumentException.class, () -> nc.publish(random(), null, null, body)); } @@ -74,7 +74,7 @@ public void testThrowsIfTooBig() throws Exception { .clientSideLimitChecks(false) .errorListener(listener) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { listener.queueError("Maximum Payload Violation"); listener.queueException(SocketException.class); nc.publish(random(), null, null, body); @@ -165,7 +165,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) { - try (Connection nc = standardConnect(options(mockTs))) { + try (Connection nc = managedConnect(options(mockTs))) { byte[] bodyBytes; if (bodyString == null || bodyString.isEmpty()) { bodyBytes = EMPTY_BODY; @@ -178,7 +178,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header nc.publish(NatsMessage.builder().subject(subject).replyTo(replyTo).headers(headers).data(bodyBytes).build()); assertTrue(gotPub.get(), "Got " + proto + "."); //wait for receipt to close up - standardCloseConnection(nc); + closeAndConfirm(nc); if (proto.equals(OP_PUB)) { String expectedProtocol; @@ -253,7 +253,7 @@ public void testUtf8Subjects() throws Exception { Options.Builder ncNotSupportedOptionsBuilder = optionsBuilder().noReconnect().clientSideLimitChecks(false); runInSharedOwnNc(ncNotSupportedOptionsBuilder, ncNotSupported -> { Options ncSupportedOptions = optionsBuilder(ncNotSupported).supportUTF8Subjects().build(); - try (Connection ncSupported = standardConnect(ncSupportedOptions)) { + try (Connection ncSupported = managedConnect(ncSupportedOptions)) { try (JetStreamTestingContext ctxNotSupported = new JetStreamTestingContext(ncNotSupported, 0)) { ctxNotSupported.createOrReplaceStream(jsSubject); JetStream jsNotSupported = ncNotSupported.jetStream(); diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java index 624a8618f..f53d1409c 100644 --- a/src/test/java/io/nats/client/SubscriberTests.java +++ b/src/test/java/io/nats/client/SubscriberTests.java @@ -13,13 +13,13 @@ package io.nats.client; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.HashSet; import java.util.concurrent.CompletableFuture; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.TestBase.*; import static org.junit.jupiter.api.Assertions.*; @@ -108,7 +108,7 @@ public void testTabInProtocolLine() throws Exception { }; try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) { - try (Connection nc = standardConnect(options(mockTs))) { + try (Connection nc = ConnectionUtils.managedConnect(options(mockTs))) { String subject = random(); Subscription sub = nc.subscribe(subject); diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java index 1683f88a9..91d6732d5 100644 --- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java +++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java @@ -46,7 +46,7 @@ public void testIsAuthError() throws Exception { public void testConnectWhenClosed() throws Exception { runInSharedOwnNc(c -> { NatsConnection nc = (NatsConnection)c; - standardCloseConnection(nc); + closeAndConfirm(nc); nc.connect(false); // should do nothing assertClosed(nc); nc.reconnect(); // should do nothing @@ -76,7 +76,7 @@ public void errorOccurred(Connection conn, String error) { .errorListener(noopErrorListener) .build(); - try (NatsConnection nc = (NatsConnection) standardConnect(options)) { + try (NatsConnection nc = (NatsConnection) managedConnect(options)) { // After we've connected, shut down, so we can attempt reconnecting. ts.shutdown(true); diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java index 96652abf3..a6f2c2c7f 100644 --- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java +++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java @@ -44,7 +44,7 @@ public void testCloseEvent() throws Exception { listener.queueConnectionEvent(Events.CLOSED); Options.Builder builder = optionsBuilder().connectionListener(listener); runInSharedOwnNc(builder, nc -> { - standardCloseConnection(nc); + closeAndConfirm(nc); assertNull(nc.getConnectedUrl()); }); listener.validate(); @@ -61,8 +61,9 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception { .connectionListener(listener) .build(); listener.queueConnectionEvent(Events.DISCOVERED_SERVERS); - standardCloseConnection( standardConnect(options) ); - listener.validate(); + try (Connection ignore = managedConnect(options)) { + listener.validate(); + } } } } @@ -79,7 +80,7 @@ public void testDisconnectReconnectCount() throws Exception { .connectionListener(listener) .build(); port = ts.getPort(); - nc = standardConnect(options); + nc = managedConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.DISCONNECTED); } @@ -91,10 +92,10 @@ public void testDisconnectReconnectCount() throws Exception { listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ts = new NatsTestServer(port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -132,7 +133,7 @@ public void testMultipleConnectionListeners() throws Exception { nc.addConnectionListener((conn, event) -> capturedEvents.add("CL4-" + event.name())); nc.removeConnectionListener(removedConnectionListener); - standardCloseConnection(nc); + closeAndConfirm(nc); assertNull(nc.getConnectedUrl()); }); diff --git a/src/test/java/io/nats/client/impl/DrainTests.java b/src/test/java/io/nats/client/impl/DrainTests.java index fa0502beb..452a671ad 100644 --- a/src/test/java/io/nats/client/impl/DrainTests.java +++ b/src/test/java/io/nats/client/impl/DrainTests.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.*; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -37,7 +37,7 @@ public class DrainTests { @Test public void testCloseOnDrainFailure() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - final Connection nc = standardConnect(optionsNoReconnect(ts)); + final Connection nc = managedConnect(optionsBuilder(ts).maxReconnects(0).build()); nc.subscribe(random()); nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do @@ -46,13 +46,13 @@ public void testCloseOnDrainFailure() throws Exception { assertThrows(Exception.class, () -> nc.drain(Duration.ofSeconds(1))); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @Test public void testSimpleSubDrain() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -78,7 +78,7 @@ public void testSimpleSubDrain() throws Exception { @Test public void testSimpleDispatchDrain() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); @@ -108,7 +108,7 @@ public void testSimpleDispatchDrain() throws Exception { @Test public void testSimpleConnectionDrain() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); @@ -143,7 +143,7 @@ public void testSimpleConnectionDrain() throws Exception { @Test public void testConnectionDrainWithZeroTimeout() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); @@ -178,7 +178,7 @@ public void testConnectionDrainWithZeroTimeout() throws Exception { @Test public void testDrainWithZeroTimeout() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -203,7 +203,7 @@ public void testDrainWithZeroTimeout() throws Exception { @Test public void testSubDuringDrainThrows() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -222,7 +222,7 @@ public void testSubDuringDrainThrows() throws Exception { @Test public void testCreateDispatcherDuringDrainThrows() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -241,7 +241,7 @@ public void testCreateDispatcherDuringDrainThrows() throws Exception { @Test public void testUnsubDuringDrainIsNoop() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); @@ -280,7 +280,7 @@ public void testUnsubDuringDrainIsNoop() throws Exception { @Test public void testDrainInMessageHandler() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); AtomicReference dispatcher = new AtomicReference<>(); AtomicReference> tracker = new AtomicReference<>(); @@ -309,7 +309,7 @@ public void testDrainInMessageHandler() throws Exception { @Test public void testDrainFutureMatches() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { count.incrementAndGet(); @@ -350,7 +350,7 @@ public void testDrainFutureMatches() throws Exception { @Test public void testFirstTimeRequestReplyDuringDrain() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -375,7 +375,7 @@ public void testFirstTimeRequestReplyDuringDrain() throws Exception { @Test public void testRequestReplyDuringDrain() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { String subject = random(); Subscription sub = subCon.subscribe(subject); subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server @@ -404,7 +404,7 @@ public void testRequestReplyDuringDrain() throws Exception { @Test public void testQueueHandoffWithDrain() throws Exception { - runInSharedOwnNc(optionsBuilderNoReconnect(), pubCon -> { + runInSharedOwnNc(optionsBuilder().maxReconnects(0), pubCon -> { final int total = 5_000; final long sleepBetweenDrains = 250; final long sleepBetweenMessages = 5; @@ -417,7 +417,7 @@ public void testQueueHandoffWithDrain() throws Exception { NatsDispatcher workingD; NatsDispatcher drainingD; - Connection draining = SharedServer.connectionForSameServer(pubCon, optionsBuilderNoReconnect()); + Connection draining = SharedServer.connectionForSameServer(pubCon, optionsBuilder().maxReconnects(0)); String subject = random(); String queue = random(); @@ -435,7 +435,7 @@ public void testQueueHandoffWithDrain() throws Exception { pubThread.start(); while (count.get() < total && Duration.between(start, now).compareTo(testTimeout) < 0) { - working = SharedServer.connectionForSameServer(pubCon, optionsBuilderNoReconnect()); + working = SharedServer.connectionForSameServer(pubCon, optionsBuilder().maxReconnects(0)); assertConnected(working); workingD = (NatsDispatcher) working.createDispatcher(msg -> count.incrementAndGet()).subscribe(subject, queue); working.flush(Duration.ofSeconds(5)); @@ -463,7 +463,7 @@ public void testQueueHandoffWithDrain() throws Exception { @Test public void testDrainWithLotsOfMessages() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { int total = 1000; String subject = random(); Subscription sub = subCon.subscribe(subject); @@ -499,7 +499,7 @@ public void testDrainWithLotsOfMessages() throws Exception { @Test public void testSlowAsyncDuringDrainCanFinishIfTime() throws Exception { - runInSharedOwnNcs(optionsBuilderNoReconnect(), (subCon, pubCon) -> { + runInSharedOwnNcs(optionsBuilder().maxReconnects(0), (subCon, pubCon) -> { AtomicInteger count = new AtomicInteger(); Dispatcher d = subCon.createDispatcher(msg -> { try { @@ -575,7 +575,7 @@ public void testThrowIfCantFlush() throws Exception { Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts).connectionListener(listener).build(); - try (Connection subCon = standardConnect(options)) { + try (Connection subCon = managedConnect(options)) { subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server listener.queueConnectionEvent(Events.DISCONNECTED); @@ -589,7 +589,7 @@ public void testThrowIfCantFlush() throws Exception { @Test public void testThrowIfClosing() throws Exception { - runInSharedOwnNc(optionsBuilderNoReconnect(), subCon -> { + runInSharedOwnNc(optionsBuilder().maxReconnects(0), subCon -> { subCon.close(); assertThrows(IllegalStateException.class, () -> subCon.drain(Duration.ofSeconds(1))); }); diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java index 26206c7fe..1d3b27a55 100644 --- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java +++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java @@ -68,7 +68,7 @@ public void testLastError() throws Exception { listener.validateAll(); - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect assertEquals(ts3.getServerUri(), nc.getConnectedUrl()); } } @@ -114,7 +114,7 @@ public void testClearLastError() throws Exception { assertNull(nc.getLastError()); } finally { - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -237,7 +237,7 @@ public void testExceptionInExceptionHandler() throws Exception { assertNull(msg); assertEquals(2, nc.getStatistics().getExceptions()); // 1 for the dispatcher, 1 for the handlers } finally { - standardCloseConnection(nc); + closeAndConfirm(nc); } } } @@ -266,7 +266,7 @@ public void testDiscardedMessageFastProducer() throws Exception { nc.flush(Duration.ofSeconds(2)); } finally { - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -292,7 +292,7 @@ public void testDiscardedMessageServerClosed() throws Exception { .build(); listener.queueConnectionEvent(Events.CONNECTED, LONG_VALIDATE_TIMEOUT); listener.queueConnectionEvent(Events.DISCONNECTED, LONG_VALIDATE_TIMEOUT); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { nc.flush(Duration.ofSeconds(1)); listener.validate(); ts.close(); diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java index 5290d2141..18e52cd49 100644 --- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.NatsJetStreamUtil; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -31,7 +32,6 @@ import static io.nats.client.api.ConsumerConfiguration.*; import static io.nats.client.support.NatsConstants.EMPTY; import static io.nats.client.support.NatsJetStreamClientError.*; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.VersionUtils.*; import static org.junit.jupiter.api.Assertions.*; @@ -387,8 +387,8 @@ public void testPrefix() throws Exception { Options optionsTar = optionsBuilder(ts) .userInfo("tar".toCharArray(), "tpass".toCharArray()).build(); - try (Connection ncSrc = standardConnect(optionsSrc); - Connection ncTar = standardConnect(optionsTar) + try (Connection ncSrc = ConnectionUtils.managedConnect(optionsSrc); + Connection ncTar = ConnectionUtils.managedConnect(optionsTar) ) { // Setup JetStreamOptions. SOURCE does not need prefix JetStreamOptions jsoSrc = JetStreamOptions.builder().build(); @@ -1093,7 +1093,7 @@ public void testNatsJetStreamUtil() { public void testRequestNoResponder() throws Exception { runInSharedCustom((ncCancel, ctx) -> { Options optReport = optionsBuilder(ncCancel).reportNoResponders().build(); - try (Connection ncReport = standardConnect(optReport)) { + try (Connection ncReport = ConnectionUtils.managedConnect(optReport)) { assertThrows(CancellationException.class, () -> ncCancel.request(random(), null).get()); ExecutionException ee = assertThrows(ExecutionException.class, () -> ncReport.request(random(), null).get()); assertInstanceOf(JetStreamStatusException.class, ee.getCause()); diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java index 19c5518ee..1a3154c1d 100644 --- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java @@ -17,11 +17,11 @@ import io.nats.client.JetStream; import io.nats.client.JetStreamManagement; import io.nats.client.api.*; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; import java.util.List; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -31,7 +31,7 @@ public class JetStreamManagementWithConfTests extends JetStreamTestBase { @Test public void testGetStreamInfoSubjectPagination() throws Exception { runInConfiguredServer("pagination.conf", ts -> { - try (Connection nc = standardConnect(options(ts))) { + try (Connection nc = ConnectionUtils.managedConnect(options(ts))) { JetStreamManagement jsm = nc.jetStreamManagement(); JetStream js = jsm.jetStream(); @@ -121,7 +121,7 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long @Test public void testJsStuffOnGoodAuthAccount() throws Exception { runInConfiguredServer("js_authorization.conf", ts -> { - try (Connection nc = standardConnect(optionsBuilder(ts).userInfo("serviceup", "uppass").build())) { + try (Connection nc = ConnectionUtils.managedConnect(optionsBuilder(ts).userInfo("serviceup", "uppass").build())) { JetStreamManagement jsm = nc.jetStreamManagement(); JetStream js = jsm.jetStream(); // add streams with both account diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index c63873f41..5513e44ab 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -20,6 +20,7 @@ import io.nats.client.support.JsonUtils; import io.nats.client.support.Listener; import io.nats.client.support.ListenerStatusType; +import io.nats.client.utils.ConnectionUtils; import io.nats.client.utils.VersionUtils; import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterAll; @@ -40,11 +41,11 @@ import static io.nats.client.api.ConsumerConfiguration.builder; import static io.nats.client.support.ApiConstants.*; +import static io.nats.client.support.Listener.MEDIUM_VALIDATE_TIMEOUT; import static io.nats.client.support.ListenerStatusType.PullError; import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; import static io.nats.client.support.Status.*; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -744,7 +745,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt runInSharedNamed("conflict", ts -> { if (conflictNc == null) { conflictListener = new Listener(); - conflictNc = standardConnect( + conflictNc = ConnectionUtils.managedConnect( optionsBuilder(ts).errorListener(conflictListener).connectionListener(conflictListener).build()); } else { @@ -753,7 +754,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(conflictNc, 1)) { JetStreamSubscription sub = setup.setup(conflictNc, tcsCtx, conflictListener); if (statusType != null) { - conflictListener.queueStatus(statusType, statusCode); + conflictListener.queueStatus(statusType, statusCode, MEDIUM_VALIDATE_TIMEOUT); } if (sub.getDispatcher() == null) { if (statusType == PullError) { diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java index 46917008d..ce031c8f2 100644 --- a/src/test/java/io/nats/client/impl/MessageContentTests.java +++ b/src/test/java/io/nats/client/impl/MessageContentTests.java @@ -17,6 +17,7 @@ import io.nats.client.*; import io.nats.client.ConnectionListener.Events; import io.nats.client.support.Listener; +import io.nats.client.utils.ConnectionUtils; import io.nats.client.utils.TestBase; import org.junit.jupiter.api.Test; @@ -25,7 +26,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; @@ -195,7 +195,7 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF .errorListener(listener) .connectionListener(listener) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = ConnectionUtils.managedConnect(options)) { listener.queueConnectionEvent(Events.DISCONNECTED); ready.complete(Boolean.TRUE); listener.validate(); diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java index 7d42f5d5b..12a5c7f2c 100644 --- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java +++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java @@ -15,6 +15,7 @@ import io.nats.client.NatsTestServer; import io.nats.client.Options; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -23,7 +24,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static org.junit.jupiter.api.Assertions.*; public class NatsConnectionImplTests { @@ -79,7 +79,7 @@ public void testConnectionClosedProperly() throws Exception { } private static void verifyInternalExecutors(Options options) throws InterruptedException { - try (NatsConnection nc = (NatsConnection)standardConnect(options)) { + try (NatsConnection nc = (NatsConnection) ConnectionUtils.managedConnect(options)) { ExecutorService es = options.getExecutor(); ScheduledExecutorService ses = options.getScheduledExecutor(); ExecutorService callbackEs = options.getCallbackExecutor(); @@ -120,7 +120,7 @@ private static void verifyExternalExecutors(Options options, ExecutorService userEs, ScheduledExecutorService userSes, ExecutorService userCallbackEs, ExecutorService userConnectEs ) throws InterruptedException, IOException { - try (NatsConnection nc = (NatsConnection)standardConnect(options)) { + try (NatsConnection nc = (NatsConnection) ConnectionUtils.managedConnect(options)) { ExecutorService es = options.getExecutor(); ScheduledExecutorService ses = options.getScheduledExecutor(); ExecutorService callbackEs = options.getCallbackExecutor(); diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java index 79d4815ae..ecdcd9a8e 100644 --- a/src/test/java/io/nats/client/impl/NatsMessageTests.java +++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.NatsServerProtocolMock.ExitAt; import io.nats.client.support.IncomingHeadersProcessor; +import io.nats.client.utils.ConnectionUtils; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; @@ -24,7 +25,6 @@ import static io.nats.client.support.NatsConstants.OP_PING; import static io.nats.client.support.NatsConstants.OP_PING_BYTES; -import static io.nats.client.utils.ConnectionUtils.standardConnect; import static io.nats.client.utils.OptionsUtils.options; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ResourceUtils.dataAsLines; @@ -134,7 +134,7 @@ public void testBigProtocolLine() throws Exception { subject.append(subject); } try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - try (Connection nc = standardConnect(options(mockTs))) { + try (Connection nc = ConnectionUtils.managedConnect(options(mockTs))) { // Without Body assertThrows(IllegalArgumentException.class, () -> nc.subscribe(subject.toString())); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 9b53d79e1..628450cc9 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static io.nats.client.support.Listener.MEDIUM_VALIDATE_TIMEOUT; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; @@ -86,13 +87,13 @@ public void testPingTimer() throws Exception { @Test public void testPingFailsWhenClosed() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder(mockTs). - pingInterval(Duration.ofMillis(10)). - maxPingsOut(5). - maxReconnects(0). - build(); - NatsConnection nc = (NatsConnection) standardConnect(options); - standardCloseConnection(nc); + Options options = optionsBuilder(mockTs) + .pingInterval(Duration.ofMillis(10)) + .maxPingsOut(5) + .maxReconnects(0) + .build(); + NatsConnection nc = (NatsConnection) managedConnect(options); + closeAndConfirm(nc); Future pong = nc.sendPing(); assertFalse(pong.get(10,TimeUnit.MILLISECONDS)); } @@ -106,7 +107,7 @@ public void testMaxPingsOut() throws Exception { .maxPingsOut(2) .maxReconnects(0) .build(); - try (NatsConnection nc = (NatsConnection) standardConnect(options)) { + try (NatsConnection nc = (NatsConnection) managedConnect(options)) { nc.sendPing(); nc.sendPing(); assertNull(nc.sendPing(), "No future returned when past max"); @@ -123,7 +124,7 @@ public void testFlushTimeout() throws Exception { .connectionListener(listener) .errorListener(listener) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { // fake server so flush will time out assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofMillis(50))); } @@ -135,7 +136,7 @@ public void testFlushTimeoutDisconnected() throws Exception { Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { Options options = optionsBuilder(ts).connectionListener(listener).build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { nc.flush(Duration.ofSeconds(2)); listener.queueConnectionEvent(Events.DISCONNECTED); ts.close(); @@ -155,12 +156,12 @@ public void testPingTimerThroughReconnect() throws Exception { .pingInterval(Duration.ofMillis(5)) .maxPingsOut(10000) // just don't want this to be what fails the test .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Statistics stats = nc.getStatistics(); sleep(200); long pings = stats.getPings(); assertTrue(pings > 10, "got pings"); - listener.queueConnectionEvent(Events.RECONNECTED); + listener.queueConnectionEvent(Events.RECONNECTED, MEDIUM_VALIDATE_TIMEOUT); ts.close(); listener.validate(); pings = stats.getPings(); diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java index 84e4a10cc..9bcf16a67 100644 --- a/src/test/java/io/nats/client/impl/ReconnectTests.java +++ b/src/test/java/io/nats/client/impl/ReconnectTests.java @@ -85,7 +85,7 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer 0, "exception count"); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -149,7 +149,7 @@ public void testSubscribeDuringReconnect() throws Exception { .connectionListener(listener) .build(); port = ts.getPort(); - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) managedConnect(options); listener.queueConnectionEvent(Events.DISCONNECTED); } @@ -167,7 +167,7 @@ public void testSubscribeDuringReconnect() throws Exception { listener.queueConnectionEvent(Events.RECONNECTED); try (NatsTestServer ignored = new NatsTestServer(port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); // Make sure the dispatcher and subscription are still there @@ -183,7 +183,7 @@ public void testSubscribeDuringReconnect() throws Exception { assertEquals(1, nc.getStatisticsCollector().getReconnects(), "reconnect count"); assertTrue(nc.getStatisticsCollector().getExceptions() > 0, "exception count"); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -205,7 +205,7 @@ public void testReconnectBuffer() throws Exception { .reconnectWait(Duration.ofMillis(1000)) .connectionListener(listener) .build(); - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) managedConnect(options); sub = nc.subscribe(subsubject); @@ -238,7 +238,7 @@ public void testReconnectBuffer() throws Exception { listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(customArgs, port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); end = System.nanoTime(); @@ -259,7 +259,7 @@ public void testReconnectBuffer() throws Exception { assertEquals(1, nc.getStatisticsCollector().getReconnects(), "reconnect count"); assertTrue(nc.getStatisticsCollector().getExceptions() > 0, "exception count"); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -274,7 +274,7 @@ public void testMaxReconnects() throws Exception { .connectionListener(listener) .reconnectWait(Duration.ofMillis(10)) .build(); - nc = standardConnect(options); + nc = managedConnect(options); listener.queueConnectionEvent(Events.CLOSED); } flushConnection(nc); @@ -293,7 +293,7 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { .connectionListener(listener) .maxReconnects(-1) .build(); - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) managedConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.RECONNECTED); } @@ -302,7 +302,7 @@ public void testReconnectToSecondServerInBootstrap() throws Exception { listener.validate(); assertConnected(nc); assertEquals(ts1.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -317,7 +317,7 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { .connectionListener(listener) .maxReconnects(-1) .build(); - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) managedConnect(options); assertEquals(ts2.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.RECONNECTED); } @@ -326,7 +326,7 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception { listener.validate(); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -344,7 +344,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { .connectionTimeout(Duration.ofSeconds(5)) .reconnectWait(Duration.ofSeconds(1)) .build(); - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) managedConnect(options); assertEquals(mockTs2.getServerUri(), nc.getConnectedUrl()); listener.queueConnectionEvent(Events.RECONNECTED); } @@ -353,7 +353,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception { listener.validate(); assertConnected(nc); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -368,7 +368,7 @@ public void testOverflowReconnectBuffer() throws Exception { .reconnectBufferSize(4*512) .reconnectWait(Duration.ofSeconds(480)) .build(); - nc = standardConnect(options); + nc = managedConnect(options); } listener.validate(); @@ -379,7 +379,7 @@ public void testOverflowReconnectBuffer() throws Exception { } }); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -393,7 +393,7 @@ public void testInfiniteReconnectBuffer() throws Exception { .reconnectBufferSize(-1) .reconnectWait(Duration.ofSeconds(30)) .build(); - nc = standardConnect(options); + nc = managedConnect(options); listener.queueConnectionEvent(Events.DISCONNECTED); } @@ -406,7 +406,7 @@ public void testInfiniteReconnectBuffer() throws Exception { } checkNotConnected(nc); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -471,7 +471,7 @@ public void testReconnectDropOnLineFeed() throws Exception { // connect good then bad listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsTestServer ignored = new NatsTestServer(port)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); listener.queueConnectionEvent(Events.DISCONNECTED); // do it here because we are about to disconnect } @@ -486,7 +486,7 @@ public void testReconnectDropOnLineFeed() throws Exception { listener.queueConnectionEvent(Events.RESUBSCRIBED); try (NatsServerProtocolMock ignored = new NatsServerProtocolMock(receiveMessageCustomizer, port, true)) { - waitUntilConnected(nc); // wait for reconnect + confirmConnected(nc); // wait for reconnect listener.validate(); subRef.get().get(); listener.queueConnectionEvent(Events.DISCONNECTED); @@ -497,7 +497,7 @@ public void testReconnectDropOnLineFeed() throws Exception { } assertEquals(2 * thrashCount, nc.getStatisticsCollector().getReconnects(), "reconnect count"); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -559,7 +559,7 @@ public void testTlsNoIpConnection() throws Exception { .build(); listener.queueConnectionEvent(Events.DISCOVERED_SERVERS); - nc = (NatsConnection) ConnectionUtils.standardConnect(options); + nc = (NatsConnection) ConnectionUtils.managedConnect(options); assertEquals(ts.getServerUri(), nc.getConnectedUrl()); flushConnection(nc); // make sure we get the new server via info @@ -575,7 +575,7 @@ public void testTlsNoIpConnection() throws Exception { URI uri = options.createURIForServer(nc.getConnectedUrl()); assertEquals(ts2.getPort(), uri.getPort()); // full uri will have some ip address, just check port - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -603,7 +603,7 @@ public void testWriterFilterTiming() throws Exception { nc.getWriter().stop(); sleep(1000); // Should have thrown an exception if #203 isn't fixed - standardCloseConnection(nc); + closeAndConfirm(nc); } } @@ -757,7 +757,7 @@ private static void _testForceReconnect(Connection nc0, Listener listener) throw listener.queueConnectionEvent(Events.DISCONNECTED); listener.queueConnectionEvent(Events.RECONNECTED); nc0.forceReconnect(); - waitUntilConnected(nc0); // wait for reconnect + confirmConnected(nc0); // wait for reconnect si = nc0.getServerInfo(); assertNotEquals(connectedServer, si.getServerId()); @@ -951,7 +951,7 @@ public void testSocketDataPortTimeout() throws Exception { getLocalhostUri(port1), getLocalhostUri(port2) }; - Connection nc = standardConnect(builder.servers(servers).build()); + Connection nc = managedConnect(builder.servers(servers).build()); String subject = random(); int connectedPort = nc.getServerInfo().getPort(); AtomicInteger pubId = new AtomicInteger(); diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java index 381e6b034..f0b4fab7d 100644 --- a/src/test/java/io/nats/client/impl/RequestTests.java +++ b/src/test/java/io/nats/client/impl/RequestTests.java @@ -27,7 +27,8 @@ import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction; import static io.nats.client.utils.ConnectionUtils.*; -import static io.nats.client.utils.OptionsUtils.*; +import static io.nats.client.utils.OptionsUtils.options; +import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -124,7 +125,7 @@ public void testRequestVarieties() throws Exception { @Test public void testSimpleResponseMessageHasConnection() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsNoReconnect(ts))) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> { @@ -148,7 +149,7 @@ public void testSimpleResponseMessageHasConnection() throws Exception { @Test public void testSafeRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsNoReconnect(ts))) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); @@ -167,7 +168,7 @@ public void testSafeRequest() throws Exception { @Test public void testMultipleRequest() throws Exception { try (NatsTestServer ts = new NatsTestServer(); - Connection nc = Nats.connect(optionsNoReconnect(ts))) { + Connection nc = Nats.connect(optionsBuilder(ts).maxReconnects(0).build())) { assertConnected(nc); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[7])); @@ -549,7 +550,7 @@ public void testRequestsVsCleanup() throws Exception { long cleanupInterval = 50; int msgCount = 100; Options options = optionsBuilder(ts).requestCleanupInterval(Duration.ofMillis(cleanupInterval)).build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), null)); String subject = random(); d.subscribe(subject); @@ -578,7 +579,7 @@ public void testDelayInPickingUpFuture() throws Exception { try (NatsTestServer ts = new NatsTestServer()) { int msgCount = 100; ArrayList> messages = new ArrayList<>(); - try (Connection nc = standardConnect(options(ts))) { + try (Connection nc = managedConnect(options(ts))) { String subject = random(); Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[1])); d.subscribe(subject); @@ -627,7 +628,7 @@ public void testBuffersResize() throws Exception { int initialSize = 128; int messageSize = 1024; Options options = optionsBuilder(ts).bufferSize(initialSize).connectionTimeout(Duration.ofSeconds(10)).build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), msg.getData())); String subject = random(); d.subscribe(subject); diff --git a/src/test/java/io/nats/client/impl/SharedServer.java b/src/test/java/io/nats/client/impl/SharedServer.java index 034412ba5..0c57fc876 100644 --- a/src/test/java/io/nats/client/impl/SharedServer.java +++ b/src/test/java/io/nats/client/impl/SharedServer.java @@ -189,7 +189,7 @@ else if (ncs.getStatus() != Connection.Status.CONNECTED) { } public Connection newConnection(Options.Builder builder) { - return ConnectionUtils.standardConnect(builder.server(serverUrl).build()); + return ConnectionUtils.managedConnect(builder.server(serverUrl).build()); } public void shutdown() { diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java index 5d735613d..7c8420ac8 100644 --- a/src/test/java/io/nats/client/impl/SimplificationTests.java +++ b/src/test/java/io/nats/client/impl/SimplificationTests.java @@ -16,6 +16,7 @@ import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.support.*; +import io.nats.client.utils.ConnectionUtils; import io.nats.client.utils.VersionUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,8 +35,6 @@ import static io.nats.client.BaseConsumeOptions.*; import static io.nats.client.support.NatsConstants.GREATER_THAN; -import static io.nats.client.utils.ConnectionUtils.standardConnect; -import static io.nats.client.utils.ConnectionUtils.waitUntilConnected; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -1732,7 +1731,7 @@ public void testReconnectOverOrdered() throws Exception { //noinspection unused try (NatsTestServer ts = new NatsTestServer(port, true)) { - nc = (NatsConnection) standardConnect(options); + nc = (NatsConnection) ConnectionUtils.managedConnect(options); StreamConfiguration sc = StreamConfiguration.builder() .name(stream) .storageType(StorageType.File) // file since we are killing the server and bringing it back up. @@ -1763,7 +1762,7 @@ public void testReconnectOverOrdered() throws Exception { // reconnect and get some more messages try (NatsTestServer ignored = new NatsTestServer(port, true)) { - waitUntilConnected(nc); // wait for reconnect + ConnectionUtils.confirmConnected(nc); // wait for reconnect sleep(10000); // long enough to get messages and for the hb alarm to have tripped } @@ -1776,7 +1775,7 @@ public void testReconnectOverOrdered() throws Exception { sleep(6000); // enough delay before reconnect to trip hb alarm again try (NatsTestServer ignored = new NatsTestServer(port, true)) { - waitUntilConnected(nc); // wait for reconnect + ConnectionUtils.confirmConnected(nc); // wait for reconnect sleep(6000); // long enough to get messages and for the hb alarm to have tripped try { diff --git a/src/test/java/io/nats/client/impl/TLSConnectTests.java b/src/test/java/io/nats/client/impl/TLSConnectTests.java index 24291e722..b402a3116 100644 --- a/src/test/java/io/nats/client/impl/TLSConnectTests.java +++ b/src/test/java/io/nats/client/impl/TLSConnectTests.java @@ -32,7 +32,6 @@ import static io.nats.client.Options.PROP_SSL_CONTEXT_FACTORY_CLASS; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; -import static io.nats.client.utils.OptionsUtils.optionsNoReconnect; import static io.nats.client.utils.TestBase.*; import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; @@ -157,12 +156,12 @@ public void testProxyNotTlsFirst() throws Exception { // 2. client regular secure | secure proxy | server tls required -> connects ProxyConnection connRR = new ProxyConnection(ts1.getServerUri(), false, null, SERVER_TLS_REQUIRED); connRR.connect(false); - closeConnection(waitUntilConnected(connRR), 1000); + confirmConnectedThenClosed(connRR); // 3. client regular secure | secure proxy | server tls available -> connects ProxyConnection connRA = new ProxyConnection(ts1.getServerUri(), false, null, SERVER_TLS_AVAILABLE); connRA.connect(false); - closeConnection(waitUntilConnected(connRA), 1000); + confirmConnectedThenClosed(connRA); }); } @@ -239,7 +238,7 @@ public void testTLSMessageFlow() throws Exception { .maxReconnects(0) .sslContext(ctx) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Dispatcher d = nc.createDispatcher( msg -> nc.publish(msg.getReplyTo(), new byte[16])); String subject = random(); @@ -272,7 +271,7 @@ public void testTLSOnReconnect() throws Exception { .connectionListener(listener) .reconnectWait(Duration.ofMillis(10)) .build(); - ncRef.set((NatsConnection)standardConnect(options)); + ncRef.set((NatsConnection) managedConnect(options)); assertInstanceOf(SocketDataPort.class, ncRef.get().getDataPort(), "Correct data port class"); listener.queueConnectionEvent(Events.DISCONNECTED); }); @@ -283,7 +282,7 @@ public void testTLSOnReconnect() throws Exception { listener.queueConnectionEvent(Events.RESUBSCRIBED); runInConfiguredServer("tlsverify.conf", newPort, ts -> listener.validate()); - standardCloseConnection(nc); + closeAndConfirm(nc); } @Test @@ -302,7 +301,7 @@ public void testDisconnectOnUpgrade() throws Exception { @Test public void testServerSecureClientNotMismatch() throws Exception { runInSharedConfiguredServer("tlsverify.conf", ts -> { - Options options = optionsNoReconnect(ts); + Options options = optionsBuilder(ts).maxReconnects(0).build(); assertThrows(IOException.class, () -> Nats.connect(options)); }); } @@ -410,17 +409,17 @@ public void testProxyTlsFirst() throws Exception { // 1. client tls first | secure proxy | server insecure -> connects ProxyConnection connTI = new ProxyConnection(ts.getServerUri(), true, null, SERVER_INSECURE); connTI.connect(false); - closeConnection(waitUntilConnected(connTI), 1000); + confirmConnectedThenClosed(connTI); // 2. client tls first | secure proxy | server tls required -> connects ProxyConnection connTR = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_REQUIRED); connTR.connect(false); - closeConnection(waitUntilConnected(connTR), 1000); + confirmConnectedThenClosed(connTR); // 3. client tls first | secure proxy | server tls available -> connects ProxyConnection connTA = new ProxyConnection(ts.getServerUri(), true, null, SERVER_TLS_AVAILABLE); connTA.connect(false); - closeConnection(waitUntilConnected(connTA), 1000); + confirmConnectedThenClosed(connTA); }); } } \ No newline at end of file diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index 6ced7dce6..e9c25af11 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -56,7 +56,7 @@ public void testRequestReply() throws Exception { } private static void standardRequestReply(Options options) throws InterruptedException, IOException { - try (Connection connection = standardConnect(options)) { + try (Connection connection = managedConnect(options)) { Dispatcher dispatcher = connection.createDispatcher( msg -> connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes())); try { @@ -245,7 +245,7 @@ public void testTLSMessageFlow() throws Exception { .maxReconnects(0) .sslContext(ctx) .build(); - try (Connection nc = standardConnect(options)) { + try (Connection nc = managedConnect(options)) { Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); String subject = random(); d.subscribe(subject); diff --git a/src/test/java/io/nats/client/support/Listener.java b/src/test/java/io/nats/client/support/Listener.java index 907108017..216f889a2 100644 --- a/src/test/java/io/nats/client/support/Listener.java +++ b/src/test/java/io/nats/client/support/Listener.java @@ -26,9 +26,10 @@ @SuppressWarnings({"CallToPrintStackTrace", "RedundantMethodOverride"}) public class Listener implements ErrorListener, ConnectionListener { - public static final int SHORT_VALIDATE_TIMEOUT = 10000; - public static final int DEFAULT_VALIDATE_TIMEOUT = 5000; - public static final int LONG_VALIDATE_TIMEOUT = 10000; + public static final int SHORT_VALIDATE_TIMEOUT = 2000; + public static final int DEFAULT_VALIDATE_TIMEOUT = 5000; + public static final int MEDIUM_VALIDATE_TIMEOUT = 7500; + public static final int LONG_VALIDATE_TIMEOUT = 12500; public static final int VERY_LONG_VALIDATE_TIMEOUT = 20000; private final boolean printExceptions; diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java index e627dc45c..efbef2cb0 100644 --- a/src/test/java/io/nats/client/utils/ConnectionUtils.java +++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java @@ -16,7 +16,6 @@ import io.nats.client.Connection; import io.nats.client.Nats; import io.nats.client.Options; -import org.jspecify.annotations.Nullable; import org.opentest4j.AssertionFailedError; import java.io.IOException; @@ -26,10 +25,13 @@ public abstract class ConnectionUtils { - public static final long CONNECTION_WAIT_MS = 10000; + public static final int DEFAULT_WAIT = 5000; + public static final int MEDIUM_WAIT = 8000; + public static final int LONG_WAIT = 12000; + public static final int VERY_LONG_WAIT = 20000; + public static final long STANDARD_FLUSH_TIMEOUT_MS = 2000; public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000; - public static final long LONG_TIMEOUT_MS = 15000; // ---------------------------------------------------------------------------------------------------- // standardConnect @@ -38,16 +40,16 @@ public abstract class ConnectionUtils { private static final int CONNECTION_RETRIES = 10; private static final long RETRY_DELAY = 100; - public static Connection standardConnect(Options options) { + public static Connection managedConnect(Options options) { try { - return standardConnect(options, null); + return managedConnect(options, DEFAULT_WAIT); } catch (Exception e) { throw new RuntimeException("Unable to make a connection.", e); } } - public static Connection standardConnect(Options options, @Nullable Class throwImmediately) throws IOException, InterruptedException { + public static Connection managedConnect(Options options, long waitTime) throws IOException, InterruptedException { IOException last = null; long delay = RETRY_DELAY - RETRY_DELAY_INCREMENT; for (int x = 1; x <= CONNECTION_RETRIES; x++) { @@ -56,12 +58,9 @@ public static Connection standardConnect(Options options, @Nullable Class thr sleep(delay); } try { - return waitUntilConnected(Nats.connect(options)); + return waitUntilStatus(Nats.connect(options), waitTime, Connection.Status.CONNECTED); } catch (IOException ioe) { - if (throwImmediately != null && throwImmediately.isAssignableFrom(ioe.getClass())) { - throw ioe; - } last = ioe; } catch (InterruptedException ie) { @@ -75,18 +74,37 @@ public static Connection standardConnect(Options options, @Nullable Class thr // ---------------------------------------------------------------------------------------------------- // connect or wait for a connection // ---------------------------------------------------------------------------------------------------- - public static Connection waitUntilConnected(Connection conn) { - return waitUntilStatus(conn, CONNECTION_WAIT_MS, Connection.Status.CONNECTED); + public static Connection confirmConnected(Connection conn) { + return waitUntilStatus(conn, DEFAULT_WAIT, Connection.Status.CONNECTED); + } + + public static Connection confirmConnected(Connection conn, long waitTime) { + return waitUntilStatus(conn, waitTime, Connection.Status.CONNECTED); + } + + // ---------------------------------------------------------------------------------------------------- + // connect or wait for a connection + // ---------------------------------------------------------------------------------------------------- + public static void confirmConnectedThenClosed(Connection conn) { + closeAndConfirm(confirmConnected(conn, DEFAULT_WAIT), DEFAULT_WAIT); + } + + public static void confirmConnectedThenClosed(Connection conn, long waitTime) { + closeAndConfirm(confirmConnected(conn, waitTime), DEFAULT_WAIT); + } + + public static void confirmConnectedThenClosed(Connection conn, long waitTime, long closeTime) { + closeAndConfirm(confirmConnected(conn, waitTime), closeTime); } // ---------------------------------------------------------------------------------------------------- // close // ---------------------------------------------------------------------------------------------------- - public static void standardCloseConnection(Connection conn) { - closeConnection(conn, CONNECTION_WAIT_MS); + public static void closeAndConfirm(Connection conn) { + closeAndConfirm(conn, DEFAULT_WAIT); } - public static void closeConnection(Connection conn, long millis) { + public static void closeAndConfirm(Connection conn, long millis) { if (conn != null) { close(conn); waitUntilStatus(conn, millis, Connection.Status.CLOSED); @@ -130,7 +148,7 @@ public static void assertClosed(Connection conn) { } public static void assertCanConnect(Options options) { - standardCloseConnection(standardConnect(options)); + closeAndConfirm(managedConnect(options)); } private static String expectingMessage(Connection conn, Connection.Status expecting) { diff --git a/src/test/java/io/nats/client/utils/OptionsUtils.java b/src/test/java/io/nats/client/utils/OptionsUtils.java index e907d6ce0..43b79a1eb 100644 --- a/src/test/java/io/nats/client/utils/OptionsUtils.java +++ b/src/test/java/io/nats/client/utils/OptionsUtils.java @@ -36,10 +36,6 @@ public static Options.Builder optionsBuilder(ErrorListener el) { return optionsBuilder().errorListener(el); } - public static Options.Builder optionsBuilderNoReconnect() { - return optionsBuilder().maxReconnects(0); - } - public static Options.Builder optionsBuilder(TestServer... tses) { if (tses.length == 1) { return optionsBuilder().server(tses[0].getServerUri()); @@ -83,10 +79,6 @@ public static Options options(NatsTestServer... testServers) { return optionsBuilder(testServers).build(); } - public static Options optionsNoReconnect(NatsTestServer testServer) { - return optionsBuilder(testServer).maxReconnects(0).build(); - } - public static Options options(NatsServerProtocolMock... testServers) { return optionsBuilder(testServers).build(); } diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java index a62c124cf..9179a8aae 100644 --- a/src/test/java/io/nats/client/utils/TestBase.java +++ b/src/test/java/io/nats/client/utils/TestBase.java @@ -198,7 +198,7 @@ public static void runInSharedConfiguredServer(String confFile, int version, InS // ---------------------------------------------------------------------------------------------------- private static void _runInOwnServer(@NonNull OneConnectionTest oneNcTest) throws Exception { try (NatsTestServer ts = new NatsTestServer()) { - try (Connection nc = standardConnect(options(ts))) { + try (Connection nc = managedConnect(options(ts))) { initVersionServerInfo(nc); oneNcTest.test(nc); } @@ -219,7 +219,7 @@ private static void _runInOwnJsServer(VersionCheck vc, @NonNull JetStreamTest js NatsServerRunner.Builder nsrb = NatsServerRunner.builder().jetstream(true); try (NatsTestServer ts = new NatsTestServer(nsrb)) { - try (Connection nc = standardConnect(options(ts))) { + try (Connection nc = managedConnect(options(ts))) { initVersionServerInfo(nc); if (vc == null || vc.runTest(VERSION_SERVER_INFO)) { NatsJetStreamManagement jsm = (NatsJetStreamManagement) nc.jetStreamManagement(); @@ -432,9 +432,9 @@ public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Ex }; try (NatsTestServer hub = new NatsTestServer(hubPort, true, null, hubInserts, null); - Connection nchub = standardConnect(options(hub)); + Connection nchub = managedConnect(options(hub)); NatsTestServer leaf = new NatsTestServer(leafPort, true, null, leafInserts, null); - Connection ncleaf = standardConnect(options(leaf)) + Connection ncleaf = managedConnect(options(leaf)) ) { twoConnectionTest.test(nchub, ncleaf); } @@ -470,9 +470,9 @@ public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeConnectionT try (NatsTestServer srv1 = new NatsTestServer(port1, tstOpts.jetStream(), null, server1Inserts, null); NatsTestServer srv2 = new NatsTestServer(port2, tstOpts.jetStream(), null, server2Inserts, null); NatsTestServer srv3 = new NatsTestServer(port3, tstOpts.jetStream(), null, server3Inserts, null); - Connection nc1 = standardConnect(makeOptions(0, tstOpts, srv1, srv2, srv3)); - Connection nc2 = standardConnect(makeOptions(1, tstOpts, srv2, srv1, srv3)); - Connection nc3 = standardConnect(makeOptions(2, tstOpts, srv3, srv1, srv2)) + Connection nc1 = managedConnect(makeOptions(0, tstOpts, srv1, srv2, srv3)); + Connection nc2 = managedConnect(makeOptions(1, tstOpts, srv2, srv1, srv3)); + Connection nc3 = managedConnect(makeOptions(2, tstOpts, srv3, srv1, srv2)) ) { threeServerTest.test(nc1, nc2, nc3); } @@ -587,9 +587,9 @@ public static NatsMessage getDataMessage(String data) { // assertions // ---------------------------------------------------------------------------------------------------- public static void assertCanConnectAndPubSub(Options options) throws IOException, InterruptedException { - Connection conn = standardConnect(options); + Connection conn = managedConnect(options); assertPubSub(conn); - standardCloseConnection(conn); + closeAndConfirm(conn); } public static void assertByteArraysEqual(byte[] data1, byte[] data2) { From ba61b9428de3a4f93a8971a007ed1ac8229a25d7 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 5 Dec 2025 12:52:48 -0500 Subject: [PATCH 36/51] there are no accidents --- .../nats/client/impl/JetStreamPullTests.java | 45 ++++++++++--------- .../java/io/nats/client/impl/PingTests.java | 35 +++------------ 2 files changed, 29 insertions(+), 51 deletions(-) diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java index 5513e44ab..e78177b21 100644 --- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java +++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java @@ -25,6 +25,7 @@ import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import java.io.IOException; import java.time.Duration; @@ -41,7 +42,6 @@ import static io.nats.client.api.ConsumerConfiguration.builder; import static io.nats.client.support.ApiConstants.*; -import static io.nats.client.support.Listener.MEDIUM_VALIDATE_TIMEOUT; import static io.nats.client.support.ListenerStatusType.PullError; import static io.nats.client.support.ListenerStatusType.PullWarning; import static io.nats.client.support.NatsJetStreamConstants.NATS_PIN_ID_HDR; @@ -50,6 +50,7 @@ import static io.nats.client.utils.ThreadUtils.sleep; import static org.junit.jupiter.api.Assertions.*; +@Isolated public class JetStreamPullTests extends JetStreamTestBase { static Connection conflictNc; @@ -728,7 +729,7 @@ public void testPullRequestOptionsBuilder() { } interface ConflictSetup { - JetStreamSubscription setup(Connection nc, JetStreamTestingContext ctx, Listener listener) throws Exception; + JetStreamSubscription setup(Connection nc, JetStreamTestingContext ctx) throws Exception; } interface BuilderCustomizer { @@ -752,10 +753,10 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt conflictListener.reset(); } try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(conflictNc, 1)) { - JetStreamSubscription sub = setup.setup(conflictNc, tcsCtx, conflictListener); if (statusType != null) { - conflictListener.queueStatus(statusType, statusCode, MEDIUM_VALIDATE_TIMEOUT); + conflictListener.queueStatus(statusType, statusCode); } + JetStreamSubscription sub = setup.setup(conflictNc, tcsCtx); if (sub.getDispatcher() == null) { if (statusType == PullError) { JetStreamStatusException jsse = assertThrows(JetStreamStatusException.class, () -> sub.nextMessage(NEXT_MESSAGE_TIMEOUT)); @@ -778,7 +779,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt @Test public void testExceededMaxWaitingSync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(1); @@ -791,7 +792,7 @@ public void testExceededMaxWaitingSync() throws Exception { @Test public void testExceededMaxWaitingAsync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_WAITING, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxPullWaiting(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -804,7 +805,7 @@ public void testExceededMaxWaitingAsync() throws Exception { @Test public void testExceedsMaxRequestBatchSync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(2); @@ -816,7 +817,7 @@ public void testExceedsMaxRequestBatchSync() throws Exception { @Test public void testExceedsMaxRequestBatchAsync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_BATCH, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBatch(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -829,7 +830,7 @@ public void testExceedsMaxRequestBatchAsync() throws Exception { @Test public void testMessageSizeExceedsMaxBytesSync() throws Exception { _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b); ctx.js.publish(ctx.subject(), new byte[1000]); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); @@ -842,7 +843,7 @@ public void testMessageSizeExceedsMaxBytesSync() throws Exception { @Test public void testMessageSizeExceedsMaxBytesAsync() throws Exception { _testConflictStatuses(409, MESSAGE_SIZE_EXCEEDS_MAX_BYTES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); ctx.js.publish(ctx.subject(), new byte[1000]); @@ -856,7 +857,7 @@ public void testMessageSizeExceedsMaxBytesAsync() throws Exception { @Test public void testExceedsMaxRequestExpiresSync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pullExpiresIn(1, 2000); @@ -868,7 +869,7 @@ public void testExceedsMaxRequestExpiresSync() throws Exception { @Test public void testExceedsMaxRequestExpiresAsync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_EXPIRES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxExpires(1000)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -881,7 +882,7 @@ public void testExceedsMaxRequestExpiresAsync() throws Exception { @Test public void testConsumerIsPushBasedSync() throws Exception { _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, - (nc, ctx, listener) -> { + (nc, ctx) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -897,7 +898,7 @@ public void testConsumerIsPushBasedSync() throws Exception { @Test public void testConsumerIsPushBasedAsync() throws Exception { _testConflictStatuses(409, CONSUMER_IS_PUSH_BASED, PullError, - (nc, ctx, listener) -> { + (nc, ctx) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); @@ -915,7 +916,7 @@ public void testConsumerIsPushBasedAsync() throws Exception { @Test public void testConsumerDeletedSyncSub() throws Exception { _testConflictStatuses(409, CONSUMER_DELETED, PullError, - (nc, ctx, listener) -> { + (nc, ctx) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, dur); @@ -931,7 +932,7 @@ public void testConsumerDeletedSyncSub() throws Exception { public void testConsumerDeletedAsyncSub() throws Exception { _testConflictStatuses(409, CONSUMER_DELETED, PullError, // Async - (nc, ctx, listener) -> { + (nc, ctx) -> { String dur = random(); ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).build()); Dispatcher d = nc.createDispatcher(); @@ -948,7 +949,7 @@ public void testConsumerDeletedAsyncSub() throws Exception { @Test public void testBadRequestSync() throws Exception { _testConflictStatuses(400, BAD_REQUEST, PullError, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(new BadPullRequestOptions()); @@ -959,7 +960,7 @@ public void testBadRequestSync() throws Exception { @Test public void testBadRequestAsync() throws Exception { _testConflictStatuses(400, BAD_REQUEST, PullError, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -971,7 +972,7 @@ public void testBadRequestAsync() throws Exception { @Test public void testNotFoundSync() throws Exception { _testConflictStatuses(404, NO_MESSAGES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pullNoWait(1); @@ -983,7 +984,7 @@ public void testNotFoundSync() throws Exception { @Test public void testNotFoundAsync() throws Exception { _testConflictStatuses(404, NO_MESSAGES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); @@ -995,7 +996,7 @@ public void testNotFoundAsync() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageSync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), so); sub.pull(PullRequestOptions.builder(1).maxBytes(2).build()); @@ -1006,7 +1007,7 @@ public void testExceedsMaxRequestBytes1stMessageSync() throws Exception { @Test public void testExceedsMaxRequestBytes1stMessageAsync() throws Exception { _testConflictStatuses(409, EXCEEDED_MAX_REQUEST_MAX_BYTES, PullWarning, - (nc, ctx, listener) -> { + (nc, ctx) -> { Dispatcher d = nc.createDispatcher(); PullSubscribeOptions so = makePso(b -> b.maxBytes(1)); JetStreamSubscription sub = ctx.js.subscribe(ctx.subject(), d, m -> {}, so); diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java index 628450cc9..b413b6e90 100644 --- a/src/test/java/io/nats/client/impl/PingTests.java +++ b/src/test/java/io/nats/client/impl/PingTests.java @@ -22,11 +22,8 @@ import java.time.Duration; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static io.nats.client.support.Listener.MEDIUM_VALIDATE_TIMEOUT; import static io.nats.client.utils.ConnectionUtils.*; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static io.nats.client.utils.ThreadUtils.sleep; @@ -84,21 +81,6 @@ public void testPingTimer() throws Exception { }); } - @Test - public void testPingFailsWhenClosed() throws Exception { - try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { - Options options = optionsBuilder(mockTs) - .pingInterval(Duration.ofMillis(10)) - .maxPingsOut(5) - .maxReconnects(0) - .build(); - NatsConnection nc = (NatsConnection) managedConnect(options); - closeAndConfirm(nc); - Future pong = nc.sendPing(); - assertFalse(pong.get(10,TimeUnit.MILLISECONDS)); - } - } - @Test public void testMaxPingsOut() throws Exception { try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) { @@ -148,26 +130,21 @@ public void testFlushTimeoutDisconnected() throws Exception { @Test public void testPingTimerThroughReconnect() throws Exception { - Listener listener = new Listener(); try (NatsTestServer ts = new NatsTestServer()) { try (NatsTestServer ts2 = new NatsTestServer()) { Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri()) - .connectionListener(listener) - .pingInterval(Duration.ofMillis(5)) - .maxPingsOut(10000) // just don't want this to be what fails the test + .pingInterval(Duration.ofMillis(500)) + .maxPingsOut(100) // just don't want this to be what fails the test .build(); try (Connection nc = managedConnect(options)) { Statistics stats = nc.getStatistics(); - sleep(200); + sleep(1000); long pings = stats.getPings(); - assertTrue(pings > 10, "got pings"); - listener.queueConnectionEvent(Events.RECONNECTED, MEDIUM_VALIDATE_TIMEOUT); + assertTrue(pings > 1, "got pings"); ts.close(); - listener.validate(); - pings = stats.getPings(); - sleep(250); // should get more pings + confirmConnected(nc); + sleep(1000); // should get more pings assertTrue(stats.getPings() > pings, "more pings"); - sleep(1000); } } } From 73b0717376ced8388aef17b5d8043f40d447892a Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 5 Dec 2025 14:22:22 -0500 Subject: [PATCH 37/51] WebsocketConnectTests cleanup --- .../client/impl/WebsocketConnectTests.java | 300 +++++++----------- 1 file changed, 106 insertions(+), 194 deletions(-) diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java index e9c25af11..7f39abe3a 100644 --- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java +++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java @@ -29,234 +29,138 @@ import java.time.Duration; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import static io.nats.client.ConnectionListener.Events.CONNECTED; import static io.nats.client.ConnectionListener.Events.RECONNECTED; -import static io.nats.client.NatsTestServer.*; -import static io.nats.client.utils.ConnectionUtils.*; +import static io.nats.client.NatsTestServer.configFileBuilder; +import static io.nats.client.NatsTestServer.nextPort; +import static io.nats.client.utils.ConnectionUtils.assertConnected; +import static io.nats.client.utils.ConnectionUtils.managedConnect; import static io.nats.client.utils.OptionsUtils.NOOP_EL; import static io.nats.client.utils.OptionsUtils.optionsBuilder; import static org.junit.jupiter.api.Assertions.*; public class WebsocketConnectTests extends TestBase { - @Test - public void testRequestReply() throws Exception { - runInSharedConfiguredServer("ws.conf", ts -> { - standardRequestReply(Options.builder() - .server(getLocalhostUri(ts.getPort())) - .maxReconnects(0).build()); + private static Options.Builder builder() { + return Options.builder() + .maxReconnects(0) + .errorListener(NOOP_EL); + } - standardRequestReply(Options.builder(). - server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) - .maxReconnects(0).build()); - }); + private static Options.Builder wsBuilder(NatsTestServer ts) { + return builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))); + } + + private static Options.Builder wssBuilder(NatsTestServer ts) throws Exception { + return builder() + .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) + .sslContext(SslTestingHelper.createTestSSLContext()); } - private static void standardRequestReply(Options options) throws InterruptedException, IOException { - try (Connection connection = managedConnect(options)) { + private static void _test(Options.Builder builder) throws InterruptedException { + try (Connection connection = managedConnect(builder.build())) { Dispatcher dispatcher = connection.createDispatcher( - msg -> connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":REPLY").getBytes())); - try { - dispatcher.subscribe("TEST"); - Message response = connection.request("TEST", "REQUEST".getBytes()).join(); - assertEquals("REQUEST:REPLY", new String(response.getData())); - } finally { - dispatcher.drain(Duration.ZERO); + msg -> connection.publish(msg.getReplyTo(), (new String(msg.getData()) + ":reply").getBytes())); + String subject = random(); + dispatcher.subscribe(subject); + for (int x = 0; x < 10; x++) { + String data = random() + x; + Message response = connection.request(subject, data.getBytes()).join(); + assertEquals(data + ":reply", new String(response.getData())); } } } @Test - public void testTLSRequestReply() throws Exception { - runInSharedConfiguredServer("wss.conf", ts -> { - java.util.function.Consumer interceptor = req -> { - // Ideally we could validate that this header was sent to NATS server - req.getHeaders().add("X-Ignored", "VALUE"); - }; - - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .httpRequestInterceptor(interceptor) - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - - standardRequestReply(options); + public void testWs() throws Exception { + runInSharedConfiguredServer("ws.conf", ts -> { + _test(optionsBuilder(ts)); + _test(wsBuilder(ts)); }); } @Test - public void testProxyRequestReply() throws Exception { - ExecutorService executor = Executors.newFixedThreadPool(3); - RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); - executor.submit(proxy); - - runInSharedConfiguredServer("ws.conf", ts -> { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WS))) - .maxReconnects(0) - .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))) - .errorListener(NOOP_EL) - .build(); - standardRequestReply(options); + public void testWss() throws Exception { + runInSharedConfiguredServer("wss.conf", ts -> { + _test(optionsBuilder(ts)); + _test(wssBuilder(ts)); }); } @Test - public void testSimpleTLSConnection() throws Exception { - runInSharedConfiguredServer("wss.conf", ts -> { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); + public void testWssVerify() throws Exception { + runInSharedConfiguredServer("wssverify.conf", ts -> { + _test(optionsBuilder(ts)); + _test(wssBuilder(ts)); }); } + private static java.util.function.Consumer getInterceptor() { + return req -> { + // Ideally we could validate that this header was sent to NATS server + req.getHeaders().add("X-Ignored", "VALUE"); + }; + } + @Test - public void testSimpleWSSIPConnection() throws Exception { - runInSharedConfiguredServer("wss.conf", ts -> { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server("wss://127.0.0.1:" + ts.getPort(WSS)) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); - }); + public void testWsInterceptor() throws Exception { + runInSharedConfiguredServer("ws.conf", + ts -> _test(wsBuilder(ts).httpRequestInterceptor(getInterceptor()))); } @Test - public void testVerifiedTLSConnection() throws Exception { - runInSharedConfiguredServer("wssverify.conf", ts -> { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); - }); + public void testWssInterceptor() throws Exception { + runInSharedConfiguredServer("wss.conf", + ts -> _test(wssBuilder(ts).httpRequestInterceptor(getInterceptor()))); } @Test - public void testOpenTLSConnection() throws Exception { - runInSharedConfiguredServer("wss.conf", ts -> { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .opentls() - .build(); - assertCanConnect(options); - }); + public void testWssVerifyInterceptor() throws Exception { + runInSharedConfiguredServer("wssverify.conf", + ts -> _test(wssBuilder(ts).httpRequestInterceptor(getInterceptor()))); } @Test - public void testURIWSSHostConnection() throws Exception { - SSLContext originalDefault = SSLContext.getDefault(); - try { - runInSharedConfiguredServer("wssverify.conf", ts -> { - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .sslContext(SslTestingHelper.createTestSSLContext())// override the custom one - .maxReconnects(0) - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); - }); - } - finally { - SSLContext.setDefault(originalDefault); - } + public void testWsOpenTLS() throws Exception { + runInSharedConfiguredServer("ws.conf", ts -> _test(wsBuilder(ts).opentls())); } @Test - public void testURIWSSIPConnection() throws Exception { - SSLContext originalDefault = SSLContext.getDefault(); - try { - runInSharedConfiguredServer("wssverify.conf", ts -> { - Options options = Options.builder() - .server("wss://127.0.0.1:" + ts.getPort(WSS)) - .sslContext(SslTestingHelper.createTestSSLContext()) // override the custom one - .maxReconnects(0) - .build(); - assertCanConnect(options); - }); - } - finally { - SSLContext.setDefault(originalDefault); - } + public void testWssOpenTLS() throws Exception { + runInSharedConfiguredServer("wss.conf", ts -> _test(wssBuilder(ts).opentls())); } @Test - public void testURISchemeWSSConnection() throws Exception { - SSLContext originalDefault = SSLContext.getDefault(); - try { - runInSharedConfiguredServer("wss.conf", ts -> { - SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .build(); - assertCanConnect(options); - }); - } - finally { - SSLContext.setDefault(originalDefault); - } + public void testWssVerifyOpenTLS() throws Exception { + runInSharedConfiguredServer("wssverify.conf", ts -> _test(wssBuilder(ts).opentls())); } @Test - public void testURISchemeWSSConnectionEnsureTlsFirstHasNoEffect() throws Exception { - SSLContext originalDefault = SSLContext.getDefault(); - try { - runInSharedConfiguredServer("wss.conf", ts -> { - SSLContext.setDefault(SslTestingHelper.createTestSSLContext()); - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .tlsFirst() - .errorListener(NOOP_EL) - .build(); - assertCanConnect(options); - }); - } - finally { - SSLContext.setDefault(originalDefault); - } + public void testProxyRequestReply() throws Exception { + ExecutorService executor = Executors.newFixedThreadPool(3); + RunProxy proxy = new RunProxy(new InetSocketAddress("localhost", 0), null, executor); + executor.submit(proxy); + + runInSharedConfiguredServer("ws.conf", ts -> { + Options.Builder builder = wsBuilder(ts) + .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxy.getPort()))); + _test(builder); + }); } @Test - public void testTLSMessageFlow() throws Exception { + public void testWssTlsFirstIgnored() throws Exception { + runInSharedConfiguredServer("wss.conf", ts -> { + _test(wssBuilder(ts).tlsFirst()); + }); + } + + @Test + public void testWssVerifyTlsFirstIgnored() throws Exception { runInSharedConfiguredServer("wssverify.conf", ts -> { - SSLContext ctx = SslTestingHelper.createTestSSLContext(); - int msgCount = 100; - Options options = Options.builder() - .server(NatsTestServer.getLocalhostUri(WSS, ts.getPort(WSS))) - .maxReconnects(0) - .sslContext(ctx) - .build(); - try (Connection nc = managedConnect(options)) { - Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16])); - String subject = random(); - d.subscribe(subject); - - for (int i = 0; i < msgCount; i++) { - Future incoming = nc.request(subject, null); - Message msg = incoming.get(500, TimeUnit.MILLISECONDS); - assertNotNull(msg); - assertEquals(16, msg.getData().length); - } - } + _test(wssBuilder(ts).tlsFirst()); }); } @@ -305,52 +209,60 @@ public void testDisconnectOnUpgrade() throws Exception { SSLContext ctx = SslTestingHelper.createTestSSLContext(); Options options = Options.builder() .server(ts.getLocalhostUri(WSS)) - .maxReconnects(0) .dataPortType(CloseOnUpgradeAttempt.class.getCanonicalName()) .sslContext(ctx) - .errorListener(NOOP_EL) .build(); assertThrows(IOException.class, () -> Nats.connect(options)); }); } @Test - public void testServerSecureClientNotMismatch() throws Exception { + public void testClientInsecureServerSecureMismatchWss() throws Exception { + runInSharedConfiguredServer("wss.conf", ts -> { + Options options = builder() + .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) + .build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); + } + + @Test + public void testClientInsecureServerSecureMismatchWssVerify() throws Exception { runInSharedConfiguredServer("wssverify.conf", ts -> { - Options options = Options.builder() + Options options = builder() .server(NatsTestServer.getLocalhostUri(WS, ts.getPort(WSS))) - .maxReconnects(0) - .errorListener(NOOP_EL) .build(); assertThrows(IOException.class, () -> Nats.connect(options)); }); } @Test - public void testClientSecureServerNotMismatch() throws Exception { + public void testClientSecureServerInsecureMismatch() throws Exception { runInSharedOwnNc(nc -> { SSLContext ctx = SslTestingHelper.createTestSSLContext(); //noinspection DataFlowIssue - Options options = optionsBuilder() + Options options = builder() .server(nc.getConnectedUrl()) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) + .sslContext(SslTestingHelper.createTestSSLContext()) .build(); assertThrows(IOException.class, () -> Nats.connect(options)); }); } @Test - public void testClientServerCertMismatch() throws Exception { + public void testClientServerCertMismatchWss() throws Exception { + runInSharedConfiguredServer("wss.conf", ts -> { + SSLContext ctx = SslTestingHelper.createEmptySSLContext(); + Options options = wssBuilder(ts).sslContext(ctx).build(); + assertThrows(IOException.class, () -> Nats.connect(options)); + }); + } + + @Test + public void testClientServerCertMismatchWssVerify() throws Exception { runInSharedConfiguredServer("wssverify.conf", ts -> { SSLContext ctx = SslTestingHelper.createEmptySSLContext(); - Options options = Options.builder() - .server(ts.getLocalhostUri(WSS)) - .maxReconnects(0) - .sslContext(ctx) - .errorListener(NOOP_EL) - .build(); + Options options = wssBuilder(ts).sslContext(ctx).build(); assertThrows(IOException.class, () -> Nats.connect(options)); }); } From cabd89df3ba250baaea1e7d54cddc184a0b69b93 Mon Sep 17 00:00:00 2001 From: scottf Date: Sun, 7 Dec 2025 07:21:21 -0500 Subject: [PATCH 38/51] resuing more --- .../nats/examples/jetstream/NatsJsPrefix.java | 2 +- .../java/io/nats/client/ConnectTests.java | 58 +++++++++-------- .../client/impl/JetStreamGeneralTests.java | 1 + .../nats/client/impl/MessageManagerTests.java | 63 ++++++++++--------- .../java/io/nats/client/utils/TestBase.java | 30 +++++---- src/test/resources/basic_account_js.conf | 5 +- src/test/resources/js_authorization.conf | 5 +- .../js_authorization_no_service.conf | 5 +- .../resources/js_authorization_token.conf | 5 +- src/test/resources/js_prefix.conf | 5 +- src/test/resources/pagination.conf | 2 +- 11 files changed, 87 insertions(+), 94 deletions(-) diff --git a/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java b/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java index 7bdf65908..5e2ec3fe5 100644 --- a/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java +++ b/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java @@ -31,7 +31,7 @@ * 
  * port: 4222
  *
- * jetstream: {max_mem_store: 1GB, max_file_store: 1GB}
+ * jetstream {max_mem_store: 1GB, max_file_store: 1GB}
  *
  * accounts: {
  *   SOURCE: {
diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java
index 5be11cba7..308d5d12d 100644
--- a/src/test/java/io/nats/client/ConnectTests.java
+++ b/src/test/java/io/nats/client/ConnectTests.java
@@ -529,39 +529,43 @@ public boolean configureAccount() {
             public boolean includeAllServers() {
                 return true;
             }
-        };
 
-        runInCluster(ConnectTests::validateRunInJsCluster);
+            @Override
+            public boolean jetStream() {
+                return true;
+            }
+        };
 
         listeners[0] = new Listener();
         listeners[1] = new Listener();
         listeners[2] = new Listener();
 
-        runInCluster(tstOpts, ConnectTests::validateRunInJsCluster);
-    }
-
-    private static void validateRunInJsCluster(Connection nc1, Connection nc2, Connection nc3) throws InterruptedException {
-        Thread.sleep(200);
-        ServerInfo si1 = nc1.getServerInfo();
-        ServerInfo si2 = nc2.getServerInfo();
-        ServerInfo si3 = nc3.getServerInfo();
-        assertEquals(si1.getCluster(), si2.getCluster());
-        assertEquals(si1.getCluster(), si3.getCluster());
-        String port1 = "" + si1.getPort();
-        String port2 = "" + si2.getPort();
-        String port3 = "" + si3.getPort();
-        String urls1 = String.join(",", si1.getConnectURLs());
-        String urls2 = String.join(",", si2.getConnectURLs());
-        String urls3 = String.join(",", si3.getConnectURLs());
-        assertTrue(urls1.contains(port1));
-        assertTrue(urls1.contains(port2));
-        assertTrue(urls1.contains(port3));
-        assertTrue(urls2.contains(port1));
-        assertTrue(urls2.contains(port2));
-        assertTrue(urls2.contains(port3));
-        assertTrue(urls3.contains(port1));
-        assertTrue(urls3.contains(port2));
-        assertTrue(urls3.contains(port3));
+        runInCluster(tstOpts, (nc1, nc2, nc3) -> {
+            Thread.sleep(200);
+            ServerInfo si1 = nc1.getServerInfo();
+            ServerInfo si2 = nc2.getServerInfo();
+            ServerInfo si3 = nc3.getServerInfo();
+            assertTrue(si1.isJetStreamAvailable());
+            assertTrue(si2.isJetStreamAvailable());
+            assertTrue(si3.isJetStreamAvailable());
+            assertEquals(si1.getCluster(), si2.getCluster());
+            assertEquals(si1.getCluster(), si3.getCluster());
+            String port1 = "" + si1.getPort();
+            String port2 = "" + si2.getPort();
+            String port3 = "" + si3.getPort();
+            String urls1 = String.join(",", si1.getConnectURLs());
+            String urls2 = String.join(",", si2.getConnectURLs());
+            String urls3 = String.join(",", si3.getConnectURLs());
+            assertTrue(urls1.contains(port1));
+            assertTrue(urls1.contains(port2));
+            assertTrue(urls1.contains(port3));
+            assertTrue(urls2.contains(port1));
+            assertTrue(urls2.contains(port2));
+            assertTrue(urls2.contains(port3));
+            assertTrue(urls3.contains(port1));
+            assertTrue(urls3.contains(port2));
+            assertTrue(urls3.contains(port3));
+        });
     }
 
     // https://github.com/nats-io/nats.java/issues/1201
diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
index 18e52cd49..3eed4307c 100644
--- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
@@ -375,6 +375,7 @@ public void testFilterSubjectEphemeral() throws Exception {
 
     @Test
     public void testPrefix() throws Exception {
+        NatsTestServer.verbose();
         String prefix = "tar.api";
         String streamMadeBySrc = "stream-made-by-src";
         String streamMadeByTar = "stream-made-by-tar";
diff --git a/src/test/java/io/nats/client/impl/MessageManagerTests.java b/src/test/java/io/nats/client/impl/MessageManagerTests.java
index 994042d16..8061c85b4 100644
--- a/src/test/java/io/nats/client/impl/MessageManagerTests.java
+++ b/src/test/java/io/nats/client/impl/MessageManagerTests.java
@@ -15,6 +15,8 @@
 
 import io.nats.client.*;
 import io.nats.client.api.ConsumerConfiguration;
+import io.nats.client.api.StorageType;
+import io.nats.client.api.StreamConfiguration;
 import io.nats.client.support.IncomingHeadersProcessor;
 import io.nats.client.support.Listener;
 import io.nats.client.support.ListenerStatusType;
@@ -43,8 +45,8 @@ public class MessageManagerTests extends JetStreamTestBase {
 
     @Test
     public void testConstruction() throws Exception {
-        runInShared(nc -> {
-            NatsJetStreamSubscription sub = genericPushSub(nc);
+        runInSharedCustom((nc, ctx) -> {
+            NatsJetStreamSubscription sub = genericPushSub(ctx);
             _pushConstruction(nc, true, true, push_hb_fc(), sub);
             _pushConstruction(nc, true, false, push_hb_xfc(), sub);
             _pushConstruction(nc, false, false, push_xhb_xfc(), sub);
@@ -76,20 +78,20 @@ private void _pushConstruction(Connection nc, boolean hb, boolean fc, SubscribeO
     @Test
     public void testPushBeforeQueueProcessorAndManage() throws Exception {
         Listener listener = new Listener();
-        runInSharedOwnNc(listener, nc -> {
-            _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, true, false);
-            _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, true, false);
-            _testPushBqpAndManageRetriable(nc, listener, push_xhb_xfc(), false, true, false);
-            _testPushBqpAndManageRetriable(nc, listener, push_hb_fc(), false, false, false);
-            _testPushBqpAndManageRetriable(nc, listener, push_hb_xfc(), false, false, false);
-            _testPushBqpAndManageRetriable(nc, listener, push_xhb_xfc(), false, false, false);
+        runInSharedCustom(listener, (nc, ctx) -> {
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_hb_fc(), false, true, false);
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_hb_xfc(), false, true, false);
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_xhb_xfc(), false, true, false);
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_hb_fc(), false, false, false);
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_hb_xfc(), false, false, false);
+            _testPushBqpAndManageRetriable(nc, ctx, listener, push_xhb_xfc(), false, false, false);
         });
     }
 
-    private void _testPushBqpAndManageRetriable(Connection nc, Listener listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException {
+    private void _testPushBqpAndManageRetriable(Connection nc, JetStreamTestingContext ctx, Listener listener, PushSubscribeOptions pso, boolean ordered, boolean syncMode, boolean queueMode) throws JetStreamApiException, IOException {
         listener.reset();
 
-        NatsJetStreamSubscription sub = genericPushSub(nc);
+        NatsJetStreamSubscription sub = genericPushSub(ctx);
         String sid = sub.getSID();
         PushMessageManager manager = getPushManager(nc, pso, sub, ordered, syncMode, queueMode);
 
@@ -126,13 +128,13 @@ private void _testPushBqpAndManageRetriable(Connection nc, Listener listener, Pu
     public void testPullBeforeQueueProcessorAndManage() throws Exception {
         Listener listener = new Listener();
         runInSharedOwnNc(listener, (nc, ctx) -> {
-            _testPullBqpAndManage(nc, listener, PullRequestOptions.builder(1).build());
-            _testPullBqpAndManage(nc, listener,  PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build());
+            _testPullBqpAndManage(nc, ctx, listener, PullRequestOptions.builder(1).build());
+            _testPullBqpAndManage(nc, ctx, listener,  PullRequestOptions.builder(1).expiresIn(10000).idleHeartbeat(100).build());
         });
     }
 
-    private void _testPullBqpAndManage(Connection nc, Listener listener, PullRequestOptions pro) throws JetStreamApiException, IOException {
-        NatsJetStreamSubscription sub = genericPullSub(nc);
+    private void _testPullBqpAndManage(Connection nc, JetStreamTestingContext ctx, Listener listener, PullRequestOptions pro) throws JetStreamApiException, IOException {
+        NatsJetStreamSubscription sub = genericPullSub(ctx);
         PullMessageManager manager = getPullManager(nc, sub, true);
         manager.startPullRequest(random(), pro, true, null);
         listener.reset();
@@ -393,8 +395,8 @@ private void _received_time_no(JetStream js, JetStreamManagement jsm, String str
 
     @Test
     public void test_hb_yes_settings() throws Exception {
-        runInShared(nc -> {
-            NatsJetStreamSubscription sub = genericPushSub(nc);
+        runInShared((nc, ctx) -> {
+            NatsJetStreamSubscription sub = genericPushSub(ctx);
 
             ConsumerConfiguration cc = ConsumerConfiguration.builder().idleHeartbeat(1000).build();
 
@@ -426,8 +428,8 @@ public void test_hb_yes_settings() throws Exception {
 
     @Test
     public void test_hb_no_settings() throws Exception {
-        runInShared(nc -> {
-            NatsJetStreamSubscription sub = genericPushSub(nc);
+        runInShared((nc, ctx) -> {
+            NatsJetStreamSubscription sub = genericPushSub(ctx);
             SubscribeOptions so = push_xhb_xfc();
             PushMessageManager manager = getPushManager(nc, so, sub, false);
             assertEquals(0, manager.getIdleHeartbeatSetting());
@@ -555,23 +557,26 @@ void publishInternal(@NonNull String subject, @Nullable String replyTo, @Nullabl
     }
 
     static AtomicInteger ID = new AtomicInteger();
-    private static NatsJetStreamSubscription genericPushSub(Connection nc) throws IOException, JetStreamApiException {
-        String subject = genericSub(nc);
-        JetStream js = nc.jetStream();
-        return (NatsJetStreamSubscription) js.subscribe(subject);
+    private static NatsJetStreamSubscription genericPushSub(JetStreamTestingContext ctx) throws IOException, JetStreamApiException {
+        String subject = genericSub(ctx);
+        return (NatsJetStreamSubscription) ctx.js.subscribe(subject);
     }
 
-    private static NatsJetStreamSubscription genericPullSub(Connection nc) throws IOException, JetStreamApiException {
-        String subject = genericSub(nc);
-        JetStream js = nc.jetStream();
-        return (NatsJetStreamSubscription) js.subscribe(subject, PullSubscribeOptions.DEFAULT_PULL_OPTS);
+    private static NatsJetStreamSubscription genericPullSub(JetStreamTestingContext ctx) throws IOException, JetStreamApiException {
+        String subject = genericSub(ctx);
+        return (NatsJetStreamSubscription) ctx.js.subscribe(subject, PullSubscribeOptions.DEFAULT_PULL_OPTS);
     }
 
-    private static String genericSub(Connection nc) throws IOException, JetStreamApiException {
+    private static String genericSub(JetStreamTestingContext ctx) throws IOException, JetStreamApiException {
         String id = "-" + ID.incrementAndGet() + "-" + System.currentTimeMillis();
         String stream = random() + id;
         String subject = random() + id;
-        createMemoryStream(nc.jetStreamManagement(), stream, subject);
+        StreamConfiguration sc = StreamConfiguration.builder()
+            .name(stream)
+            .storageType(StorageType.Memory)
+            .subjects(subject)
+            .build();
+        ctx.addStream(sc);
         return subject;
     }
 
diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java
index 9179a8aae..831a630ac 100644
--- a/src/test/java/io/nats/client/utils/TestBase.java
+++ b/src/test/java/io/nats/client/utils/TestBase.java
@@ -380,6 +380,10 @@ public static void runInSharedCustom(VersionCheck vc, JetStreamTestingContextTes
         _runInShared(null, vc, null, null, 0, ctxTest);
     }
 
+    public static void runInSharedCustom(ErrorListener el, JetStreamTestingContextTest ctxTest) throws Exception {
+        _runInShared(optionsBuilder(el), null, null, null, 0, ctxTest);
+    }
+
     public static void runInSharedCustom(Options.Builder builder, JetStreamTestingContextTest ctxTest) throws Exception {
         _runInShared(builder, null, null, null, 0, ctxTest);
     }
@@ -411,8 +415,7 @@ public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Ex
 
         String[] hubInserts = new String[] {
             "server_name: " + HUB_DOMAIN,
-            "jetstream {",
-            "    store_dir: " + tempJsStoreDir(),
+            "jetstream {", // store_dir: will be added by the runner
             "    domain: " + HUB_DOMAIN,
             "}",
             "leafnodes {",
@@ -423,7 +426,6 @@ public static void runInJsHubLeaf(TwoConnectionTest twoConnectionTest) throws Ex
         String[] leafInserts = new String[] {
             "server_name: " + LEAF_DOMAIN,
             "jetstream {",
-            "    store_dir: " + tempJsStoreDir(),
             "    domain: " + LEAF_DOMAIN,
             "}",
             "leafnodes {",
@@ -455,17 +457,15 @@ public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeConnectionT
         int listen1 = NatsTestServer.nextPort();
         int listen2 = NatsTestServer.nextPort();
         int listen3 = NatsTestServer.nextPort();
-        String dir1 = tstOpts.jetStream() ? tempJsStoreDir() : null;
-        String dir2 = tstOpts.jetStream() ? tempJsStoreDir() : null;
-        String dir3 = tstOpts.jetStream() ? tempJsStoreDir() : null;
+        boolean js = tstOpts.jetStream();
         String cluster = "cluster_" + random();
         String serverPrefix = "server_" + random() + "_";
 
         boolean configureAccount = tstOpts.configureAccount();
 
-        String[] server1Inserts = makeInsert(cluster, serverPrefix + 1, dir1, listen1, listen2, listen3, configureAccount);
-        String[] server2Inserts = makeInsert(cluster, serverPrefix + 2, dir2, listen2, listen1, listen3, configureAccount);
-        String[] server3Inserts = makeInsert(cluster, serverPrefix + 3, dir3, listen3, listen1, listen2, configureAccount);
+        String[] server1Inserts = makeInsert(cluster, serverPrefix + 1, js, listen1, listen2, listen3, configureAccount);
+        String[] server2Inserts = makeInsert(cluster, serverPrefix + 2, js, listen2, listen1, listen3, configureAccount);
+        String[] server3Inserts = makeInsert(cluster, serverPrefix + 3, js, listen3, listen1, listen2, configureAccount);
 
         try (NatsTestServer srv1 = new NatsTestServer(port1, tstOpts.jetStream(), null, server1Inserts, null);
              NatsTestServer srv2 = new NatsTestServer(port2, tstOpts.jetStream(), null, server2Inserts, null);
@@ -478,12 +478,10 @@ public static void runInCluster(ThreeServerTestOptions tstOpts, ThreeConnectionT
         }
     }
 
-    private static String[] makeInsert(String clusterName, String serverName, String jsStoreDir, int listen, int route1, int route2, boolean configureAccount) {
+    private static String[] makeInsert(String clusterName, String serverName, boolean js, int listen, int route1, int route2, boolean configureAccount) {
         List serverInserts = new ArrayList<>();
-        if (jsStoreDir != null) {
-            serverInserts.add("jetstream {");
-            serverInserts.add("    store_dir=" + jsStoreDir);
-            serverInserts.add("}");
+        if (js) {
+            serverInserts.add("jetstream {}"); // store_dir: will be added by the runner
         }
         serverInserts.add("server_name=" + serverName);
         serverInserts.add("cluster {");
@@ -498,8 +496,8 @@ private static String[] makeInsert(String clusterName, String serverName, String
             serverInserts.add("accounts {");
             serverInserts.add("  $SYS: {}");
             serverInserts.add("  NVCF: {");
-            if (jsStoreDir != null) {
-                serverInserts.add("    jetstream: \"enabled\",");
+            if (js) {
+                serverInserts.add("    jetstream: enabled,");
             }
             serverInserts.add("    users: [ { nkey: " + USER_NKEY + " } ]");
             serverInserts.add("  }");
diff --git a/src/test/resources/basic_account_js.conf b/src/test/resources/basic_account_js.conf
index a7c92a999..e4f89f8cf 100644
--- a/src/test/resources/basic_account_js.conf
+++ b/src/test/resources/basic_account_js.conf
@@ -1,7 +1,4 @@
-jetstream: {
-  max_mem_store: 1GB,
-  max_file_store: 1GB
-}
+jetstream {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   BASIC = {
diff --git a/src/test/resources/js_authorization.conf b/src/test/resources/js_authorization.conf
index b68e0dcd4..1ee2f1e93 100644
--- a/src/test/resources/js_authorization.conf
+++ b/src/test/resources/js_authorization.conf
@@ -1,9 +1,6 @@
 port: 4222
 
-jetstream: {
-  max_mem_store: 1GB,
-  max_file_store: 1GB
-}
+jetstream {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   SERVICE = {
diff --git a/src/test/resources/js_authorization_no_service.conf b/src/test/resources/js_authorization_no_service.conf
index 0c6b005e4..79e409073 100644
--- a/src/test/resources/js_authorization_no_service.conf
+++ b/src/test/resources/js_authorization_no_service.conf
@@ -1,9 +1,6 @@
 port: 4222
 
-jetstream: {
-  max_mem_store: 1GB,
-  max_file_store: 1GB
-}
+jetstream {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   SERVICE = {
diff --git a/src/test/resources/js_authorization_token.conf b/src/test/resources/js_authorization_token.conf
index 3a84e0e1c..e608b31ef 100644
--- a/src/test/resources/js_authorization_token.conf
+++ b/src/test/resources/js_authorization_token.conf
@@ -1,9 +1,6 @@
 port: 4222
 
-jetstream: {
-  max_mem_store: 1GB,
-  max_file_store: 1GB
-}
+jetstream {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   token: servicetoken
diff --git a/src/test/resources/js_prefix.conf b/src/test/resources/js_prefix.conf
index 73c6f57e0..edf973e05 100644
--- a/src/test/resources/js_prefix.conf
+++ b/src/test/resources/js_prefix.conf
@@ -1,9 +1,6 @@
 port: 4222
 
-jetstream: {
-  max_mem_store: 1GB,
-  max_file_store: 1GB
-}
+jetstream {max_mem_store: 1GB,max_file_store: 1GB}
 
 accounts: {
   SOURCE: {
diff --git a/src/test/resources/pagination.conf b/src/test/resources/pagination.conf
index 9223e7275..b162656c7 100644
--- a/src/test/resources/pagination.conf
+++ b/src/test/resources/pagination.conf
@@ -1,3 +1,3 @@
 max_payload: 67108864
-jetstream: {
+jetstream {
 }
\ No newline at end of file

From 5b66c00b32bf6b60897c407497ca05645f24140d Mon Sep 17 00:00:00 2001
From: scottf 
Date: Sun, 7 Dec 2025 12:06:42 -0500
Subject: [PATCH 39/51] RC1

---
 src/test/java/io/nats/client/impl/ErrorListenerTests.java  | 7 ++++---
 .../java/io/nats/client/impl/JetStreamGeneralTests.java    | 1 -
 src/test/java/io/nats/client/impl/KeyValueTests.java       | 3 ++-
 src/test/resources/basic_account_js.conf                   | 2 +-
 src/test/resources/js_authorization.conf                   | 2 +-
 src/test/resources/js_authorization_no_service.conf        | 2 +-
 src/test/resources/js_authorization_token.conf             | 2 +-
 src/test/resources/js_prefix.conf                          | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
index 1d3b27a55..afbffc5ed 100644
--- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java
+++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
@@ -88,14 +88,15 @@ public void testClearLastError() throws Exception {
                 .errorListener(listener)
                 .maxReconnects(-1)
                 .build();
-            nc = (NatsConnection) Nats.connect(options);
-            assertConnected(nc);
-            assertEquals(ts.getServerUri(), nc.getConnectedUrl());
 
             listener.queueConnectionEvent(Events.DISCONNECTED);
             listener.queueConnectionEvent(Events.RECONNECTED);
             listener.queueError("Authorization Violation", LONG_VALIDATE_TIMEOUT);
 
+            nc = (NatsConnection) Nats.connect(options);
+            assertConnected(nc);
+            assertEquals(ts.getServerUri(), nc.getConnectedUrl());
+
             ts.close();
 
             try {
diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
index 3eed4307c..18e52cd49 100644
--- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
@@ -375,7 +375,6 @@ public void testFilterSubjectEphemeral() throws Exception {
 
     @Test
     public void testPrefix() throws Exception {
-        NatsTestServer.verbose();
         String prefix = "tar.api";
         String streamMadeBySrc = "stream-made-by-src";
         String streamMadeByTar = "stream-made-by-tar";
diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java
index 7024042ba..5e37cee30 100644
--- a/src/test/java/io/nats/client/impl/KeyValueTests.java
+++ b/src/test/java/io/nats/client/impl/KeyValueTests.java
@@ -1087,7 +1087,8 @@ else if (expected instanceof String) {
     }
 
     @Test
-    public void testWithAccount() throws Exception {
+    public void
+    testWithAccount() throws Exception {
         runInConfiguredServer("kv_account.conf", ts -> {
             Options acctA = optionsBuilder(ts).userInfo("a", "a").build();
             Options acctI = optionsBuilder(ts).userInfo("i", "i").inboxPrefix("ForI").build();
diff --git a/src/test/resources/basic_account_js.conf b/src/test/resources/basic_account_js.conf
index e4f89f8cf..9a11d6931 100644
--- a/src/test/resources/basic_account_js.conf
+++ b/src/test/resources/basic_account_js.conf
@@ -1,4 +1,4 @@
-jetstream {max_mem_store: 1GB,max_file_store: 1GB}
+jetstream: {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   BASIC = {
diff --git a/src/test/resources/js_authorization.conf b/src/test/resources/js_authorization.conf
index 1ee2f1e93..0c22ed465 100644
--- a/src/test/resources/js_authorization.conf
+++ b/src/test/resources/js_authorization.conf
@@ -1,6 +1,6 @@
 port: 4222
 
-jetstream {max_mem_store: 1GB,max_file_store: 1GB}
+jetstream: {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   SERVICE = {
diff --git a/src/test/resources/js_authorization_no_service.conf b/src/test/resources/js_authorization_no_service.conf
index 79e409073..099317adb 100644
--- a/src/test/resources/js_authorization_no_service.conf
+++ b/src/test/resources/js_authorization_no_service.conf
@@ -1,6 +1,6 @@
 port: 4222
 
-jetstream {max_mem_store: 1GB,max_file_store: 1GB}
+jetstream: {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   SERVICE = {
diff --git a/src/test/resources/js_authorization_token.conf b/src/test/resources/js_authorization_token.conf
index e608b31ef..bf7b540fb 100644
--- a/src/test/resources/js_authorization_token.conf
+++ b/src/test/resources/js_authorization_token.conf
@@ -1,6 +1,6 @@
 port: 4222
 
-jetstream {max_mem_store: 1GB,max_file_store: 1GB}
+jetstream: {max_mem_store: 1GB,max_file_store: 1GB}
 
 authorization {
   token: servicetoken
diff --git a/src/test/resources/js_prefix.conf b/src/test/resources/js_prefix.conf
index edf973e05..c1f8f0a00 100644
--- a/src/test/resources/js_prefix.conf
+++ b/src/test/resources/js_prefix.conf
@@ -1,6 +1,6 @@
 port: 4222
 
-jetstream {max_mem_store: 1GB,max_file_store: 1GB}
+jetstream: {max_mem_store: 1GB,max_file_store: 1GB}
 
 accounts: {
   SOURCE: {

From b98d0b1759985f459b98b79dc48d8377a354b2c7 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Sun, 7 Dec 2025 14:42:58 -0500
Subject: [PATCH 40/51] RC2

---
 src/test/java/io/nats/client/impl/ReconnectTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index 9bcf16a67..db02c55e1 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -455,9 +455,9 @@ public void testReconnectDropOnLineFeed() throws Exception {
             port = mockTs.getPort();
             nc = (NatsConnection) Nats.connect(options);
             assertConnected(nc);
+            listener.queueConnectionEvent(Events.DISCONNECTED);
             nc.subscribe("test");
             subRef.get().get();
-            listener.queueConnectionEvent(Events.DISCONNECTED);
             sendRef.get().complete(true);
             flushConnection(nc); // mock server will close so we do this inside the curly
             listener.validate();

From f99fdc1ef20f96bddd17a0f7b4ca283651afbd65 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Sun, 7 Dec 2025 15:26:35 -0500
Subject: [PATCH 41/51] need to pull the server runner snapshot

---
 .github/workflows/build-pr.yml     | 2 +-
 src/test/resources/kv_account.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index c1ec61f11..175cb59cc 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Build and Test
-        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport
+        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport --refresh-dependencies
       - name: Verify Javadoc
         run: ./gradlew javadoc
       - name: Send coverage to Coveralls
diff --git a/src/test/resources/kv_account.conf b/src/test/resources/kv_account.conf
index 5a8b4e09a..e8034003d 100644
--- a/src/test/resources/kv_account.conf
+++ b/src/test/resources/kv_account.conf
@@ -1,7 +1,7 @@
 jetstream: enabled
 accounts: {
     A: {
-        jetstream: true
+        jetstream: enabled
         users: [ {user: a, password: a} ]
         exports: [
             {service: '$JS.API.>'}

From 866634d4a4ade8c82f5923a6380061a680bc6849 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Mon, 8 Dec 2025 10:54:05 -0500
Subject: [PATCH 42/51] revert this change wasn't needed

---
 src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java b/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java
index 5e2ec3fe5..7bdf65908 100644
--- a/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java
+++ b/src/examples/java/io/nats/examples/jetstream/NatsJsPrefix.java
@@ -31,7 +31,7 @@
  * 
  * port: 4222
  *
- * jetstream {max_mem_store: 1GB, max_file_store: 1GB}
+ * jetstream: {max_mem_store: 1GB, max_file_store: 1GB}
  *
  * accounts: {
  *   SOURCE: {

From 1c6bd6a61a28a55e509117fcc5a288c196e00e17 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Tue, 9 Dec 2025 09:25:49 -0500
Subject: [PATCH 43/51] remove readme change, will be fixed elsewhere

---
 src/examples/java/io/nats/examples/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/examples/java/io/nats/examples/README.md b/src/examples/java/io/nats/examples/README.md
index b878e5ceb..0f00429c8 100644
--- a/src/examples/java/io/nats/examples/README.md
+++ b/src/examples/java/io/nats/examples/README.md
@@ -114,7 +114,7 @@ To run with the completely unverified client:
 java -cp build/libs/jnats-{major.minor.patch}-SNAPSHOT.jar:build/libs/jnats-{major.minor.patch}-SNAPSHOT-examples.jar io.nats.examples.NatsSub opentls://localhost:4443 test 3
 ```
 
-There are a set of tls configuration files for the server in the test files that can be used to run the NATS server.
+There are a set tls configuration for the server in the test files that can be used to run the NATS server.
 
 ```bash
 nats-server --config src/test/resources/tls.conf

From 1d967565ee8b28eb3e539760d7da0b0735a1fcb0 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Tue, 9 Dec 2025 17:52:14 -0500
Subject: [PATCH 44/51] clean up all ide warnings

---
 src/test/java/io/nats/client/NUIDTests.java   |   4 +-
 .../io/nats/client/SubscribeOptionsTests.java |   2 +
 .../nats/client/api/ObjectStoreApiTests.java  |  15 -
 .../client/api/StreamConfigurationTests.java  |   3 -
 .../nats/client/impl/AuthAndConnectTests.java |   2 +-
 .../nats/client/impl/ErrorListenerTests.java  |  73 +---
 .../io/nats/client/impl/HeadersTests.java     |  63 ++--
 .../client/impl/JetStreamGeneralTests.java    | 114 +++---
 .../client/impl/JetStreamManagementTests.java |   9 +-
 .../JetStreamManagementWithConfTests.java     |   3 +-
 .../nats/client/impl/JetStreamPullTests.java  |   6 +-
 .../client/impl/JetStreamPushAsyncTests.java  |   3 +-
 .../nats/client/impl/JetStreamTestBase.java   |  38 +-
 .../nats/client/impl/MessageContentTests.java |   2 +-
 .../client/impl/NatsConnectionImplTests.java  |   3 +-
 .../impl/NatsJetStreamMetaDataTests.java      |   1 +
 .../io/nats/client/impl/NatsMessageTests.java |   5 +-
 .../NatsProvidersAndImplementationsTests.java |  15 +-
 .../nats/client/impl/NatsStatisticsTests.java |   4 +-
 .../io/nats/client/impl/ReconnectTests.java   |  91 ++---
 .../io/nats/client/impl/RequestTests.java     |   5 +-
 .../nats/client/impl/SimplificationTests.java | 348 +++++++++---------
 .../client/impl/WebsocketConnectTests.java    |   9 +-
 .../io/nats/client/support/JwtUtilsTests.java |  10 +-
 .../java/io/nats/client/support/Listener.java |  20 +-
 .../client/support/ScheduledTaskTests.java    |  31 +-
 .../nats/client/support/ValidatorTests.java   |  73 ++--
 .../java/io/nats/client/utils/TestBase.java   |   4 -
 .../io/nats/client/utils/VersionUtils.java    |  24 +-
 29 files changed, 417 insertions(+), 563 deletions(-)

diff --git a/src/test/java/io/nats/client/NUIDTests.java b/src/test/java/io/nats/client/NUIDTests.java
index 4bed73d2f..e4e5d3cef 100644
--- a/src/test/java/io/nats/client/NUIDTests.java
+++ b/src/test/java/io/nats/client/NUIDTests.java
@@ -27,7 +27,7 @@
 public class NUIDTests {
     @Test
     public void testDigits() {
-        assertEquals(NUID.digits.length, NUID.base, "digits length does not match base modulo");
+        assertEquals(NUID.base, NUID.digits.length, "digits length does not match base modulo");
     }
 
     @Test
@@ -104,6 +104,7 @@ public void whenRandomizePrefixCalledDirectlyThenPrefixIsRandomized() {
     public void whenMultipleThreadsIncrementSequenceThenNoCollisionsOccur() throws InterruptedException {
         NUID nuid = NUID.getInstance();
         Set sequences = ConcurrentHashMap.newKeySet();
+        //noinspection resource
         ExecutorService service = Executors.newFixedThreadPool(10);
 
         // This test checks the thread-safety of nextSequence by generating sequences from multiple threads.
@@ -116,6 +117,7 @@ public void whenMultipleThreadsIncrementSequenceThenNoCollisionsOccur() throws I
         }
 
         service.shutdown();
+        //noinspection ResultOfMethodCallIgnored
         service.awaitTermination(1, TimeUnit.MINUTES);
 
         // All sequences should be unique, verifying no sequence collision occurs when accessed by multiple threads.
diff --git a/src/test/java/io/nats/client/SubscribeOptionsTests.java b/src/test/java/io/nats/client/SubscribeOptionsTests.java
index eb19d829a..7ba9261f7 100644
--- a/src/test/java/io/nats/client/SubscribeOptionsTests.java
+++ b/src/test/java/io/nats/client/SubscribeOptionsTests.java
@@ -379,10 +379,12 @@ public void testOrderedCreation() {
 
         ConsumerConfiguration ccHb = ConsumerConfiguration.builder().idleHeartbeat(100).build();
         PushSubscribeOptions pso = PushSubscribeOptions.builder().configuration(ccHb).ordered(true).build();
+        assertNotNull(pso.getConsumerConfiguration().getIdleHeartbeat());
         assertEquals(100, pso.getConsumerConfiguration().getIdleHeartbeat().toMillis());
 
         ccHb = ConsumerConfiguration.builder().idleHeartbeat(DEFAULT_ORDERED_HEARTBEAT + 1).build();
         pso = PushSubscribeOptions.builder().configuration(ccHb).ordered(true).build();
+        assertNotNull(pso.getConsumerConfiguration().getIdleHeartbeat());
         assertEquals(DEFAULT_ORDERED_HEARTBEAT + 1, pso.getConsumerConfiguration().getIdleHeartbeat().toMillis());
 
         // okay if you set it to true
diff --git a/src/test/java/io/nats/client/api/ObjectStoreApiTests.java b/src/test/java/io/nats/client/api/ObjectStoreApiTests.java
index 1a7518366..77e9d5b7f 100644
--- a/src/test/java/io/nats/client/api/ObjectStoreApiTests.java
+++ b/src/test/java/io/nats/client/api/ObjectStoreApiTests.java
@@ -160,11 +160,9 @@ private void linkCoverage(ObjectLink link1a, ObjectLink link1b, ObjectLink link2
         assertFalse(blink1a.isObjectLink());
         assertTrue(blink1a.isBucketLink());
 
-        //noinspection EqualsWithItself
         assertEquals(link1a, link1a);
         assertEquals(link1a, link1b);
         assertEquals(link1a, ObjectLink.object(link1a.getBucket(), link1a.getObjectName()));
-        //noinspection EqualsWithItself
         assertEquals(blink1a, blink1a);
         assertEquals(blink1a, blink1b);
         assertFalse(link1a.equals(new Object()));
@@ -192,7 +190,6 @@ private void metaOptionsCoverage(ObjectMetaOptions metaOptions, ObjectMetaOption
         assertTrue(metaOptionsC.hasData());
         assertFalse(ObjectMetaOptions.builder().build().hasData());
 
-        //noinspection EqualsWithItself
         assertEquals(metaOptions, metaOptions);
         assertFalse(metaOptions.equals(new Object()));
         assertFalse(metaOptions.equals(null));
@@ -243,7 +240,6 @@ private void metaCoverage(ObjectLink link, ObjectLink link2) {
         ObjectMeta metaH = ObjectMeta.builder("meta").headers(new Headers().put("key", "data")).headers(null).build();
         assertEquals(0, metaH.getHeaders().size());
 
-        //noinspection EqualsWithItself
         assertEquals(meta1a, meta1a);
         assertEquals(meta1a, meta1b);
         assertNotEquals(meta1a, meta1c);
@@ -253,19 +249,16 @@ private void metaCoverage(ObjectLink link, ObjectLink link2) {
         assertNotEquals(meta1a, meta3a);
         assertNotEquals(meta1a, meta4a);
 
-        //noinspection EqualsWithItself
         assertEquals(meta2a, meta2a);
         assertEquals(meta2a, meta2b);
         assertNotEquals(meta2a, meta2c);
         assertNotEquals(meta2a, meta1a);
 
-        //noinspection EqualsWithItself
         assertEquals(meta3a, meta3a);
         assertEquals(meta3a, meta3b);
         assertNotEquals(meta3a, meta3c);
         assertNotEquals(meta3a, meta1a);
 
-        //noinspection EqualsWithItself
         assertEquals(meta4a, meta4a);
         assertEquals(meta4a, meta4b);
         assertNotEquals(meta4a, meta4c);
@@ -346,7 +339,6 @@ private void infoCoverage(ObjectLink link1, ObjectLink link2) {
 
         assertEquals(info1a, info1b);
         assertNotEquals(info1a, info1c);
-        //noinspection EqualsWithItself
         assertEquals(info1a, info1a);
         assertFalse(info1a.equals(null));
         assertFalse(info1a.equals(new Object()));
@@ -358,43 +350,36 @@ private void infoCoverage(ObjectLink link1, ObjectLink link2) {
         assertNotEquals(info1a, info7a);
         assertNotEquals(info1a, info8a);
 
-        //noinspection EqualsWithItself
         assertEquals(info2a, info2a);
         assertEquals(info2a, info2b);
         assertNotEquals(info2a, info2c);
         assertNotEquals(info2a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info3a, info3a);
         assertEquals(info3a, info3b);
         assertNotEquals(info3a, info3c);
         assertNotEquals(info3a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info4a, info4a);
         assertEquals(info4a, info4b);
         assertNotEquals(info4a, info4c);
         assertNotEquals(info4a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info5a, info5a);
         assertEquals(info5a, info5b);
         assertNotEquals(info5a, info5c);
         assertNotEquals(info5a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info6a, info6a);
         assertEquals(info6a, info6b);
         assertNotEquals(info6a, info6c);
         assertNotEquals(info6a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info7a, info7a);
         assertEquals(info7a, info7b);
         assertNotEquals(info7a, info7c);
         assertNotEquals(info7a, info1a);
 
-        //noinspection EqualsWithItself
         assertEquals(info8a, info8a);
         assertEquals(info8a, info8b);
         assertNotEquals(info8a, info8c);
diff --git a/src/test/java/io/nats/client/api/StreamConfigurationTests.java b/src/test/java/io/nats/client/api/StreamConfigurationTests.java
index eeab8d4f9..ff3af0340 100644
--- a/src/test/java/io/nats/client/api/StreamConfigurationTests.java
+++ b/src/test/java/io/nats/client/api/StreamConfigurationTests.java
@@ -266,11 +266,9 @@ public void testConstruction() {
         for (String l1 : lines) {
             if (l1.startsWith("{")) {
                 Mirror m1 = new Mirror(JsonParser.parseUnchecked(l1));
-                //noinspection EqualsWithItself
                 assertEquals(m1, m1);
                 assertEquals(m1, Mirror.builder(m1).build());
                 Source s1 = new Source(JsonParser.parseUnchecked(l1));
-                //noinspection EqualsWithItself
                 assertEquals(s1, s1);
                 assertEquals(s1, Source.builder(s1).build());
                 //this provides testing coverage
@@ -298,7 +296,6 @@ public void testConstruction() {
         lines = ResourceUtils.dataAsLines("ExternalJson.txt");
         for (String l1 : lines) {
             External e1 = new External(JsonParser.parseUnchecked(l1));
-            //noinspection EqualsWithItself
             assertEquals(e1, e1);
             //noinspection MisorderedAssertEqualsArguments
             assertNotEquals(e1, null);
diff --git a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java
index 91d6732d5..d86ce49e9 100644
--- a/src/test/java/io/nats/client/impl/AuthAndConnectTests.java
+++ b/src/test/java/io/nats/client/impl/AuthAndConnectTests.java
@@ -31,7 +31,7 @@
 
 public class AuthAndConnectTests extends TestBase {
     @Test
-    public void testIsAuthError() throws Exception {
+    public void testIsAuthError() {
         //noinspection resource
         NatsConnection nats = new NatsConnection(options());
         assertTrue(nats.isAuthenticationError("user authentication expired"));
diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
index afbffc5ed..3b4e4b716 100644
--- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java
+++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
@@ -36,7 +36,7 @@
 public class ErrorListenerTests extends TestBase {
 
     @Test
-    public void testLastError() throws Exception {
+    public void testLastError_ClearError_AuthViolation() throws Exception {
         NatsConnection nc;
         Listener listener = new Listener();
         String[] customArgs = {"--user", "stephen", "--pass", "password"};
@@ -70,77 +70,10 @@ public void testLastError() throws Exception {
 
             confirmConnected(nc); // wait for reconnect
             assertEquals(ts3.getServerUri(), nc.getConnectedUrl());
-        }
-    }
-
-    @Test
-    public void testClearLastError() throws Exception {
-        NatsConnection nc = null;
-        Listener listener = new Listener();
-        String[] customArgs = {"--user", "stephen", "--pass", "password"};
-
-        try (NatsTestServer ts = new NatsTestServer();
-             NatsTestServer ts2 = new NatsTestServer(customArgs); //ts2 requires auth
-             NatsTestServer ts3 = new NatsTestServer()) {
-            Options options = optionsBuilder(ts.getServerUri(), ts2.getServerUri(), ts3.getServerUri())
-                .noRandomize()
-                .connectionListener(listener)
-                .errorListener(listener)
-                .maxReconnects(-1)
-                .build();
-
-            listener.queueConnectionEvent(Events.DISCONNECTED);
-            listener.queueConnectionEvent(Events.RECONNECTED);
-            listener.queueError("Authorization Violation", LONG_VALIDATE_TIMEOUT);
-
-            nc = (NatsConnection) Nats.connect(options);
-            assertConnected(nc);
-            assertEquals(ts.getServerUri(), nc.getConnectedUrl());
-
-            ts.close();
-
-            try {
-                nc.flush(Duration.ofSeconds(1));
-            }
-            catch (Exception exp) {
-                // this usually fails
-            }
-
-            listener.validateAll();
-
-            assertConnected(nc);
-            assertEquals(ts3.getServerUri(), nc.getConnectedUrl());
 
             nc.clearLastError();
             assertNull(nc.getLastError());
         }
-        finally {
-            closeAndConfirm(nc);
-        }
-    }
-
-    @Test
-    public void testErrorOnNoAuth() throws Exception {
-        String[] customArgs = {"--user", "stephen", "--pass", "password"};
-        Listener listener = new Listener();
-        try (NatsTestServer ts = new NatsTestServer(customArgs)) {
-            // See config file for user/pass
-            // no or wrong u/p in the options is an error
-            Options options = optionsBuilder(ts)
-                .maxReconnects(0)
-                .errorListener(listener)
-                .build();
-            try {
-                Nats.connect(options);
-                fail();
-            }
-            catch (AuthenticationException ae) {
-                if (ae.getMessage().contains("Authorization Violation")) {
-                    return;
-                }
-                fail();
-            }
-        }
     }
 
     @Test
@@ -159,10 +92,8 @@ public void testExceptionOnBadDispatcher() throws Exception {
                 d.subscribe(subject);
                 Future incoming = nc.request(subject, null);
 
-                Message msg;
-
                 try {
-                    msg = incoming.get(200, TimeUnit.MILLISECONDS);
+                    incoming.get(200, TimeUnit.MILLISECONDS);
                     fail();
                 }
                 catch (TimeoutException te) {
diff --git a/src/test/java/io/nats/client/impl/HeadersTests.java b/src/test/java/io/nats/client/impl/HeadersTests.java
index 5af80e1ed..971e8aa66 100644
--- a/src/test/java/io/nats/client/impl/HeadersTests.java
+++ b/src/test/java/io/nats/client/impl/HeadersTests.java
@@ -557,36 +557,36 @@ public void constructStatusWithValidBytesAndCoverage() {
         assertValidStatus("NATS/1.0   923   Unknown Message And Code\r\n", 923, "Unknown Message And Code");
 
         // additional coverage for status extraction comparing status text to known values
-        assertValidStatus(999, EXCEEDED_MAX_WAITING);
-        assertValidStatus(999, EXCEEDED_MAX_REQUEST_BATCH);
-        assertValidStatus(999, EXCEEDED_MAX_REQUEST_MAX_BYTES);
-        assertValidStatus(999, EXCEEDED_MAX_REQUEST_EXPIRES);
-        assertValidStatus(999, EOB_TEXT);
-
-        assertValidStatus(999, BATCH_COMPLETED);
-        assertValidStatus(999, BAD_REQUEST);
-
-        assertValidStatus(999, NO_RESPONDERS_TEXT);
-        assertValidStatus(999, NO_MESSAGES);
-
-        assertValidStatus(999, FLOW_CONTROL_TEXT);
-        assertValidStatus(999, HEARTBEAT_TEXT);
-        assertValidStatus(999, MESSAGE_SIZE_EXCEEDS_MAX_BYTES);
-        assertValidStatus(999, LEADERSHIP_CHANGE);
-        assertValidStatus(999, SERVER_SHUTDOWN);
-        assertValidStatus(999, CONSUMER_DELETED);
-        assertValidStatus(999, CONSUMER_IS_PUSH_BASED);
+        assertValidStatus(EXCEEDED_MAX_WAITING);
+        assertValidStatus(EXCEEDED_MAX_REQUEST_BATCH);
+        assertValidStatus(EXCEEDED_MAX_REQUEST_MAX_BYTES);
+        assertValidStatus(EXCEEDED_MAX_REQUEST_EXPIRES);
+        assertValidStatus(EOB_TEXT);
+
+        assertValidStatus(BATCH_COMPLETED);
+        assertValidStatus(BAD_REQUEST);
+
+        assertValidStatus(NO_RESPONDERS_TEXT);
+        assertValidStatus(NO_MESSAGES);
+
+        assertValidStatus(FLOW_CONTROL_TEXT);
+        assertValidStatus(HEARTBEAT_TEXT);
+        assertValidStatus(MESSAGE_SIZE_EXCEEDS_MAX_BYTES);
+        assertValidStatus(LEADERSHIP_CHANGE);
+        assertValidStatus(SERVER_SHUTDOWN);
+        assertValidStatus(CONSUMER_DELETED);
+        assertValidStatus(CONSUMER_IS_PUSH_BASED);
 
         // coverage
-        assertValidStatus(999, "E Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "B Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "N Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "F Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "I Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "M Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "L Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "S Test Starts With Known Letter But Not Known");
-        assertValidStatus(999, "C Test Starts With Known Letter But Not Known");
+        assertValidStatus("E Test Starts With Known Letter But Not Known");
+        assertValidStatus("B Test Starts With Known Letter But Not Known");
+        assertValidStatus("N Test Starts With Known Letter But Not Known");
+        assertValidStatus("F Test Starts With Known Letter But Not Known");
+        assertValidStatus("I Test Starts With Known Letter But Not Known");
+        assertValidStatus("M Test Starts With Known Letter But Not Known");
+        assertValidStatus("L Test Starts With Known Letter But Not Known");
+        assertValidStatus("S Test Starts With Known Letter But Not Known");
+        assertValidStatus("C Test Starts With Known Letter But Not Known");
     }
 
     @Test
@@ -686,10 +686,10 @@ private void assertValidHeader(IncomingHeadersProcessor ihp, String key, String
         }
     }
 
-    private void assertValidStatus(int code, String text) {
-        String test = "NATS/1.0 " + code + " " + text + "\r\n";
+    private void assertValidStatus(String text) {
+        String test = "NATS/1.0 999 " + text + "\r\n";
         IncomingHeadersProcessor ihp = new IncomingHeadersProcessor(test.getBytes());
-        assertValidStatus(ihp, code, text);
+        assertValidStatus(ihp, 999, text);
     }
 
     private IncomingHeadersProcessor assertValidStatus(String test, int code, String msg) {
@@ -815,7 +815,6 @@ public void equalsHash() {
         Headers h2 = new Headers();
         //noinspection MisorderedAssertEqualsArguments
         assertNotEquals(h1, null);
-        //noinspection EqualsWithItself
         assertEquals(h1, h1);
         assertEquals(h1, h2);
         assertEquals(h1.hashCode(), h1.hashCode());
diff --git a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
index 18e52cd49..eede22c37 100644
--- a/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamGeneralTests.java
@@ -33,7 +33,8 @@
 import static io.nats.client.support.NatsConstants.EMPTY;
 import static io.nats.client.support.NatsJetStreamClientError.*;
 import static io.nats.client.utils.OptionsUtils.optionsBuilder;
-import static io.nats.client.utils.VersionUtils.*;
+import static io.nats.client.utils.VersionUtils.atLeast2_10;
+import static io.nats.client.utils.VersionUtils.before2_11;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class JetStreamGeneralTests extends JetStreamTestBase {
@@ -124,11 +125,14 @@ public void testJetStreamSubscribe() throws Exception {
             // coverage
             Dispatcher dispatcher = nc.createDispatcher();
             ctx.js.subscribe(ctx.subject());
-            ctx.js.subscribe(ctx.subject(), (PushSubscribeOptions)null);
+            ctx.js.subscribe(ctx.subject(), (PushSubscribeOptions) null);
             ctx.js.subscribe(ctx.subject(), random(), null);
-            ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {}, false);
-            ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {}, false, null);
-            ctx.js.subscribe(ctx.subject(), random(), dispatcher, mh -> {}, false, null);
+            ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {
+            }, false);
+            ctx.js.subscribe(ctx.subject(), dispatcher, mh -> {
+            }, false, null);
+            ctx.js.subscribe(ctx.subject(), random(), dispatcher, mh -> {
+            }, false, null);
 
             // bind with w/o subject
             durable = random();
@@ -142,9 +146,11 @@ public void testJetStreamSubscribe() throws Exception {
             PushSubscribeOptions psoBind = PushSubscribeOptions.bind(ctx.stream, durable);
             unsubscribeEnsureNotBound(ctx.js.subscribe(null, psoBind));
             unsubscribeEnsureNotBound(ctx.js.subscribe("", psoBind));
-            JetStreamSubscription sub = ctx.js.subscribe(null, dispatcher, mh -> {}, false, psoBind);
+            JetStreamSubscription sub = ctx.js.subscribe(null, dispatcher, mh -> {
+            }, false, psoBind);
             unsubscribeEnsureNotBound(dispatcher, sub);
-            ctx.js.subscribe("", dispatcher, mh -> {}, false, psoBind);
+            ctx.js.subscribe("", dispatcher, mh -> {
+            }, false, psoBind);
 
             durable = random();
             deliver = random();
@@ -159,54 +165,54 @@ public void testJetStreamSubscribe() throws Exception {
             psoBind = PushSubscribeOptions.bind(ctx.stream, durable);
             unsubscribeEnsureNotBound(ctx.js.subscribe(null, queue, psoBind));
             unsubscribeEnsureNotBound(ctx.js.subscribe("", queue, psoBind));
-            sub = ctx.js.subscribe(null, queue, dispatcher, mh -> {}, false, psoBind);
+            sub = ctx.js.subscribe(null, queue, dispatcher, mh -> {
+            }, false, psoBind);
             unsubscribeEnsureNotBound(dispatcher, sub);
-            ctx.js.subscribe("", queue, dispatcher, mh -> {}, false, psoBind);
-
-            if (atLeast2_9_0()) {
-                String name = random();
-                ConsumerConfiguration cc = builder().name(name).build();
-                pso = PushSubscribeOptions.builder().configuration(cc).build();
-                sub = ctx.js.subscribe(ctx.subject(), pso);
-                m = sub.nextMessage(DEFAULT_TIMEOUT);
-                assertNotNull(m);
-                assertEquals(DATA, new String(m.getData()));
-                ConsumerInfo ci = sub.getConsumerInfo();
-                assertEquals(name, ci.getName());
-                assertEquals(name, ci.getConsumerConfiguration().getName());
-                assertNull(ci.getConsumerConfiguration().getDurable());
-
-                durable = random();
-                cc = builder().durable(durable).build();
-                pso = PushSubscribeOptions.builder().configuration(cc).build();
-                sub = ctx.js.subscribe(ctx.subject(), pso);
-                m = sub.nextMessage(DEFAULT_TIMEOUT);
-                assertNotNull(m);
-                assertEquals(DATA, new String(m.getData()));
-                ci = sub.getConsumerInfo();
-                assertEquals(durable, ci.getName());
-                assertEquals(durable, ci.getConsumerConfiguration().getName());
-                assertEquals(durable, ci.getConsumerConfiguration().getDurable());
-
-                String durName = random();
-                cc = builder().durable(durName).name(durName).build();
-                pso = PushSubscribeOptions.builder().configuration(cc).build();
-                sub = ctx.js.subscribe(ctx.subject(), pso);
-                m = sub.nextMessage(DEFAULT_TIMEOUT);
-                assertNotNull(m);
-                assertEquals(DATA, new String(m.getData()));
-                ci = sub.getConsumerInfo();
-                assertEquals(durName, ci.getName());
-                assertEquals(durName, ci.getConsumerConfiguration().getName());
-                assertEquals(durName, ci.getConsumerConfiguration().getDurable());
-
-                // test opt out
-                JetStreamOptions jso = JetStreamOptions.builder().optOut290ConsumerCreate(true).build();
-                JetStream jsOptOut = nc.jetStream(jso);
-                ConsumerConfiguration ccOptOut = builder().name(random()).build();
-                PushSubscribeOptions psoOptOut = PushSubscribeOptions.builder().configuration(ccOptOut).build();
-                assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(ctx.subject(), psoOptOut));
-            }
+            ctx.js.subscribe("", queue, dispatcher, mh -> {
+            }, false, psoBind);
+
+            String name = random();
+            ConsumerConfiguration cc = builder().name(name).build();
+            pso = PushSubscribeOptions.builder().configuration(cc).build();
+            sub = ctx.js.subscribe(ctx.subject(), pso);
+            m = sub.nextMessage(DEFAULT_TIMEOUT);
+            assertNotNull(m);
+            assertEquals(DATA, new String(m.getData()));
+            ConsumerInfo ci = sub.getConsumerInfo();
+            assertEquals(name, ci.getName());
+            assertEquals(name, ci.getConsumerConfiguration().getName());
+            assertNull(ci.getConsumerConfiguration().getDurable());
+
+            durable = random();
+            cc = builder().durable(durable).build();
+            pso = PushSubscribeOptions.builder().configuration(cc).build();
+            sub = ctx.js.subscribe(ctx.subject(), pso);
+            m = sub.nextMessage(DEFAULT_TIMEOUT);
+            assertNotNull(m);
+            assertEquals(DATA, new String(m.getData()));
+            ci = sub.getConsumerInfo();
+            assertEquals(durable, ci.getName());
+            assertEquals(durable, ci.getConsumerConfiguration().getName());
+            assertEquals(durable, ci.getConsumerConfiguration().getDurable());
+
+            String durName = random();
+            cc = builder().durable(durName).name(durName).build();
+            pso = PushSubscribeOptions.builder().configuration(cc).build();
+            sub = ctx.js.subscribe(ctx.subject(), pso);
+            m = sub.nextMessage(DEFAULT_TIMEOUT);
+            assertNotNull(m);
+            assertEquals(DATA, new String(m.getData()));
+            ci = sub.getConsumerInfo();
+            assertEquals(durName, ci.getName());
+            assertEquals(durName, ci.getConsumerConfiguration().getName());
+            assertEquals(durName, ci.getConsumerConfiguration().getDurable());
+
+            // test opt out
+            JetStreamOptions jso = JetStreamOptions.builder().optOut290ConsumerCreate(true).build();
+            JetStream jsOptOut = nc.jetStream(jso);
+            ConsumerConfiguration ccOptOut = builder().name(random()).build();
+            PushSubscribeOptions psoOptOut = PushSubscribeOptions.builder().configuration(ccOptOut).build();
+            assertClientError(JsConsumerCreate290NotAvailable, () -> jsOptOut.subscribe(ctx.subject(), psoOptOut));
         });
     }
 
diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java
index 85fe358ba..81495c522 100644
--- a/src/test/java/io/nats/client/impl/JetStreamManagementTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamManagementTests.java
@@ -104,7 +104,7 @@ public void testStreamCreate210() throws Exception {
 
     @Test
     public void testStreamMetadata() throws Exception {
-        runInSharedCustom(VersionUtils::atLeast2_9_0, (nc, ctx) -> {
+        runInSharedCustom((nc, ctx) -> {
             Map metaData = new HashMap<>(); metaData.put(META_KEY, META_VALUE);
             StreamConfiguration sc = ctx.scBuilder(1).metadata(metaData).build();
             StreamInfo si = ctx.createOrReplaceStream(sc);
@@ -504,7 +504,7 @@ public void testDeleteStream() throws Exception {
             jsapiEx = assertThrows(JetStreamApiException.class, () -> ctx.jsm.getStreamInfo(ctx.stream));
             assertEquals(10059, jsapiEx.getApiErrorCode());
 
-            jsapiEx = assertThrows(JetStreamApiException.class, () -> ctx.deleteStream());
+            jsapiEx = assertThrows(JetStreamApiException.class, ctx::deleteStream);
             assertEquals(10059, jsapiEx.getApiErrorCode());
         });
     }
@@ -1185,8 +1185,7 @@ public void testMessageGetRequestObjectDeprecatedMethods() {
 
     @Test
     public void testDirectMessageRepublishedSubject() throws Exception {
-        runInSharedCustom(VersionUtils::atLeast2_9_0, (nc, ctx) -> {
-            String streamName = random();
+        runInSharedCustom((nc, ctx) -> {
             String bucketName = random();
             String subject = random();
             String streamSubject = subject + ".>";
@@ -1229,7 +1228,7 @@ public void testDirectMessageRepublishedSubject() throws Exception {
 
     @Test
     public void testCreateConsumerUpdateConsumer() throws Exception {
-        runInOwnJsServer(VersionUtils::atLeast2_9_0, (nc, jsm, js) -> {
+        runInOwnJsServer((nc, jsm, js) -> {
             String streamPrefix = random();
             JetStreamManagement jsmNew = nc.jetStreamManagement();
             JetStreamManagement jsmPre290 = nc.jetStreamManagement(JetStreamOptions.builder().optOut290ConsumerCreate(true).build());
diff --git a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java
index 1a3154c1d..b9ffadeed 100644
--- a/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamManagementWithConfTests.java
@@ -119,11 +119,10 @@ private void validateStreamInfo(StreamState streamState, long subjectsList, long
     }
 
     @Test
-    public void testJsStuffOnGoodAuthAccount() throws Exception {
+    public void testGoodAuthAccount() throws Exception {
         runInConfiguredServer("js_authorization.conf", ts -> {
             try (Connection nc = ConnectionUtils.managedConnect(optionsBuilder(ts).userInfo("serviceup", "uppass").build())) {
                 JetStreamManagement jsm = nc.jetStreamManagement();
-                JetStream js = jsm.jetStream();
                 // add streams with both account
                 String stream = random();
                 String subject1 = random();
diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
index e78177b21..d94211d97 100644
--- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
@@ -618,7 +618,7 @@ public void testDurable() throws Exception {
 
     @Test
     public void testNamed() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_0, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             String name = random();
 
             ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder()
@@ -1035,7 +1035,7 @@ public String toJson() {
     @Test
     public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception {
         Listener listener = new Listener();
-        runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInSharedOwnNc(listener, (nc, ctx) -> {
             listener.queueStatus(PullWarning, CONFLICT_CODE);
             String dur = random();
             ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(dur).ackPolicy(AckPolicy.None).filterSubjects(ctx.subject()).build());
@@ -1061,7 +1061,7 @@ public void testExceedsMaxRequestBytesNthMessageSyncSub() throws Exception {
     @Test
     public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception {
         Listener listener = new Listener();
-        runInSharedOwnNc(listener, VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInSharedOwnNc(listener, (nc, ctx) -> {
             listener.queueStatus(PullWarning, CONFLICT_CODE);
             ctx.stream = randomWide(6); // six letters so I can count
             String subject = randomWide(5); // five letters so I can count
diff --git a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java
index 88234970c..ac35269b8 100644
--- a/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamPushAsyncTests.java
@@ -385,14 +385,13 @@ private void validateHeadersOnly(Object[] expecteds, MemStorBugHandler handler)
             Object expected = expecteds[aix++];
             Headers h = m.getHeaders();
             assertNotNull(h);
+            assertTrue(m.getData() == null || m.getData().length == 0);
             if (expected instanceof String) {
-                assertTrue(m.getData() == null || m.getData().length == 0);
                 assertEquals("" + ((String)expected).length(), h.getFirst(MSG_SIZE_HDR));
                 assertNull(h.getFirst(KV_OPERATION_HEADER_KEY));
                 assertNull(h.getFirst(ROLLUP_HDR));
             }
             else {
-                assertTrue(m.getData() == null || m.getData().length == 0);
                 assertEquals("0", h.getFirst(MSG_SIZE_HDR));
                 assertEquals(expected, KeyValueOperation.valueOf(h.getFirst(KV_OPERATION_HEADER_KEY)));
                 if (expected == KeyValueOperation.PURGE) {
diff --git a/src/test/java/io/nats/client/impl/JetStreamTestBase.java b/src/test/java/io/nats/client/impl/JetStreamTestBase.java
index 77d9b9385..5a38c03da 100644
--- a/src/test/java/io/nats/client/impl/JetStreamTestBase.java
+++ b/src/test/java/io/nats/client/impl/JetStreamTestBase.java
@@ -39,9 +39,9 @@ public class JetStreamTestBase extends TestBase {
     public static final String TestMetaV2 = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000.4";
     public static final String TestMetaVFuture = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000.4.dont.care.how.many.more";
     public static final String InvalidMetaNoAck = "$JS.nope.test-stream.test-consumer.1.2.3.1605139610113260000";
+    public static final String InvalidMetaData = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000.not-a-number";
     public static final String InvalidMetaLt8Tokens = "$JS.ACK.less-than.8-tokens.1.2.3";
     public static final String InvalidMeta10Tokens = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000";
-    public static final String InvalidMetaData = "$JS.ACK.v2Domain.v2Hash.test-stream.test-consumer.1.2.3.1605139610113260000.not-a-number";
 
     public static final Duration DEFAULT_TIMEOUT = Duration.ofMillis(1000);
 
@@ -106,6 +106,12 @@ public static void jsPublish(JetStream js, String subject, int startId, int coun
         }
     }
 
+    public static void jsPublishNull(JetStream js, String subject, int count) throws IOException, JetStreamApiException {
+        for (int x = 0; x < count; x++) {
+            js.publish(subject, null);
+        }
+    }
+
     public static void jsPublishBytes(JetStream js, String subject, int count, byte[] bytes) throws IOException, JetStreamApiException {
         for (int x = 0; x < count; x++) {
             js.publish(subject, bytes);
@@ -274,36 +280,6 @@ public static void assertIsJetStream(Message m) {
         assertNull(m.getStatus());
     }
 
-    public static void assertLastIsStatus(List messages, int code) {
-        int lastIndex = messages.size() - 1;
-        for (int x = 0; x < lastIndex; x++) {
-            Message m = messages.get(x);
-            assertTrue(m.isJetStream());
-        }
-        assertIsStatus(messages.get(lastIndex), code);
-    }
-
-    public static void assertStarts408(List messages, int count408, int expectedJs) {
-        for (int x = 0; x < count408; x++) {
-            assertIsStatus(messages.get(x), 408);
-        }
-        int countedJs = 0;
-        int lastIndex = messages.size() - 1;
-        for (int x = count408; x <= lastIndex; x++) {
-            Message m = messages.get(x);
-            assertTrue(m.isJetStream());
-            countedJs++;
-        }
-        assertEquals(expectedJs, countedJs);
-    }
-
-    private static void assertIsStatus(Message statusMsg, int code) {
-        assertFalse(statusMsg.isJetStream());
-        assertTrue(statusMsg.isStatusMessage());
-        assertNotNull(statusMsg.getStatus());
-        assertEquals(code, statusMsg.getStatus().getCode());
-    }
-
     public static void assertSource(JetStreamManagement jsm, String stream, Long msgCount, Long firstSeq)
             throws IOException, JetStreamApiException {
         sleep(1000);
diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java
index ce031c8f2..fb5745188 100644
--- a/src/test/java/io/nats/client/impl/MessageContentTests.java
+++ b/src/test/java/io/nats/client/impl/MessageContentTests.java
@@ -195,7 +195,7 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF
                 .errorListener(listener)
                 .connectionListener(listener)
                 .build();
-            try (Connection nc = ConnectionUtils.managedConnect(options)) {
+            try (Connection ignore = ConnectionUtils.managedConnect(options)) {
                 listener.queueConnectionEvent(Events.DISCONNECTED);
                 ready.complete(Boolean.TRUE);
                 listener.validate();
diff --git a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java
index 12a5c7f2c..d1184f493 100644
--- a/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java
+++ b/src/test/java/io/nats/client/impl/NatsConnectionImplTests.java
@@ -18,7 +18,6 @@
 import io.nats.client.utils.ConnectionUtils;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -119,7 +118,7 @@ private static void verifyInternalExecutors(Options options) throws InterruptedE
     private static void verifyExternalExecutors(Options options,
                                                 ExecutorService userEs, ScheduledExecutorService userSes,
                                                 ExecutorService userCallbackEs, ExecutorService userConnectEs
-    ) throws InterruptedException, IOException {
+    ) throws InterruptedException {
         try (NatsConnection nc = (NatsConnection) ConnectionUtils.managedConnect(options)) {
             ExecutorService es = options.getExecutor();
             ScheduledExecutorService ses = options.getScheduledExecutor();
diff --git a/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java b/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java
index 2b98fd383..8d28e6ecd 100644
--- a/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java
+++ b/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java
@@ -80,6 +80,7 @@ public void testNotInVersion() {
 
     @Test
     public void testInvalidMetaData() {
+        assertThrows(IllegalArgumentException.class, () -> getTestMessage(InvalidMetaData).metaData());
         assertThrows(IllegalArgumentException.class, () -> getTestMessage(InvalidMetaLt8Tokens).metaData());
         assertThrows(IllegalArgumentException.class, () -> getTestMessage(InvalidMeta10Tokens).metaData());
 
diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java
index ecdcd9a8e..83aef92d0 100644
--- a/src/test/java/io/nats/client/impl/NatsMessageTests.java
+++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java
@@ -122,9 +122,8 @@ public void testCustomMaxControlLine() throws Exception {
             subject.append(subject);
         }
 
-        runInSharedOwnNc(optionsBuilder().maxReconnects(0).maxControlLine(maxControlLine), nc -> {
-            assertThrows(IllegalArgumentException.class, () -> nc.request(subject.toString(), body));
-        });
+        runInSharedOwnNc(optionsBuilder().maxReconnects(0).maxControlLine(maxControlLine),
+            nc -> assertThrows(IllegalArgumentException.class, () -> nc.request(subject.toString(), body)));
     }
 
     @Test
diff --git a/src/test/java/io/nats/client/impl/NatsProvidersAndImplementationsTests.java b/src/test/java/io/nats/client/impl/NatsProvidersAndImplementationsTests.java
index abb77402e..3df73be5c 100644
--- a/src/test/java/io/nats/client/impl/NatsProvidersAndImplementationsTests.java
+++ b/src/test/java/io/nats/client/impl/NatsProvidersAndImplementationsTests.java
@@ -43,8 +43,7 @@ public void testNatsInetAddress() throws UnknownHostException {
         validateNatsInetAddress("synadia.io");
         validateNatsInetAddress("synadia.com");
 
-        NatsInetAddress.setProvider(new NatsInetAddressProvider() {
-        });
+        NatsInetAddress.setProvider(new NatsInetAddressProvider() {});
         validateNatsInetAddress("synadia.io");
         validateNatsInetAddress("synadia.com");
     }
@@ -64,8 +63,8 @@ private static void validateNatsInetAddress(String host) throws UnknownHostExcep
             assertEquals(ia, iaByAddress);
         }
 
-        InetAddress ia = NatsInetAddress.getLoopbackAddress();
-        ia = NatsInetAddress.getLocalHost();
+        NatsInetAddress.getLoopbackAddress();
+        NatsInetAddress.getLocalHost();
     }
 
     @Test
@@ -124,8 +123,7 @@ public void afterConstruct(@NonNull Options options) {
         }
 
         @Override
-        public void upgradeToSecure() throws IOException {
-        }
+        public void upgradeToSecure() throws IOException {}
 
         @Override
         public int read(byte[] dst, int off, int len) throws IOException {
@@ -137,8 +135,7 @@ public void write(byte[] src, int toWrite) throws IOException {
         }
 
         @Override
-        public void shutdownInput() throws IOException {
-        }
+        public void shutdownInput() throws IOException {}
 
         @Override
         public void close() throws IOException {
@@ -154,7 +151,9 @@ public void flush() throws IOException {
     public void testSocketDataPort() throws IOException, URISyntaxException {
         // this is coverage for connect, afterConstruct and forceClose
         InterfaceCoverageDataPort cdp = new InterfaceCoverageDataPort();
+        //noinspection DataFlowIssue
         cdp.connect((NatsConnection) null, new NatsUri(Options.DEFAULT_URL), 0);
+        //noinspection DataFlowIssue
         cdp.afterConstruct(null);
         cdp.forceClose();
 
diff --git a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java
index fb3621543..f4a380f3b 100644
--- a/src/test/java/io/nats/client/impl/NatsStatisticsTests.java
+++ b/src/test/java/io/nats/client/impl/NatsStatisticsTests.java
@@ -33,9 +33,7 @@ public class NatsStatisticsTests extends TestBase {
     @Test
     public void testHumanReadableString() throws Exception {
         runInSharedOwnNc(optionsBuilder().turnOnAdvancedStats(), nc -> {
-            Dispatcher d = nc.createDispatcher(msg -> {
-                nc.publish(msg.getReplyTo(), new byte[16]);
-            });
+            Dispatcher d = nc.createDispatcher(msg -> nc.publish(msg.getReplyTo(), new byte[16]));
             String subject = random();
             d.subscribe(subject);
 
diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index db02c55e1..362861d86 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -44,8 +44,6 @@
 import static io.nats.client.utils.OptionsUtils.*;
 import static io.nats.client.utils.TestBase.*;
 import static io.nats.client.utils.ThreadUtils.sleep;
-import static io.nats.client.utils.VersionUtils.atLeast2_9_0;
-import static io.nats.client.utils.VersionUtils.initVersionServerInfo;
 import static org.junit.jupiter.api.Assertions.*;
 
 @Isolated
@@ -607,29 +605,9 @@ public void testWriterFilterTiming() throws Exception {
         }
     }
 
-    private static class TestReconnectWaitHandler implements ConnectionListener {
-        AtomicInteger disconnectCount = new AtomicInteger();
-
-        public int getDisconnectCount() {
-            return disconnectCount.get();
-        }
-
-        private void incrementDisconnectedCount() {
-            disconnectCount.incrementAndGet();
-        }
-
-        @Override
-        public void connectionEvent(Connection conn, Events type) {
-            if (type == Events.DISCONNECTED) {
-                // disconnect is called after every failed reconnect attempt.
-                incrementDisconnectedCount();
-            }
-        }
-    }
-
     @Test
     public void testReconnectWait() throws Exception {
-        TestReconnectWaitHandler trwh = new TestReconnectWaitHandler();
+        Listener listener = new Listener();
 
         int port = NatsTestServer.nextPort();
 
@@ -638,14 +616,14 @@ public void testReconnectWait() throws Exception {
                 .maxReconnects(-1)
                 .connectionTimeout(Duration.ofSeconds(1))
                 .reconnectWait(Duration.ofMillis(250))
-                .connectionListener(trwh)
+                .connectionListener(listener)
                 .build();
 
             //noinspection unused
             try (Connection nc = Nats.connect(options)) {
                 ts.close();
                 sleep(250);
-                assertTrue(trwh.getDisconnectCount() < 3, "disconnectCount");
+                assertTrue(listener.getConnectionEventCount(Events.DISCONNECTED) < 3, "disconnectCount");
             }
         }
     }
@@ -792,31 +770,28 @@ public boolean includeAllServers() {
     @Test
     public void testForceReconnectQueueBehaviorCheck() throws Exception {
         runInCluster((nc0, nc1, nc2) -> {
-            initVersionServerInfo(nc0);
-            if (atLeast2_9_0()) {
-                int pubCount = 100_000;
-                int subscribeTime = 5000;
-                int flushWait = 2500;
-                int port = nc0.getServerInfo().getPort();
-
-                ForceReconnectQueueCheckDataPort.DELAY = 75;
-
-                String subject = random();
-                ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
-                _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, 0);
-
-                subject = random();
-                ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
-                _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, flushWait);
-
-                subject = random();
-                ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
-                _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, 0);
-
-                subject = random();
-                ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
-                _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, flushWait);
-            }
+            int pubCount = 100_000;
+            int subscribeTime = 5000;
+            int flushWait = 2500;
+            int port = nc0.getServerInfo().getPort();
+
+            ForceReconnectQueueCheckDataPort.DELAY = 75;
+
+            String subject = random();
+            ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
+            _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, 0);
+
+            subject = random();
+            ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
+            _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, false, flushWait);
+
+            subject = random();
+            ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
+            _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, 0);
+
+            subject = random();
+            ForceReconnectQueueCheckDataPort.setCheck("PUB " + subject);
+            _testForceReconnectQueueCheck(subject, pubCount, subscribeTime, port, true, flushWait);
         });
     }
 
@@ -833,7 +808,7 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount,
             froBuilder.forceClose();
         }
 
-        ReconnectQueueCheckConnectionListener listener = new ReconnectQueueCheckConnectionListener();
+        Listener listener = new Listener();
 
         Options options = optionsBuilder(port)
             .connectionListener(listener)
@@ -845,9 +820,10 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount,
                 nc.publish(subject, (x + "").getBytes());
             }
 
+            listener.queueConnectionEvent(Events.RECONNECTED);
             nc.forceReconnect(froBuilder.build());
 
-            assertTrue(listener.latch.await(subscribeTime, TimeUnit.MILLISECONDS));
+            listener.validate();
 
             long maxTime = subscribeTime;
             while (!subscriber.subscriberDone.get() && maxTime > 0) {
@@ -868,17 +844,6 @@ private static void _testForceReconnectQueueCheck(String subject, int pubCount,
         }
     }
 
-    static class ReconnectQueueCheckConnectionListener implements ConnectionListener {
-        public CountDownLatch latch = new CountDownLatch(1);
-
-        @Override
-        public void connectionEvent(Connection conn, Events type) {
-            if (type == Events.RECONNECTED) {
-                latch.countDown();
-            }
-        }
-    }
-
     static class ReconnectQueueCheckSubscriber implements Runnable {
         final AtomicBoolean subscriberDone;
         final String subject;
diff --git a/src/test/java/io/nats/client/impl/RequestTests.java b/src/test/java/io/nats/client/impl/RequestTests.java
index f0b4fab7d..5d532f27f 100644
--- a/src/test/java/io/nats/client/impl/RequestTests.java
+++ b/src/test/java/io/nats/client/impl/RequestTests.java
@@ -199,6 +199,7 @@ public void testMultipleReplies() throws Exception {
             Dispatcher d3 = nc.createDispatcher(handler);
             Dispatcher d4 = nc.createDispatcher(msg -> {
                 requests.incrementAndGet();
+                //noinspection ResultOfMethodCallIgnored
                 d4CanReply.await(5, TimeUnit.SECONDS);
                 nc.publish(msg.getReplyTo(), null);
             });
@@ -742,8 +743,6 @@ public void testCancelledFutureMustNotErrorOnCleanResponses() throws Exception {
 
     @Test
     public void testRtt() throws Exception {
-        runInShared(nc -> {
-            assertTrue(nc.RTT().toMillis() < 50);
-        });
+        runInShared(nc -> assertTrue(nc.RTT().toMillis() < 50));
     }
 }
diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java
index 7c8420ac8..b6fe329b4 100644
--- a/src/test/java/io/nats/client/impl/SimplificationTests.java
+++ b/src/test/java/io/nats/client/impl/SimplificationTests.java
@@ -18,7 +18,6 @@
 import io.nats.client.support.*;
 import io.nats.client.utils.ConnectionUtils;
 import io.nats.client.utils.VersionUtils;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;
@@ -43,7 +42,7 @@ public class SimplificationTests extends JetStreamTestBase {
 
     @Test
     public void testStreamContextErrors() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, nc -> {
+        runInShared(nc -> {
             assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random()));
             assertThrows(JetStreamApiException.class, () -> nc.getStreamContext(random(), JetStreamOptions.DEFAULT_JS_OPTIONS));
             assertThrows(JetStreamApiException.class, () -> nc.jetStream().getStreamContext(random()));
@@ -52,7 +51,7 @@ public void testStreamContextErrors() throws Exception {
 
     @Test
     public void testStreamContextFromConnection() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext streamContext = nc.getStreamContext(ctx.stream);
             assertEquals(ctx.stream, streamContext.getStreamName());
             _testStreamContext(ctx, streamContext);
@@ -61,7 +60,7 @@ public void testStreamContextFromConnection() throws Exception {
 
     @Test
     public void testStreamContextFromContext() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext streamContext = ctx.js.getStreamContext(ctx.stream);
             assertEquals(ctx.stream, streamContext.getStreamName());
             _testStreamContext(ctx, streamContext);
@@ -190,9 +189,10 @@ private String validateConsumerNameForOrdered(BaseConsumerContext bcc, MessageCo
     static int FETCH_EPHEMERAL = 1;
     static int FETCH_DURABLE = 2;
     static int FETCH_ORDERED = 3;
+
     @Test
     public void testFetch() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             for (int x = 1; x <= 20; x++) {
                 ctx.js.publish(ctx.subject(), ("test-fetch-msg-" + x).getBytes());
             }
@@ -331,7 +331,7 @@ private String generateConsumerName(int maxMessages, int maxBytes) {
 
     @Test
     public void testFetchNoWaitPlusExpires() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder()
                 .name(ctx.consumerName())
                 .inactiveThreshold(100000) // I could have used a durable, but this is long enough for the test
@@ -395,7 +395,7 @@ private int readMessages(FetchConsumer fc) throws InterruptedException, JetStrea
 
     @Test
     public void testIterableConsumer() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             // Pre define a consumer
             ConsumerConfiguration cc = ConsumerConfiguration.builder().durable(ctx.consumerName()).build();
             ctx.jsm.addOrUpdateConsumer(ctx.stream, cc);
@@ -422,7 +422,7 @@ public void testIterableConsumer() throws Exception {
 
     @Test
     public void testOrderedConsumerDeliverPolices() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             jsPublish(ctx.js, ctx.subject(), 101, 3, 100);
             ZonedDateTime startTime = getStartTimeFirstMessage(ctx);
 
@@ -477,7 +477,7 @@ public void testOrderedConsumerCoverage() {
 
     @Test
     public void testOrderedIterableConsumerBasic() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext sctx = nc.getStreamContext(ctx.stream);
 
             int stopCount = 500;
@@ -541,7 +541,7 @@ private void _testIterableBasic(JetStream js, int stopCount, IterableConsumer co
 
     @Test
     public void testConsumeWithHandler() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             jsPublish(ctx.js, ctx.subject(), 2500);
 
             // Pre define a consumer
@@ -629,7 +629,7 @@ private static void stopAndWaitForFinished(MessageConsumer mcon) throws Interrup
 
     @Test
     public void testNext() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             jsPublish(ctx.js, ctx.subject(), 4);
 
             String name = random();
@@ -701,7 +701,7 @@ public void testNext() throws Exception {
 
     @Test
     public void testCoverage() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             // Pre define a consumer
             ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(1)).build());
             ctx.jsm.addOrUpdateConsumer(ctx.stream, ConsumerConfiguration.builder().durable(ctx.consumerName(2)).build());
@@ -723,8 +723,10 @@ public void testCoverage() throws Exception {
 
             after(cctx1.iterate(), ctx.consumerName(1), true);
             after(cctx2.iterate(ConsumeOptions.DEFAULT_CONSUME_OPTIONS), ctx.consumerName(2), true);
-            after(cctx3.consume(m -> {}), ctx.consumerName(3), true);
-            after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {}), ctx.consumerName(4), true);
+            after(cctx3.consume(m -> {
+            }), ctx.consumerName(3), true);
+            after(cctx4.consume(ConsumeOptions.DEFAULT_CONSUME_OPTIONS, m -> {
+            }), ctx.consumerName(4), true);
             after(cctx5.fetchMessages(1), ctx.consumerName(5), false);
             after(cctx6.fetchBytes(1000), ctx.consumerName(6), false);
         });
@@ -806,7 +808,7 @@ private void _check_values(FetchConsumeOptions fco, int maxMessages, int maxByte
 
     private FetchConsumeOptions roundTripSerialize(FetchConsumeOptions fco) throws IOException, ClassNotFoundException {
         SerializableFetchConsumeOptions sfco = new SerializableFetchConsumeOptions(fco);
-        sfco = (SerializableFetchConsumeOptions)roundTripSerialize(sfco);
+        sfco = (SerializableFetchConsumeOptions) roundTripSerialize(sfco);
         return sfco.getFetchConsumeOptions();
     }
 
@@ -888,7 +890,7 @@ private void check_values(ConsumeOptions co, int batchSize, int batchBytes, int
 
     private ConsumeOptions roundTripSerialize(ConsumeOptions co) throws IOException, ClassNotFoundException {
         SerializableConsumeOptions sco = new SerializableConsumeOptions(co);
-        sco = (SerializableConsumeOptions)roundTripSerialize(sco);
+        sco = (SerializableConsumeOptions) roundTripSerialize(sco);
         return sco.getConsumeOptions();
     }
 
@@ -923,7 +925,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) {
 
     @Test
     public void testOrderedBehaviorNext() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
             jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
@@ -983,6 +985,7 @@ private void _testOrderedNext(StreamContext sctx, int expectedStreamSeq, Ordered
     }
 
     public static long CS_FOR_SS_3 = 3;
+
     public static class PullOrderedTestDropSimulator extends PullOrderedMessageManager {
         @SuppressWarnings("ClassEscapesDefinedScope")
         public PullOrderedTestDropSimulator(NatsConnection conn, NatsJetStream js, String stream, SubscribeOptions so, ConsumerConfiguration serverCC, boolean queueMode, boolean syncMode) {
@@ -993,8 +996,7 @@ public PullOrderedTestDropSimulator(NatsConnection conn, NatsJetStream js, Strin
         protected Boolean beforeQueueProcessorImpl(NatsMessage msg) {
             if (msg.isJetStream()
                 && msg.metaData().streamSequence() == 3
-                && msg.metaData().consumerSequence() == CS_FOR_SS_3)
-            {
+                && msg.metaData().consumerSequence() == CS_FOR_SS_3) {
                 return false;
             }
 
@@ -1004,7 +1006,7 @@ protected Boolean beforeQueueProcessorImpl(NatsMessage msg) {
 
     @Test
     public void testOrderedBehaviorFetch() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
             jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
@@ -1073,7 +1075,7 @@ private void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq, Ordere
 
     @Test
     public void testOrderedBehaviorIterable() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
             jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
@@ -1129,13 +1131,13 @@ public void testOrderedConsumeConstruction() {
         assertEquals(GREATER_THAN, occ.getFilterSubjects().get(0));
         assertFalse(occ.hasMultipleFilterSubjects());
 
-        occ = new OrderedConsumerConfiguration().filterSubjects((String[])null);
+        occ = new OrderedConsumerConfiguration().filterSubjects((String[]) null);
         assertNotNull(occ.getFilterSubjects());
         assertEquals(GREATER_THAN, occ.getFilterSubject());
         assertEquals(GREATER_THAN, occ.getFilterSubjects().get(0));
         assertFalse(occ.hasMultipleFilterSubjects());
 
-        occ = new OrderedConsumerConfiguration().filterSubjects((List)null);
+        occ = new OrderedConsumerConfiguration().filterSubjects((List) null);
         assertNotNull(occ.getFilterSubjects());
         assertEquals(GREATER_THAN, occ.getFilterSubject());
         assertEquals(GREATER_THAN, occ.getFilterSubjects().get(0));
@@ -1156,7 +1158,7 @@ public void testOrderedConsumeConstruction() {
 
     @Test
     public void testOrderedConsume() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration()
                 .filterSubject(ctx.subject());
             _testOrderedConsume(ctx, occ);
@@ -1165,7 +1167,7 @@ public void testOrderedConsume() throws Exception {
 
     @Test
     public void testOrderedConsumeWithPrefix() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
                 .filterSubject(ctx.subject());
@@ -1240,105 +1242,122 @@ public void testOrderedConsumeMultipleSubjects() throws Exception {
 
     @Test
     public void testOrderedMultipleWays() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
-            OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration().filterSubject(ctx.subject());
+            OrderedConsumerConfiguration occ = new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject());
             OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ);
 
             // can't do others while doing next
-            CountDownLatch latch = new CountDownLatch(1);
+            CountDownLatch latch1 = new CountDownLatch(1);
             new Thread(() -> {
                 try {
                     // make sure there is enough time to call other methods.
-                    assertNull(occtx.next(2000));
+                    assertNull(occtx.next(1000));
                 }
                 catch (Exception e) {
                     throw new RuntimeException(e);
                 }
                 finally {
-                    latch.countDown();
+                    latch1.countDown();
                 }
             }).start();
 
             Thread.sleep(100); // make sure there is enough time for the thread to start and get into the next method
-            validateCantCallOtherMethods(occtx);
+            validateCantCallOtherMethods(occtx, true, true);
 
             //noinspection ResultOfMethodCallIgnored
-            latch.await(3000, TimeUnit.MILLISECONDS);
-
-            for (int x = 0; x < 10_000; x++) {
-                ctx.js.publish(ctx.subject(), ("multiple" + x).getBytes());
-            }
+            latch1.await(3000, TimeUnit.MILLISECONDS);
 
             // can do others now
+            jsPublishNull(ctx.js, ctx.subject(), 1);
             Message m = occtx.next(1000);
             assertNotNull(m);
             assertEquals(1, m.metaData().streamSequence());
 
-            // can't do others while doing next
+            // can't do others while doing fetch
             int seq = 2;
             try (FetchConsumer fc = occtx.fetchMessages(5)) {
-                while (seq <= 6) {
-                    m = fc.nextMessage();
+                validateCantCallOtherMethods(occtx, false, true);
+                jsPublishNull(ctx.js, ctx.subject(), 5);
+                m = fc.nextMessage();
+                while (m != null) {
                     assertNotNull(m);
                     assertEquals(seq, m.metaData().streamSequence());
                     assertFalse(fc.isFinished());
-                    validateCantCallOtherMethods(occtx);
+                    validateCantCallOtherMethods(occtx, false, true);
                     seq++;
+                    m = fc.nextMessage();
                 }
-
                 assertNull(fc.nextMessage());
                 assertTrue(fc.isFinished());
-                assertNull(fc.nextMessage()); // just some coverage
+                assertNull(fc.nextMessage()); // just some coverage for when finished
             }
 
             // can do others now
+            jsPublishNull(ctx.js, ctx.subject(), 1);
             m = occtx.next(1000);
             assertNotNull(m);
             assertEquals(seq++, m.metaData().streamSequence());
 
             // can't do others while doing iterate
-            ConsumeOptions copts = ConsumeOptions.builder().batchSize(10).build();
+            ConsumeOptions copts = ConsumeOptions.builder().batchSize(10).expiresIn(3000).build();
             try (IterableConsumer ic = occtx.iterate(copts)) {
-                ic.stop();
+                validateCantCallOtherMethods(occtx, true, true);
+                jsPublishNull(ctx.js, ctx.subject(), 1);
                 m = ic.nextMessage(1000);
-                while (m != null) {
-                    assertEquals(seq, m.metaData().streamSequence());
-                    if (!ic.isFinished()) {
-                        validateCantCallOtherMethods(occtx);
-                    }
-                    ++seq;
-                    m = ic.nextMessage(1000);
+                assertNotNull(m);
+                assertEquals(seq++, m.metaData().streamSequence());
+                ic.stop();
+                while (!ic.isFinished()) {
+                    assertNull(ic.nextMessage(100));
                 }
             }
 
             // can do others now
+            jsPublishNull(ctx.js, ctx.subject(), 1);
             m = occtx.next(1000);
             assertNotNull(m);
             assertEquals(seq++, m.metaData().streamSequence());
 
-            int last = Math.min(seq + 10, 9999);
-            try (FetchConsumer fc = occtx.fetchMessages(last - seq)) {
-                while (seq < last) {
-                    fc.stop();
-                    m = fc.nextMessage();
-                    assertNotNull(m);
-                    assertEquals(seq, m.metaData().streamSequence());
-                    assertFalse(fc.isFinished());
-                    validateCantCallOtherMethods(occtx);
-                    seq++;
-                }
+            CountDownLatch latch2 = new CountDownLatch(1);
+            AtomicLong conSeq = new AtomicLong();
+            copts = ConsumeOptions.builder().batchSize(10).expiresIn(1000).build();
+            MessageConsumer mc = occtx.consume(copts, cm -> {
+                assertNotNull(cm);
+                conSeq.set(cm.metaData().streamSequence());
+                latch2.countDown();
+            });
+
+            validateCantCallOtherMethods(occtx, true, false);
+
+            jsPublishNull(ctx.js, ctx.subject(), 1);
+            assertTrue(latch2.await(1000, TimeUnit.MILLISECONDS));
+            assertEquals(seq++, conSeq.get());
+            mc.stop();
+            while (!mc.isFinished()) {
+                sleep(100);
             }
+            mc.close();
+
+            // can do others now
+            jsPublishNull(ctx.js, ctx.subject(), 1);
+            m = occtx.next(1000);
+            assertNotNull(m);
+            assertEquals(seq, m.metaData().streamSequence());
         });
     }
 
     @SuppressWarnings("resource")
-    private void validateCantCallOtherMethods(OrderedConsumerContext ctx) {
+    private void validateCantCallOtherMethods(OrderedConsumerContext ctx, boolean fetch, boolean consume) {
         assertThrows(IOException.class, () -> ctx.next(1000));
-        assertThrows(IOException.class, () -> ctx.fetchMessages(1));
-        //noinspection DataFlowIssue
-        assertThrows(IllegalArgumentException.class, () -> ctx.consume(null));
+        if (fetch) {
+            assertThrows(IOException.class, () -> ctx.fetchMessages(1));
+        }
+        if (consume) {
+            assertThrows(IOException.class, () -> ctx.consume(m -> {}));
+        }
     }
 
     @Test
@@ -1441,7 +1460,7 @@ private void check_values(OrderedConsumerConfiguration occ, ZonedDateTime zdt) {
 
     private OrderedConsumerConfiguration roundTripSerialize(OrderedConsumerConfiguration occ) throws IOException, ClassNotFoundException {
         SerializableOrderedConsumerConfiguration socc = new SerializableOrderedConsumerConfiguration(occ);
-        socc = (SerializableOrderedConsumerConfiguration)roundTripSerialize(socc);
+        socc = (SerializableOrderedConsumerConfiguration) roundTripSerialize(socc);
         return socc.getOrderedConsumerConfiguration();
     }
 
@@ -1456,7 +1475,7 @@ private Object roundTripSerialize(Serializable s) throws IOException, ClassNotFo
 
     @Test
     public void testOverflowFetch() throws Exception {
-        runInShared(VersionUtils::atLeast2_9_1, (nc, ctx) -> {
+        runInShared((nc, ctx) -> {
             jsPublish(ctx.js, ctx.subject(), 100);
 
             // Testing min ack pending
@@ -1649,8 +1668,7 @@ public void testOverflowConsume() throws Exception {
             };
 
             try (MessageConsumer mcOver = ctxOver.consume(coOver, overHandler);
-                 MessageConsumer mcPrime = ctxPrime.consume(coPrime, primeHandler))
-            {
+                 MessageConsumer mcPrime = ctxPrime.consume(coPrime, primeHandler)) {
                 validateConsumerName(ctxPrime, mcPrime, cname);
                 validateConsumerName(ctxOver, mcOver, cname);
                 while (left.get() > 0) {
@@ -1688,107 +1706,101 @@ public void testFinishEmptyStream() throws Exception {
     }
 
     @Test
-    @Disabled("This is a timing flapper and is annoying. java 21 makes it worse")
     public void testReconnectOverOrdered() throws Exception {
-            // ------------------------------------------------------------
-            // The idea here is...
-            // 1. connect with an ordered consumer and start consuming
-            // 2. stop the server then restart it causing a disconnect,
-            //    but reconnect before the idle heartbeat alarm kicks in
-            // 3. stop the server but wait a little before restarting
-            //    so the alarm goes off but still disconnected
-            //    to make sure the consumer continues after that condition
-            // ------------------------------------------------------------
-            int port = NatsTestServer.nextPort();
-            Listener listener = new Listener();
-            Options options = optionsBuilder()
-                .connectionListener(listener)
-                .errorListener(listener)
-                .server(NatsTestServer.getLocalhostUri(port)).build();
-            NatsConnection nc;
-
-            String stream = random();
-            String subject = random();
-
-            AtomicBoolean allInOrder = new AtomicBoolean(true);
-            AtomicInteger atomicCount = new AtomicInteger();
-            AtomicLong nextExpectedSequence = new AtomicLong(0);
-
-            MessageHandler handler = msg -> {
-                if (msg.metaData().streamSequence() != nextExpectedSequence.incrementAndGet()) {
-                    allInOrder.set(false);
-                }
-                msg.ack();
-                atomicCount.incrementAndGet();
-                sleep(50); // simulate some work and to slow the endless consume
-            };
-
-            // variable are here. initialized during first server, but used after.
-            StreamContext streamContext;
-            OrderedConsumerContext orderedConsumerContext;
-            MessageConsumer mcon;
-            String firstConsumerName;
-
-            //noinspection unused
-            try (NatsTestServer ts = new NatsTestServer(port, true)) {
-                nc = (NatsConnection) ConnectionUtils.managedConnect(options);
-                StreamConfiguration sc = StreamConfiguration.builder()
-                    .name(stream)
-                    .storageType(StorageType.File) // file since we are killing the server and bringing it back up.
-                    .subjects(subject).build();
-                nc.jetStreamManagement().addStream(sc);
-
-                jsPublish(nc, subject, 10000);
-
-                ConsumeOptions consumeOptions = ConsumeOptions.builder()
-                    .batchSize(100) // small batch size means more round trips
-                    .expiresIn(1500) // idle heartbeat is half of this, alarm time is 3 * ihb
-                    .build();
-
-                OrderedConsumerConfiguration ocConfig = new OrderedConsumerConfiguration().filterSubjects(subject);
-                streamContext = nc.getStreamContext(stream);
-                orderedConsumerContext = streamContext.createOrderedConsumer(ocConfig);
-                assertNull(orderedConsumerContext.getConsumerName());
-                mcon = orderedConsumerContext.consume(consumeOptions, handler);
-                firstConsumerName = validateConsumerNameForOrdered(orderedConsumerContext, mcon, null);
-
-                sleep(500); // time enough to get some messages
+        // ------------------------------------------------------------
+        // The idea here is...
+        // 1. connect with an ordered consumer and start consuming
+        // 2. stop the server then restart it causing a disconnect,
+        //    but reconnect before the idle heartbeat alarm kicks in
+        // 3. stop the server but wait a little before restarting
+        //    so the alarm goes off but still disconnected
+        //    to make sure the consumer continues after that condition
+        // ------------------------------------------------------------
+        String stream = random();
+        String subject = random();
+
+        AtomicBoolean allInOrder = new AtomicBoolean(true);
+        AtomicInteger messageCount = new AtomicInteger();
+        AtomicLong nextExpectedSequence = new AtomicLong(0);
+
+        MessageHandler handler = msg -> {
+            if (msg.metaData().streamSequence() != nextExpectedSequence.incrementAndGet()) {
+                allInOrder.set(false);
             }
+            msg.ack();
+            messageCount.incrementAndGet();
+            sleep(50); // simulate some work and to slow the endless consume
+        };
 
-            assertTrue(allInOrder.get());
-            int count1 = atomicCount.get();
-            assertTrue(count1 > 0);
-            assertEquals(count1, nextExpectedSequence.get());
-
-            // reconnect and get some more messages
-            try (NatsTestServer ignored = new NatsTestServer(port, true)) {
-                ConnectionUtils.confirmConnected(nc); // wait for reconnect
-                sleep(10000); // long enough to get messages and for the hb alarm to have tripped
-            }
-
-            assertNotEquals(firstConsumerName, orderedConsumerContext.getConsumerName());
-
-            assertTrue(allInOrder.get());
-            int count2 = atomicCount.get();
-            assertTrue(count2 > count1);
-            assertEquals(count2, nextExpectedSequence.get());
-
-            sleep(6000); // enough delay before reconnect to trip hb alarm again
-            try (NatsTestServer ignored = new NatsTestServer(port, true)) {
-                ConnectionUtils.confirmConnected(nc); // wait for reconnect
-                sleep(6000); // long enough to get messages and for the hb alarm to have tripped
+        StreamConfiguration sc = StreamConfiguration.builder()
+            .name(stream)
+            .storageType(StorageType.File) // file since we are killing the server and bringing it back up.
+            .subjects(subject).build();
+
+        NatsTestServer ts = new NatsTestServer(NatsTestServer.builder().jetstream());
+        /* start server */
+        Listener listener = new Listener();
+        Options options = optionsBuilder(ts)
+            .connectionListener(listener)
+            .errorListener(listener)
+            .build();
+        NatsConnection nc = (NatsConnection) ConnectionUtils.managedConnect(options);
+        JetStreamManagement jsm = nc.jetStreamManagement();
+        JetStream js = jsm.jetStream();
+        jsm.addStream(sc);
+
+        for (int x = 0; x < 2000; x++) {
+            js.publish(subject, null);
+        }
 
-                try {
-                    nc.jetStreamManagement().deleteStream(stream); // it was a file stream clean it up
-                }
-                catch (JetStreamApiException ignore) {
-                    // in GH actions this fails sometimes
-                }
-            }
+        ConsumeOptions consumeOptions = ConsumeOptions.builder()
+            .batchSize(100) // small batch size means more round trips
+            .expiresIn(1000) // idle heartbeat is half of this, alarm time is 3 times
+            .build();
+
+        OrderedConsumerConfiguration ocConfig = new OrderedConsumerConfiguration().filterSubjects(subject);
+        StreamContext streamContext = nc.getStreamContext(stream);
+        OrderedConsumerContext orderedConsumerContext = streamContext.createOrderedConsumer(ocConfig);
+        assertNull(orderedConsumerContext.getConsumerName());
+        MessageConsumer mcon = orderedConsumerContext.consume(consumeOptions, handler);
+        validateConsumerNameForOrdered(orderedConsumerContext, mcon, null);
+        sleep(500); // time enough to get some messages
+
+        /* close server */ ts.close();
+
+        validateOverOrdered(messageCount, allInOrder, nextExpectedSequence);
+
+        // reconnect and get some more messages
+        messageCount.set(0);
+        listener.queueConnectionEvent(ConnectionListener.Events.RECONNECTED);
+        /* start server */ ts.start();
+        listener.validate(); // reconnected
+        listener.queueHeartbeat();
+        sleep(3500); // long enough to get messages and for the hb alarm to have tripped
+        /* close server */ ts.close();
+
+        listener.validate(); // heartbeat
+        validateOverOrdered(messageCount, allInOrder, nextExpectedSequence);
+
+        // wait enough time to get more heartbeats, then reconnect and get some more messages
+        listener.queueHeartbeat();
+        sleep(3500);
+        listener.validate(); // heartbeat
+
+        messageCount.set(0);
+        listener.queueConnectionEvent(ConnectionListener.Events.RECONNECTED);
+        /* start server */ ts.start();
+        listener.validate(); // reconnected
+        listener.queueHeartbeat();
+        sleep(3500); // long enough to get messages and for the hb alarm to have tripped
+        /* close server */ ts.close();
+        listener.validate(); // heartbeat
+        validateOverOrdered(messageCount, allInOrder, nextExpectedSequence);
+    }
 
-            assertTrue(allInOrder.get());
-            int count3 = atomicCount.get();
-            assertTrue(count3 > count2);
-            assertEquals(count3, nextExpectedSequence.get());
-        }
+    private static void validateOverOrdered(AtomicInteger atomicCount, AtomicBoolean allInOrder, AtomicLong nextExpectedSequence) {
+        int count = atomicCount.get();
+        assertTrue(allInOrder.get());
+        assertTrue(count > 0);
+    }
 }
diff --git a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java
index 7f39abe3a..21614ed69 100644
--- a/src/test/java/io/nats/client/impl/WebsocketConnectTests.java
+++ b/src/test/java/io/nats/client/impl/WebsocketConnectTests.java
@@ -152,16 +152,12 @@ public void testProxyRequestReply() throws Exception {
 
     @Test
     public void testWssTlsFirstIgnored() throws Exception {
-        runInSharedConfiguredServer("wss.conf", ts -> {
-            _test(wssBuilder(ts).tlsFirst());
-        });
+        runInSharedConfiguredServer("wss.conf", ts -> _test(wssBuilder(ts).tlsFirst()));
     }
 
     @Test
     public void testWssVerifyTlsFirstIgnored() throws Exception {
-        runInSharedConfiguredServer("wssverify.conf", ts -> {
-            _test(wssBuilder(ts).tlsFirst());
-        });
+        runInSharedConfiguredServer("wssverify.conf", ts -> _test(wssBuilder(ts).tlsFirst()));
     }
 
     @Test
@@ -239,7 +235,6 @@ public void testClientInsecureServerSecureMismatchWssVerify() throws Exception {
     @Test
     public void testClientSecureServerInsecureMismatch() throws Exception {
         runInSharedOwnNc(nc -> {
-            SSLContext ctx = SslTestingHelper.createTestSSLContext();
             //noinspection DataFlowIssue
             Options options = builder()
                 .server(nc.getConnectedUrl())
diff --git a/src/test/java/io/nats/client/support/JwtUtilsTests.java b/src/test/java/io/nats/client/support/JwtUtilsTests.java
index 8c0e6651e..faf56a6ff 100644
--- a/src/test/java/io/nats/client/support/JwtUtilsTests.java
+++ b/src/test/java/io/nats/client/support/JwtUtilsTests.java
@@ -169,12 +169,12 @@ public void issueUserJWTSuccessAllArgs() throws Exception {
     public void issueUserJWTSuccessCustom() throws Exception {
         UserClaim userClaim = new UserClaim("ACXZRALIL22WRETDRXYKOYDB7XC3E7MBSVUSUMFACO6OM5VPRNFMOOO6")
             .pub(new Permission()
-                .allow(new String[] {"pub-allow-subject"})
-                .deny(new String[] {"pub-deny-subject"}))
+                .allow("pub-allow-subject")
+                .deny("pub-deny-subject"))
             .sub(new Permission()
-                .allow(new String[] {"sub-allow-subject"})
-                .deny(new String[] {"sub-deny-subject"}))
-            .tags(new String[]{"tag1", "tag\\two"});
+                .allow("sub-allow-subject")
+                .deny("sub-deny-subject"))
+            .tags("tag1", "tag\\two");
 
         String jwt = issueUserJWT(SIGNING_KEY, new String(USER_KEY.getPublicKey()), "custom", null, 1633043378, userClaim);
         String claimBody = getClaimBody(jwt);
diff --git a/src/test/java/io/nats/client/support/Listener.java b/src/test/java/io/nats/client/support/Listener.java
index 216f889a2..73021ba58 100644
--- a/src/test/java/io/nats/client/support/Listener.java
+++ b/src/test/java/io/nats/client/support/Listener.java
@@ -18,7 +18,9 @@
 
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -37,6 +39,7 @@ public class Listener implements ErrorListener, ConnectionListener {
 
     private final List futures;
     private final List discardedMessages;
+    private final Map connectionEventCounts;
     private Connection lastConnectionEventConnection;
     private int exceptionCount;
     private int heartbeatAlarmCount;
@@ -57,6 +60,7 @@ public Listener(boolean printExceptions, boolean verbose) {
         this.verbose = verbose;
         futures = new ArrayList<>();
         discardedMessages = new ArrayList<>();
+        connectionEventCounts = new HashMap<>();
     }
 
     public void reset() {
@@ -65,6 +69,7 @@ public void reset() {
         }
         futures.clear();
         discardedMessages.clear();
+        connectionEventCounts.clear();
         lastConnectionEventConnection = null;
         exceptionCount = 0;
         heartbeatAlarmCount = 0;
@@ -225,6 +230,10 @@ public List getDiscardedMessages() {
         return discardedMessages;
     }
 
+    public int getConnectionEventCount(ConnectionListener.Events event) {
+        return connectionEventCounts.getOrDefault(event, 0);
+    }
+
     public Connection getLastConnectionEventConnection() {
         return lastConnectionEventConnection;
     }
@@ -251,17 +260,18 @@ public int getPullStatusWarningsCount() {
     // Connection Listener
     // ----------------------------------------------------------------------------------------------------
     @Override
-    public void connectionEvent(Connection conn, Events type) {
-        connectionEvent(conn, type, 0L, null);
+    public void connectionEvent(Connection conn, Events event) {
+        connectionEvent(conn, event, 0L, null);
     }
 
     @Override
-    public void connectionEvent(Connection conn, Events type, Long time, String uriDetails) {
+    public void connectionEvent(Connection conn, Events event, Long time, String uriDetails) {
         if (verbose) {
-            report("connectionEvent", type);
+            report("connectionEvent", event);
         }
+        connectionEventCounts.merge(event, 1, Integer::sum);
         lastConnectionEventConnection = conn;
-        tryToComplete(futures, f -> type.equals(f.eventType));
+        tryToComplete(futures, f -> event.equals(f.eventType));
     }
 
     // ----------------------------------------------------------------------------------------------------
diff --git a/src/test/java/io/nats/client/support/ScheduledTaskTests.java b/src/test/java/io/nats/client/support/ScheduledTaskTests.java
index 62105609c..16e1a62ec 100644
--- a/src/test/java/io/nats/client/support/ScheduledTaskTests.java
+++ b/src/test/java/io/nats/client/support/ScheduledTaskTests.java
@@ -21,32 +21,32 @@ public void testScheduledTask() throws InterruptedException {
         AtomicInteger counter400 = new AtomicInteger();
         SttRunnable sttr400 = new SttRunnable(100, counter400);
         ScheduledTask task400 = new ScheduledTask(stpe, 0, 400, TimeUnit.MILLISECONDS, sttr400);
-        validateTaskPeriods(task400, 0, 400);
+        validateTaskPeriods(task400, 400);
 
         AtomicInteger counter200 = new AtomicInteger();
         SttRunnable sttr200 = new SttRunnable(300, counter200);
         ScheduledTask task200 = new ScheduledTask(stpe, 0, 200, TimeUnit.MILLISECONDS, sttr200);
-        validateTaskPeriods(task200, 0, 200);
+        validateTaskPeriods(task200, 200);
 
         AtomicInteger counter100 = new AtomicInteger();
         SttRunnable sttr100 = new SttRunnable(400, counter100);
         String id = "100-" + random();
         ScheduledTask task100 = new ScheduledTask(id, stpe, 0, 100, TimeUnit.MILLISECONDS, sttr100);
-        validateTaskPeriods(task100, 0, 100);
+        validateTaskPeriods(task100, 100);
         assertEquals(id, task100.getId());
         assertTrue(task100.toString().contains(id));
         assertTrue(task100.toString().contains("live"));
         assertTrue(task400.toString().contains("!done"));
 
-        validateState(task400, sttr400, false, false, null);
-        validateState(task200, sttr200, false, false, null);
-        validateState(task100, sttr100, false, false, null);
+        validateState(task400, false, false, null);
+        validateState(task200, false, false, null);
+        validateState(task100, false, false, null);
 
         Thread.sleep(1600); // 3 x 500 = 1500, give a buffer to ensure three runs
 
-        validateState(task400, sttr400, false, false, null);
-        validateState(task200, sttr200, false, false, null);
-        validateState(task100, sttr100, false, false, null);
+        validateState(task400, false, false, null);
+        validateState(task200, false, false, null);
+        validateState(task100, false, false, null);
 
         task400.shutdown();
         task200.shutdown();
@@ -57,9 +57,9 @@ public void testScheduledTask() throws InterruptedException {
         assertTrue(task200.isDone());
 
         Thread.sleep(500); // give one full cycle to make sure it's all done
-        validateState(task400, sttr400, true, true, false);
-        validateState(task200, sttr200, true, true, false);
-        validateState(task100, sttr100, true, true, false);
+        validateState(task400, true, true, false);
+        validateState(task200, true, true, false);
+        validateState(task100, true, true, false);
 
         assertTrue(counter400.get() >= 3);
         assertTrue(counter200.get() >= 3);
@@ -73,13 +73,12 @@ public void testScheduledTask() throws InterruptedException {
         assertTrue(task400.toString().contains("/done"));
     }
 
-    @SuppressWarnings("SameParameterValue")
-    private static void validateTaskPeriods(ScheduledTask task, long expectedDelay, long expectedPeriod) {
-        assertEquals(TimeUnit.MILLISECONDS.toNanos(expectedDelay), task.getInitialDelayNanos());
+    private static void validateTaskPeriods(ScheduledTask task, long expectedPeriod) {
+        assertEquals(TimeUnit.MILLISECONDS.toNanos(0), task.getInitialDelayNanos());
         assertEquals(TimeUnit.MILLISECONDS.toNanos(expectedPeriod), task.getPeriodNanos());
     }
 
-    static void validateState(ScheduledTask task, Runnable taskRunnable, boolean shutdown, boolean done, Boolean executing) {
+    static void validateState(ScheduledTask task, boolean shutdown, boolean done, Boolean executing) {
         assertEquals(shutdown, task.isShutdown());
         assertEquals(done, task.isDone());
         if (executing != null) {
diff --git a/src/test/java/io/nats/client/support/ValidatorTests.java b/src/test/java/io/nats/client/support/ValidatorTests.java
index 64044ee73..b1c8a05b3 100644
--- a/src/test/java/io/nats/client/support/ValidatorTests.java
+++ b/src/test/java/io/nats/client/support/ValidatorTests.java
@@ -54,7 +54,7 @@ public void testValidateSubject() {
         notAllowedNotRequired(Validator::validateSubject, Arrays.asList(ENDS_WITH_DOT, ENDS_WITH_DOT_SPACE, ENDS_WITH_CR, ENDS_WITH_LF, ENDS_WITH_TAB));
 
         allowedRequired(Validator::validateSubject, false, Arrays.asList(STAR_SEGMENT, GT_LAST_SEGMENT));
-        allowedRequired(Validator::validateSubject, true, Arrays.asList(STAR_SEGMENT));
+        allowedRequired(Validator::validateSubject, true, Collections.singletonList(STAR_SEGMENT));
         notAllowedRequired(Validator::validateSubject, true, Collections.singletonList(GT_LAST_SEGMENT));
         allowedNotRequired(Validator::validateSubject, false, Arrays.asList(null, GT_LAST_SEGMENT));
         notAllowedNotRequired(Validator::validateSubject, true, Collections.singletonList(GT_LAST_SEGMENT));
@@ -384,13 +384,16 @@ public void testValidateMustMatchIfBothSupplied() {
     @Test
     public void testValidateRequired() {
         required("required", "label");
+        //noinspection deprecation
         required("required1", "required2", "label");
         required(new Object(), "label");
         required(Collections.singletonList("list"), "label");
         required(Collections.singletonMap("key", "value"), "label");
 
         assertThrows(IllegalArgumentException.class, () -> required((String)null, "label"));
+        //noinspection deprecation
         assertThrows(IllegalArgumentException.class, () -> required("no-second", null, "label"));
+        //noinspection deprecation
         assertThrows(IllegalArgumentException.class, () -> required(null, "no-first", "label"));
         assertThrows(IllegalArgumentException.class, () -> required(EMPTY, "label"));
         assertThrows(IllegalArgumentException.class, () -> required((Object)null, "label"));
@@ -500,7 +503,8 @@ private void notAllowedRequired(StringAndRequiredTest test, List strings
         }
     }
 
-    private void notAllowedRequired(StringLabelRequiredCantEndWithGtTest test, boolean cantEndWithGt, List strings) {
+    private void notAllowedRequired(StringLabelRequiredCantEndWithGtTest test,
+                                    @SuppressWarnings("SameParameterValue") boolean cantEndWithGt, List strings) {
         for (String s : strings) {
             assertThrows(IllegalArgumentException.class, () -> test.validate(s, "notAllowedRequired", true, cantEndWithGt), notAllowedMessage(s));
         }
@@ -512,7 +516,8 @@ private void allowedNotRequired(StringAndRequiredTest test, List strings
         }
     }
 
-    private void allowedNotRequired(StringLabelRequiredCantEndWithGtTest test, boolean cantEndWithGt, List strings) {
+    private void allowedNotRequired(StringLabelRequiredCantEndWithGtTest test,
+                                    @SuppressWarnings("SameParameterValue") boolean cantEndWithGt, List strings) {
         for (String s : strings) {
             assertEquals(s, test.validate(s, "allowedNotRequired", false, cantEndWithGt), allowedMessage(s));
         }
@@ -530,7 +535,8 @@ private void notAllowedNotRequired(StringAndRequiredTest test, List stri
         }
     }
 
-    private void notAllowedNotRequired(StringLabelRequiredCantEndWithGtTest test, boolean cantEndWithGt, List strings) {
+    private void notAllowedNotRequired(StringLabelRequiredCantEndWithGtTest test,
+                                       @SuppressWarnings("SameParameterValue") boolean cantEndWithGt, List strings) {
         for (String s : strings) {
             assertThrows(IllegalArgumentException.class, () -> test.validate(s, "notAllowedNotRequired", false, cantEndWithGt), notAllowedMessage(s));
         }
@@ -640,50 +646,49 @@ public void testListsAreEquivalent() {
         List l2 = Arrays.asList("two", "one");
         List l3 = Arrays.asList("one", "not");
         List l4 = Collections.singletonList("three");
-        List l5 = null;
-        List l6 = new ArrayList<>();
+        List l5 = new ArrayList<>();
 
         assertTrue(listsAreEquivalent(l1, l1));
         assertTrue(listsAreEquivalent(l1, l2));
         assertFalse(listsAreEquivalent(l1, l3));
         assertFalse(listsAreEquivalent(l1, l4));
+        assertFalse(listsAreEquivalent(l1, null));
         assertFalse(listsAreEquivalent(l1, l5));
-        assertFalse(listsAreEquivalent(l1, l6));
 
         assertTrue(listsAreEquivalent(l2, l1));
         assertTrue(listsAreEquivalent(l2, l2));
         assertFalse(listsAreEquivalent(l2, l3));
         assertFalse(listsAreEquivalent(l2, l4));
+        assertFalse(listsAreEquivalent(l2, null));
         assertFalse(listsAreEquivalent(l2, l5));
-        assertFalse(listsAreEquivalent(l2, l6));
 
         assertFalse(listsAreEquivalent(l3, l1));
         assertFalse(listsAreEquivalent(l3, l2));
         assertTrue(listsAreEquivalent(l3, l3));
         assertFalse(listsAreEquivalent(l3, l4));
+        assertFalse(listsAreEquivalent(l3, null));
         assertFalse(listsAreEquivalent(l3, l5));
-        assertFalse(listsAreEquivalent(l3, l6));
 
         assertFalse(listsAreEquivalent(l4, l1));
         assertFalse(listsAreEquivalent(l4, l2));
         assertFalse(listsAreEquivalent(l4, l3));
         assertTrue(listsAreEquivalent(l4, l4));
+        assertFalse(listsAreEquivalent(l4, null));
         assertFalse(listsAreEquivalent(l4, l5));
-        assertFalse(listsAreEquivalent(l4, l6));
+
+        assertFalse(listsAreEquivalent(null, l1));
+        assertFalse(listsAreEquivalent(null, l2));
+        assertFalse(listsAreEquivalent(null, l3));
+        assertFalse(listsAreEquivalent(null, l4));
+        assertTrue(listsAreEquivalent(null, null));
+        assertTrue(listsAreEquivalent(null, l5));
 
         assertFalse(listsAreEquivalent(l5, l1));
         assertFalse(listsAreEquivalent(l5, l2));
         assertFalse(listsAreEquivalent(l5, l3));
         assertFalse(listsAreEquivalent(l5, l4));
+        assertTrue(listsAreEquivalent(l5, null));
         assertTrue(listsAreEquivalent(l5, l5));
-        assertTrue(listsAreEquivalent(l5, l6));
-
-        assertFalse(listsAreEquivalent(l6, l1));
-        assertFalse(listsAreEquivalent(l6, l2));
-        assertFalse(listsAreEquivalent(l6, l3));
-        assertFalse(listsAreEquivalent(l6, l4));
-        assertTrue(listsAreEquivalent(l6, l5));
-        assertTrue(listsAreEquivalent(l6, l6));
     }
 
     @Test
@@ -707,64 +712,62 @@ public void testMapsAreEqual() {
         Map m5 = new HashMap<>();
         m5.put("five", "5");
 
-        Map m6 = null;
-
-        Map m7 = new HashMap<>();
+        Map m6 = new HashMap<>();
 
         assertTrue(mapsAreEquivalent(m1, m1));
         assertTrue(mapsAreEquivalent(m1, m2));
         assertFalse(mapsAreEquivalent(m1, m3));
         assertFalse(mapsAreEquivalent(m1, m4));
         assertFalse(mapsAreEquivalent(m1, m5));
+        assertFalse(mapsAreEquivalent(m1, null));
         assertFalse(mapsAreEquivalent(m1, m6));
-        assertFalse(mapsAreEquivalent(m1, m7));
 
         assertTrue(mapsAreEquivalent(m2, m1));
         assertTrue(mapsAreEquivalent(m2, m2));
         assertFalse(mapsAreEquivalent(m2, m3));
         assertFalse(mapsAreEquivalent(m2, m4));
         assertFalse(mapsAreEquivalent(m2, m5));
+        assertFalse(mapsAreEquivalent(m2, null));
         assertFalse(mapsAreEquivalent(m2, m6));
-        assertFalse(mapsAreEquivalent(m2, m7));
 
         assertFalse(mapsAreEquivalent(m3, m1));
         assertFalse(mapsAreEquivalent(m3, m2));
         assertTrue(mapsAreEquivalent(m3, m3));
         assertFalse(mapsAreEquivalent(m3, m4));
         assertFalse(mapsAreEquivalent(m3, m5));
+        assertFalse(mapsAreEquivalent(m3, null));
         assertFalse(mapsAreEquivalent(m3, m6));
-        assertFalse(mapsAreEquivalent(m3, m7));
 
         assertFalse(mapsAreEquivalent(m4, m1));
         assertFalse(mapsAreEquivalent(m4, m2));
         assertFalse(mapsAreEquivalent(m4, m3));
         assertTrue(mapsAreEquivalent(m4, m4));
         assertFalse(mapsAreEquivalent(m4, m5));
+        assertFalse(mapsAreEquivalent(m4, null));
         assertFalse(mapsAreEquivalent(m4, m6));
-        assertFalse(mapsAreEquivalent(m4, m7));
 
         assertFalse(mapsAreEquivalent(m5, m1));
         assertFalse(mapsAreEquivalent(m5, m2));
         assertFalse(mapsAreEquivalent(m5, m3));
         assertFalse(mapsAreEquivalent(m5, m4));
         assertTrue(mapsAreEquivalent(m5, m5));
+        assertFalse(mapsAreEquivalent(m5, null));
         assertFalse(mapsAreEquivalent(m5, m6));
-        assertFalse(mapsAreEquivalent(m5, m7));
+
+        assertFalse(mapsAreEquivalent(null, m1));
+        assertFalse(mapsAreEquivalent(null, m2));
+        assertFalse(mapsAreEquivalent(null, m3));
+        assertFalse(mapsAreEquivalent(null, m4));
+        assertFalse(mapsAreEquivalent(null, m5));
+        assertTrue(mapsAreEquivalent(null, null));
+        assertTrue(mapsAreEquivalent(null, m6));
 
         assertFalse(mapsAreEquivalent(m6, m1));
         assertFalse(mapsAreEquivalent(m6, m2));
         assertFalse(mapsAreEquivalent(m6, m3));
-        assertFalse(mapsAreEquivalent(m6, m4));
         assertFalse(mapsAreEquivalent(m6, m5));
+        assertTrue(mapsAreEquivalent(m6, null));
         assertTrue(mapsAreEquivalent(m6, m6));
-        assertTrue(mapsAreEquivalent(m6, m7));
-
-        assertFalse(mapsAreEquivalent(m7, m1));
-        assertFalse(mapsAreEquivalent(m7, m2));
-        assertFalse(mapsAreEquivalent(m7, m3));
-        assertFalse(mapsAreEquivalent(m7, m5));
-        assertTrue(mapsAreEquivalent(m7, m6));
-        assertTrue(mapsAreEquivalent(m7, m7));
     }
 
     @Test
diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java
index 831a630ac..d2958bf2f 100644
--- a/src/test/java/io/nats/client/utils/TestBase.java
+++ b/src/test/java/io/nats/client/utils/TestBase.java
@@ -662,10 +662,6 @@ public static void assertMetaData(Map metadata) {
             }
             assertEquals(META_VALUE, metadata.get(META_KEY));
         }
-        else if (atLeast2_9_0() ){
-            assertNotNull(metadata);
-            assertEquals(0, metadata.size());
-        }
     }
 
     // ----------------------------------------------------------------------------------------------------
diff --git a/src/test/java/io/nats/client/utils/VersionUtils.java b/src/test/java/io/nats/client/utils/VersionUtils.java
index eba2215d5..48b8b60c2 100644
--- a/src/test/java/io/nats/client/utils/VersionUtils.java
+++ b/src/test/java/io/nats/client/utils/VersionUtils.java
@@ -29,26 +29,6 @@ public static void initVersionServerInfo(Connection nc) {
         }
     }
 
-    public static boolean atLeast2_9_0() {
-        return atLeast2_9_0(VERSION_SERVER_INFO);
-    }
-
-    public static boolean atLeast2_9_0(ServerInfo si) {
-        return si.isSameOrNewerThanVersion("2.9.0");
-    }
-
-    public static boolean atLeast2_9_6(ServerInfo si) {
-        return si.isSameOrNewerThanVersion("2.9.6");
-    }
-
-    public static boolean atLeast2_10_26(ServerInfo si) {
-        return si.isSameOrNewerThanVersion("2.10.26");
-    }
-
-    public static boolean atLeast2_9_1(ServerInfo si) {
-        return si.isSameOrNewerThanVersion("2.9.1");
-    }
-
     public static boolean atLeast2_10() {
         return atLeast2_10(VERSION_SERVER_INFO);
     }
@@ -61,6 +41,10 @@ public static boolean atLeast2_10_3(ServerInfo si) {
         return si.isSameOrNewerThanVersion("2.10.3");
     }
 
+    public static boolean atLeast2_10_26(ServerInfo si) {
+        return si.isSameOrNewerThanVersion("2.10.26");
+    }
+
     public static boolean atLeast2_11(ServerInfo si) {
         return si.isNewerVersionThan("2.10.99");
     }

From b3b6f16def339c879f479eb6f3836c78f80b0854 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Wed, 10 Dec 2025 07:47:11 -0500
Subject: [PATCH 45/51] try to fix Authorization Violation test flappers

---
 src/test/java/io/nats/client/AuthTests.java              | 9 +++++++--
 .../java/io/nats/client/impl/ErrorListenerTests.java     | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java
index 750c4625e..372645a2c 100644
--- a/src/test/java/io/nats/client/AuthTests.java
+++ b/src/test/java/io/nats/client/AuthTests.java
@@ -692,9 +692,14 @@ public void testRealUserAuthenticationExpired() throws Exception {
                 listener.validate();
             }
             catch (RuntimeException e) {
-                if (!e.getMessage().contains("Authorization Violation")) {
-                    fail(e);
+                Throwable t = e;
+                while (t != null) {
+                    if (t instanceof AuthenticationException) {
+                        return;
+                    }
+                    t = t.getCause();
                 }
+                fail(e);
             }
         });
     }
diff --git a/src/test/java/io/nats/client/impl/ErrorListenerTests.java b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
index 3b4e4b716..457827e06 100644
--- a/src/test/java/io/nats/client/impl/ErrorListenerTests.java
+++ b/src/test/java/io/nats/client/impl/ErrorListenerTests.java
@@ -38,7 +38,7 @@ public class ErrorListenerTests extends TestBase {
     @Test
     public void testLastError_ClearError_AuthViolation() throws Exception {
         NatsConnection nc;
-        Listener listener = new Listener();
+        Listener listener = new Listener(true);
         String[] customArgs = {"--user", "stephen", "--pass", "password"};
 
         try (NatsTestServer ts = new NatsTestServer();

From d5f596c08f6ebb12eb6e6d85ce7b85e54d2ca4cb Mon Sep 17 00:00:00 2001
From: scottf 
Date: Wed, 10 Dec 2025 12:18:02 -0500
Subject: [PATCH 46/51] I think I finally unflapped
 testRealUserAuthenticationExpired

---
 src/test/java/io/nats/client/AuthTests.java   | 21 +++++++++++++++----
 .../io/nats/client/utils/ConnectionUtils.java |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java
index 372645a2c..d321d4422 100644
--- a/src/test/java/io/nats/client/AuthTests.java
+++ b/src/test/java/io/nats/client/AuthTests.java
@@ -41,6 +41,7 @@
 import static io.nats.client.utils.OptionsUtils.NOOP_EL;
 import static io.nats.client.utils.OptionsUtils.optionsBuilder;
 import static io.nats.client.utils.ResourceUtils.jwtResource;
+import static io.nats.client.utils.ThreadUtils.sleep;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
@@ -661,8 +662,7 @@ private static void _testReconnectAfter(String errText) throws Exception {
 
     @Test
     public void testRealUserAuthenticationExpired() throws Exception {
-        Listener listener = new Listener(true);
-        listener.queueError("User Authentication Expired");
+        Listener listener = new Listener();
 
         String accountSeed = "SAAPXJRFMUYDUH3NOZKE7BS2ZDO2P4ND7G6W743MTNA3KCSFPX3HNN6AX4";
         String accountId = "ACPWDUYSZRRF7XAEZKUAGPUH6RPICWEHSTFELYKTOWUVZ4R2XMP4QJJX";
@@ -688,10 +688,22 @@ public void testRealUserAuthenticationExpired() throws Exception {
                 .errorListener(listener)
                 .maxReconnects(5)
                 .build();
-            try (Connection ignored = managedConnect(options)) {
-                listener.validate();
+
+            listener.queueError("User Authentication Expired");
+
+            // so these shenanigans to test this...
+            // 1. sometimes it connects and the expiration comes while connected
+            // 2. sometimes the connect exceptions right away
+            // 3. sometimes the connect happens but still exceptions
+            // this is all simply the speed and timing of the machine/server/connection
+            try (Connection ignored = Nats.connect(options)) {
+                sleep(2500); // 1. connected, so the validate() at the end verifies this
+            }
+            catch (AuthenticationException ignore) {
+                return; // 2. sometimes the connect exceptions right away
             }
             catch (RuntimeException e) {
+                // 3. sometimes the connect happens but still exceptions
                 Throwable t = e;
                 while (t != null) {
                     if (t instanceof AuthenticationException) {
@@ -701,6 +713,7 @@ public void testRealUserAuthenticationExpired() throws Exception {
                 }
                 fail(e);
             }
+            listener.validate(); // 1. finish
         });
     }
 }
diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java
index efbef2cb0..320dcf444 100644
--- a/src/test/java/io/nats/client/utils/ConnectionUtils.java
+++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java
@@ -74,6 +74,7 @@ public static Connection managedConnect(Options options, long waitTime) throws I
     // ----------------------------------------------------------------------------------------------------
     // connect or wait for a connection
     // ----------------------------------------------------------------------------------------------------
+    @SuppressWarnings("UnusedReturnValue")
     public static Connection confirmConnected(Connection conn) {
         return waitUntilStatus(conn, DEFAULT_WAIT, Connection.Status.CONNECTED);
     }

From 538d485adcc355491cb1187a8a9429fbddc46331 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Wed, 10 Dec 2025 15:58:54 -0500
Subject: [PATCH 47/51] NatsServerProtocolMock

---
 .../java/io/nats/client/impl/ConnectionListenerTests.java   | 4 ++--
 src/test/java/io/nats/client/impl/ReconnectTests.java       | 6 +++---
 src/test/java/io/nats/client/utils/TestBase.java            | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
index a6f2c2c7f..ea596e18a 100644
--- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
+++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
@@ -52,7 +52,7 @@ public void testCloseEvent() throws Exception {
 
     @Test
     public void testDiscoveredServersCountAndListenerInOptions() throws Exception {
-        try (NatsTestServer ts = new NatsTestServer()) {
+        runInSharedServer(ts -> {
             String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+ts.getServerUri()+"\"]}";
             try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) {
                 Listener listener = new Listener();
@@ -65,7 +65,7 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception {
                     listener.validate();
                 }
             }
-        }
+        });
     }
 
     @Test
diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index 362861d86..f4ab46516 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -330,9 +330,9 @@ public void testNoRandomizeReconnectToSecondServer() throws Exception {
 
     @Test
     public void testReconnectToSecondServerFromInfo() throws Exception {
-        NatsConnection nc;
         Listener listener = new Listener();
-        try (NatsTestServer ts = new NatsTestServer()) {
+        runInSharedServer(ts -> {
+            NatsConnection nc;
             String striped = ts.getServerUri().substring("nats://".length()); // info doesn't have protocol
             String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}";
             try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) {
@@ -352,7 +352,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception {
             assertConnected(nc);
             assertEquals(ts.getServerUri(), nc.getConnectedUrl());
             closeAndConfirm(nc);
-        }
+        });
     }
 
     @Test
diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java
index d2958bf2f..01037e291 100644
--- a/src/test/java/io/nats/client/utils/TestBase.java
+++ b/src/test/java/io/nats/client/utils/TestBase.java
@@ -181,6 +181,10 @@ else if (nameAndConfFile != null) {
         inServerTest.test(ts);
     }
 
+    public static void runInSharedServer(InServerTest inServerTest) throws Exception {
+        inServerTest.test(SharedServer.getInstance(SHARED_NAME).getServer());
+    }
+
     public static void runInSharedNamed(String name, InServerTest inServerTest) throws Exception {
         _runInSharedNamedServer(name, null, null, -1, inServerTest);
     }

From 3d6f2e7bb91a7a23b90b0b9e1e55b1baeb333a3f Mon Sep 17 00:00:00 2001
From: scottf 
Date: Wed, 10 Dec 2025 16:58:39 -0500
Subject: [PATCH 48/51] NatsServerProtocolMock use case tuning

---
 src/test/java/io/nats/client/AuthTests.java   |  2 +-
 .../java/io/nats/client/ConnectTests.java     |  4 +--
 src/test/java/io/nats/client/EchoTests.java   | 18 +++--------
 .../java/io/nats/client/PublishTests.java     | 20 ++++++------
 .../java/io/nats/client/SubscriberTests.java  |  7 ++--
 .../client/impl/ConnectionListenerTests.java  |  2 +-
 .../io/nats/client/impl/InfoHandlerTests.java | 32 +++++--------------
 .../nats/client/impl/JetStreamPullTests.java  |  8 ++---
 .../nats/client/impl/MessageContentTests.java |  2 +-
 .../io/nats/client/impl/NatsMessageTests.java |  2 +-
 .../java/io/nats/client/impl/PingTests.java   | 11 ++-----
 .../io/nats/client/impl/ReconnectTests.java   | 12 +++----
 .../io/nats/client/utils/ConnectionUtils.java | 19 ++++++++++-
 .../java/io/nats/client/utils/TestBase.java   | 28 ++++++++--------
 14 files changed, 77 insertions(+), 90 deletions(-)

diff --git a/src/test/java/io/nats/client/AuthTests.java b/src/test/java/io/nats/client/AuthTests.java
index d321d4422..7a77980ac 100644
--- a/src/test/java/io/nats/client/AuthTests.java
+++ b/src/test/java/io/nats/client/AuthTests.java
@@ -646,7 +646,7 @@ private static void _testReconnectAfter(String errText) throws Exception {
 
                 listener.queueConnectionEvent(Events.RECONNECTED);
 
-                try (Connection nc = managedConnect(options)) {
+                try (Connection nc = standardConnect(options)) {
                     assertEquals(mockTs.getServerUri(), nc.getConnectedUrl());
                     fMock.complete(true);
                     listener.validate();
diff --git a/src/test/java/io/nats/client/ConnectTests.java b/src/test/java/io/nats/client/ConnectTests.java
index 308d5d12d..26140d34c 100644
--- a/src/test/java/io/nats/client/ConnectTests.java
+++ b/src/test/java/io/nats/client/ConnectTests.java
@@ -111,7 +111,7 @@ public void testConnectVariants() throws Exception {
     @Test
     public void testFullFakeConnect() throws Exception {
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) {
-            assertCanConnect(options(mockTs));
+            assertCanConnect(mockTs);
         }
     }
 
@@ -119,7 +119,7 @@ public void testFullFakeConnect() throws Exception {
     public void testFullFakeConnectWithTabs() throws Exception {
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) {
             mockTs.useTabs();
-            assertCanConnect(options(mockTs));
+            assertCanConnect(mockTs);
         }
     }
 
diff --git a/src/test/java/io/nats/client/EchoTests.java b/src/test/java/io/nats/client/EchoTests.java
index f6b648b95..b6c489645 100644
--- a/src/test/java/io/nats/client/EchoTests.java
+++ b/src/test/java/io/nats/client/EchoTests.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.time.Duration;
 
-import static io.nats.client.utils.ConnectionUtils.assertClosed;
+import static io.nats.client.utils.ConnectionUtils.assertCanConnect;
 import static io.nats.client.utils.OptionsUtils.options;
 import static io.nats.client.utils.OptionsUtils.optionsBuilder;
 import static org.junit.jupiter.api.Assertions.*;
@@ -31,24 +31,16 @@ public class EchoTests extends TestBase {
     @Test
     public void testFailWithBadServerProtocol() throws Exception {
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) {
-            Options opt = optionsBuilder(mockTs).noEcho().noReconnect().build();
-            assertThrows(IOException.class, () -> Nats.connect(opt));
+            Options options = optionsBuilder(mockTs).noEcho().noReconnect().build();
+            assertThrows(IOException.class, () -> Nats.connect(options));
         }
     }
 
     @Test
     public void testConnectToOldServerWithEcho() throws Exception {
-        Connection nc = null;
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) {
-            Options opt = optionsBuilder(mockTs).noReconnect().build();
-            try {
-                nc = Nats.connect(opt);
-            } finally {
-                if (nc != null) {
-                    nc.close();
-                    assertClosed(nc);
-                }
-            }
+            Options options = optionsBuilder(mockTs).noReconnect().build();
+            assertCanConnect(options);
         }
     }
     
diff --git a/src/test/java/io/nats/client/PublishTests.java b/src/test/java/io/nats/client/PublishTests.java
index 39ae3e5ae..33971ca94 100644
--- a/src/test/java/io/nats/client/PublishTests.java
+++ b/src/test/java/io/nats/client/PublishTests.java
@@ -86,16 +86,14 @@ public void testThrowsIfTooBig() throws Exception {
     @Test
     public void testThrowsIfHeadersNotSupported() throws Exception {
         String customInfo = "{\"server_id\":\"test\", \"version\":\"9.9.99\"}";
-
-        try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo);
-             Connection nc = Nats.connect(mockTs.getServerUri())) {
-            assertConnected(nc);
-
-            assertThrows(IllegalArgumentException.class,
-                () -> nc.publish(NatsMessage.builder()
-                    .subject("testThrowsIfheadersNotSupported")
-                    .headers(new Headers().add("key", "value"))
-                    .build()));
+        try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo)) {
+            try (Connection nc = standardConnect(mockTs)) {
+                assertThrows(IllegalArgumentException.class,
+                    () -> nc.publish(NatsMessage.builder()
+                        .subject("testThrowsIfheadersNotSupported")
+                        .headers(new Headers().add("key", "value"))
+                        .build()));
+            }
         }
     }
 
@@ -165,7 +163,7 @@ private void runSimplePublishTest(String subject, String replyTo, Headers header
         };
 
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) {
-            try (Connection nc = managedConnect(options(mockTs))) {
+            try (Connection nc = standardConnect(mockTs)) {
                 byte[] bodyBytes;
                 if (bodyString == null || bodyString.isEmpty()) {
                     bodyBytes = EMPTY_BODY;
diff --git a/src/test/java/io/nats/client/SubscriberTests.java b/src/test/java/io/nats/client/SubscriberTests.java
index f53d1409c..fbe0e9093 100644
--- a/src/test/java/io/nats/client/SubscriberTests.java
+++ b/src/test/java/io/nats/client/SubscriberTests.java
@@ -13,14 +13,13 @@
 
 package io.nats.client;
 
-import io.nats.client.utils.ConnectionUtils;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.concurrent.CompletableFuture;
 
-import static io.nats.client.utils.OptionsUtils.options;
+import static io.nats.client.utils.ConnectionUtils.standardConnect;
 import static io.nats.client.utils.TestBase.*;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -108,14 +107,14 @@ public void testTabInProtocolLine() throws Exception {
         };
 
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(receiveMessageCustomizer)) {
-            try (Connection nc = ConnectionUtils.managedConnect(options(mockTs))) {
+            try (Connection nc = standardConnect(mockTs)) {
                 String subject = random();
                 Subscription sub = nc.subscribe(subject);
 
                 gotSub.get();
                 sendMsg.complete(Boolean.TRUE);
 
-                Message msg = sub.nextMessage(Duration.ZERO);//Duration.ofMillis(1000));
+                Message msg = sub.nextMessage(Duration.ZERO);
 
                 assertTrue(sub.isActive());
                 assertNotNull(msg);
diff --git a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
index ea596e18a..fbb06a6f8 100644
--- a/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
+++ b/src/test/java/io/nats/client/impl/ConnectionListenerTests.java
@@ -61,7 +61,7 @@ public void testDiscoveredServersCountAndListenerInOptions() throws Exception {
                     .connectionListener(listener)
                     .build();
                 listener.queueConnectionEvent(Events.DISCOVERED_SERVERS);
-                try (Connection ignore = managedConnect(options)) {
+                try (Connection ignore = standardConnect(options)) {
                     listener.validate();
                 }
             }
diff --git a/src/test/java/io/nats/client/impl/InfoHandlerTests.java b/src/test/java/io/nats/client/impl/InfoHandlerTests.java
index bb40e05ba..c7b31f8b3 100644
--- a/src/test/java/io/nats/client/impl/InfoHandlerTests.java
+++ b/src/test/java/io/nats/client/impl/InfoHandlerTests.java
@@ -13,7 +13,10 @@
 
 package io.nats.client.impl;
 
-import io.nats.client.*;
+import io.nats.client.Connection;
+import io.nats.client.ConnectionListener;
+import io.nats.client.NatsServerProtocolMock;
+import io.nats.client.Options;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -22,8 +25,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static io.nats.client.utils.ConnectionUtils.assertClosed;
-import static io.nats.client.utils.ConnectionUtils.assertConnected;
+import static io.nats.client.utils.ConnectionUtils.standardConnect;
 import static io.nats.client.utils.OptionsUtils.optionsBuilder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -32,15 +34,9 @@ public class InfoHandlerTests {
     @Test
     public void testInitialInfo() throws IOException, InterruptedException {
         String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\"}";
-
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(null, customInfo)) {
-            Connection nc = Nats.connect(mockTs.getServerUri());
-            try {
-                assertConnected(nc);
+            try (Connection nc = standardConnect(mockTs)) {
                 assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info");
-            } finally {
-                nc.close();
-                assertClosed(nc);
             }
         }
     }
@@ -89,23 +85,16 @@ public void testUnsolicitedInfo() throws IOException, InterruptedException, Exec
         };
 
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(infoCustomizer, customInfo)) {
-            Connection nc = Nats.connect(mockTs.getServerUri());
-            try {
-                assertConnected(nc);
+            try (Connection nc = standardConnect(mockTs)) {
                 assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info");
                 sendInfo.complete(Boolean.TRUE);
 
                 assertTrue(gotPong.get(), "Got pong."); // Server round tripped so we should have new info
                 assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info");
-            } finally {
-                nc.close();
-                assertClosed(nc);
             }
         }
     }
 
-
-
     @Test
     public void testLDM() throws IOException, InterruptedException, ExecutionException, TimeoutException {
         String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\", \"ldm\":true}";
@@ -157,17 +146,12 @@ public void testLDM() throws IOException, InterruptedException, ExecutionExcepti
 
             Options options = optionsBuilder(mockTs).connectionListener(cl).build();
 
-            Connection nc = Nats.connect(options);
-            try {
-                assertConnected(nc);
+            try (Connection nc = standardConnect(options)) {
                 assertEquals("myid", nc.getServerInfo().getServerId(), "got custom info");
                 sendInfo.complete(Boolean.TRUE);
 
                 assertTrue(gotPong.get(), "Got pong."); // Server round tripped so we should have new info
                 assertEquals("replacement", nc.getServerInfo().getServerId(), "got replacement info");
-            } finally {
-                nc.close();
-                assertClosed(nc);
             }
         }
 
diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
index d94211d97..cf4c7eed4 100644
--- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
@@ -1063,9 +1063,9 @@ public void testDoesNotExceedMaxRequestBytesExactBytes() throws Exception {
         Listener listener = new Listener();
         runInSharedOwnNc(listener, (nc, ctx) -> {
             listener.queueStatus(PullWarning, CONFLICT_CODE);
-            ctx.stream = randomWide(6); // six letters so I can count
-            String subject = randomWide(5); // five letters so I can count
-            String durable = randomWide(10); // short keeps under max bytes
+            ctx.stream = random(6); // six letters so I can count
+            String subject = random(5); // five letters so I can count
+            String durable = random(); // default random is 10 chars so is short enough to keeps under max bytes
             ctx.createOrReplaceStream(subject);
             ctx.jsm.addOrUpdateConsumer(ctx.stream, builder().durable(durable).ackPolicy(AckPolicy.None).filterSubjects(subject).build());
             PullSubscribeOptions so = PullSubscribeOptions.bind(ctx.stream, durable);
@@ -1371,7 +1371,7 @@ public void testPinnedClient() throws Exception {
         // unpin 10 times and make sure that new pins are made
         runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> {
             String consumer = random();
-            String group = random();
+                String group = random();
 
             ConsumerConfiguration cc = ConsumerConfiguration.builder()
                 .filterSubject(ctx.subject())
diff --git a/src/test/java/io/nats/client/impl/MessageContentTests.java b/src/test/java/io/nats/client/impl/MessageContentTests.java
index fb5745188..f6fefe534 100644
--- a/src/test/java/io/nats/client/impl/MessageContentTests.java
+++ b/src/test/java/io/nats/client/impl/MessageContentTests.java
@@ -195,7 +195,7 @@ void runBadContentTest(NatsServerProtocolMock.Customizer badServer, CompletableF
                 .errorListener(listener)
                 .connectionListener(listener)
                 .build();
-            try (Connection ignore = ConnectionUtils.managedConnect(options)) {
+            try (Connection ignore = ConnectionUtils.standardConnect(options)) {
                 listener.queueConnectionEvent(Events.DISCONNECTED);
                 ready.complete(Boolean.TRUE);
                 listener.validate();
diff --git a/src/test/java/io/nats/client/impl/NatsMessageTests.java b/src/test/java/io/nats/client/impl/NatsMessageTests.java
index 83aef92d0..ff9c9b41c 100644
--- a/src/test/java/io/nats/client/impl/NatsMessageTests.java
+++ b/src/test/java/io/nats/client/impl/NatsMessageTests.java
@@ -133,7 +133,7 @@ public void testBigProtocolLine() throws Exception {
             subject.append(subject);
         }
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(ExitAt.NO_EXIT)) {
-            try (Connection nc = ConnectionUtils.managedConnect(options(mockTs))) {
+            try (Connection nc = ConnectionUtils.standardConnect(options(mockTs))) {
                 // Without Body
                 assertThrows(IllegalArgumentException.class, () -> nc.subscribe(subject.toString()));
 
diff --git a/src/test/java/io/nats/client/impl/PingTests.java b/src/test/java/io/nats/client/impl/PingTests.java
index b413b6e90..e7768cdcf 100644
--- a/src/test/java/io/nats/client/impl/PingTests.java
+++ b/src/test/java/io/nats/client/impl/PingTests.java
@@ -58,13 +58,8 @@ public void testHandlingPing() throws Exception {
         };
 
         try (NatsServerProtocolMock mockTs = new NatsServerProtocolMock(pingPongCustomizer)) {
-            Connection  nc = Nats.connect(mockTs.getServerUri());
-            try {
-                assertConnected(nc);
+            try (Connection nc = standardConnect(mockTs)) {
                 assertTrue(gotPong.get(), "Got pong.");
-            } finally {
-                nc.close();
-                assertClosed(nc);
             }
         }
     }
@@ -89,7 +84,7 @@ public void testMaxPingsOut() throws Exception {
                 .maxPingsOut(2)
                 .maxReconnects(0)
                 .build();
-            try (NatsConnection nc = (NatsConnection) managedConnect(options)) {
+            try (NatsConnection nc = (NatsConnection)standardConnect(options)) {
                 nc.sendPing();
                 nc.sendPing();
                 assertNull(nc.sendPing(), "No future returned when past max");
@@ -106,7 +101,7 @@ public void testFlushTimeout() throws Exception {
                 .connectionListener(listener)
                 .errorListener(listener)
                 .build();
-            try (Connection nc = managedConnect(options)) {
+            try (Connection nc = standardConnect(options)) {
                 // fake server so flush will time out
                 assertThrows(TimeoutException.class, () -> nc.flush(Duration.ofMillis(50)));
             }
diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index f4ab46516..11505ccee 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -109,7 +109,7 @@ private void _testReconnect(NatsServerRunner.Builder nsrb, BiConsumer {
-            NatsConnection nc;
+            Connection nc;
             String striped = ts.getServerUri().substring("nats://".length()); // info doesn't have protocol
             String customInfo = "{\"server_id\":\"myid\", \"version\":\"9.9.99\",\"connect_urls\": [\""+striped+"\"]}";
             try (NatsServerProtocolMock mockTs2 = new NatsServerProtocolMock(null, customInfo)) {
@@ -342,7 +342,7 @@ public void testReconnectToSecondServerFromInfo() throws Exception {
                     .connectionTimeout(Duration.ofSeconds(5))
                     .reconnectWait(Duration.ofSeconds(1))
                     .build();
-                nc = (NatsConnection) managedConnect(options);
+                nc = standardConnect(options);
                 assertEquals(mockTs2.getServerUri(), nc.getConnectedUrl());
                 listener.queueConnectionEvent(Events.RECONNECTED);
             }
@@ -371,9 +371,10 @@ public void testOverflowReconnectBuffer() throws Exception {
 
         listener.validate();
 
+        String subject = random();
         assertThrows(IllegalStateException.class, () -> {
             for (int i = 0; i < 20; i++) {
-                nc.publish("test", new byte[512]);// Should be full by the 5th message
+                nc.publish(subject, new byte[512]);// Should be full by the 5th message
             }
         });
 
@@ -451,8 +452,7 @@ public void testReconnectDropOnLineFeed() throws Exception {
                 .connectionListener(listener)
                 .build();
             port = mockTs.getPort();
-            nc = (NatsConnection) Nats.connect(options);
-            assertConnected(nc);
+            nc = (NatsConnection) standardConnect(options);
             listener.queueConnectionEvent(Events.DISCONNECTED);
             nc.subscribe("test");
             subRef.get().get();
diff --git a/src/test/java/io/nats/client/utils/ConnectionUtils.java b/src/test/java/io/nats/client/utils/ConnectionUtils.java
index 320dcf444..36b702737 100644
--- a/src/test/java/io/nats/client/utils/ConnectionUtils.java
+++ b/src/test/java/io/nats/client/utils/ConnectionUtils.java
@@ -15,11 +15,13 @@
 
 import io.nats.client.Connection;
 import io.nats.client.Nats;
+import io.nats.client.NatsServerProtocolMock;
 import io.nats.client.Options;
 import org.opentest4j.AssertionFailedError;
 
 import java.io.IOException;
 
+import static io.nats.client.utils.OptionsUtils.options;
 import static io.nats.client.utils.ThreadUtils.sleep;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
@@ -34,7 +36,7 @@ public abstract class ConnectionUtils {
     public static final long MEDIUM_FLUSH_TIMEOUT_MS = 5000;
 
     // ----------------------------------------------------------------------------------------------------
-    // standardConnect
+    // connectWithRetry
     // ----------------------------------------------------------------------------------------------------
     private static final int RETRY_DELAY_INCREMENT = 50;
     private static final int CONNECTION_RETRIES = 10;
@@ -71,6 +73,17 @@ public static Connection managedConnect(Options options, long waitTime) throws I
         throw last;
     }
 
+    // ----------------------------------------------------------------------------------------------------
+    // standardConnect
+    // ----------------------------------------------------------------------------------------------------
+    public static Connection standardConnect(NatsServerProtocolMock ts) throws IOException, InterruptedException {
+        return confirmConnected(Nats.connect(options(ts)));
+    }
+
+    public static Connection standardConnect(Options options) throws IOException, InterruptedException {
+        return confirmConnected(Nats.connect(options));
+    }
+
     // ----------------------------------------------------------------------------------------------------
     // connect or wait for a connection
     // ----------------------------------------------------------------------------------------------------
@@ -148,6 +161,10 @@ public static void assertClosed(Connection conn) {
             () -> expectingMessage(conn, Connection.Status.CLOSED));
     }
 
+    public static void assertCanConnect(NatsServerProtocolMock ts) {
+        closeAndConfirm(managedConnect(options(ts)));
+    }
+
     public static void assertCanConnect(Options options) {
         closeAndConfirm(managedConnect(options));
     }
diff --git a/src/test/java/io/nats/client/utils/TestBase.java b/src/test/java/io/nats/client/utils/TestBase.java
index 01037e291..bea451317 100644
--- a/src/test/java/io/nats/client/utils/TestBase.java
+++ b/src/test/java/io/nats/client/utils/TestBase.java
@@ -25,9 +25,9 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.time.Duration;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
 
 import static io.nats.client.support.NatsConstants.DOT;
@@ -533,25 +533,27 @@ private static Options makeOptions(int id, ThreeServerTestOptions tstOpts, NatsT
         return b.build();
     }
 
-    private static String tempJsStoreDir() throws IOException {
-        return Files.createTempDirectory(random()).toString().replace("\\", "\\\\");  // when on windows this is necessary. unix doesn't have backslash
-    }
-
     // ----------------------------------------------------------------------------------------------------
     // data makers
     // ----------------------------------------------------------------------------------------------------
     public static final String DATA = "data";
 
-    public static String random() {
-        return NUID.nextGlobalSequence();
-    }
+    // Fastest - using char array directly
+    private static final char[] CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
+
+    public static String random(int length) {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        char[] result = new char[length];
 
-    public static String randomWide(int width) {
-        StringBuilder sb = new StringBuilder();
-        while (sb.length() < width) {
-            sb.append(random());
+        for (int i = 0; i < length; i++) {
+            result[i] = CHARS[random.nextInt(CHARS.length)];
         }
-        return sb.substring(0, width);
+
+        return new String(result);
+    }
+
+    public static String random() {
+        return random(10);
     }
 
     public static String subject(int variant) {

From 6edd8c0ef27f377d98fc1a8357384110656ad6c5 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Wed, 10 Dec 2025 17:25:13 -0500
Subject: [PATCH 49/51] fixing flappers

---
 .../io/nats/client/impl/KeyValueTests.java    | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/src/test/java/io/nats/client/impl/KeyValueTests.java b/src/test/java/io/nats/client/impl/KeyValueTests.java
index 5e37cee30..fa3087866 100644
--- a/src/test/java/io/nats/client/impl/KeyValueTests.java
+++ b/src/test/java/io/nats/client/impl/KeyValueTests.java
@@ -1953,23 +1953,16 @@ else if (mcount == 4) {
                         .build())
                     .build());
 
-            long mark = System.currentTimeMillis();
+            long createdTimeMark = System.currentTimeMillis();
             kv.create(key, dataBytes(), MessageTtl.seconds(1));
             StreamInfo si = ctx.jsm.getStreamInfo(rawStream);
             assertEquals(1, si.getStreamState().getMsgCount());
 
-            long safety = 0;
-            long gotZero = -1;
-            while (++safety < 10000 && errorLatch.getCount() > 0) {
-                si = ctx.jsm.getStreamInfo(rawStream);
-                if (si.getStreamState().getMsgCount() == 0) {
-                    gotZero = System.currentTimeMillis();
-                    break;
-                }
-            }
+            long purgedTimeMark = waitForPurge(ctx, rawStream);
+
             assertEquals(1, errorLatch.getCount(), error.get());
             assertEquals(2, messages.get());
-            assertTrue(gotZero - mark >= 100); // this is arbitrary but I need something
+            assertTrue(purgedTimeMark - createdTimeMark >= 1000); // ttl is 1 second, should take at least this long
             assertEquals("PUT", ops.get(0));
             assertEquals("MaxAge", ops.get(1));
 
@@ -1981,23 +1974,26 @@ else if (mcount == 4) {
             si = ctx.jsm.getStreamInfo(rawStream);
             assertEquals(1, si.getStreamState().getMsgCount());
 
-            safety = 0;
-            gotZero = -1;
-            while (++safety < 10000 && errorLatch.getCount() > 0) {
-                si = ctx.jsm.getStreamInfo(rawStream);
-                if (si.getStreamState().getMsgCount() == 0) {
-                    gotZero = System.currentTimeMillis();
-                    break;
-                }
-            }
+            purgedTimeMark = waitForPurge(ctx, rawStream);
             assertEquals(1, errorLatch.getCount(), error.get());
             assertEquals(4, messages.get());
-            assertTrue(gotZero - mark >= 1000);
+            assertTrue(purgedTimeMark - createdTimeMark >= 1000); // ttl is 1 second, should take at least this long
             assertEquals("PUT", ops.get(2));
             assertEquals("PURGE", ops.get(3));
         });
     }
 
+    private static long waitForPurge(JetStreamTestingContext ctx, String rawStream) throws IOException, JetStreamApiException {
+        for (int tries = 0; tries < 20; tries++) {
+            sleep(500); // it takes a bit of time for the purge to happen, depends on the server load
+            StreamInfo si = ctx.jsm.getStreamInfo(rawStream);
+            if (si.getStreamState().getMsgCount() == 0) {
+                return System.currentTimeMillis();
+            }
+        }
+        return -1;
+    }
+
     @Test
     public void testJustTtlForDeletePurge() throws Exception {
         runInShared(VersionUtils::atLeast2_12, (nc, ctx) -> {
@@ -2058,41 +2054,25 @@ else if (mcount == 4) {
             assertEquals(1, si.getStreamState().getMsgCount());
 
             kv.delete(key);
-            long mark = System.currentTimeMillis();
+            long createdTimeMark = System.currentTimeMillis();
             si = ctx.jsm.getStreamInfo(rawStream);
             assertEquals(1, si.getStreamState().getMsgCount());
 
-            long safety = 0;
-            long gotZero = -1;
-            while (++safety < 10000 && errorLatch.getCount() > 0) {
-                si = ctx.jsm.getStreamInfo(rawStream);
-                if (si.getStreamState().getMsgCount() == 0) {
-                    gotZero = System.currentTimeMillis();
-                    break;
-                }
-            }
+            long purgedTimeMark = waitForPurge(ctx, rawStream);
             assertEquals(1, errorLatch.getCount(), error.get());
             assertEquals(2, messages.get());
-            assertTrue(gotZero - mark >= 1000);
+            assertTrue(purgedTimeMark - createdTimeMark >= 1000);
             assertEquals("PUT", ops.get(0));
             assertEquals("DEL", ops.get(1));
 
             kv.create(key, dataBytes());
-            mark = System.currentTimeMillis();
+            createdTimeMark = System.currentTimeMillis();
             kv.purge(key);
 
-            safety = 0;
-            gotZero = -1;
-            while (++safety < 10000 && errorLatch.getCount() > 0) {
-                si = ctx.jsm.getStreamInfo(rawStream);
-                if (si.getStreamState().getMsgCount() == 0) {
-                    gotZero = System.currentTimeMillis();
-                    break;
-                }
-            }
+            purgedTimeMark = waitForPurge(ctx, rawStream);
             assertEquals(1, errorLatch.getCount(), error.get());
             assertEquals(4, messages.get());
-            assertTrue(gotZero - mark >= 1000);
+            assertTrue(purgedTimeMark - createdTimeMark >= 1000);
             assertEquals("PUT", ops.get(2));
             assertEquals("PURGE", ops.get(3));
         });

From 66a0cdae9ba44ca2f498edc83c82d72ed9f7ac44 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Mon, 15 Dec 2025 19:40:43 -0500
Subject: [PATCH 50/51] testSocketDataPortTimeout

---
 .../io/nats/client/impl/ReconnectTests.java   | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index e30a17039..2aaeb4be3 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -31,15 +31,12 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 
 import static io.nats.client.AuthTests.getUserCredsAuthHander;
 import static io.nats.client.NatsTestServer.configFileBuilder;
-import static io.nats.client.NatsTestServer.getLocalhostUri;
-import static io.nats.client.support.Listener.VERY_LONG_VALIDATE_TIMEOUT;
-import static io.nats.client.support.NatsConstants.OUTPUT_QUEUE_IS_FULL;
+import static io.nats.client.support.Listener.*;
 import static io.nats.client.utils.ConnectionUtils.*;
 import static io.nats.client.utils.OptionsUtils.*;
 import static io.nats.client.utils.TestBase.*;
@@ -894,52 +891,50 @@ public void run() {
 
     @Test
     public void testSocketDataPortTimeout() throws Exception {
-        ListenerForTesting listener = new ListenerForTesting(false, true);
+        Listener listener = new Listener();
         Options.Builder builder = Options.builder()
             .noRandomize()
-            .socketWriteTimeout(5000) // long time ensures we can get to OUTPUT_QUEUE_IS_FULL
+            .socketWriteTimeout(5000) // long time vital! to get OUTPUT_QUEUE_IS_FULL
             .pingInterval(Duration.ofSeconds(1))
             .maxMessagesInOutgoingQueue(100)
             .dataPortType(SocketDataPortBlockSimulator.class.getCanonicalName())
             .connectionListener(listener)
             .errorListener(listener);
 
+        // 1. The socket port gets blocked, the queue fills up before the socketWriteTimeout()
+        // 2. The socket write times out
+        // 3. That causes a disconnect
+        // 4. Eventually reconnected. Give it a long timeout, it takes a while on GH machine
+        listener.queueException(IllegalStateException.class, "Output queue", MEDIUM_VALIDATE_TIMEOUT);
+        listener.queueSocketWriteTimeout(LONG_VALIDATE_TIMEOUT);
         listener.queueConnectionEvent(Events.DISCONNECTED);
-        listener.queueConnectionEvent(Events.RECONNECTED);
-        listener.queueSocketWriteTimeout();
+        listener.queueConnectionEvent(Events.RECONNECTED, MEDIUM_VALIDATE_TIMEOUT);
 
-        AtomicBoolean gotOutputQueueIsFull = new AtomicBoolean();
         try (NatsTestServer ts1 = new NatsTestServer()) {
             try (NatsTestServer ts2 = new NatsTestServer()) {
                 String[] servers = new String[]{
                     ts1.getNatsLocalhostUri(),
                     ts2.getNatsLocalhostUri()
                 };
-                try (Connection nc = standardConnection(builder.servers(servers).build())) {
+                try (Connection nc = standardConnect(builder.servers(servers).build())) {
                     int connectedPort = nc.getServerInfo().getPort();
-                    listener.prepForStatusChange(Events.RECONNECTED);
 
-                    String subject = subject();
-                    AtomicInteger pubId = new AtomicInteger();
-                    while (pubId.get() < 50000) {
+                    String subject = random();
+                    int pubId = 0;
+                    while (pubId++ < 1000) {
+                        if (pubId == 10) {
+                            SocketDataPortBlockSimulator.simulateBlock();
+                        }
                         try {
-                            nc.publish(subject, ("" + pubId.incrementAndGet()).getBytes());
-                            if (pubId.get() == 10) {
-                                SocketDataPortBlockSimulator.simulateBlock();
-                            }
+                            nc.publish(subject, null);
                         }
-                        catch (Exception e) {
-                            if (e.getMessage().contains(OUTPUT_QUEUE_IS_FULL)) {
-                                gotOutputQueueIsFull.set(true);
+                        catch (IllegalStateException e) {
+                            if (e.getMessage().contains("Output queue")) {
                                 break;
                             }
                         }
                     }
-                    assertTrue(listener.waitForStatusChange(10, TimeUnit.SECONDS));
-
-                    assertTrue(gotOutputQueueIsFull.get());
-                    assertTrue(listener.getSocketWriteTimeoutCount() > 0);
-                    assertTrue(listener.getConnectionEvents().contains(Events.DISCONNECTED));
+                    listener.validateAll();
                     assertNotEquals(connectedPort, nc.getServerInfo().getPort());
                 }
             }

From 7c097e88e76395778f72fdf5602b2b1084320b49 Mon Sep 17 00:00:00 2001
From: scottf 
Date: Tue, 16 Dec 2025 06:46:49 -0500
Subject: [PATCH 51/51] flappers are always a timing issue exacerbated by GH
 actions instances are shared and slow

---
 .../nats/client/impl/JetStreamPullTests.java  |   6 +-
 .../io/nats/client/impl/ReconnectTests.java   |   2 +-
 .../nats/client/impl/SimplificationTests.java | 156 +++++++++++++-----
 .../java/io/nats/service/ServiceTests.java    |   4 +-
 4 files changed, 125 insertions(+), 43 deletions(-)

diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
index cf4c7eed4..5b385c1ff 100644
--- a/src/test/java/io/nats/client/impl/JetStreamPullTests.java
+++ b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
@@ -740,12 +740,12 @@ private PullSubscribeOptions makePso(BuilderCustomizer c) {
         return c.customize(ConsumerConfiguration.builder().ackPolicy(AckPolicy.None)).inactiveThreshold(INACTIVE_THRESHOLD).buildPullSubscribeOptions();
     }
 
-    static final long NEXT_MESSAGE_TIMEOUT = 2000;
+    static final long NEXT_MESSAGE_TIMEOUT = 5000;
     static final long INACTIVE_THRESHOLD = 30_000;
     private void _testConflictStatuses(int statusCode, String statusText, ListenerStatusType statusType, ConflictSetup setup) throws Exception {
         runInSharedNamed("conflict", ts -> {
             if (conflictNc == null) {
-                conflictListener = new Listener();
+                conflictListener = new Listener(true);
                 conflictNc = ConnectionUtils.managedConnect(
                     optionsBuilder(ts).errorListener(conflictListener).connectionListener(conflictListener).build());
             }
@@ -754,7 +754,7 @@ private void _testConflictStatuses(int statusCode, String statusText, ListenerSt
             }
             try (JetStreamTestingContext tcsCtx = new JetStreamTestingContext(conflictNc, 1)) {
                 if (statusType != null) {
-                    conflictListener.queueStatus(statusType, statusCode);
+                    conflictListener.queueStatus(statusType, statusCode, Listener.LONG_VALIDATE_TIMEOUT);
                 }
                 JetStreamSubscription sub = setup.setup(conflictNc, tcsCtx);
                 if (sub.getDispatcher() == null) {
diff --git a/src/test/java/io/nats/client/impl/ReconnectTests.java b/src/test/java/io/nats/client/impl/ReconnectTests.java
index 2aaeb4be3..679be73dc 100644
--- a/src/test/java/io/nats/client/impl/ReconnectTests.java
+++ b/src/test/java/io/nats/client/impl/ReconnectTests.java
@@ -891,7 +891,7 @@ public void run() {
 
     @Test
     public void testSocketDataPortTimeout() throws Exception {
-        Listener listener = new Listener();
+        Listener listener = new Listener(true);
         Options.Builder builder = Options.builder()
             .noRandomize()
             .socketWriteTimeout(5000) // long time vital! to get OUTPUT_QUEUE_IS_FULL
diff --git a/src/test/java/io/nats/client/impl/SimplificationTests.java b/src/test/java/io/nats/client/impl/SimplificationTests.java
index b6fe329b4..8d1b8568f 100644
--- a/src/test/java/io/nats/client/impl/SimplificationTests.java
+++ b/src/test/java/io/nats/client/impl/SimplificationTests.java
@@ -984,19 +984,21 @@ private void _testOrderedNext(StreamContext sctx, int expectedStreamSeq, Ordered
         validateConsumerNameForOrdered(occtx, null, occ.getConsumerNamePrefix());
     }
 
-    public static long CS_FOR_SS_3 = 3;
-
     public static class PullOrderedTestDropSimulator extends PullOrderedMessageManager {
+        long ccForSs3;
         @SuppressWarnings("ClassEscapesDefinedScope")
-        public PullOrderedTestDropSimulator(NatsConnection conn, NatsJetStream js, String stream, SubscribeOptions so, ConsumerConfiguration serverCC, boolean queueMode, boolean syncMode) {
+        public PullOrderedTestDropSimulator(long ccForSs3,
+            NatsConnection conn, NatsJetStream js, String stream, SubscribeOptions so,
+                                            ConsumerConfiguration serverCC, boolean queueMode, boolean syncMode) {
             super(conn, js, stream, so, serverCC, syncMode);
+            this.ccForSs3 = ccForSs3;
         }
 
         @Override
         protected Boolean beforeQueueProcessorImpl(NatsMessage msg) {
             if (msg.isJetStream()
                 && msg.metaData().streamSequence() == 3
-                && msg.metaData().consumerSequence() == CS_FOR_SS_3) {
+                && msg.metaData().consumerSequence() == ccForSs3) {
                 return false;
             }
 
@@ -1010,31 +1012,69 @@ public void testOrderedBehaviorFetch() throws Exception {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
             jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
-            ZonedDateTime startTime = getStartTimeFirstMessage(ctx);
 
             // New pomm factory in place before subscriptions are made
-            ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new;
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(3, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject()));
 
-            // Set the Consumer Sequence For Stream Sequence 3 statically for ease
-            CS_FOR_SS_3 = 3;
-            _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration().filterSubject(ctx.subject()));
             _testOrderedFetch(sctx, 1, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
                 .filterSubject(ctx.subject()));
+        });
+    }
 
-            CS_FOR_SS_3 = 2;
-            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
-                .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime));
-            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
+    @Test
+    public void testOrderedBehaviorFetchByStartTime() throws Exception {
+        runInShared((nc, ctx) -> {
+            StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
+
+            jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
+            ZonedDateTime startTime = getStartTimeFirstMessage(ctx);
+
+            // New pomm factory in place before subscriptions are made
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(2, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartTime)
+                .startTime(startTime));
+
+            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
-                .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime));
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartTime)
+                .startTime(startTime));
+        });
+    }
 
-            CS_FOR_SS_3 = 2;
-            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
-                .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2));
-            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
+    @Test
+    public void testOrderedBehaviorFetchByStartSequence() throws Exception {
+        runInShared((nc, ctx) -> {
+            StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
+
+            jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
+
+            // New pomm factory in place before subscriptions are made
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(2, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartSequence)
+                .startSequence(2));
+
+            _testOrderedFetch(sctx, 2, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
-                .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2));
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartSequence)
+                .startSequence(2));
         });
     }
 
@@ -1079,32 +1119,70 @@ public void testOrderedBehaviorIterable() throws Exception {
             StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
             jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
-            ZonedDateTime startTime = getStartTimeFirstMessage(ctx);
 
-            // New pomm factory in place before each subscription is made
-            // Set the Consumer Sequence For Stream Sequence 3 statically for ease
-            CS_FOR_SS_3 = 3;
-            ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new;
-            _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration().filterSubject(ctx.subject()));
+            // New pomm factory in place before subscription is made
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(3, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject()));
+
             _testOrderedIterate(sctx, 1, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
                 .filterSubject(ctx.subject()));
+        });
+    }
 
-            CS_FOR_SS_3 = 2;
-            ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new;
-            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
-                .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime));
-            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
+    @Test
+    public void testOrderedBehaviorIterableByStartTime() throws Exception {
+        runInShared((nc, ctx) -> {
+            StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
+
+            jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
+            ZonedDateTime startTime = getStartTimeFirstMessage(ctx);
+
+            // New pomm factory in place before subscription is made
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(2, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartTime)
+                .startTime(startTime));
+
+            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
-                .deliverPolicy(DeliverPolicy.ByStartTime).startTime(startTime));
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartTime)
+                .startTime(startTime));
 
-            CS_FOR_SS_3 = 2;
-            ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new;
-            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
-                .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2));
-            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration().filterSubject(ctx.subject())
+        });
+    }
+
+    @Test
+    public void testOrderedBehaviorIterableByStartSequence() throws Exception {
+        runInShared((nc, ctx) -> {
+            StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
+
+            jsPublish(ctx.js, ctx.subject(), 101, 6, 100);
+
+            // New pomm factory in place before subscription is made
+            ctx.js._pullOrderedMessageManagerFactory =
+                (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                    new PullOrderedTestDropSimulator(2, conn, js, stream, so, serverCC, queueMode, syncMode);
+
+            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration()
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartSequence)
+                .startSequence(2));
+
+            _testOrderedIterate(sctx, 2, new OrderedConsumerConfiguration()
                 .consumerNamePrefix(random())
-                .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2));
+                .filterSubject(ctx.subject())
+                .deliverPolicy(DeliverPolicy.ByStartSequence)
+                .startSequence(2));
         });
     }
 
@@ -1179,7 +1257,9 @@ private void _testOrderedConsume(JetStreamTestingContext ctx, OrderedConsumerCon
         StreamContext sctx = ctx.js.getStreamContext(ctx.stream);
 
         // Get this in place before subscriptions are made
-        ctx.js._pullOrderedMessageManagerFactory = PullOrderedTestDropSimulator::new;
+        ctx.js._pullOrderedMessageManagerFactory =
+            (conn, js, stream, so, serverCC, queueMode, syncMode) ->
+                new PullOrderedTestDropSimulator(3, conn, js, stream, so, serverCC, queueMode, syncMode);
 
         CountDownLatch msgLatch = new CountDownLatch(6);
         AtomicInteger received = new AtomicInteger();
diff --git a/src/test/java/io/nats/service/ServiceTests.java b/src/test/java/io/nats/service/ServiceTests.java
index 289216b02..5a4bc4671 100644
--- a/src/test/java/io/nats/service/ServiceTests.java
+++ b/src/test/java/io/nats/service/ServiceTests.java
@@ -630,7 +630,9 @@ public void testResponsesFromAllInstances() throws Exception {
             assertTrue(service1.isStarted(1, TimeUnit.SECONDS));
             assertTrue(service2.isStarted(1, TimeUnit.SECONDS));
 
-            Discovery discovery = new Discovery(clientNc);
+            // give 10 seconds for responses, b/c sometimes on GH this takes more than the default 5 seconds.
+            // limit to 2 results so we don't wait the entire time when we do get results
+            Discovery discovery = new Discovery(clientNc, 10_000, 2);
 
             List prs = discovery.ping();
             boolean one = false;