Skip to content

[WiP] Activate RCP tests in Tycho build #1145

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

Closed
wants to merge 3 commits into from
Closed

[WiP] Activate RCP tests in Tycho build #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bccafcf
Fix expected workbench operations in WorkbenchAdvisorTest
HeikoKlare Sep 20, 2023
26e743e
Enable org.eclipse.ui.tests.rcp in Tycho build
HeikoKlare Sep 20, 2023
aee9844
version bump org.eclipse.ui.tests.rcp
HeikoKlare Sep 20, 2023
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
4 changes: 3 additions & 1 deletion ...eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchAdvisorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public void postWindowClose(IWorkbenchWindowConfigurer c) {
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_STARTUP);
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_WINDOW_OPEN);
wa.assertNextOperation(WorkbenchAdvisorObserver.FILL_ACTION_BARS);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_RESTORE);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_OPEN);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_STARTUP);
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_SHUTDOWN);
Expand Down Expand Up @@ -213,7 +214,7 @@ public void initialize(IWorkbenchConfigurer c) {
wa2.assertNextOperation(WorkbenchAdvisorObserver.PRE_STARTUP);
wa2.assertNextOperation(WorkbenchAdvisorObserver.PRE_WINDOW_OPEN);
wa2.assertNextOperation(WorkbenchAdvisorObserver.FILL_ACTION_BARS);
// wa2.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_RESTORE);
wa2.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_RESTORE);
wa2.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_OPEN);
wa2.assertNextOperation(WorkbenchAdvisorObserver.POST_STARTUP);
wa2.assertNextOperation(WorkbenchAdvisorObserver.PRE_SHUTDOWN);
Expand Down Expand Up @@ -244,6 +245,7 @@ public void postStartup() {
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_STARTUP);
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_WINDOW_OPEN);
wa.assertNextOperation(WorkbenchAdvisorObserver.FILL_ACTION_BARS);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_RESTORE);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_WINDOW_OPEN);
wa.assertNextOperation(WorkbenchAdvisorObserver.POST_STARTUP);
wa.assertNextOperation(WorkbenchAdvisorObserver.PRE_SHUTDOWN);
Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.ui.tests.rcp/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: %pluginName
Bundle-SymbolicName: org.eclipse.ui.tests.rcp; singleton:=true
Bundle-Version: 3.6.100.qualifier
Bundle-Version: 3.6.200.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
Expand Down
6 changes: 4 additions & 2 deletions tests/org.eclipse.ui.tests.rcp/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ output.. = bin/
# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
# This plug-in's name does not comply with Tycho's naming convention for test-plugins -> packaging type has to be specified explicitly
pom.model.packaging = eclipse-test-plugin
# Test not yet ready for Surefire
pom.model.property.skipTests = true
pom.model.property.testClass = org.eclipse.ui.tests.rcp.RcpTestSuite
# Tests have to run headless, with an application
pom.model.property.tycho.surefire.useUIHarness = false
pom.model.property.tycho.surefire.useUIThread = true