tuning test execution

scottf · scottf · commit e704148a6cb3 · 2025-11-08T06:11:35.000-05:00
diff --git 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#<head>#<head><link rel="icon" type="image/ico" href="favicon.ico">#', '{}', ';'
-            }
-            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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public boolean isSuccess() {`
`49`	`49`	`*/`
`50`	`50`	`@Deprecated`
`51`	`51`	`public int getPurgedCount() {`
`52`		`- return new Long(purged).intValue();`
	`52`	`+ return Long.valueOf(purged).intValue();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`