From 4b9ad9cbfb18d0c62605295783007fd7df7c487f Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Mon, 18 Dec 2023 12:35:13 +0100
Subject: [PATCH] Log actual errors instead of only number in
 ProcessConsoleTests #1033

The ProcessConsoleTests are randomly failing because some error is
logged during test execution. The error message does, however, only
contain the number of logged errors, but not the error itself. With this
change, actual errors are stored and output rather than only their
number.

Contributes to
https://github.com/eclipse-platform/eclipse.platform/issues/1033
---
 .../debug/tests/console/ProcessConsoleTests.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
index cbfe3401e27..499a4ebb2c2 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
@@ -14,6 +14,7 @@
 package org.eclipse.debug.tests.console;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -32,12 +33,13 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
+
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
@@ -74,15 +76,15 @@
  */
 public class ProcessConsoleTests extends AbstractDebugTest {
 	/**
-	 * Number of received log messages with severity error while running a
-	 * single test method.
+	 * Log messages with severity error received while running a single test
+	 * method.
 	 */
-	private final AtomicInteger loggedErrors = new AtomicInteger(0);
+	private final List<IStatus> loggedErrors = Collections.synchronizedList(new ArrayList<>());
 
 	/** Listener to count error messages in {@link ConsolePlugin} log. */
 	private final ILogListener errorLogListener = (status, plugin) -> {
 			if (status.matches(IStatus.ERROR)) {
-				loggedErrors.incrementAndGet();
+				loggedErrors.add(status);
 			}
 	};
 
@@ -93,7 +95,7 @@ public class ProcessConsoleTests extends AbstractDebugTest {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		loggedErrors.set(0);
+		loggedErrors.clear();
 		Platform.addLogListener(errorLogListener);
 	}
 
@@ -108,7 +110,7 @@ public void tearDown() throws Exception {
 
 		super.tearDown();
 
-		assertEquals("Test triggered errors.", 0, loggedErrors.get());
+		assertThat("Test triggered errors.", loggedErrors, empty());
 	}
 
 	/**