Setting Maven user settings as a part of IBeforeTest can be disabled …

…and configured

plugins/org.jboss.tools.maven.reddeer/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Maven Reddeer
-Bundle-SymbolicName: org.jboss.tools.maven.reddeer
+Bundle-SymbolicName: org.jboss.tools.maven.reddeer;singleton:=true
 Bundle-Version: 4.4.0.qualifier
 Bundle-Activator: org.jboss.tools.maven.reddeer.Activator
 Require-Bundle: org.jboss.reddeer.go;bundle-version="1.0.0",

tests/org.jboss.tools.maven.ui.bot.test/plugin.xml → plugins/org.jboss.tools.maven.reddeer/plugin.xml

@@ -2,6 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension point="org.jboss.reddeer.junit.before.test">
-      <client class="org.jboss.tools.maven.ui.bot.test.utils.SetMavenUserSettings"/>
+      <client class="org.jboss.tools.maven.reddeer.junit.extensions.before.test.impl.SetMavenUserSettings"/>
    </extension>
 </plugin>

plugins/org.jboss.tools.maven.reddeer/src/org/jboss/tools/maven/reddeer/junit/extensions/before/test/impl/SetMavenUserSettings.java

@@ -0,0 +1,55 @@
+package org.jboss.tools.maven.reddeer.junit.extensions.before.test.impl;
+
+import java.io.File;
+
+import org.jboss.reddeer.common.exception.RedDeerException;
+import org.jboss.reddeer.common.logging.Logger;
+import org.jboss.reddeer.junit.extensionpoint.IBeforeTest;
+import org.jboss.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
+import org.jboss.tools.maven.reddeer.preferences.MavenUserPreferencePage;
+
+/**
+ * This extensions sets defined Maven settings.xml in Maven -> User Settings property page
+ * 
+ * available properties:
+ * maven.settings.path - path to settings.xml which should be set. If this property is not set this class wont run
+ * @author rawagner
+ *
+ */
+public class SetMavenUserSettings implements IBeforeTest {
+
+	private static final Logger log = Logger.getLogger(SetMavenUserSettings.class);
+
+	@Override
+	public void runBeforeTest() {
+		setUserSettings(getMavenSettingsPath());
+
+	}
+
+	@Override
+	public boolean hasToRun() {
+		return System.getProperty("maven.settings.path") != null;
+	}
+
+	private String getMavenSettingsPath(){
+		File userSettings = new File(System.getProperty("maven.settings.path"));
+		if(!userSettings.exists()){
+			log.warn("Maven settings.xml does not exist");
+		}
+		return userSettings.getAbsolutePath();
+	}
+
+	private void setUserSettings(String mavenSettingsPath){
+		log.debug("Setting maven user settings to "+mavenSettingsPath);
+		WorkbenchPreferenceDialog preferenceDialog = new WorkbenchPreferenceDialog();
+		preferenceDialog.open();
+		MavenUserPreferencePage mpreferences = new MavenUserPreferencePage();
+		preferenceDialog.select(mpreferences);
+		if(!mpreferences.getUserSettings().equals(mavenSettingsPath)){
+			mpreferences.setUserSettings(mavenSettingsPath);
+			mpreferences.apply();
+		} 
+		preferenceDialog.ok();
+	}
+
+}

plugins/org.jboss.tools.maven.reddeer/src/org/jboss/tools/maven/reddeer/preferences/MavenUserPreferencePage.java

@@ -62,17 +62,15 @@ public String getUserSettings(){
 		return text.getMessage();
 	}
 
-	public void ok(){
+	public void apply(){
 		new PushButton("Apply").click();
 		try{
 		    new DefaultShell("Update project required");
 		    new PushButton("Yes").click();
 		    new DefaultShell("Preferences");
+		    new WaitWhile(new JobIsRunning(),TimePeriod.VERY_LONG);
 		} catch(SWTLayerException ex){
 			log.info("Update project required shell was not found.");
-		} finally {
-			new WaitWhile(new JobIsRunning(),TimePeriod.VERY_LONG);
-			new WorkbenchPreferenceDialog().ok();
 		}
 	}
 }

tests/org.jboss.tools.maven.ui.bot.test/build.properties

@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+               .

tests/org.jboss.tools.maven.ui.bot.test/pom.xml

@@ -12,11 +12,10 @@
 
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<systemProperties>${integrationTestsSystemProperties} -Djbosstools.test.seam.2.1.0.home=${requirementsDirectory}/jboss-seam-2.1.2 -Djbosstools.test.seam.2.3.0.home=${requirementsDirectory}/jboss-seam-2.3.0.Final -Djbosstools.test.seam.2.2.0.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Dproject.build.directory=${project.build.directory} -Djbosstools.test.wildfly8.home=${jbosstools.test.wildfly8.home} -Dreddeer.config=target/classes/servers</systemProperties>
+		<systemProperties>${integrationTestsSystemProperties} -Djbosstools.test.seam.2.1.0.home=${requirementsDirectory}/jboss-seam-2.1.2 -Djbosstools.test.seam.2.3.0.home=${requirementsDirectory}/jboss-seam-2.3.0.Final -Djbosstools.test.seam.2.2.0.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Dproject.build.directory=${project.build.directory} -Djbosstools.test.wildfly8.home=${jbosstools.test.wildfly8.home} -Dreddeer.config=target/classes/servers -Dmaven.settings.path=target/classes/settings.xml</systemProperties>
 		<jbosstools.test.wildfly8.home>${requirementsDirectory}/wildfly-8.1.0.Final</jbosstools.test.wildfly8.home>
 		<surefire.timeout>14400</surefire.timeout>
 	</properties>
-
 	<build>
 		<resources>
 			<resource>

tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/profile/MavenProfilesTest.java

@@ -82,7 +82,8 @@ public static void setup() throws IOException {
 		MavenUserPreferencePage mu = new MavenUserPreferencePage();
 		preferenceDialog.select(mu);
 		mu.setUserSettings(new File("resources/usersettings/settings.xml").getCanonicalPath());
-		mu.ok();
+		mu.apply();
+		preferenceDialog.ok();
 		importMavenProject("resources/projects/simple-jar/pom.xml");
 		importMavenProject("resources/projects/simple-jar1/pom.xml");
 		importMavenProject("resources/projects/simple-jar2/pom.xml");

tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/sourcelookup/SourceLookupTest.java

@@ -53,7 +53,8 @@ public void setupSettings(){
 		MavenUserPreferencePage mpreferences = new MavenUserPreferencePage();
 		preferenceDialog.select(mpreferences);
 		mpreferences.setUserSettings(new File("target/classes/settings"+TEST_NUMBER+".xml").getAbsolutePath());
-		mpreferences.ok();
+		mpreferences.apply();
+		preferenceDialog.ok();
 		TEST_NUMBER=1;
 	}
 

tests/org.jboss.tools.usercase.ticketmonster.ui.bot.test/src/org/jboss/tools/usercase/ticketmonster/ui/bot/test/TicketMonsterBaseTest.java

@@ -111,7 +111,8 @@ public static void beforeClass(){
 		MavenUserPreferencePage mpreferences = new MavenUserPreferencePage();
 		preferenceDialog.select(mpreferences);
 		mpreferences.setUserSettings(new File(USER_SETTINGS).getAbsolutePath());
-		mpreferences.ok();
+		mpreferences.apply();
+		preferenceDialog.ok();
 	}
 
 	public void createTicketMonsterEAP6(){

tests/org.jboss.tools.usercase.ticketmonster.ui.bot.test/src/org/jboss/tools/usercase/ticketmonster/ui/bot/test/part2/Chapter8CreateJavaEE6ProjectTest.java

@@ -53,8 +53,7 @@ public void setMavenUserSettings(){
 		preferenceDialog.select(mpreferences);
 		String path = new File("target/classes/settings"+testNumber+".xml").getAbsolutePath();
 		mpreferences.setUserSettings(path);
-		mpreferences.ok();
-		preferenceDialog.open();
+		mpreferences.apply();
 		ConfiguratorPreferencePage pp = new ConfiguratorPreferencePage();
 		preferenceDialog.select(pp);
 		ConfigureMavenRepositoriesWizard cw = pp.configureRepositories();