[tryout fix] concurrency bug in NamespacedHierarchicalStore#computeIfAbsent(Object, Object, Function) junit-team#5171 junit-team#5209

Signed-off-by: Vincent Potucek <vpotucek@me.com>

Author: Vincent Potucek

platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java

@@ -711,11 +711,57 @@ public int hashCode() {
 				// Force all CollidingKey instances to have the same hash code
 				return 42;
 			}
+		}@SuppressWarnings("deprecation")
+		@Test
+		void getOrComputeIfAbsentDoesNotDeadlockWithCollidingKeys() throws Exception {
+			var store = new NamespacedHierarchicalStore<String>(null);
+			var latch1 = new CountDownLatch(1);
+			var latch2 = new CountDownLatch(1);
+
+			var thread1 = new Thread(() -> {
+				store.getOrComputeIfAbsent("ns", new CollidingKey(1), key -> {
+					latch1.countDown();
+					try {
+						// Wait for second thread to start its computation
+						latch2.await();
+					}
+					catch (InterruptedException e) {
+						Thread.currentThread().interrupt();
+						throw new RuntimeException(e);
+					}
+					return "value1";
+				});
+			});
+
+			var thread2 = new Thread(() -> {
+				try {
+					// Wait for first thread to start its computation
+					latch1.await();
+					store.getOrComputeIfAbsent("ns", new CollidingKey(2), key -> {
+						latch2.countDown();
+						return "value2";
+					});
+				}
+				catch (InterruptedException e) {
+					Thread.currentThread().interrupt();
+					throw new RuntimeException(e);
+				}
+			});
+
+			thread1.start();
+			thread2.start();
+
+			// Wait with timeout to detect deadlocks
+			thread1.join(5000);
+			thread2.join(5000);
+
+			assertFalse(thread1.isAlive(), "Thread1 should have completed (no deadlock)");
+			assertFalse(thread2.isAlive(), "Thread2 should have completed (no deadlock)");
 		}
 
 		@SuppressWarnings("deprecation")
 		@Test
-		void getOrComputeIfAbsentDoesNotDeadlockWithCollidingKeys() throws Exception {
+		void getOrComputeIfAbsentDoesNotDeadlockWithCollidingKeys2() throws Exception {
 			try (var localStore = new NamespacedHierarchicalStore<String>(null)) {
 				var firstComputationStarted = new CountDownLatch(1);
 				var secondComputationAllowedToFinish = new CountDownLatch(1);
@@ -1149,54 +1195,6 @@ void computeIfAbsentWithExceptionInMemoizingSupplierPropagation() {
 
 	}
 
-	@SuppressWarnings("deprecation")
-	@Test
-	void getOrComputeIfAbsentDoesNotDeadlockWithCollidingKeys() throws Exception {
-		var store = new NamespacedHierarchicalStore<String>(null);
-		var latch1 = new CountDownLatch(1);
-		var latch2 = new CountDownLatch(1);
-
-		var thread1 = new Thread(() -> {
-			store.getOrComputeIfAbsent("ns", new CollidingKey(1), key -> {
-				latch1.countDown();
-				try {
-					// Wait for second thread to start its computation
-					latch2.await();
-				}
-				catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-					throw new RuntimeException(e);
-				}
-				return "value1";
-			});
-		});
-
-		var thread2 = new Thread(() -> {
-			try {
-				// Wait for first thread to start its computation
-				latch1.await();
-				store.getOrComputeIfAbsent("ns", new CollidingKey(2), key -> {
-					latch2.countDown();
-					return "value2";
-				});
-			}
-			catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				throw new RuntimeException(e);
-			}
-		});
-
-		thread1.start();
-		thread2.start();
-
-		// Wait with timeout to detect deadlocks
-		thread1.join(5000);
-		thread2.join(5000);
-
-		assertFalse(thread1.isAlive(), "Thread1 should have completed (no deadlock)");
-		assertFalse(thread2.isAlive(), "Thread2 should have completed (no deadlock)");
-	}
-
 	@Test
 	void computeIfAbsentOverridesParentNullValue() {
 		var parent = new NamespacedHierarchicalStore<String>(null);