You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/12/06 14:51:19 UTC
svn commit: r1042643 - in /jackrabbit/trunk/jackrabbit-core: pom.xml
src/test/java/org/apache/jackrabbit/core/TestAll.java
Author: jukka
Date: Mon Dec 6 13:51:19 2010
New Revision: 1042643
URL: http://svn.apache.org/viewvc?rev=1042643&view=rev
Log:
JCR-2828: InternalVersionManager deadlock
Enable ConcurrentVersioningTest and other concurrency tests
when using the integrationTesting profile
Modified:
jackrabbit/trunk/jackrabbit-core/pom.xml
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1042643&r1=1042642&r2=1042643&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Mon Dec 6 13:51:19 2010
@@ -33,6 +33,10 @@
<name>Jackrabbit Core</name>
<description>Jackrabbit content repository implementation</description>
+ <properties>
+ <org.apache.jackrabbit.test.integration>false</org.apache.jackrabbit.test.integration>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -106,6 +110,10 @@ org.apache.jackrabbit.test.api.Shareable
org.apache.jackrabbit.test.api.ShareableNodeTest#testGetNodesByPattern
</value>
</property>
+ <property>
+ <name>org.apache.jackrabbit.test.integration</name>
+ <value>${org.apache.jackrabbit.test.integration}</value>
+ </property>
</systemProperties>
</configuration>
<executions>
@@ -287,16 +295,22 @@ org.apache.jackrabbit.test.api.Shareable
</dependency>
</dependencies>
- <!--
- These profiles can be used to run the (integration) tests against different DB backends.
- For instance, if you want to run the integration tests against MySQL backend, do:
-
- mvn clean integration-test -Pmysql,use-descriptor-overlay
-
- Note: the ${config.db.name} database is dropped and re-created in the clean phase.
- -->
<profiles>
<profile>
+ <id>integrationTesting</id>
+ <properties>
+ <org.apache.jackrabbit.test.integration>true</org.apache.jackrabbit.test.integration>
+ </properties>
+ </profile>
+ <!--
+ These profiles can be used to run the (integration) tests against different DB backends.
+ For instance, if you want to run the integration tests against MySQL backend, do:
+
+ mvn clean integration-test -Pmysql,use-descriptor-overlay
+
+ Note: the ${config.db.name} database is dropped and re-created in the clean phase.
+ -->
+ <profile>
<id>mysql</id>
<properties>
<config.db.name>jackrabbit</config.db.name>
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java?rev=1042643&r1=1042642&r2=1042643&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java Mon Dec 6 13:51:19 2010
@@ -58,6 +58,20 @@ public class TestAll extends TestCase {
suite.addTestSuite(ConcurrentReorderTest.class);
suite.addTestSuite(ConcurrentAddRemoveNodeTest.class);
+ if (Boolean.getBoolean("org.apache.jackrabbit.test.integration")) {
+ suite.addTestSuite(ConcurrencyTest.class);
+ // suite.addTestSuite(ConcurrencyTest3.class);
+ suite.addTestSuite(ConcurrentVersioningTest.class);
+ // suite.addTestSuite(ConcurrentVersioningWithTransactionsTest.class);
+ suite.addTestSuite(ConcurrentCheckinMixedTransactionTest.class);
+ suite.addTestSuite(ConcurrentLoginTest.class);
+ suite.addTestSuite(ConcurrentNodeModificationTest.class);
+ suite.addTestSuite(ConcurrentReadWriteTest.class);
+ suite.addTestSuite(ConcurrentRenameTest.class);
+ suite.addTestSuite(ConcurrentSaveTest.class);
+ suite.addTestSuite(ConcurrentWorkspaceCopyTest.class);
+ }
+
suite.addTestSuite(UserPerWorkspaceSecurityManagerTest.class);
suite.addTestSuite(PersistenceManagerTest.class);