Skip to content
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

Jump to bottom

Fix failing test testPerformanceMeterFactory #224 #225

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Fix failing test testPerformanceMeterFactory #224 #225

Show file tree
Hide file tree
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
0 ...settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.core.resources.prefs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion bundles/org.eclipse.test.performance/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.test.performance; singleton:=true
Bundle-Version: 3.19.200.qualifier
Bundle-Version: 3.19.300.qualifier
Bundle-Activator: org.eclipse.test.internal.performance.PerformanceTestPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.test.performance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.test</groupId>
<artifactId>org.eclipse.test.performance</artifactId>
<version>3.19.200-SNAPSHOT</version>
<version>3.19.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:-raw,unchecked</code.ignoredWarnings>
Expand Down
3 changes: 2 additions & 1 deletion ...formance/src/org/eclipse/test/internal/performance/tests/PerformanceMeterFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public void testPerformanceMeterFactory() {
System.setProperty(
"PerformanceMeterFactory", "org.eclipse.test.performance:org.eclipse.test.internal.performance.OSPerformanceMeterFactory"); //$NON-NLS-1$ //$NON-NLS-2$

PerformanceMeter pm = Performance.getDefault().createPerformanceMeter("scenarioId"); //$NON-NLS-1$
Performance performance = Performance.getDefault();
PerformanceMeter pm = performance.createPerformanceMeter(performance.getDefaultScenarioId(this));

assertTrue(pm instanceof OSPerformanceMeter);
}
Expand Down
3 changes: 2 additions & 1 deletion ...rformance/src/org/eclipse/test/internal/performance/tests/SimplePerformanceMeterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
public class SimplePerformanceMeterTest extends TestCase {

public void testPerformanceMeterFactory() {
PerformanceMeter meter = Performance.getDefault().createPerformanceMeter("scenarioId"); //$NON-NLS-1$
Performance performance = Performance.getDefault();
PerformanceMeter meter = performance.createPerformanceMeter(performance.getDefaultScenarioId(this));

assertTrue(meter instanceof OSPerformanceMeter);

Expand Down