|
From: <man...@us...> - 2011-03-19 22:30:29
|
Revision: 6203
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6203&view=rev
Author: manningr
Date: 2011-03-19 22:30:23 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Disabled running normal tests when the uitests profile is enabled (see comment above profile in root pom). Removed needless duplicate surefire configuration in app/pom.xml. Added fest test dependency in example plugin.
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/plugins/example/pom.xml
trunk/sql12/pom.xml
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2011-03-19 17:35:17 UTC (rev 6202)
+++ trunk/sql12/app/pom.xml 2011-03-19 22:30:23 UTC (rev 6203)
@@ -159,29 +159,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <excludes>
- <exclude>**/ApplicationArgumentsTest.java</exclude>
- <exclude>**/*UITest.java</exclude>
- </excludes>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${jar-plugin-version}</version>
<configuration>
@@ -223,43 +200,4 @@
</plugin>
</plugins>
</build>
-<!-- <profiles>-->
-<!-- <profile>-->
-<!-- <id>uitests</id>-->
-<!-- <activation>-->
-<!-- <property>-->
-<!-- <name>uitests</name>-->
-<!-- </property>-->
-<!-- </activation>-->
-<!-- <build>-->
-<!-- <plugins>-->
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-surefire-plugin</artifactId>-->
-<!-- <version>${surefire-plugin-version}</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>uitests</id>-->
-<!-- <phase>test</phase>-->
-<!-- <goals>-->
-<!-- <goal>test</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <redirectTestOutputToFile>true</redirectTestOutputToFile>-->
-<!-- <includes>-->
-<!-- <include>**/*UITest.java</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>**/Abstract*UITest.java</exclude>-->
-<!-- </excludes>-->
-<!-- <parallel>${surefire-parallel-type}</parallel>-->
-<!-- <threadCount>${surefire-thread-count}</threadCount>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-<!-- </plugins>-->
-<!-- </build>-->
-<!-- </profile>-->
-<!-- </profiles>-->
</project>
Modified: trunk/sql12/plugins/example/pom.xml
===================================================================
--- trunk/sql12/plugins/example/pom.xml 2011-03-19 17:35:17 UTC (rev 6202)
+++ trunk/sql12/plugins/example/pom.xml 2011-03-19 22:30:23 UTC (rev 6203)
@@ -104,6 +104,12 @@
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-swing-junit-4.5</artifactId>
+ <version>${fest-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.example.ExamplePlugin</pluginClassName>
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2011-03-19 17:35:17 UTC (rev 6202)
+++ trunk/sql12/pom.xml 2011-03-19 22:30:23 UTC (rev 6203)
@@ -199,16 +199,22 @@
<version>${surefire-plugin-version}</version>
<configuration>
<excludes>
- <!--
- Until ApplicationArguments can be isolated from being accessed statically by
- all code that currently relies on it, we exclude ApplicationArgumentsTest it here
- so that it doesn't poison other tests that happen to run after it in the same
- JVM. This is only technically required by the "app" project, but at the moment
- we wish to share the commonly needed additional exclusion for UI Test classes.
+ <!--
+ Until ApplicationArguments can be isolated from being accessed statically by all code that
+ currently relies on it, we exclude ApplicationArgumentsTest it here so that it doesn't
+ poison other tests that happen to run after it in the same JVM. This is only technically
+ required by the "app" project, but at the moment we wish to share the commonly needed
+ additional exclusion for UI Test classes.
-->
<exclude>**/ApplicationArgumentsTest.java</exclude>
<exclude>**/*UITest.java</exclude>
</excludes>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
<parallel>${surefire-parallel-type}</parallel>
<threadCount>${surefire-thread-count}</threadCount>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -297,6 +303,16 @@
</plugins>
</build>
</profile>
+ <!--
+ This profile disables the normal execution of unit tests (src/test/java) and instead runs only
+ the UI Tests (tests ending in *UITest.java). This was done because when the normal tests are run
+ along with the UI tests in this configuration it obstructs the normal processing of the Emma code
+ coverage plugin to have two test phases, where the second one removes the output of the first. So
+ since the normal tests must be run in Emma without the UI tests, this requires another job in
+ Hudson to run the UI tests. Rather than have the normal tests run twice, once for code coverage
+ without UI tests, and once with the UI tests, it was decided to simply disable them in this
+ profile.
+ -->
<profile>
<id>uitests</id>
<activation>
@@ -312,6 +328,12 @@
<version>${surefire-plugin-version}</version>
<executions>
<execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>uitests</id>
<phase>test</phase>
<goals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
