Merge pull request #6358 from pkriens/build/reactivate-windows-tests

Reenable windows tests

.github/workflows/cibuild.yml

@@ -54,9 +54,9 @@ jobs:
           runner: '{0}' # 'xvfb-run --auto-servernum {0}'
           canonical: ${{ (github.repository == 'bndtools/bnd') && ((github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/next')) && (github.event_name != 'pull_request') }}
           fetch-depth: '0'
-#        - os: 'windows-latest'
-#          java: '17'
-#          runner: '{0}'
+        - os: 'windows-latest'
+          java: '17'
+          runner: '{0}'
     name: Build JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:

biz.aQute.tester.test/test/aQute/tester/testbase/AbstractActivatorCommonTest.java

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.osgi.framework.Bundle;
 
+import aQute.junit.system.BndSystem;
 import aQute.launchpad.LaunchpadBuilder;
 import aQute.lib.io.IO;
 import aQute.tester.junit.platform.test.ExitCode;
@@ -71,7 +72,7 @@ public void start_withSeparateThreadProp_startsInNewThread() throws Exception {
 		final AtomicReference<Throwable> exception = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 		bndThread.setUncaughtExceptionHandler((thread, e) -> {
-			exception.set(e);
+			exception.set(BndSystem.convert(e, ExitCode::new));
 			latch.countDown();
 		});
 

biz.aQute.tester.test/test/aQute/tester/testbase/AbstractActivatorTest.java

@@ -16,7 +16,6 @@
 import java.util.Optional;
 import java.util.RandomAccess;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.IntConsumer;
 import java.util.stream.Stream;
 
 import org.assertj.core.api.Assert;
@@ -178,8 +177,12 @@ protected ExitCode runTests(Callback postCreateCallback, Class<?>[]... bundles)
 		try {
 			r.run();
 			throw new AssertionError("Expecting run() to call System.exit(), but it didn't");
-		} catch (ExitCode e) {
-			return e;
+		} catch (Throwable e) {
+			Throwable t = BndSystem.convert(e, ExitCode::new);
+			if (t instanceof ExitCode ec)
+				return ec;
+
+			throw Exceptions.duck(t);
 		}
 	}
 
@@ -206,7 +209,7 @@ public void runTester() {
 		final Runnable r = oR.get();
 
 		runThread = new Thread(r, name);
-		runThread.setUncaughtExceptionHandler((t, x) -> uncaught.set(x));
+		runThread.setUncaughtExceptionHandler((t, x) -> uncaught.set(BndSystem.convert(x, ExitCode::new)));
 		runThread.start();
 	}
 
@@ -435,15 +438,6 @@ public void succeeded() {
 	}
 
 	protected AutoCloseable setExitToThrowExitCode() {
-		IntConsumer target = code -> {
-			throw new ExitCode(code);
-		};
-		IntConsumer prev = BndSystem.exit.getAndSet(target);
-		return () -> {
-			boolean success = BndSystem.exit.compareAndSet(prev, target);
-			if (!success)
-				throw new Error(
-					"Overrode BndSystem exit function and tried to restore it. However, someone changed it in the mean time");
-		};
+		return BndSystem.throwErrorOnExit();
 	}
 }

biz.aQute.tester/src/aQute/junit/system/BndSystem.java

@@ -1,17 +1,49 @@
 package aQute.junit.system;
 
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.function.IntConsumer;
 
 /**
- * Centralizes calling exit
+ * Centralizes calling exit. Handling might give the impression that is clumsy
+ * but realize that this class is sometimes used with multiple classloaders that
+ * hold this class. E.g. Launchpad. That is the reason system properties are
+ * used.
  */
 public class BndSystem {
 
+	static final String							THROW_ERROR_ON_EXIT	= "aQute.throw.error.on.exit";
+
+	@Deprecated
 	public static AtomicReference<IntConsumer> exit = new AtomicReference<>(System::exit);
 
 	public static void exit(int code) {
+		if ( Boolean.getBoolean(THROW_ERROR_ON_EXIT)) {
+			throw new Error(THROW_ERROR_ON_EXIT + code);
+		}
 		exit.get()
 			.accept(code);
 	}
+
+	public static AutoCloseable throwErrorOnExit() {
+		System.getProperties()
+			.setProperty(THROW_ERROR_ON_EXIT, "true");
+		return () -> {
+			System.getProperties()
+				.setProperty(THROW_ERROR_ON_EXIT, "false");
+		};
+	}
+
+	public static Throwable convert(Throwable throwable, Function<Integer, Throwable> converter) {
+		if (throwable instanceof Error) {
+			String message = throwable.getMessage();
+			if (message.startsWith(THROW_ERROR_ON_EXIT)) {
+				try {
+					return converter.apply(Integer.parseInt(message.substring(THROW_ERROR_ON_EXIT.length())));
+				} catch (NumberFormatException nfe) {
+				}
+			}
+		}
+		return throwable;
+	}
 }