Convert LeastTests to JUnit 5

Author: akurtakov

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/Bug397302Tests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2017 IBM Corporation and others.
+ * Copyright (c) 2013, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,24 +14,21 @@
 
 package org.eclipse.ui.tests.leaks;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.Map;
 
 import org.eclipse.ui.AbstractSourceProvider;
 import org.eclipse.ui.ISourceProviderListener;
-import org.eclipse.ui.tests.harness.util.TestRunLogUtil;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestWatcher;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.5
  */
 public class Bug397302Tests {
-	@Rule
-	public TestWatcher LOG_TESTRUN = TestRunLogUtil.LOG_TESTRUN;
 
 	/**
 	 * @since 3.5
@@ -68,7 +65,7 @@ public void dispose() {
 
 		@Override
 		public Map getCurrentState() {
-			return Collections.EMPTY_MAP;
+			return Collections.emptyMap();
 		}
 
 		@Override
@@ -77,7 +74,7 @@ public String[] getProvidedSourceNames() {
 		}
 
 		public void callOut() {
-			this.fireSourceChanged(0, Collections.EMPTY_MAP);
+			this.fireSourceChanged(0, Collections.emptyMap());
 		}
 
 	}
@@ -100,17 +97,17 @@ public void testBugAsDescribed() {
 
 		testSourceProvider.callOut();
 
-		Assert.assertEquals(1, a.getCallCount());
-		Assert.assertEquals(1, b.getCallCount());
+		assertEquals(1, a.getCallCount());
+		assertEquals(1, b.getCallCount());
 
 		// remove listeners, call out to them, and verify that they no longer got called
 		testSourceProvider.removeSourceProviderListener(a);
 		testSourceProvider.removeSourceProviderListener(b);
 
 		testSourceProvider.callOut();
 
-		Assert.assertEquals(1, a.getCallCount());
-		Assert.assertEquals(1, b.getCallCount());
+		assertEquals(1, a.getCallCount());
+		assertEquals(1, b.getCallCount());
 
 		// loose our strong references to a & b, force a GC, and see whether either gets leaked.
 		// Test: The bug asserts that B has been leaked. Force a GC, and test whether
@@ -121,8 +118,8 @@ public void testBugAsDescribed() {
 
 		System.gc();
 
-		Assert.assertNull("Reference A", listenerARef.get());
-		Assert.assertNull("Reference B", listenerBRef.get());
+		assertNull(listenerARef.get(), "Reference A");
+		assertNull(listenerBRef.get(), "Reference B");
 
 		// Need this to prevent the above GC call from sweeping everything up before we're ready.
 		// See this only when NOT in debug.

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/ContextEditorPart.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corporation and others.
+ * Copyright (c) 2014, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -40,13 +40,11 @@ public class ContextEditorPart extends EditorPart {
 
 	@Override
 	public void doSave(IProgressMonitor arg0) {
-		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public void doSaveAs() {
-		// TODO Auto-generated method stub
 
 	}
 
@@ -79,13 +77,11 @@ public void setSelection(ISelection selection) {
 
 	@Override
 	public boolean isDirty() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public boolean isSaveAsAllowed() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/LeakTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2021 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -17,8 +17,8 @@
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
@@ -44,12 +44,12 @@
 import org.eclipse.ui.internal.part.NullEditorInput;
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 import org.eclipse.ui.tests.api.MockViewPart;
-import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
 import org.eclipse.ui.tests.harness.util.FileUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
  * Very simple leak tests to determine if any of our heavy objects are not being
@@ -58,9 +58,8 @@
  *
  * @since 3.1
  */
+@ExtendWith(CloseTestWindowsExtension.class)
 public class LeakTests {
-	@Rule
-	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
 
 	private IWorkbenchPage fActivePage;
 
@@ -72,7 +71,6 @@ public static void checkRef(ReferenceQueue<?> queue, Reference<?> ref)
 			throws IllegalArgumentException, InterruptedException {
 		boolean flag = false;
 		for (int i = 0; i < 100; i++) {
-			System.runFinalization();
 			System.gc();
 			Thread.yield();
 			processEvents();
@@ -83,21 +81,21 @@ public static void checkRef(ReferenceQueue<?> queue, Reference<?> ref)
 			}
 		}
 
-		assertTrue("Reference not enqueued", flag);
+		assertTrue(flag, "Reference not enqueued");
 	}
 
 	@SuppressWarnings("unchecked")
 	private Reference createReference(ReferenceQueue queue, Object object) {
 		return new PhantomReference<>(object, queue);
 	}
 
-	@Before
+	@BeforeEach
 	public final void setUp() throws Exception {
 		fWin = openTestWindow(IDE.RESOURCE_PERSPECTIVE_ID);
 		fActivePage = fWin.getActivePage();
 	}
 
-	@After
+	@AfterEach
 	public final void tearDown() throws Exception {
 		fWin = null;
 		fActivePage = null;