Author: dgolovin
Date: 2011-08-15 19:57:12 -0400 (Mon, 15 Aug 2011)
New Revision: 33949
Added:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
Log:
https://issues.jboss.org/browse/JBIDE-9460 test failures in
org.jboss.tools.smooks.ui.bot.test
added dependencies into pom.xml to install smooks when tests started by maven
-Pjbosstools-nightly-staging-composite
should be added to maven parameters to install smooks from nightly composite update site
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 23:48:41 UTC
(rev 33948)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 23:57:12 UTC
(rev 33949)
@@ -15,6 +15,7 @@
<properties>
<emma.filter>org.jboss.tools.smooks.*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
+ <systemProperties>-Djbosstools.test.smooks.1.2.4=${requirement.build.root}/smooks-1.2.4</systemProperties>
</properties>
<build>
@@ -24,6 +25,19 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <product>org.eclipse.sdk.ide</product>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.smooks.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties 2011-08-15
23:57:12 UTC (rev 33949)
@@ -0,0 +1 @@
+requirements=smooks-1.2.4
\ No newline at end of file
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-08-15
23:48:41 UTC (rev 33948)
+++
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-08-15
23:57:12 UTC (rev 33949)
@@ -1,10 +1,18 @@
package org.jboss.tools.smooks.ui.bot.tests;
+import org.eclipse.swt.widgets.MessageBox;
+
public class Project {
// Smooks project
public static final String PROJECT_NAME = "smookstest1";
- public static final String SMOOKS_PATH = "/home/jpeterka/lib/smooks-1.2.4";
+ public static final String SMOOKS_PATH_VAR_NAME =
"jbosstools.test.smooks.1.2.4";
+ public static final String SMOOKS_PATH;
public static final String SMOOKS_LIBNAME = "smooks-1.2.4";
-
+ static {
+ SMOOKS_PATH = System.getProperty(SMOOKS_PATH_VAR_NAME);
+ if(SMOOKS_PATH==null) {
+ throw new IllegalStateException(java.text.MessageFormat.format("System property
{''0''} is not defined", SMOOKS_PATH_VAR_NAME));
+ }
+ }
}