Bug 464998 - Configure integration tests

Fixed dependencies of client.test.ui for alternative run configurations Change-Id: Ia85b05655fd65a18c510cd433b16e9fdcb7ee94a
eclipse-emfstore · May 26, 2015 · 1a14d35 · 1a14d35
1 parent 5eaa63f
commit 1a14d35
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
@@ -426,6 +426,16 @@
                                     <artifactId>org.eclipse.emf.emfstore.client</artifactId>
                                     <version>0.0.0</version>
                                 </dependency>
+                                <dependency>
+                                    <type>eclipse-plugin</type>
+                                    <artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
+                                    <version>0.0.0</version>
+                                </dependency>
+                                <dependency>
+                                    <type>eclipse-plugin</type>
+                                    <artifactId>org.eclipse.emf.emfstore.client.ui.rcp</artifactId>
+                                    <version>0.0.0</version>
+                                </dependency>
                                 <dependency>
                                     <type>eclipse-plugin</type>
                                     <artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
@@ -494,6 +504,16 @@
                                     <level>4</level>
                                     <autoStart>false</autoStart>
                                 </bundle>
+                                <bundle>
+                                    <id>org.eclipse.emf.emfstore.client.ui</id>
+                                    <level>4</level>
+                                    <autoStart>false</autoStart>
+                                </bundle>
+                                <bundle>
+                                    <id>org.eclipse.emf.emfstore.client.ui.rcp</id>
+                                    <level>4</level>
+                                    <autoStart>false</autoStart>
+                                </bundle>
                                 <bundle>
                                     <id>org.eclipse.emf.emfstore.client.changetracking.test</id>
                                     <level>4</level>
@@ -598,6 +618,16 @@
                                     <artifactId>org.eclipse.emf.emfstore.client</artifactId>
                                     <version>0.0.0</version>
                                 </dependency>
+                                <dependency>
+                                    <type>eclipse-plugin</type>
+                                    <artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
+                                    <version>0.0.0</version>
+                                </dependency>
+                                <dependency>
+                                    <type>eclipse-plugin</type>
+                                    <artifactId>org.eclipse.emf.emfstore.client.ui.rcp</artifactId>
+                                    <version>0.0.0</version>
+                                </dependency>
                                 <dependency>
                                     <type>eclipse-plugin</type>
                                     <artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
@@ -666,6 +696,16 @@
                                     <level>4</level>
                                     <autoStart>false</autoStart>
                                 </bundle>
+                                <bundle>
+                                    <id>org.eclipse.emf.emfstore.client.ui</id>
+                                    <level>4</level>
+                                    <autoStart>false</autoStart>
+                                </bundle>
+                                <bundle>
+                                    <id>org.eclipse.emf.emfstore.client.ui.rcp</id>
+                                    <level>4</level>
+                                    <autoStart>false</autoStart>
+                                </bundle>
                                 <bundle>
                                     <id>org.eclipse.emf.emfstore.client.changetracking.test</id>
                                     <level>4</level>

diff --git a/...src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShareProjectControllerTest.java b/...src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShareProjectControllerTest.java
@@ -22,7 +22,6 @@
 import org.eclipse.swtbot.swt.finder.results.VoidResult;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotList;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
 import org.junit.Test;
 
@@ -58,9 +57,6 @@ public void run() {
 				shareProjectController.execute();
 			}
 		});
-		final SWTBotList list = getBot().shell("Please select a server").bot().list();
-		list.select(1);
-		getBot().button("OK").click();
 
 		getBot().waitUntil(new DefaultCondition() {
 			// BEGIN SUPRESS CATCH EXCEPTION