You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/10/05 11:11:05 UTC

svn commit: r1706772 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Author: mreutegg
Date: Mon Oct  5 09:11:05 2015
New Revision: 1706772

URL: http://svn.apache.org/viewvc?rev=1706772&view=rev
Log:
OAK-3455: Improve conflict exception message

CommitFailedException may not have the message, but the DocumentStoreException cause must have the it

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1706772&r1=1706771&r2=1706772&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Mon Oct  5 09:11:05 2015
@@ -1613,7 +1613,8 @@ public class DocumentNodeStoreTest {
             merge(ns2, b2);
             fail("Must throw CommitFailedException");
         } catch (CommitFailedException e) {
-            assertTrue(e.getMessage().contains("not yet visible"));
+            assertNotNull(e.getCause());
+            assertTrue(e.getCause().getMessage().contains("not yet visible"));
         }
 
     }