Wait for specific MethodExitEvent in MethodReturnValuesTests

org.eclipse.jdt.debug.jdi.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDI Tests
 Bundle-SymbolicName: org.eclipse.jdt.debug.jdi.tests; singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse
 Require-Bundle: org.junit,

org.eclipse.jdt.debug.jdi.tests/pom.xml

@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.jdi.tests</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
+  <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java

@@ -116,8 +116,8 @@ public boolean modificationWatchpoint(ModificationWatchpointEvent event) {
 	 * Notify any object that is waiting for an event.
 	 */
 	synchronized protected void notifyEvent(Event event) {
-		notify();
 		fEvent = event;
+		notify();
 	}
 	/**
 	 * @see org.eclipse.debug.jdi.tests.EventListener#step(com.sun.jdi.event.StepEvent)

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitEventWaiter.java

@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Simeon Andreev and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Simeon Andreev - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.debug.jdi.tests;
+
+import com.sun.jdi.event.MethodExitEvent;
+import com.sun.jdi.request.EventRequest;
+/**
+ * Listen for MethodExitEvent for a specific method.
+ */
+public class MethodExitEventWaiter extends EventWaiter {
+	protected String fMethodName;
+
+	/**
+	 * Constructor
+	 */
+	public MethodExitEventWaiter(EventRequest request, boolean shouldGo, String methodName) {
+		super(request, shouldGo);
+		fMethodName = methodName;
+	}
+
+	/**
+	 * @see org.eclipse.debug.jdi.tests.EventWaiter#methodExit((com.sun.jdi.event.MethodExitEvent)
+	 */
+	@Override
+	public boolean methodExit(MethodExitEvent event) {
+		if (event.method().name().equals(fMethodName)) {
+			notifyEvent(event);
+			return fShouldGo;
+		}
+		return true;
+	}
+}

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodReturnValuesTests.java

@@ -95,7 +95,7 @@ public void testGetVoidMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "print");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(10000);
@@ -137,7 +137,7 @@ public void testGetStringMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "foo");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -179,7 +179,7 @@ public void testGetIntMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getInt");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -221,7 +221,7 @@ public void testGetBooleanMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getBoolean");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -263,7 +263,7 @@ public void testGetLongMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getLong");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);