Merge pull request quarkusio#47879 from geoand/quarkusio#27349

gsmet · web-flow · commit 09d452a5abde · 2025-05-15T14:05:44.000+02:00
Make MockSupport methods synchronized
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java
@@ -13,11 +13,11 @@ class MockSupport {
 
     private static final Deque<List<Object>> contexts = new ArrayDeque<>();
 
-    static void pushContext() {
+    static synchronized void pushContext() {
         contexts.push(new ArrayList<>());
     }
 
-    static void popContext() {
+    static synchronized void popContext() {
         if (contexts.isEmpty()) {
             return; // can happen on error in QuarkusTestResourceLifecycleManagers etc.
         }
@@ -38,7 +38,7 @@ static void popContext() {
         }
     }
 
-    static <T> void installMock(T instance, T mock) {
+    static synchronized <T> void installMock(T instance, T mock) {
         //due to class loading issues we can't access the interface directly
         List<Object> inst = contexts.peek();
         if (inst == null) {

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ class MockSupport {`
`13`	`13`
`14`	`14`	`private static final Deque<List<Object>> contexts = new ArrayDeque<>();`
`15`	`15`
`16`		`- static void pushContext() {`
	`16`	`+ static synchronized void pushContext() {`
`17`	`17`	`contexts.push(new ArrayList<>());`
`18`	`18`	`}`
`19`	`19`
`20`		`- static void popContext() {`
	`20`	`+ static synchronized void popContext() {`
`21`	`21`	`if (contexts.isEmpty()) {`
`22`	`22`	`return; // can happen on error in QuarkusTestResourceLifecycleManagers etc.`
`23`	`23`	`}`
`@@ -38,7 +38,7 @@ static void popContext() {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- static <T> void installMock(T instance, T mock) {`
	`41`	`+ static synchronized <T> void installMock(T instance, T mock) {`
`42`	`42`	`//due to class loading issues we can't access the interface directly`
`43`	`43`	`List<Object> inst = contexts.peek();`
`44`	`44`	`if (inst == null) {`