svn commit: r1576773 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java

[reschke]

Author: reschke
Date: Wed Mar 12 15:03:25 2014
New Revision: 1576773

URL: http://svn.apache.org/r1576773
Log:
OAK-1491 - add additional diagnostics for occasionally failing test

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java?rev=1576773&r1=1576772&r2=1576773&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
 Wed Mar 12 15:03:25 2014
@@ -104,15 +104,41 @@ public class JackrabbitNodeTest extends 
             superuser.save();
 
             boolean foundMove = false;
+            StringBuffer diags = new StringBuffer();
             for (Event event : result.getEvents(5000)) {
+                if (diags.length() != 0) {
+                    diags.append(", ");
+                }
+                diags.append("type " + event.getType() + " " + event.getDate() 
+ "ms " + event.getPath());
                 if (Event.NODE_MOVED == event.getType()) {
                     foundMove = true;
                     break;
                 }
             }
+            if (diags.length() == 0) {
+                diags.append("none");
+            }
+
+            if (!foundMove) {
+                // force another event, wait some more
+                testRootNode.addNode(name + "XYZ");
+                superuser.save();
+
+                StringBuffer addDiags = new StringBuffer();
+                for (Event event : result.getEvents(60000)) {
+                    if (addDiags.length() != 0) {
+                        addDiags.append(", ");
+                    }
+                    addDiags.append("type " + event.getType() + " " + 
event.getDate() + "ms " + event.getPath());
+                }
+
+                if (addDiags.length() > 0) {
+                    diags.append("; next event after additional addNode/save 
operation: " + addDiags);
+                }
+            }
 
             if (!foundMove) {
-                fail("Expected NODE_MOVED event upon renaming a node.");
+                fail("Expected NODE_MOVED event upon renaming a node 
(received: " + diags + ")");
             }
         } finally {
             mgr.removeEventListener(result);