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

Reddeer fixes #2222

Merged
merged 9 commits into from
Aug 30, 2023
Merged

Reddeer fixes #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
178953c
"Do not automatically update dependencies from remote repositories" does
olkornii Aug 29, 2023
d743e1a
Fixed getWidgetFromPartWhenOtherShellIsActive test
olkornii Aug 30, 2023
d0a3dd6
Test staging eclipse update site
odockal Aug 29, 2023
7aebf5c
commented first failed
olkornii Aug 30, 2023
cb729db
Changed EAR version from 8 to 10
olkornii Aug 30, 2023
6681bd4
Enable JavaProjectWizardTests
olkornii Aug 30, 2023
d22e9d3
CodeSmells fixes
olkornii Aug 30, 2023
d0044a0
Increased xmx from 512m to 1024m
olkornii Aug 30, 2023
f1f9197
Updated Java version for JavaProjectWizardTests
olkornii Aug 30, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<properties>
<tycho-version>2.7.5</tycho-version>
<tychoExtrasVersion>${tycho-version}</tychoExtrasVersion>
<eclipse-target-site>https://download.eclipse.org/releases/2023-09/</eclipse-target-site>
<eclipse-target-site>https://download.eclipse.org/staging/2023-09/</eclipse-target-site>
<swtbot-update-site>https://download.eclipse.org/technology/swtbot/snapshots/</swtbot-update-site>
<!-- when making final release, switch from S to R latest update site - https://github.com/eclipse/reddeer/issues/2100 -->
<!--eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-R/</eclipse-orbit-update-site-->
Expand Down
8 changes: 5 additions & 3 deletions ...r.e4.workbench.test/src/org/eclipse/reddeer/e4/workbench/test/part/WorkbenchPartTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@

import org.eclipse.reddeer.common.exception.RedDeerException;
import org.eclipse.reddeer.common.matcher.RegexMatcher;
import org.eclipse.reddeer.common.wait.WaitWhile;
import org.eclipse.reddeer.common.wait.WaitUntil;
import org.eclipse.reddeer.core.matcher.WithTextMatcher;
import org.eclipse.reddeer.junit.runner.RedDeerSuite;
import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
import org.eclipse.reddeer.swt.impl.menu.ShellMenuItem;
import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
import org.eclipse.reddeer.swt.impl.table.DefaultTable;
import org.eclipse.reddeer.swt.impl.table.DefaultTableItem;
import org.eclipse.reddeer.swt.impl.text.DefaultText;
Expand Down Expand Up @@ -98,13 +99,14 @@ public void testPartAsReferencedComposite() {

@Test
public void getWidgetFromPartWhenOtherShellIsActive() {
new ShellMenuItem("Help","About");
new WaitWhile(new ShellIsAvailable("About"));
new ShellMenuItem("Help","About").select();
new WaitUntil(new ShellIsAvailable("About"));

try {
new DefaultTableItem("Sample item 1");
} catch (RedDeerException e) {
//not found which is ok because About shell is open
new DefaultShell("About").close();
return;
}
fail();
Expand Down
6 changes: 3 additions & 3 deletions ...lipse.test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/wizards/JavaProjectWizardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void testJavaProjectWizardCreateInfoModule() {

NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
pageOne.setProjectName(JAVA_PROJECT);
pageOne.useExecutionEnvironmentJRE("JavaSE-11");
pageOne.useExecutionEnvironmentJRE("JavaSE-17");
new WaitUntil(new JobIsRunning(), TimePeriod.MEDIUM, false);
new WaitWhile(new JobIsRunning(), TimePeriod.MEDIUM, false);
pageOne.createModuleInfoFile(true);
Expand All @@ -129,7 +129,7 @@ public void testJavaProjectWizardCreateInfoModuleDefaultName() {

NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
pageOne.setProjectName(JAVA_PROJECT);
pageOne.useExecutionEnvironmentJRE("JavaSE-11");
pageOne.useExecutionEnvironmentJRE("JavaSE-17");
pageOne.createModuleInfoFile(true);

dialog.finish();
Expand All @@ -148,7 +148,7 @@ public void testJavaProjectWizardDisabledModuleInfoCheckbox() {

NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
pageOne.setProjectName(JAVA_PROJECT);
pageOne.useExecutionEnvironmentJRE("JavaSE-1.8");
pageOne.useExecutionEnvironmentJRE("JavaSE-17");
try {
pageOne.createModuleInfoFile(true);
} catch (WaitTimeoutExpiredException exc) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/org/eclipse/reddeer/eclipse/test/jst/j2ee/ui/project/facet/EARProjectWizardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void createProjectWithWebModule(){
ear.open();
EarProjectFirstPage fp = new EarProjectFirstPage(ear);
fp.setProjectName(projectName);
fp.setEARVersion("8.0");
fp.setEARVersion("10.0");
ear.next();
EarProjectInstallPage ip = new EarProjectInstallPage(ear);
assertFalse(ip.isGenerateApplicationXML());
Expand Down
8 changes: 4 additions & 4 deletions ...src/org/eclipse/reddeer/eclipse/test/m2e/core/ui/preferences/MavenPreferencePageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void checkAllPreferences() {
preferencesDialog.select(mavenPreferencePage);

mavenPreferencePage.setDebugOutput(true);
mavenPreferencePage.setDoNotAutoUpdateDeps(true);
// mavenPreferencePage.setDoNotAutoUpdateDeps(true); # is not a part of 2023-09 Eclipse
mavenPreferencePage.setDownloadArtifactJavadoc(true);
mavenPreferencePage.setDownloadArtifactSources(true);
mavenPreferencePage.setDownloadRepoIndexOnStartup(true);
Expand All @@ -43,7 +43,7 @@ public void checkAllPreferences() {
mavenPreferencePage.setUpdateMavenProjectsOnStartup(true);

assertTrue(mavenPreferencePage.isDebugOutputChecked());
assertTrue(mavenPreferencePage.isDoNotAutoUpdateDepsChecked());
// assertTrue(mavenPreferencePage.isDoNotAutoUpdateDepsChecked()); # is not a part of 2023-09 Eclipse
assertTrue(mavenPreferencePage.isDownloadArtifactJavadocChecked());
assertTrue(mavenPreferencePage.isDownloadArtifactSourcesChecked());
assertTrue(mavenPreferencePage.isDownloadRepoIndexOnStartupChecked());
Expand All @@ -60,7 +60,7 @@ public void uncheckAllPreferences() {
preferencesDialog.select(mavenPreferencePage);

mavenPreferencePage.setDebugOutput(false);
mavenPreferencePage.setDoNotAutoUpdateDeps(false);
// mavenPreferencePage.setDoNotAutoUpdateDeps(false); # is not a part of 2023-09 Eclipse
mavenPreferencePage.setDownloadArtifactJavadoc(false);
mavenPreferencePage.setDownloadArtifactSources(false);
mavenPreferencePage.setDownloadRepoIndexOnStartup(false);
Expand All @@ -69,7 +69,7 @@ public void uncheckAllPreferences() {
mavenPreferencePage.setUpdateMavenProjectsOnStartup(false);

assertFalse(mavenPreferencePage.isDebugOutputChecked());
assertFalse(mavenPreferencePage.isDoNotAutoUpdateDepsChecked());
// assertFalse(mavenPreferencePage.isDoNotAutoUpdateDepsChecked()); # is not a part of 2023-09 Eclipse
assertFalse(mavenPreferencePage.isDownloadArtifactJavadocChecked());
assertFalse(mavenPreferencePage.isDownloadArtifactSourcesChecked());
assertFalse(mavenPreferencePage.isDownloadRepoIndexOnStartupChecked());
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
<argLine>-DlogMessageFilter=${logMessageFilter} -DpauseFailedTest=${pauseFailedTest} -DrelativeScreenshotDirectory=${relativeScreenshotDirectory} ${platformSystemProperties} ${customArgLine} ${junitExtensionsProperties} ${tycho.testArgLine} -Xmx512m</argLine>
<argLine>-DlogMessageFilter=${logMessageFilter} -DpauseFailedTest=${pauseFailedTest} -DrelativeScreenshotDirectory=${relativeScreenshotDirectory} ${platformSystemProperties} ${customArgLine} ${junitExtensionsProperties} ${tycho.testArgLine} -Xmx1024m</argLine>
<product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
<dependencies combine.children="append">
Expand Down
Loading