[jbosstools-commits] JBoss Tools SVN: r42409 - in trunk/tests/plugins/org.jboss.tools.tests.installation: .settings and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: mickael_istria
Date: 2012-07-05 08:22:10 -0400 (Thu, 05 Jul 2012)
New Revision: 42409

Added:
   trunk/tests/plugins/org.jboss.tools.tests.installation/.classpath
   trunk/tests/plugins/org.jboss.tools.tests.installation/.project
   trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/
   trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/org.eclipse.jdt.core.prefs
Modified:
   trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java
Log:
JBIDE-11713: Adapt to Eclipse 4.2 pop-up

Added: trunk/tests/plugins/org.jboss.tools.tests.installation/.classpath
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/.classpath	                        (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/.classpath	2012-07-05 12:22:10 UTC (rev 42409)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


Property changes on: trunk/tests/plugins/org.jboss.tools.tests.installation/.classpath
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/tests/plugins/org.jboss.tools.tests.installation/.project
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/.project	                        (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/.project	2012-07-05 12:22:10 UTC (rev 42409)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jboss.tools.tests.installation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: trunk/tests/plugins/org.jboss.tools.tests.installation/.project
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/org.eclipse.jdt.core.prefs	2012-07-05 12:22:10 UTC (rev 42409)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6


Property changes on: trunk/tests/plugins/org.jboss.tools.tests.installation/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java	2012-07-05 12:20:58 UTC (rev 42408)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java	2012-07-05 12:22:10 UTC (rev 42409)
@@ -146,7 +146,14 @@
 				}
 			}, 15 * 60000); // 15 more minutes
 		}
-		this.bot.shell("Software Updates").bot().button("Not Now").click(); // Don't restart in test, test executor will do it.
+		SWTBot restartShellBot = this.bot.shell("Software Updates").bot();
+		try {
+			// Eclipse 3.7.x => "Not now"
+			restartShellBot.button("Not Now").click(); // Don't restart in test, test executor will do it.
+		} catch (WidgetNotFoundException ex) {
+			// Eclipse 4.2 => "No"
+			restartShellBot.button("No").click();
+		}
 	}