You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/06/07 12:09:12 UTC
svn commit: r664308 - in /directory/sandbox/seelmann/testingframework:
test-integration-core/META-INF/MANIFEST.MF test-integration-core/pom.xml
test-integration-ui/META-INF/MANIFEST.MF test-integration-ui/pom.xml
Author: seelmann
Date: Sat Jun 7 03:09:12 2008
New Revision: 664308
URL: http://svn.apache.org/viewvc?rev=664308&view=rev
Log:
Added support for different platforms
Modified:
directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF
directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml
directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF
directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml
Modified: directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF?rev=664308&r1=664307&r2=664308&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF Sat Jun 7 03:09:12 2008
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Apache Directory Studio Integration Tests Core
+Bundle-Name: Apache Directory Studio Core Integration Tests
Bundle-SymbolicName: org.apache.directory.studio.test.integration.core;singleton:=true
Bundle-Version: 1.2.0.SNAPSHOT
Bundle-Localization: plugin
Modified: directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml?rev=664308&r1=664307&r2=664308&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml Sat Jun 7 03:09:12 2008
@@ -29,19 +29,98 @@
<artifactId>test.integration.core</artifactId>
<version>${test.integration.core.version}</version>
- <name>Apache Directory Studio Integration Tests Core</name>
+ <name>Apache Directory Studio Core Integration Tests</name>
<packaging>jar</packaging>
<description></description>
<profiles>
- <!-- Run Core Test within Eclipse Test Framework -->
+
+ <!--linux-x86 -->
+ <profile>
+ <id>linux-x86</id>
+ <activation>
+ <os>
+ <arch>i386</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch x86</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- linux-x86_64 -->
+ <profile>
+ <id>linux-x86_64</id>
+ <activation>
+ <os>
+ <arch>amd64</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch x86_64</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- linux-ppc -->
+ <profile>
+ <id>linux-ppc</id>
+ <activation>
+ <os>
+ <arch>ppc</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch ppc</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!--win32 -->
+ <profile>
+ <id>win32</id>
+ <activation>
+ <os>
+ <arch>x86</arch>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^\\]*)\\(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os win32 -ws win32 -arch x86</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- macosx -->
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ <name>mac os x</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os macosx -ws carbon -arch x64</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- launch core tests using eclipse test framework -->
<profile>
<id>integration-core</id>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -50,22 +129,28 @@
<phase>test</phase>
<configuration>
<tasks>
+
+ <!-- cleanup and recreate test-sandbox -->
<delete dir="target/test-sandbox"/>
<mkdir dir="target/test-sandbox"/>
- <mkdir dir="target/test-sandbox/plugins"/>
<mkdir dir="target/test-sandbox/workspace"/>
+ <!-- copy previous build of of apache directory studio binaries to test-sandbox -->
<copy todir="target/test-sandbox">
<fileset dir="../target/distributions">
<include name="ApacheDirectoryStudio-*/**" />
</fileset>
- <regexpmapper from="^(ApacheDirectoryStudio-[^/]*)/(.*)$$" to="\2"/>
+ <regexpmapper from="${integration-regexp}" to="\2"/>
</copy>
+
+ <!-- copy SWTbot and eclipse testing plugins to test-sandbox -->
<copy todir="target/test-sandbox/plugins">
<fileset dir="../test-integration-ui/resources/test-plugins">
<include name="**/*" />
</fileset>
</copy>
+
+ <!-- copy additional eclipse dependencies to test-sandbox -->
<copy todir="target/test-sandbox/plugins">
<fileset dir="${eclipse-home}/plugins">
<include name="org.apache.commons.collections_*.jar" />
@@ -97,46 +182,13 @@
</fileset>
</copy>
+ <!-- launch the tests -->
<java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
- <arg line="-os linux -ws gtk -arch x86_64 -application org.eclipse.test.coretestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.core -className org.apache.directory.studio.test.integration.core.AutomatedSuite"/>
+ <arg line="${integration-cmdline-params} -application org.eclipse.test.coretestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.core -className org.apache.directory.studio.test.integration.core.AutomatedSuite"/>
<classpath>
<pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
</classpath>
</java>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-core</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <delete dir="target/distributions"/>
- <mkdir dir="target/distributions"/>
- <untar compression="gzip" src="../target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT-dist.tar.gz" dest="target/distributions"/>
- <copy todir="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT">
- <fileset dir="resources/" />
- </copy>
- <mkdir dir="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace"/>
- <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
- <arg line="-os linux -ws gtk -arch x86_64 -application org.eclipse.test.coretestapplication -data target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.core -className org.apache.directory.studio.test.integration.core.AutomatedSuite"/>
- <classpath>
- <pathelement location="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
- </classpath>
- </java>
</tasks>
</configuration>
<goals>
@@ -145,7 +197,7 @@
</execution>
</executions>
</plugin>
- -->
+
</plugins>
</build>
</profile>
@@ -228,7 +280,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <!-- <version>4.4</version> -->
<scope>provided</scope>
</dependency>
<dependency>
Modified: directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF?rev=664308&r1=664307&r2=664308&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF Sat Jun 7 03:09:12 2008
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Apache Directory Studio Integration Tests UI
+Bundle-Name: Apache Directory Studio UI Integration Tests
Bundle-SymbolicName: org.apache.directory.studio.test.integration.ui;singleton:=true
Bundle-Version: 1.2.0.SNAPSHOT
Bundle-Vendor: Apache Software Foundation
Modified: directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml?rev=664308&r1=664307&r2=664308&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml Sat Jun 7 03:09:12 2008
@@ -29,52 +29,96 @@
<artifactId>test.integration.ui</artifactId>
<version>${test.integration.ui.version}</version>
- <name>Apache Directory Studio Integration Tests UI</name>
+ <name>Apache Directory Studio UI Integration Tests</name>
<packaging>jar</packaging>
<description></description>
<profiles>
- <!-- Run UM Test within Eclipse Test Framework -->
+
+ <!--linux-x86 -->
+ <profile>
+ <id>linux-x86</id>
+ <activation>
+ <os>
+ <arch>i386</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch x86</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- linux-x86_64 -->
+ <profile>
+ <id>linux-x86_64</id>
+ <activation>
+ <os>
+ <arch>amd64</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch x86_64</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- linux-ppc -->
+ <profile>
+ <id>linux-ppc</id>
+ <activation>
+ <os>
+ <arch>ppc</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os linux -ws gtk -arch ppc</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!--win32 -->
+ <profile>
+ <id>win32</id>
+ <activation>
+ <os>
+ <arch>x86</arch>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^\\]*)\\(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os win32 -ws win32 -arch x86</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- macosx -->
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ <name>mac os x</name>
+ </os>
+ </activation>
+ <properties>
+ <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
+ <integration-cmdline-params>-os macosx -ws carbon -arch x64</integration-cmdline-params>
+ </properties>
+ </profile>
+
+ <!-- launch UI tests using eclipse test framework -->
<profile>
<id>integration-ui</id>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-ui</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <delete dir="target/distributions"/>
- <mkdir dir="target/distributions"/>
- <untar compression="gzip" src="../target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT-dist.tar.gz" dest="target/distributions"/>
- <copy todir="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT">
- <fileset dir="../test-integration-core/resources/" />
- </copy>
- <copy todir="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT">
- <fileset dir="resources/" />
- </copy>
- <mkdir dir="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace"/>
- <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
- <arg line="-os linux -ws gtk -arch x86_64 -application net.sf.swtbot.eclipse.headless.swtbottestapplication -data target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.ui -className org.apache.directory.studio.test.integration.ui.AutomatedSuite"/>
- <classpath>
- <pathelement location="target/distributions/ApacheDirectoryStudio-linux-x86_64-1.2.0.SNAPSHOT/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
- </classpath>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -85,22 +129,28 @@
<phase>test</phase>
<configuration>
<tasks>
+
+ <!-- cleanup and recreate test-sandbox -->
<delete dir="target/test-sandbox"/>
<mkdir dir="target/test-sandbox"/>
- <mkdir dir="target/test-sandbox/plugins"/>
<mkdir dir="target/test-sandbox/workspace"/>
+ <!-- copy previous build of of apache directory studio binaries to test-sandbox -->
<copy todir="target/test-sandbox">
<fileset dir="../target/distributions">
<include name="ApacheDirectoryStudio-*/**" />
</fileset>
- <regexpmapper from="^(ApacheDirectoryStudio-[^/]*)/(.*)$$" to="\2"/>
+ <regexpmapper from="${integration-regexp}" to="\2"/>
</copy>
+
+ <!-- copy SWTbot and eclipse testing plugins to test-sandbox -->
<copy todir="target/test-sandbox/plugins">
<fileset dir="resources/test-plugins">
<include name="**/*" />
</fileset>
</copy>
+
+ <!-- copy additional eclipse dependencies to test-sandbox -->
<copy todir="target/test-sandbox/plugins">
<fileset dir="${eclipse-home}/plugins">
<include name="org.apache.commons.collections_*.jar" />
@@ -132,13 +182,13 @@
</fileset>
</copy>
+ <!-- launch the tests -->
<java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
- <arg line="-os linux -ws gtk -arch x86_64 -application net.sf.swtbot.eclipse.headless.swtbottestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.ui -className org.apache.directory.studio.test.integration.ui.AutomatedSuite"/>
+ <arg line="${integration-cmdline-params} -application net.sf.swtbot.eclipse.headless.swtbottestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.ui -className org.apache.directory.studio.test.integration.ui.AutomatedSuite"/>
<classpath>
<pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
</classpath>
</java>
-
</tasks>
</configuration>
<goals>