Author: aheritier
Date: 2009-10-19 09:04:34 -0400 (Mon, 19 Oct 2009)
New Revision: 296
Modified:
jcr/trunk/component/core/TCK.cmd
jcr/trunk/component/core/TCK.sh
jcr/trunk/component/core/pom.xml
jcr/trunk/component/core/test-all.cmd
jcr/trunk/component/core/test-dev.cmd
jcr/trunk/component/core/test.cmd
Log:
SWF-194 : Split unit tests, devtests in different profiles
Modified: jcr/trunk/component/core/TCK.cmd
===================================================================
--- jcr/trunk/component/core/TCK.cmd 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/TCK.cmd 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,3 +1,3 @@
-@set MAVEN_OPTS=-Duser.language=en -Duser.region=us -Dmaven.test.skip=true
-Dexo.devtest.skip=true -DforkMode=never -Dorg.exoplatform.jcr.monitor.jdbcMonitor
%MAVEN_OPTS%
+@set MAVEN_OPTS=-Duser.language=en -Duser.region=us -Dmaven.test.skip=true
-DforkMode=never -Dorg.exoplatform.jcr.monitor.jdbcMonitor %MAVEN_OPTS%
@start mvn clean install -Prun-its
Modified: jcr/trunk/component/core/TCK.sh
===================================================================
--- jcr/trunk/component/core/TCK.sh 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/TCK.sh 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,2 +1,2 @@
-MAVEN_OPTS="-Duser.language=en -Duser.region=us -Dmaven.test.skip=true
-Dexo.devtest.skip=true -DforkMode=never -Dorg.exoplatform.jcr.monitor.jdbcMonitor
$MAVEN_OPTS "
+MAVEN_OPTS="-Duser.language=en -Duser.region=us -Dmaven.test.skip=true
-DforkMode=never -Dorg.exoplatform.jcr.monitor.jdbcMonitor $MAVEN_OPTS "
mvn $MAVEN_OPTS clean install -Prun-its
\ No newline at end of file
Modified: jcr/trunk/component/core/pom.xml
===================================================================
--- jcr/trunk/component/core/pom.xml 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/pom.xml 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,24 +1,12 @@
-<!--
- Copyright (C) 2009 eXo Platform SAS.
+ <!--
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it
and/or modify it under the terms of the GNU Lesser General Public License as published by
the Free Software
+ Foundation; either version 2.1 of the License, or (at your option) any later
version. This software is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. You should have received a copy of the
GNU Lesser General
+ Public License along with this software; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
site:
http://www.fsf.org.
+ -->
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -316,26 +304,6 @@
</configuration>
<executions>
<execution>
- <id>execution0 - developers tests</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemProperties>
- <property>
- <name>jcr.test.configuration.file</name>
- <value>${jcr.test.configuration.file}</value>
- </property>
- </systemProperties>
- <includes>
-
<include>**/**/TestErrorMultithreading__.java</include>
- <include>**/**/TestConcurrentItems__.java</include>
- <include>**/**/TestInvalidItemState__.java</include>
- </includes>
- </configuration>
- </execution>
- <execution>
<id>execution1 - exo tests</id>
<phase>test</phase>
<goals>
@@ -343,6 +311,7 @@
</goals>
<configuration>
<argLine>-Xmx512M</argLine>
+ <exo.devtest.skip>true</exo.devtest.skip>
<systemProperties>
<property>
<name>jcr.test.configuration.file</name>
@@ -489,6 +458,40 @@
<!-- ***************** -->
<!-- INTEGRATION TESTS -->
<!-- ***************** -->
+ <!-- Use "mvn -Prun-devtests" to launch them -->
+ <profile>
+ <id>run-devtests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>execution0 - developers tests</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>jcr.test.configuration.file</name>
+
<value>${jcr.test.configuration.file}</value>
+ </property>
+ </systemProperties>
+ <includes>
+
<include>**/**/TestErrorMultithreading__.java</include>
+
<include>**/**/TestConcurrentItems__.java</include>
+
<include>**/**/TestInvalidItemState__.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- Use "mvn -Prun-its" to launch them -->
<profile>
<id>run-its</id>
Modified: jcr/trunk/component/core/test-all.cmd
===================================================================
--- jcr/trunk/component/core/test-all.cmd 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/test-all.cmd 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,3 +1,3 @@
-@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false
-Dexo.devtest.skip=true -DforkMode=once
+@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false
-DforkMode=once
@start mvn clean test -Prun-its
\ No newline at end of file
Modified: jcr/trunk/component/core/test-dev.cmd
===================================================================
--- jcr/trunk/component/core/test-dev.cmd 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/test-dev.cmd 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,3 +1,3 @@
-@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=true
-Dexo.devtest.skip=false -DforkMode=never
+@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=true
-DforkMode=never
-@start mvn clean test
\ No newline at end of file
+@start mvn clean test -Prun-devtests
\ No newline at end of file
Modified: jcr/trunk/component/core/test.cmd
===================================================================
--- jcr/trunk/component/core/test.cmd 2009-10-19 12:50:03 UTC (rev 295)
+++ jcr/trunk/component/core/test.cmd 2009-10-19 13:04:34 UTC (rev 296)
@@ -1,3 +1,3 @@
-@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false
-Dexo.devtest.skip=true -DforkMode=never
+@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false
-DforkMode=never
@start mvn clean test
\ No newline at end of file