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 2015/03/31 23:21:15 UTC

svn commit: r1670484 - in /directory/studio/trunk: README.md tests/pom-first.xml tests/pom.xml tests/test.integration.ui/pom.xml

Author: seelmann
Date: Tue Mar 31 21:21:15 2015
New Revision: 1670484

URL: http://svn.apache.org/r1670484
Log:
Integrate UI tests in build, disabled by default

Modified:
    directory/studio/trunk/README.md
    directory/studio/trunk/tests/pom-first.xml
    directory/studio/trunk/tests/pom.xml
    directory/studio/trunk/tests/test.integration.ui/pom.xml

Modified: directory/studio/trunk/README.md
URL: http://svn.apache.org/viewvc/directory/studio/trunk/README.md?rev=1670484&r1=1670483&r2=1670484&view=diff
==============================================================================
--- directory/studio/trunk/README.md (original)
+++ directory/studio/trunk/README.md Tue Mar 31 21:21:15 2015
@@ -39,6 +39,12 @@ or on Windows :
 
     > build.bat
 
+### Tests
+
+* Unit tests included in src/test/java of each plugin are executed automatically and run in 'test' phase
+* Core integration tests in tests/test.integration.core are executed automatically and run in 'integration-test' phase
+* SWTBot based UI integration tests in tests/test/integration.ui are not yet fully working and diabled by default. They can be enabled with -Denable-ui-tests.
+
 ### Build issues
 
 Tycho doesn't handle snapshot dependencies well. The first time a snapshot dependency is used within the build it is cached in `~/.m2/repository/p2`. Afterwards any change in the dependency (e.g. ApacheDS or LDAP API) is the considered unless it is deleted from the cache.

Modified: directory/studio/trunk/tests/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/pom-first.xml?rev=1670484&r1=1670483&r2=1670484&view=diff
==============================================================================
--- directory/studio/trunk/tests/pom-first.xml (original)
+++ directory/studio/trunk/tests/pom-first.xml Tue Mar 31 21:21:15 2015
@@ -34,7 +34,7 @@
 
   <modules>
     <module>test.integration.core/pom-first.xml</module>
-<!--     <module>test.integration.ui</module> -->
+    <module>test.integration.ui/pom-first.xml</module>
   </modules>
 
   <build>

Modified: directory/studio/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/pom.xml?rev=1670484&r1=1670483&r2=1670484&view=diff
==============================================================================
--- directory/studio/trunk/tests/pom.xml (original)
+++ directory/studio/trunk/tests/pom.xml Tue Mar 31 21:21:15 2015
@@ -33,7 +33,7 @@
 
   <modules>
     <module>test.integration.core</module>
-<!--     <module>test.integration.ui</module> -->
+    <module>test.integration.ui</module>
   </modules>
   
 </project>

Modified: directory/studio/trunk/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?rev=1670484&r1=1670483&r2=1670484&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom.xml Tue Mar 31 21:21:15 2015
@@ -32,6 +32,30 @@
   <packaging>eclipse-test-plugin</packaging>
   <description />
 
+  <!-- 
+    UI tests using SWTBot are not yet fully working. By default test execution
+    is disabled but can be activated with property -Denable-ui-tests
+   -->
+  <properties>
+    <skip-ui-tests>true</skip-ui-tests>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>enable-ui-tests</id>
+      <activation>
+        <property>
+          <name>enable-ui-tests</name>
+        </property>
+      </activation>
+      <properties>
+        <skip-ui-tests>false</skip-ui-tests>
+      </properties>
+    </profile>
+    <!-- TODO: for Mac VM args -XstartOnFirstThread may be required -->
+  </profiles>
+
+
   <build>
     <plugins>
       <plugin>
@@ -40,6 +64,7 @@
         <configuration>
           <dependency-resolution>
             <extraRequirements>
+              <!-- TODO: more requirements required -->
               <requirement>
                 <type>eclipse-feature</type>
                 <id>org.eclipse.rcp</id>
@@ -54,11 +79,25 @@
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
+          <skip>${skip-ui-tests}</skip>
           <includes>
             <include>**/*Test.java</include>
+<!--             <include>**/ApacheDSPluginTest.java</include> -->
+<!--             <include>**/BrowserTest.java</include> -->
+<!--             <include>**/EntryEditorTest.java</include> -->
+<!--             <include>**/ImportExportTest.java</include> -->
+<!--             <include>**/NewConnectionWizardTest.java</include> -->
+<!--             <include>**/NewEntryWizardTest.java</include> -->
+<!--             <include>**/PreferencesTest.java</include> -->
+<!--             <include>**/ReferralDialogTest.java</include> -->
+<!--             <include>**/RenameEntryDialogTest.java</include> -->
+<!--             <include>**/SearchTest.java</include> -->
+<!--             <include>**/SwtResourcesTest.java</include> -->
           </includes>
           <useUIHarness>true</useUIHarness>
           <useUIThread>false</useUIThread>
+          <appArgLine>-nl en -debug debugoptions</appArgLine>
+          <!-- TODO: Run tests in Studio RCP app only, or in full IDE, or both? -->
 <!--           <product>org.eclipse.sdk.ide</product> -->
 <!--           <application>org.eclipse.ui.ide.workbench</application> -->
           <product>org.apache.directory.studio.rcp.product</product>