From 58f313894ab632381d446bb137dae4a0ee3c27b9 Mon Sep 17 00:00:00 2001
From: Arthur Daussy <arthur.daussy@obeo.fr>
Date: Thu, 9 Oct 2014 17:22:08 +0200
Subject: [PATCH] Configures Q7 tests to run on Mars platform

Change-Id: I3313010c3722706b6a87db4d411e19f43880b636
---
 .../org.eclipse.emf.compare.q7.tests/createAUT.sh  | 16 ++++++++-
 plugins/org.eclipse.emf.compare.q7.tests/pom.xml   | 38 +++++++++++++++++++---
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
index eef3e1178..edf2845f7 100755
--- a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
+++ b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
@@ -51,7 +51,21 @@ fi
 echo "Unzipping $P2_ADMIN_ZIPNAME"
 tar zxf "$P2_ADMIN_ZIPPATH" -C $workdir
 
-if [[ "$simrel" == "luna"* ]]; then
+if [[ "$simrel" == "mars"* ]]; then
+	simrel_zip_name="eclipse-SDK-4.5M2-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
+	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/S-4.5M2-201409180330/$simrel_zip_name"	
+	p2_repositories="http://download.eclipse.org/releases/mars/,\
+http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\
+http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/"
+	p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\
+org.eclipse.egit.feature.group,\
+org.eclipse.emf.sdk.feature.group,\
+org.eclipse.uml2.uml.feature.group,\
+org.eclipse.papyrus.sdk.feature.feature.group,\
+org.eclipse.emf.compare.uml2.feature.group,\
+org.eclipse.emf.compare.diagram.gmf.feature.group,\
+org.eclipse.emf.compare.diagram.papyrus.feature.group"
+elif [[ "$simrel" == "luna"* ]]; then
 	simrel_zip_name="eclipse-SDK-4.4-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
 	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/$simrel_zip_name"
 	p2_repositories="http://download.eclipse.org/releases/luna/,\
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
index bfc35bd45..d67c38a22 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
@@ -23,8 +23,8 @@
   </pluginRepositories> 
   
   <properties>
-    <q7-runner-version>1.5.0-SNAPSHOT</q7-runner-version>
-    <q7-maven-version>1.5.1-SNAPSHOT</q7-maven-version>
+    <q7-runner-version>1.3.14-SNAPSHOT</q7-runner-version>
+    <q7-maven-version>1.3.14-SNAPSHOT</q7-maven-version>
     <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
     <testFailureIgnore>true</testFailureIgnore>
   </properties>
@@ -53,10 +53,10 @@
   </build>
  
   <profiles>
-    <profile>
-      <id>luna</id>
+   <profile>
+      <id>mars</id>
       <properties>
-        <profile-id>luna</profile-id>
+        <profile-id>mars</profile-id>
       </properties>
       <activation>
         <activeByDefault>true</activeByDefault>
@@ -85,6 +85,34 @@
       </build>
     </profile>
     <profile>
+      <id>luna</id>
+      <properties>
+        <profile-id>luna</profile-id>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.xored.q7</groupId>
+            <artifactId>q7-maven-plugin</artifactId>
+            <version>${q7-maven-version}</version>
+            <extensions>true</extensions>
+            <configuration>
+              <aut>
+                <explicit>${project.build.directory}/${profile-id}/eclipse</explicit>
+              </aut>
+              <testFailureIgnore>${testFailureIgnore}</testFailureIgnore>
+              <suites>
+                <suite>TestSuite.Full</suite>
+              </suites>
+              <q7>
+                <version>${q7-runner-version}</version>
+              </q7>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>kepler</id>
       <properties>
         <profile-id>kepler</profile-id>
-- 
2.11.4.GIT