runtime tests: throw dedicated TestException

To make it easier to filter test output for unintended exceptions.
eclipse-platform · Dec 20, 2024 · 470362a · 470362a
1 parent ca5ed8a
commit 470362a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/....core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java b/....core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
@@ -35,10 +35,6 @@ public class LogSerializationTest {
 
 	static class TestException extends Exception {
 		private static final long serialVersionUID = 1L;
-
-		TestException() {
-			super();
-		}
 	}
 
 	private File logFile = null;
@@ -139,7 +135,16 @@ protected IStatus[] getInterestingMultiStatuses() {
 			interestingChildren[i] = subArray;
 		}
 		int childOff = 0;
-		return new IStatus[] {new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "message", null), new MultiStatus("org.foo.bar", 5, interestingChildren[childOff++ % len], "message", new NullPointerException()), new MultiStatus("plugin-id", 8, interestingChildren[childOff++ % len], "message", null), new MultiStatus("plugin-id", 0, interestingChildren[childOff++ % len], "message", new IllegalStateException()), new MultiStatus("plugin-id", 65756, interestingChildren[childOff++ % len], "message", null), new MultiStatus(".", 1, interestingChildren[childOff++ % len], "message", null), new MultiStatus("org.foo.blaz", 1, interestingChildren[childOff++ % len], "", null), new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "%$(% 98%(%(*^", null),
+		return new IStatus[] { new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "message", null),
+				new MultiStatus("org.foo.bar", 5, interestingChildren[childOff++ % len], "message",
+						new TestException()),
+				new MultiStatus("plugin-id", 8, interestingChildren[childOff++ % len], "message", null),
+				new MultiStatus("plugin-id", 0, interestingChildren[childOff++ % len], "message",
+						new TestException()),
+				new MultiStatus("plugin-id", 65756, interestingChildren[childOff++ % len], "message", null),
+				new MultiStatus(".", 1, interestingChildren[childOff++ % len], "message", null),
+				new MultiStatus("org.foo.blaz", 1, interestingChildren[childOff++ % len], "", null),
+				new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "%$(% 98%(%(*^", null),
 				new MultiStatus("plugin-id", 1, "message", null), new MultiStatus("..", 87326, "", null),};
 	}
 

diff --git a/...tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java b/...tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
@@ -142,6 +142,9 @@ public void testGetLogLocation() throws IOException {
 		assertEquals("4.0", initialLocation, Platform.getLogFileLocation());
 	}
 
+	static class TestException extends Exception {
+		private static final long serialVersionUID = 1L;
+	}
 	@Test
 	public void testRunnable() {
 		final List<Throwable> exceptions = new ArrayList<>();
@@ -152,7 +155,7 @@ public void testRunnable() {
 		ILogListener logListener = (status, plugin) -> collected.add(status);
 		Platform.addLogListener(logListener);
 
-		final Exception exception = new Exception("PlatformTest.testRunnable: this exception is thrown on purpose as part of the test.");
+		final Exception exception = new TestException();
 		ISafeRunnable runnable = new ISafeRunnable() {
 			@Override
 			public void handleException(Throwable t) {

diff --git a/...tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java b/...tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
@@ -443,6 +443,10 @@ public boolean shouldRun() {
 
 	}
 
+	static class TestException extends RuntimeException {
+		private static final long serialVersionUID = 1L;
+	}
+
 	/**
 	 * Test of an ill-behaving {@link Job#shouldRun()}.
 	 */
@@ -463,7 +467,7 @@ protected IStatus run(IProgressMonitor monitor) {
 
 			@Override
 			public boolean shouldRun() {
-				throw new RuntimeException("Exception thrown on purpose as part of a test");
+				throw new TestException();
 			}
 		}
 		ShouldRunJob j = new ShouldRunJob();
@@ -1085,7 +1089,7 @@ public void testJoinFailingListener() throws InterruptedException {
 		shortJob.addJobChangeListener(new JobChangeAdapter() {
 			@Override
 			public void done(IJobChangeEvent event) {
-				throw new RuntimeException("This exception thrown on purpose as part of a test");
+				throw new TestException();
 			}
 		});
 		final AtomicIntegerArray status = new AtomicIntegerArray(new int[1]);