You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2010/09/22 16:16:25 UTC
svn commit: r999965 - in /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core: lock/DefaultISMLockingTest.java lock/TestAll.java state/DefaultISMLockingDeadlockTest.java state/TestAll.java

Author: thomasm
Date: Wed Sep 22 14:16:25 2010
New Revision: 999965

URL: http://svn.apache.org/viewvc?rev=999965&view=rev
Log:
JCR-2753 Deadlock in DefaultISMLocking - moving & renaming test case

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java
      - copied, changed from r999299, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/DefaultISMLockingTest.java
Removed:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/DefaultISMLockingTest.java
Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/TestAll.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/TestAll.java?rev=999965&r1=999964&r2=999965&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/TestAll.java Wed Sep 22 14:16:25 2010
@@ -35,7 +35,6 @@ public class TestAll extends TestCase {
     public static Test suite() {
         TestSuite suite = new TestSuite("org.apache.jackrabbit.core.lock tests");
 
-        suite.addTestSuite(DefaultISMLockingTest.class);
         suite.addTestSuite(ExtendedLockingTest.class);
 
         return suite;

Copied: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java (from r999299, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/DefaultISMLockingTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java?p2=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java&p1=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/DefaultISMLockingTest.java&r1=999299&r2=999965&rev=999965&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/DefaultISMLockingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java Wed Sep 22 14:16:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.core.lock;
+package org.apache.jackrabbit.core.state;
 
 import org.apache.jackrabbit.core.state.DefaultISMLocking;
 import org.apache.jackrabbit.core.state.ISMLocking;
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.test.JUnitT
 /**
  * Tests the DefaultISMLocking class.
  */
-public class DefaultISMLockingTest extends JUnitTest {
+public class DefaultISMLockingDeadlockTest extends JUnitTest {
 
     public void test() throws InterruptedException {
         final ISMLocking lock = new DefaultISMLocking();

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java?rev=999965&r1=999964&r2=999965&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java Wed Sep 22 14:16:25 2010
@@ -37,6 +37,7 @@ public class TestAll extends TestCase {
 
         suite.addTestSuite(ChangeLogTest.class);
         suite.addTestSuite(DefaultISMLockingTest.class);
+        suite.addTestSuite(DefaultISMLockingDeadlockTest.class);
         suite.addTestSuite(FineGrainedISMLockingTest.class);
         suite.addTestSuite(NameSetTest.class);