directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r754651 - in /directory/studio/trunk: test-integration-core/ test-integration-ui/ test-integration-ui/resources/test-plugins/
Date Sun, 15 Mar 2009 10:51:11 GMT
Author: seelmann
Date: Sun Mar 15 10:51:10 2009
New Revision: 754651

URL: http://svn.apache.org/viewvc?rev=754651&view=rev
Log:
Fixed tests

Added:
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar
  (with props)
Modified:
    directory/studio/trunk/test-integration-core/pom.xml
    directory/studio/trunk/test-integration-ui/pom.xml

Modified: directory/studio/trunk/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/pom.xml?rev=754651&r1=754650&r2=754651&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/pom.xml (original)
+++ directory/studio/trunk/test-integration-core/pom.xml Sun Mar 15 10:51:10 2009
@@ -139,10 +139,16 @@
                     <mkdir dir="target/test-sandbox"/>
                     <mkdir dir="target/test-sandbox/workspace"/>
                     
-                    <!-- copy previous build of of apache directory studio binaries to
test-sandbox -->
+                    <!-- copy complete eclipse distribution to test-sandbox -->
+                    <copy todir="target/test-sandbox">
+                      <fileset dir="${eclipse-home}">
+                      </fileset>
+                    </copy>
+                    
+                    <!-- copy apache directory studio plugins to test-sandbox -->
                     <copy todir="target/test-sandbox">
                       <fileset dir="../target/distributions">
-                        <include name="ApacheDirectoryStudio-*/**" />
+                        <include name="ApacheDirectoryStudio-*/**/plugins/org.apache.directory*"/>
                       </fileset>
                       <regexpmapper from="${integration-regexp}" to="\2"/>
                     </copy>
@@ -161,43 +167,13 @@
                       </fileset>
                     </copy>
                     
-                    <!-- copy additional eclipse dependencies to test-sandbox -->
-                    <copy todir="target/test-sandbox/${integration-plugins-folder}">
-                      <fileset dir="${eclipse-home}/plugins">
-                        <include name="org.apache.commons.collections_*.jar" />
-                        <include name="org.apache.log4j_*.jar" />
-                        <include name="org.eclipse.ant.core_*.jar" />
-                        <include name="org.eclipse.ant.ui_*.jar" />
-                        <include name="org.eclipse.compare_*.jar" />
-                        <include name="org.eclipse.core.variables_*.jar" />
-                        <include name="org.eclipse.debug.core_*.jar" />
-                        <include name="org.eclipse.debug.ui_*.jar" />
-                        <include name="org.eclipse.team.core_*.jar" />
-                        <include name="org.eclipse.team.ui_*.jar" />
-                        <include name="org.eclipse.ui.browser_*.jar" />
-                        <include name="org.eclipse.ui.cheatsheets_*.jar" />
-                        <include name="org.eclipse.ui.console_*.jar" />
-                        <include name="org.eclipse.ui.externaltools_*.jar" />
-                        <include name="org.eclipse.ui.navigator_*.jar" />
-                        <include name="org.eclipse.ui.navigator.resources_*.jar" />
-                        <include name="org.eclipse.ui.net_*.jar" />
-                        <include name="org.eclipse.ui.presentations_*.jar" />
-                        <include name="org.eclipse.ui.views.properties.tabbed_*.jar" />
-                        <include name="org.eclipse.jdt*" />
-                        <include name="org.eclipse.ltk*" />
-                        <include name="org.eclipse.pde*" />
-                        <include name="org.eclipse.ui.intro.universal_*/**" />
-                        <include name="org.apache.ant_*/**" />
-                        <include name="org.junit_*/**" />
-                        <include name="org.junit4_*/**" />
-                      </fileset>
-                    </copy>
-                    
                     <!-- launch the tests -->
                     <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
                       <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/${integration-plugins-folder}/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar"
/>
+                        <fileset dir="target/test-sandbox">
+                          <include name="**/org.eclipse.equinox.launcher_*.jar"/>
+                        </fileset>
                       </classpath>
                     </java>
                   </tasks>

Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=754651&r1=754650&r2=754651&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Sun Mar 15 10:51:10 2009
@@ -139,16 +139,16 @@
                     <mkdir dir="target/test-sandbox"/>
                     <mkdir dir="target/test-sandbox/workspace"/>
                     
-                    <!-- copy previous build of of apache directory studio binaries to
test-sandbox -->
+                    <!-- copy complete eclipse distribution to test-sandbox -->
+                    <copy todir="target/test-sandbox">
+                      <fileset dir="${eclipse-home}">
+                      </fileset>
+                    </copy>
+                    
+                    <!-- copy apache directory studio plugins to test-sandbox -->
                     <copy todir="target/test-sandbox">
                       <fileset dir="../target/distributions">
-                        <include name="ApacheDirectoryStudio-*/**" />
-                        <!-- 
-                          To run the tests we need the full org.eclipse.ui.ide plugins 
-                          including the Resouce perspective, so we can't use the 
-                          adapted studio plugin.
-                        -->
-                        <exclude name="**/*org.eclipse.ui.ide*"/>
+                        <include name="ApacheDirectoryStudio-*/**/plugins/org.apache.directory*"/>
                       </fileset>
                       <regexpmapper from="${integration-regexp}" to="\2"/>
                     </copy>
@@ -167,47 +167,16 @@
                       </fileset>
                     </copy>
                     
-                    <!-- copy additional eclipse dependencies to test-sandbox -->
-                    <copy todir="target/test-sandbox/${integration-plugins-folder}">
-                      <fileset dir="${eclipse-home}/plugins">
-                        <include name="org.apache.commons.collections_*.jar" />
-                        <include name="org.apache.log4j_*.jar" />
-                        <include name="org.eclipse.ant.core_*.jar" />
-                        <include name="org.eclipse.ant.ui_*.jar" />
-                        <include name="org.eclipse.compare_*.jar" />
-                        <include name="org.eclipse.core.variables_*.jar" />
-                        <include name="org.eclipse.debug.core_*.jar" />
-                        <include name="org.eclipse.debug.ui_*.jar" />
-                        <include name="org.eclipse.team.core_*.jar" />
-                        <include name="org.eclipse.team.ui_*.jar" />
-                        <include name="org.eclipse.ui.browser_*.jar" />
-                        <include name="org.eclipse.ui.cheatsheets_*.jar" />
-                        <include name="org.eclipse.ui.console_*.jar" />
-                        <include name="org.eclipse.ui.externaltools_*.jar" />
-                        <include name="org.eclipse.ui.ide_*.jar" />
-                        <include name="org.eclipse.ui.ide.application_*.jar" />
-                        <include name="org.eclipse.ui.navigator_*.jar" />
-                        <include name="org.eclipse.ui.navigator.resources_*.jar" />
-                        <include name="org.eclipse.ui.net_*.jar" />
-                        <include name="org.eclipse.ui.presentations_*.jar" />
-                        <include name="org.eclipse.ui.views.properties.tabbed_*.jar" />
-                        <include name="org.eclipse.jdt*" />
-                        <include name="org.eclipse.ltk*" />
-                        <include name="org.eclipse.pde*" />
-                        <include name="org.eclipse.ui.intro.universal_*/**" />
-                        <include name="org.apache.ant_*/**" />
-                        <include name="org.junit_*/**" />
-                        <include name="org.junit4_*/**" />
-                      </fileset>
-                    </copy>
-                    
                     <!-- launch the tests -->
                     <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
                       <arg line="${integration-cmdline-params} -nl en -debug debugoptions
-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/${integration-plugins-folder}/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar"
/>
+                        <fileset dir="target/test-sandbox">
+                          <include name="**/org.eclipse.equinox.launcher_*.jar"/>
+                        </fileset>
                       </classpath>
                     </java>
+                    
                   </tasks>
                 </configuration>
                 <goals>

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar?rev=754651&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar?rev=754651&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message