fix tests for jdk 21

xvik · Mar 7, 2024 · 922f91d · 922f91d
1 parent 6626f0e
commit 922f91d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/...guicey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/StartErrorJupiterTest.java b/...guicey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/StartErrorJupiterTest.java
@@ -15,7 +15,6 @@
 import ru.vyarus.dropwizard.guice.test.builder.TestSupportHolder;
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
-import uk.org.webcompere.systemstubs.security.SystemExit;
 import uk.org.webcompere.systemstubs.stream.SystemErr;
 
 /**
@@ -25,27 +24,21 @@
 @ExtendWith(SystemStubsExtension.class)
 public class StartErrorJupiterTest {
 
-    @SystemStub
-    SystemExit exit;
     @SystemStub
     SystemErr err;
 
     @Test
         // NOTE could be parallelized with some tests, but not with other error tests
     void checkStartupFail() throws Exception {
-        exit.execute(() -> {
-            ErrorApplication.main("server");
-        });
-        Assertions.assertEquals(1, exit.getExitCode());
+        Assertions.assertThrows(RuntimeException.class, () -> ErrorApplication.main("server"));
+
         Assertions.assertFalse(TestSupportHolder.isContextSet());
     }
 
     @Test
         // NOTE not parallelizable test!
     void checkStartupFailWithOutput() throws Exception {
-        exit.execute(() -> {
-            ErrorApplication.main("server");
-        });
+        Assertions.assertThrows(RuntimeException.class, () -> ErrorApplication.main("server"));
         // strange matching because in java9 @Named value will be quoted and in 8 will not
         Assertions.assertTrue(err.getText()
                 .contains("[Guice/MissingImplementation]: No implementation for String annotated with @Named"));
@@ -70,6 +63,11 @@ public void initialize(Bootstrap<TestConfiguration> bootstrap) {
         @Override
         public void run(TestConfiguration configuration, Environment environment) throws Exception {
         }
+
+        @Override
+        protected void onFatalError(Throwable t) {
+            throw new RuntimeException(t);
+        }
     }
 
     public static class ErrorModule extends AbstractModule {

diff --git a/...cey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/debug/HookObjectsLogTest.java b/...cey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/debug/HookObjectsLogTest.java
@@ -47,6 +47,8 @@ void checkSetupOutputForAnnotation() {
         System.err.println(output);
 
         assertThat(output.replaceAll("\\$\\$Lambda\\$\\d+/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
+                // jdk 21
+                .replaceAll("\\$\\$Lambda/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
                 .replaceAll("\\) {8,}\t", ")        \t"))
                 .contains("Guicey test extensions (Test1.):\n" +
                         "\n" +
@@ -82,6 +84,8 @@ void checkSetupOutputForManualRegistration() {
         System.err.println(output);
 
         assertThat(output.replaceAll("\\$\\$Lambda\\$\\d+/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
+                // jdk 21
+                .replaceAll("\\$\\$Lambda/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
                 .replaceAll("\\) {8,}\t", ")        \t"))
                 .contains("Guicey test extensions (Test2.):\n" +
                         "\n" +

diff --git a/...ey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/debug/SetupObjectsLogTest.java b/...ey/src/test/groovy/ru/vyarus/dropwizard/guice/test/jupiter/debug/SetupObjectsLogTest.java
@@ -45,6 +45,8 @@ void checkSetupOutputForAnnotation() {
         System.err.println(output);
 
         assertThat(output.replaceAll("\\$\\$Lambda\\$\\d+/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
+                // jdk 21
+                .replaceAll("\\$\\$Lambda/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
                 .replaceAll("\\) {8,}\t", ")        \t"))
                 .contains("Guicey test extensions (Test1.):\n" +
                         "\n" +
@@ -73,6 +75,8 @@ void checkSetupOutputForManualRegistration() {
         System.err.println(output);
 
         assertThat(output.replaceAll("\\$\\$Lambda\\$\\d+/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
+                // jdk 21
+                .replaceAll("\\$\\$Lambda/\\d+(x[a-z\\d]+)?", "\\$\\$Lambda\\$111/1111111")
                 .replaceAll("\\) {8,}\t", ")        \t"))
                 .contains("Guicey test extensions (Test2.):\n" +
                         "\n" +

diff --git a/guicey-spa/src/test/groovy/ru/vyarus/guicey/spa/err/MappingClashTest.groovy b/guicey-spa/src/test/groovy/ru/vyarus/guicey/spa/err/MappingClashTest.groovy
@@ -4,13 +4,13 @@ import io.dropwizard.core.Application
 import io.dropwizard.core.Configuration
 import io.dropwizard.core.setup.Bootstrap
 import io.dropwizard.core.setup.Environment
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.extension.ExtendWith
 import ru.vyarus.dropwizard.guice.GuiceBundle
 import ru.vyarus.guicey.spa.SpaBundle
 import spock.lang.Specification
 import uk.org.webcompere.systemstubs.jupiter.SystemStub
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension
-import uk.org.webcompere.systemstubs.security.SystemExit
 import uk.org.webcompere.systemstubs.stream.SystemErr
 
 /**
@@ -20,20 +20,15 @@ import uk.org.webcompere.systemstubs.stream.SystemErr
 @ExtendWith(SystemStubsExtension)
 class MappingClashTest extends Specification {
 
-    @SystemStub
-    SystemExit exit
     @SystemStub
     SystemErr err
 
     def "Check uri paths clash"() {
 
         when: "starting app"
-        exit.execute(() -> {
-            new App().run(['server'] as String[])
-        });
+        Assertions.assertThrows(RuntimeException.class, () -> new App().run(['server'] as String[]))
 
         then: "error"
-        exit.exitCode == 1
         err.text.contains("Assets servlet app2 registration clash with already installed servlets on paths: /app/*")
     }
 
@@ -51,5 +46,10 @@ class MappingClashTest extends Specification {
         @Override
         void run(Configuration configuration, Environment environment) throws Exception {
         }
+
+        @Override
+        protected void onFatalError(Throwable t) {
+            throw new RuntimeException(t)
+        }
     }
 }