Skip to content

Remove JUnit 3 compatibility from PerformanceTestRunner #2349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Dec 30, 2025
Merged

Remove JUnit 3 compatibility from PerformanceTestRunner #2349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions ....eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
*******************************************************************************/
package org.eclipse.core.tests.harness;

import static org.junit.Assert.fail;

import junit.framework.TestCase;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.Performance;
import org.eclipse.test.performance.PerformanceMeter;
Expand All @@ -38,28 +35,6 @@ public void setRegressionReason(String comment) {
*/
protected abstract void test() throws Exception;

/**
* Executes the performance test the given number of times. Use the outer time
* to execute the test several times in order to obtain a normalized average. Use
* the inner loop for very fast tests that would otherwise be difficult to measure
* due to Java's poor timer granularity. The inner loop is not needed for long
* tests that typically take more than a second to execute.
*
* @param testCase The test that is running (used to obtain an appropriate meter)
* @param localName the short name used to tag the local test
* @param outer The number of repetitions of the test.
* @param inner The number of repetitions within the performance timer.
*/
public final void run(TestCase testCase, String localName, int outer, int inner) {
Performance perf = Performance.getDefault();
PerformanceMeter meter = perf.createPerformanceMeter(perf.getDefaultScenarioId(testCase));
try {
runTest(meter, localName, outer, inner);
} catch (Exception e) {
fail("Failed performance test with exception:" + e);
}
}

/**
* Executes the performance test the given number of times. Use the outer time
* to execute the test several times in order to obtain a normalized average.
Expand All @@ -78,10 +53,10 @@ public final void run(TestCase testCase, String localName, int outer, int inner)
public final void run(Class<?> testClass, String testMethodName, int outer, int inner) throws Exception {
Performance perf = Performance.getDefault();
PerformanceMeter meter = perf.createPerformanceMeter(perf.getDefaultScenarioId(testClass, testMethodName));
runTest(meter, null, outer, inner);
runTest(meter, outer, inner);
}

private void runTest(PerformanceMeter meter, String localName, int outer, int inner) throws Exception {
private void runTest(PerformanceMeter meter, int outer, int inner) throws Exception {
Performance perf = Performance.getDefault();
if (regressionReason != null) {
perf.setComment(meter, Performance.EXPLAINS_DEGRADATION_COMMENT, regressionReason);
Expand All @@ -96,9 +71,6 @@ private void runTest(PerformanceMeter meter, String localName, int outer, int in
meter.stop();
tearDown();
}
if (localName != null) {
perf.tagAsSummary(meter, localName, Dimension.ELAPSED_PROCESS);
}
if (fingerprintName != null) {
perf.tagAsSummary(meter, fingerprintName, Dimension.ELAPSED_PROCESS);
}
Expand Down
Loading