Test and benchmark fixes

Author: SupremeMortal

build.gradle.kts

@@ -23,10 +23,15 @@ dependencies {
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.jmh.core)
     testAnnotationProcessor(libs.jmh.generator.annprocess)
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 checkerFramework {
     version = libs.versions.checkerframework
+
+    checkers = listOf(
+        "org.checkerframework.checker.compilermsgs.CompilerMessagesChecker"
+    )
 }
 
 java {

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 checkerframework = "3.26.0"
-jmh = "1.27"
+jmh = "1.37"
 
 [libraries]
 checker-qual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerframework" }
 checker = { group = "org.checkerframework", name = "checker", version.ref = "checkerframework" }
 jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
-junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.7.0" }
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.14.3" }
 
 [bundles]
 

src/main/java/org/cloudburstmc/nbt/NBTInputStream.java

@@ -126,7 +126,7 @@ private Object deserialize(NbtType<?> type, int maxDepth) throws IOException {
             case LIST:
                 int typeId = input.readUnsignedByte();
                 NbtType<?> listType = NbtType.byId(typeId);
-                List<? super Object> list = new ArrayList<>();
+                List<Object> list = new ArrayList<>();
                 int listLength = input.readInt();
                 for (int i = 0; i < listLength; i++) {
                     list.add(deserialize(listType, maxDepth - 1));

src/test/java/org/cloudburstmc/nbt/NbtBenchmarkTests.java

@@ -8,6 +8,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
+import org.openjdk.jmh.runner.options.VerboseMode;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,7 +26,7 @@ public void launchBenchmark() throws Exception {
         Options opt = new OptionsBuilder()
                 // Specify which benchmarks to run.
                 // You can be more specific if you'd like to run only one benchmark per test.
-                .include(this.getClass().getName() + ".*")
+                .include(NbtBenchmarkTests.class.getName() + ".*")
                 // Set the following options as needed
                 .mode(Mode.AverageTime)
                 .timeUnit(TimeUnit.MICROSECONDS)
@@ -35,6 +36,7 @@ public void launchBenchmark() throws Exception {
                 .measurementIterations(10)
                 .threads(2)
                 .forks(1)
+                .verbosity(VerboseMode.NORMAL)
                 .shouldFailOnError(true)
                 .shouldDoGC(true)
                 //.jvmArgs("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining")
@@ -51,6 +53,7 @@ public static class BenchmarkState {
         @Setup(Level.Trial)
         public void initialize() {
             InputStream stream = NbtBenchmarkTests.class.getClassLoader().getResourceAsStream("benchmark.nbt");
+            assert stream != null;
             try (GZIPInputStream is = new GZIPInputStream(stream)) {
                 ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 
@@ -73,4 +76,4 @@ public void cloudBenchmark(BenchmarkState state, Blackhole bh) throws IOExceptio
         NBTInputStream stream = NbtUtils.createReader(new ByteArrayInputStream(state.nbtBytes));
         stream.readTag();
     }
-}
+}