Increase waiting for update jobs in new test, ensure launches are cleaned up on fail

Fixes: #2704

Author: trancexpress

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest5.java

@@ -255,10 +255,10 @@ public void testTerminateLaunch() throws Exception {
 				"""
 			package pack;
 			import org.junit.jupiter.api.Test;
-			public class ATestCase {
+			public class ATestCaseTerminate {
 			    @Test public void testSleep() throws Exception { Thread.sleep(30_000); }
 			}""";
-		IType aTestCase= createType(source, "pack", "ATestCase.java");
+		IType aTestCase= createType(source, "pack", "ATestCaseTerminate.java");
 
 		buildTestCase(aTestCase);
 
@@ -272,7 +272,7 @@ public class ATestCase {
 			waitForCondition(launchesListener.fLaunchChanged::get, 30 * 1000, 1000);
 
 			long scheduledJobsCount = jobListener.scheduledCount.get();
-			boolean jobCountIncrease= waitForCondition(() -> jobListener.scheduledCount.get() > scheduledJobsCount, 1 * 1000, 100);
+			boolean jobCountIncrease= waitForCondition(() -> jobListener.scheduledCount.get() > scheduledJobsCount, 5 * 1000, 100);
 			assertTrue("Expected JUnit update jobs to be scheduled", jobCountIncrease);
 
 			terminateLaunches();
@@ -283,6 +283,7 @@ public class ATestCase {
 			assertFalse("Expected no new JUnit update jobs to be scheduled", jobCountIncrease);
 		} finally {
 			jm.removeJobChangeListener(jobListener);
+			terminateLaunches();
 			cleanUp(configuration, launchesListener);
 		}
 	}

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest6.java

@@ -250,10 +250,10 @@ public void testTerminateLaunch() throws Exception {
 				"""
 			package pack;
 			import org.junit.jupiter.api.Test;
-			public class ATestCase {
+			public class ATestCaseTerminate {
 			    @Test public void testSleep() throws Exception { Thread.sleep(30_000); }
 			}""";
-		IType aTestCase= createType(source, "pack", "ATestCase.java");
+		IType aTestCase= createType(source, "pack", "ATestCaseTerminate.java");
 
 		buildTestCase(aTestCase);
 
@@ -267,7 +267,7 @@ public class ATestCase {
 			waitForCondition(launchesListener.fLaunchChanged::get, 30 * 1000, 1000);
 
 			long scheduledJobsCount = jobListener.scheduledCount.get();
-			boolean jobCountIncrease= waitForCondition(() -> jobListener.scheduledCount.get() > scheduledJobsCount, 1 * 1000, 100);
+			boolean jobCountIncrease= waitForCondition(() -> jobListener.scheduledCount.get() > scheduledJobsCount, 5 * 1000, 100);
 			assertTrue("Expected JUnit update jobs to be scheduled", jobCountIncrease);
 
 			TestRunListenerTest5.terminateLaunches();
@@ -278,6 +278,7 @@ public class ATestCase {
 			assertFalse("Expected no new JUnit update jobs to be scheduled", jobCountIncrease);
 		} finally {
 			jm.removeJobChangeListener(jobListener);
+			TestRunListenerTest5.terminateLaunches();
 			cleanUp(configuration, launchesListener);
 		}
 	}