Fix tests for Eclipse Photon

Signed-off-by: Rastislav Wagner <rawagner@redhat.com>
eclipse · Mar 29, 2018 · 930bcef · 930bcef
1 parent e13032b
commit 930bcef
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/plugins/org.eclipse.reddeer.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.reddeer.core/META-INF/MANIFEST.MF
@@ -19,4 +19,3 @@ Export-Package: org.eclipse.reddeer.core.condition,
  org.eclipse.reddeer.core.reference,
  org.eclipse.reddeer.core.resolver,
  org.eclipse.reddeer.core.util
-
diff --git a/...deer.eclipse/src/org/eclipse/reddeer/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/...deer.eclipse/src/org/eclipse/reddeer/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
@@ -11,13 +11,17 @@
 package org.eclipse.reddeer.eclipse.ui.dialogs;
 
 import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.condition.WidgetIsFound;
 import org.eclipse.reddeer.core.matcher.WithMnemonicTextMatcher;
+import org.eclipse.reddeer.jface.condition.WindowIsAvailable;
 import org.eclipse.reddeer.jface.window.AbstractWindow;
 import org.eclipse.reddeer.jface.window.Openable;
+import org.eclipse.reddeer.swt.api.Button;
 import org.eclipse.reddeer.swt.api.Shell;
 import org.eclipse.reddeer.swt.api.Table;
 import org.eclipse.reddeer.swt.impl.button.CancelButton;
 import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
 import org.eclipse.reddeer.swt.impl.table.DefaultTable;
 import org.eclipse.reddeer.swt.impl.text.DefaultText;
 import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
@@ -73,14 +77,26 @@ public Openable getDefaultOpenAction() {
 	 * Click 'OK' button.
 	 */
 	public void ok() {
-		new OkButton(this).click();
+		WidgetIsFound openButtonTest = new WidgetIsFound(org.eclipse.swt.widgets.Button.class, this.getControl(),
+				new WithMnemonicTextMatcher("Open"));
+
+
+		Button button;
+		if(openButtonTest.test()){
+			button = new PushButton((org.eclipse.swt.widgets.Button)openButtonTest.getResult()); //photon changed button text
+		} else {
+			button = new OkButton(this);	
+		}
+		button.click();
+		new WaitWhile(new WindowIsAvailable(this));
 	}
 
 	/**
 	 * Click 'Cancel' button.
 	 */
 	public void cancel() {
 		new CancelButton(this).click();
+		new WaitWhile(new WindowIsAvailable(this));
 	}
 
 	/**

diff --git a/tests/org.eclipse.reddeer.eclipse.test/META-INF/MANIFEST.MF b/tests/org.eclipse.reddeer.eclipse.test/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.reddeer.go;bundle-version="[2.1,2.2)",
  org.eclipse.datatools.sqltools.sqlscrapbook;bundle-version="1.0.2",
  org.eclipse.datatools.sqltools.result.ui;bundle-version="1.1.3",
  org.eclipse.epp.logging.aeri.core,
- org.eclipse.epp.logging.aeri.ide
+ org.eclipse.epp.logging.aeri.ide,
+ org.eclipse.jdt.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.hamcrest.core
diff --git a/tests/org.eclipse.reddeer.eclipse.test/pom.xml b/tests/org.eclipse.reddeer.eclipse.test/pom.xml
@@ -172,4 +172,17 @@
 			</build>
 		</profile>
 	</profiles>
+
+	<repositories>
+		<repository>
+			<id>datatools</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/datatools/updates/1.14.100-SNAPSHOT/repository</url>
+		</repository>
+		<repository>
+			<id>rse</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/tm/updates/3.7.100-SNAPSHOT/repository/</url>
+		</repository>
+	</repositories>
 </project>
diff --git a/...test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/dialogs/OpenTypeSelectionDialogTest.java b/...test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/dialogs/OpenTypeSelectionDialogTest.java
@@ -26,7 +26,9 @@
 import org.eclipse.reddeer.eclipse.jdt.ui.wizards.NewClassWizardPage;
 import org.eclipse.reddeer.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageOne;
 import org.eclipse.reddeer.eclipse.ui.navigator.resources.ProjectExplorer;
+import org.eclipse.reddeer.eclipse.ui.perspectives.JavaPerspective;
 import org.eclipse.reddeer.junit.runner.RedDeerSuite;
+import org.eclipse.reddeer.requirements.openperspective.OpenPerspectiveRequirement.OpenPerspective;
 import org.eclipse.reddeer.swt.api.TableItem;
 import org.eclipse.reddeer.swt.condition.ShellIsActive;
 import org.eclipse.reddeer.swt.impl.menu.ShellMenuItem;
@@ -40,6 +42,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(RedDeerSuite.class)
+@OpenPerspective(JavaPerspective.class)
 public class OpenTypeSelectionDialogTest {
 
 	private static final String TEST_PROJECT_NAME = "OpenTypeSelectionDialogTest";
@@ -119,6 +122,7 @@ public static void prepareWorkspace() {
 	@AfterClass
 	public static void cleanWorkspace() {
 		ProjectExplorer pe = new ProjectExplorer();
+		pe.open();
 		pe.deleteAllProjects();
 	}
 
@@ -138,6 +142,9 @@ private static void createJavaClass(String name) {
 
 		NewClassWizardPage wizardPage = new NewClassWizardPage(javaClassDialog);
 		wizardPage.setName(name);
+		if(wizardPage.getSourceFolder().isEmpty()) {
+			wizardPage.setSourceFolder(TEST_PROJECT_NAME+"/src");
+		}
 		wizardPage.setPackage("test");
 
 		javaClassDialog.finish();