diff --git a/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF index 2d30229ef5d..3c7cc52e1f9 100644 --- a/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF @@ -2,6 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)", + org.junit.jupiter.api.extension;version="[5.14.0,6.0.0)", + org.junit.jupiter.api.function;version="[5.14.0,6.0.0)", + org.junit.jupiter.engine;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SymbolicName: org.eclipse.ui.monitoring.tests;singleton:=true @@ -9,6 +12,5 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.3.0.qualifier Fragment-Host: org.eclipse.ui.monitoring;bundle-version="1.0.0" Require-Bundle: org.eclipse.jface;bundle-version="[3.10.0,4.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)", - org.junit;bundle-version="[4.12.0,5.0.0)" + org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)" Automatic-Module-Name: org.eclipse.ui.monitoring.tests diff --git a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/DefaultLoggerTests.java b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/DefaultLoggerTests.java index 917461efd5d..07c7e12ff0f 100644 --- a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/DefaultLoggerTests.java +++ b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/DefaultLoggerTests.java @@ -15,8 +15,8 @@ *******************************************************************************/ package org.eclipse.ui.internal.monitoring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; @@ -30,8 +30,8 @@ import org.eclipse.ui.monitoring.PreferenceConstants; import org.eclipse.ui.monitoring.StackSample; import org.eclipse.ui.monitoring.UiFreezeEvent; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * JUnit test for the {@link DefaultUiFreezeEventLogger}. @@ -45,7 +45,7 @@ public class DefaultLoggerTests { private ThreadInfo thread; private IStatus loggedStatus; - @Before + @BeforeEach public void setUp() { logger = new DefaultUiFreezeEventLogger(DURATION * 10); createLogListener(); @@ -68,30 +68,31 @@ private UiFreezeEvent createFreezeEvent() { } @Test - public void testLogEvent() { - UiFreezeEvent event = createFreezeEvent(); - String expectedTime = dateFormat.format(new Date(TIME).toInstant()); - String expectedHeader = - String.format("UI freeze of %.2gs at %s", DURATION / 1000.0, expectedTime); - String expectedEventMessage = String.format("Sample at %s (+%.3fs)", expectedTime, 0.000); + void testLogEvent() { + UiFreezeEvent event = createFreezeEvent(); + String expectedTime = dateFormat.format(new Date(TIME).toInstant()); + String expectedHeader = + String.format("UI freeze of %.2gs at %s", DURATION / 1000.0, expectedTime); + String expectedEventMessage = String.format("Sample at %s (+%.3fs)", expectedTime, 0.000); - logger.log(event); + logger.log(event); - assertEquals(PreferenceConstants.PLUGIN_ID, loggedStatus.getPlugin()); - assertTrue("Logged status was not a MultiStatus", loggedStatus.isMultiStatus()); - assertEquals(expectedHeader, loggedStatus.getMessage()); - assertEquals("One nested IStatus did not get logged correctly.", 1, - loggedStatus.getChildren().length); + assertEquals(PreferenceConstants.PLUGIN_ID, loggedStatus.getPlugin()); + assertTrue(loggedStatus.isMultiStatus(), "Logged status was not a MultiStatus"); + assertEquals(expectedHeader, loggedStatus.getMessage()); + assertEquals(1, loggedStatus.getChildren().length, + "One nested IStatus did not get logged correctly."); - IStatus freezeEvent = loggedStatus.getChildren()[0]; - assertTrue(freezeEvent.getMessage().contains(expectedEventMessage)); + IStatus freezeEvent = loggedStatus.getChildren()[0]; + assertTrue(freezeEvent.getMessage().contains(expectedEventMessage)); - StackTraceElement[] threadStackTrace = thread.getStackTrace(); - StackTraceElement[] loggedStackTrace = freezeEvent.getException().getStackTrace(); - assertEquals(threadStackTrace.length, loggedStackTrace.length); + StackTraceElement[] threadStackTrace = thread.getStackTrace(); + StackTraceElement[] loggedStackTrace = freezeEvent.getException().getStackTrace(); + assertEquals(threadStackTrace.length, loggedStackTrace.length); - for (int i = 0; i < threadStackTrace.length; i++) { - assertEquals(threadStackTrace[i], loggedStackTrace[i]); - } + for (int i = 0; i < threadStackTrace.length; i++) { + assertEquals(threadStackTrace[i], loggedStackTrace[i]); + } } + } diff --git a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadManualTests.java b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadManualTests.java index 85e005e8084..e75b947c5fb 100644 --- a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadManualTests.java +++ b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadManualTests.java @@ -17,9 +17,10 @@ *******************************************************************************/ package org.eclipse.ui.internal.monitoring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; @@ -35,9 +36,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.monitoring.PreferenceConstants; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * A test that measures performance overhead of {@link EventLoopMonitorThread}. @@ -111,12 +112,12 @@ public class EventLoopMonitorThreadManualTests { */ protected static final long PN63_GENERATOR_POLY = (3L << 62) | 1; - @Before + @BeforeEach public void setUp() { MonitoringPlugin.getPreferenceStore().setValue(PreferenceConstants.MONITORING_ENABLED, false); } - @After + @AfterEach public void tearDown() { MonitoringPlugin.getPreferenceStore().setToDefault(PreferenceConstants.MONITORING_ENABLED); } @@ -163,7 +164,7 @@ protected static long doWork(long pnSeqeuence, long iterations) { @Test public void testFixedWork() throws Exception{ final Display display = Display.getDefault(); - assertNotNull("No SWT Display available.", display); + assertNotNull(display, "No SWT Display available."); final MockUiFreezeEventLogger logger = new MockUiFreezeEventLogger(); final CountDownLatch backgroundJobsDone = new CountDownLatch(1); @@ -246,13 +247,18 @@ public void testFixedWork() throws Exception{ maxRelativeIncreaseOneStackAllowed * 100)); } assertTrue( - String.format(""" - Relative overhead of monitoring surpassed threshold for - measurement %d of %d. It took %.3fs with a relative increase of %.3f%% - (allowed < %.3f%%).""", - i, NUM_UI_STACK_MEASUREMENTS, tWork[0] / 1e9, relativeDiffOneThread * 100, - maxRelativeIncreaseOneStackAllowed * 100), - relativeDiffOneThread <= maxRelativeIncreaseOneStackAllowed); + relativeDiffOneThread <= maxRelativeIncreaseOneStackAllowed, + String.format(""" + Relative overhead of monitoring surpassed threshold for \ + measurement %d of %d. It took %.3fs with a relative increase of %.3f%% \ + (allowed < %.3f%%).""", + i, + NUM_UI_STACK_MEASUREMENTS, + tWork[0] / 1e9, + relativeDiffOneThread * 100, + maxRelativeIncreaseOneStackAllowed * 100) + ); + } killMonitorThread(monitor1, display); @@ -277,13 +283,19 @@ public void testFixedWork() throws Exception{ i, NUM_ALL_STACKS_MEASUREMENTS, tWork[0] / 1e9, relativeDiffAllThreads * 100, maxRelativeIncreaseAllStacksAllowed * 100)); } - assertTrue(String.format(""" - Relative overhead of monitoring with stack traces of all threads - surpassed threshold for measurement %d of %d. It took %.3fs with a relative - increase of %.3f%% (allowed < %.3f%%).""", - i, NUM_ALL_STACKS_MEASUREMENTS, tWork[0] / 1e9, relativeDiffAllThreads * 100, - maxRelativeIncreaseAllStacksAllowed * 100), - relativeDiffAllThreads <= maxRelativeIncreaseAllStacksAllowed); + assertTrue( + relativeDiffAllThreads <= maxRelativeIncreaseAllStacksAllowed, + String.format(""" + Relative overhead of monitoring with stack traces of all threads \ + surpassed threshold for measurement %d of %d. It took %.3fs with a relative \ + increase of %.3f%% (allowed < %.3f%%).""", + i, + NUM_ALL_STACKS_MEASUREMENTS, + tWork[0] / 1e9, + relativeDiffAllThreads * 100, + maxRelativeIncreaseAllStacksAllowed * 100) + ); + } killMonitorThread(monitor2, display); @@ -376,22 +388,30 @@ public void testFixedWork() throws Exception{ threads.offer(t); // Retry. } } - - assertEquals("Did not log expected number of freeze events,", + assertEquals( NUM_UI_STACK_MEASUREMENTS + NUM_ALL_STACKS_MEASUREMENTS, - logger.getLoggedEvents().size()); - assertTrue(String.format(""" - Relative overhead of monitoring with stack traces of the UI - thread was %.3f%% (allowed < %.3f%%).""", - worstRelativeDiffOneThread * 100, - maxRelativeIncreaseOneStackAllowed * 100), - worstRelativeDiffOneThread <= maxRelativeIncreaseOneStackAllowed); - assertTrue(String.format(""" - Relative overhead of monitoring with stack traces of all - threads was %.3f%% (allowed < %.3f%%).""", - worstRelativeDiffAllThreads * 100, - maxRelativeIncreaseAllStacksAllowed * 100), - worstRelativeDiffAllThreads <= maxRelativeIncreaseAllStacksAllowed); + logger.getLoggedEvents().size(), + "Did not log expected number of freeze events." + ); + + assertTrue( + worstRelativeDiffOneThread <= maxRelativeIncreaseOneStackAllowed, + String.format(""" + Relative overhead of monitoring with stack traces of the UI \ + thread was %.3f%% (allowed < %.3f%%).""", + worstRelativeDiffOneThread * 100, + maxRelativeIncreaseOneStackAllowed * 100) + ); + + assertTrue( + worstRelativeDiffAllThreads <= maxRelativeIncreaseAllStacksAllowed, + String.format(""" + Relative overhead of monitoring with stack traces of all \ + threads was %.3f%% (allowed < %.3f%%).""", + worstRelativeDiffAllThreads * 100, + maxRelativeIncreaseAllStacksAllowed * 100) + ); + } private Thread createAndStartMonitoringThread(Display display, boolean dumpAll) throws Exception { diff --git a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadTests.java b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadTests.java index 63e012f4b71..eb2a0a0e6d2 100644 --- a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadTests.java +++ b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/EventLoopMonitorThreadTests.java @@ -17,9 +17,10 @@ *******************************************************************************/ package org.eclipse.ui.internal.monitoring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -29,9 +30,9 @@ import org.eclipse.ui.monitoring.PreferenceConstants; import org.eclipse.ui.monitoring.StackSample; import org.eclipse.ui.monitoring.UiFreezeEvent; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link EventLoopMonitorThread} class. @@ -89,7 +90,7 @@ protected void sleepForMillis(long nanoseconds) { private static ThreadControl monitorThreadControl; private static long timestamp; - @Before + @BeforeEach public void setUp() { MonitoringPlugin.getPreferenceStore().setValue(PreferenceConstants.MONITORING_ENABLED, false); logger = new MockUiFreezeEventLogger(); @@ -98,7 +99,7 @@ public void setUp() { timestamp = 1; } - @After + @AfterEach public void tearDown() throws Exception { if (monitoringThread != null) { shutdownMonitoringThread(); @@ -210,9 +211,9 @@ public void testStackDecimation() throws Exception { runForCycles(3); UiFreezeEvent event = loggedEvents.get(0); - assertNotNull("A freeze event was not automatically published", event); - assertEquals("Decimation did not resize the stack trace array properly", MIN_STACK_TRACES, - event.getStackTraceSamples().length); + assertNotNull(event, "A freeze event was not automatically published"); + assertEquals(MIN_STACK_TRACES, + event.getStackTraceSamples().length, "Decimation did not resize the stack trace array properly"); // Decimation slows down the sampling rate by a factor of 2, so test the resampling reduction. eventLength = MAX_STACK_TRACES + (MIN_MAX_STACK_TRACE_DELTA - 1) * 2; @@ -222,9 +223,9 @@ public void testStackDecimation() throws Exception { runForCycles(3); event = loggedEvents.get(1); - assertNotNull("A freeze event was not automatically published", event); - assertEquals("Decimation did not reset the sampiling rate properly", MIN_STACK_TRACES, - event.getStackTraceSamples().length); + assertNotNull(event, "A freeze event was not automatically published"); + assertEquals(MIN_STACK_TRACES, + event.getStackTraceSamples().length, "Decimation did not reset the sampiling rate properly"); // Test the resampling reduction after two decimations. eventLength = @@ -235,9 +236,9 @@ public void testStackDecimation() throws Exception { runForCycles(3); event = loggedEvents.get(2); - assertNotNull("A freeze event was not automatically published", event); - assertEquals("Decimation did not reset the sampiling rate properly", MIN_STACK_TRACES, - event.getStackTraceSamples().length); + assertNotNull(event, "A freeze event was not automatically published"); + assertEquals(MIN_STACK_TRACES, + event.getStackTraceSamples().length, "Decimation did not reset the sampiling rate properly"); } @Test @@ -260,21 +261,21 @@ public void testPublishPossibleDeadlock() throws Exception { long remaining = maxDeadlock - (timestamp - startTime); runForTime(remaining - 1); - assertTrue("No deadlock should get logged before its time", loggedEvents.isEmpty()); + assertTrue(loggedEvents.isEmpty(), "No deadlock should get logged before its time"); // March time forward to trigger the possible deadlock logging. runForCycles(4); - assertEquals("Incorrect number of events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertTrue("Possible deadlock logging should have a valid number of stack traces", - event.getStackTraceSamples().length >= MIN_STACK_TRACES); + assertTrue(event.getStackTraceSamples().length >= MIN_STACK_TRACES, + "Possible deadlock logging should have a valid number of stack traces"); // Extending the UI freeze shouldn't log any more events. runForTime(maxDeadlock * 2); runForCycles(3); - assertEquals("No more deadlock events should get logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "No more deadlock events should get logged"); } @Test @@ -295,7 +296,7 @@ public void testPublishNoDeadlocksWhenSleeping() throws Exception { runForTime(FORCE_DEADLOCK_LOG_TIME_MS * 2); runForCycles(3); - assertTrue("No deadlock events should get logged", loggedEvents.isEmpty()); + assertTrue(loggedEvents.isEmpty(), "No deadlock events should get logged"); } @Test @@ -310,7 +311,7 @@ public void testNoLoggingForSleep() throws Exception { sendEvent(SWT.PostExternalEventDispatch); runForCycles(3); - assertTrue("Sleeping should not trigger a freeze event", loggedEvents.isEmpty()); + assertTrue(loggedEvents.isEmpty(), "Sleeping should not trigger a freeze event"); } @Test @@ -329,15 +330,15 @@ public void testEventLogging() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event log has an incorrect start time", eventStartTime, - event.getStartTimestamp()); - assertEquals("A freeze event's duration was incorrect", freezeDuration, - event.getTotalDuration()); - assertEquals("A freeze event didn't capture a good range of stack samples (" - + getStackSamplesTimeline(event) + ")", - expectedStackCount(freezeDuration), event.getStackTraceSamples().length); + assertEquals(eventStartTime, + event.getStartTimestamp(), "A freeze event log has an incorrect start time"); + assertEquals(freezeDuration, + event.getTotalDuration(), "A freeze event's duration was incorrect"); + assertEquals(expectedStackCount(freezeDuration), event.getStackTraceSamples().length, + "A freeze event didn't capture a good range of stack samples (" + + getStackSamplesTimeline(event) + ")"); } @Test @@ -359,15 +360,15 @@ public void testNestedEventLogging() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event log has an incorrect start time", eventStartTime, - event.getStartTimestamp()); - assertEquals("A freeze event's duration was incorrect", freezeDuration, - event.getTotalDuration()); - assertEquals("A freeze event didn't capture a good range of stack samples (" - + getStackSamplesTimeline(event) + ")", - expectedStackCount(freezeDuration), event.getStackTraceSamples().length); + assertEquals(eventStartTime, + event.getStartTimestamp(), "A freeze event log has an incorrect start time"); + assertEquals(freezeDuration, + event.getTotalDuration(), "A freeze event's duration was incorrect"); + assertEquals(expectedStackCount(freezeDuration), event.getStackTraceSamples().length, + "A freeze event didn't capture a good range of stack samples (" + + getStackSamplesTimeline(event) + ")"); } @Test @@ -392,15 +393,15 @@ public void testDoublyNestedEventLogging() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event log has an incorrect start time", eventStartTime, - event.getStartTimestamp()); - assertEquals("A freeze event's duration was incorrect", freezeDuration, - event.getTotalDuration()); - assertEquals("A freeze event didn't capture a good range of stack samples (" - + getStackSamplesTimeline(event) + ")", - expectedStackCount(freezeDuration), event.getStackTraceSamples().length); + assertEquals(eventStartTime, + event.getStartTimestamp(), "A freeze event log has an incorrect start time"); + assertEquals(freezeDuration, + event.getTotalDuration(), "A freeze event's duration was incorrect"); + assertEquals(expectedStackCount(freezeDuration), event.getStackTraceSamples().length, + "A freeze event didn't capture a good range of stack samples (" + + getStackSamplesTimeline(event) + ")"); } @Test @@ -427,15 +428,15 @@ public void testSeeLongEventInContinuationAfterNestedCall() throws Exception { freezeDuration = timestamp - eventResumeTime; runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event didn't start from the nested return point", - eventResumeTime, event.getStartTimestamp()); - assertEquals("A freeze event's duration was incorrect", freezeDuration, - event.getTotalDuration()); - assertEquals("A freeze event didn't capture a good range of stack samples (" - + getStackSamplesTimeline(event) + ")", - expectedStackCount(freezeDuration), event.getStackTraceSamples().length); + assertEquals(eventResumeTime, event.getStartTimestamp(), + "A freeze event didn't start from the nested return point"); + assertEquals(freezeDuration, + event.getTotalDuration(), "A freeze event's duration was incorrect"); + assertEquals(expectedStackCount(freezeDuration), event.getStackTraceSamples().length, + "A freeze event didn't capture a good range of stack samples (" + + getStackSamplesTimeline(event) + ")"); } @Test @@ -471,15 +472,15 @@ public void testSeeLongEventInTheMiddleOfNestedCalls() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event didn't start from the nested return point", - eventResumeTime, event.getStartTimestamp()); - assertEquals("A freeze event's duration was incorrect", freezeDuration, - event.getTotalDuration()); - assertEquals("A freeze event didn't capture a good range of stack samples (" - + getStackSamplesTimeline(event) + ")", - expectedStackCount(freezeDuration), event.getStackTraceSamples().length); + assertEquals(eventResumeTime, event.getStartTimestamp(), + "A freeze event didn't start from the nested return point"); + assertEquals(freezeDuration, + event.getTotalDuration(), "A freeze event's duration was incorrect"); + assertEquals(expectedStackCount(freezeDuration), event.getStackTraceSamples().length, + "A freeze event didn't capture a good range of stack samples (" + + getStackSamplesTimeline(event) + ")"); } @Test @@ -514,8 +515,8 @@ public void testSeeSleepInTheMiddleOfNestedCalls() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertTrue("A freeze event should not be published during an external event dispatch", - loggedEvents.isEmpty()); + assertTrue(loggedEvents.isEmpty(), + "A freeze event should not be published during an external event dispatch"); } @Test @@ -533,8 +534,8 @@ public void testConsecutiveSleeps() throws Exception { eventStartTime = timestamp; runForCycles(3); - assertTrue("A freeze event shold not be published during an external event dispatch", - loggedEvents.isEmpty()); + assertTrue(loggedEvents.isEmpty(), + "A freeze event shold not be published during an external event dispatch"); // Let a long time elapse between the last PostExternalEventDispatch and the next // PreExternalEventDispatch. @@ -545,11 +546,11 @@ public void testConsecutiveSleeps() throws Exception { sendEvent(SWT.PostEvent); runForCycles(3); - assertEquals("Incorrect number of freeze events was logged", 1, loggedEvents.size()); + assertEquals(1, loggedEvents.size(), "Incorrect number of freeze events was logged"); UiFreezeEvent event = loggedEvents.get(0); - assertEquals("A freeze event log has an incorrect start time", eventStartTime, - event.getStartTimestamp()); - assertEquals("A freeze event's duration is incorrect", eventDuration, - event.getTotalDuration()); + assertEquals(eventStartTime, + event.getStartTimestamp(), "A freeze event log has an incorrect start time"); + assertEquals(eventDuration, + event.getTotalDuration(), "A freeze event's duration is incorrect"); } } diff --git a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/FilterHandlerTests.java b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/FilterHandlerTests.java index 2e7ce025c2a..75c7560b1a5 100644 --- a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/FilterHandlerTests.java +++ b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/FilterHandlerTests.java @@ -16,15 +16,16 @@ *******************************************************************************/ package org.eclipse.ui.internal.monitoring; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import org.eclipse.ui.monitoring.StackSample; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FilterHandler} class.