Author: mreutegg
Date: Tue Apr 8 06:55:49 2014
New Revision: 1585647
URL: http://svn.apache.org/r1585647
Log:
OAK-1690: OrderableNodesTest fails with Document_JDBC
Disabled the test for now and improved exception chaining for failed reset
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java?rev=1585647&r1=1585646&r2=1585647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
Tue Apr 8 06:55:49 2014
@@ -692,17 +692,17 @@ public abstract class AbstractNodeStoreB
@Nonnull
@Override
NodeState getHead() {
- throw new IllegalStateException("Branch with failed reset");
+ throw new IllegalStateException("Branch with failed reset", ex);
}
@Override
void setRoot(NodeState root) {
- throw new IllegalStateException("Branch with failed reset");
+ throw new IllegalStateException("Branch with failed reset", ex);
}
@Override
void rebase() {
- throw new IllegalStateException("Branch with failed reset");
+ throw new IllegalStateException("Branch with failed reset", ex);
}
/**
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java?rev=1585647&r1=1585646&r2=1585647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
Tue Apr 8 06:55:49 2014
@@ -29,11 +29,14 @@ import org.junit.Test;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
public class OrderableNodesTest extends AbstractRepositoryTest {
public OrderableNodesTest(NodeStoreFixture fixture) {
super(fixture);
+ // OAK-1690
+ assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC);
}
@Test
