[sling-ide-tooling] branch feature/SLING-7605 updated: SLING-8287 - DirWatcherTest consistently fails on Jenkins

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-7605
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/feature/SLING-7605 by this 
push:
     new 6aca254  SLING-8287 - DirWatcherTest consistently fails on Jenkins
6aca254 is described below

commit 6aca25438a21418a4f62cad08eb76da77acab7a6
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Fri Feb 22 21:26:07 2019 +0100

    SLING-8287 - DirWatcherTest consistently fails on Jenkins
    
    Add more debug information to DirWatcherTEst.
---
 .../src/main/java/org/apache/sling/ide/cli/impl/DirWatcher.java  | 5 +++++
 .../test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java  | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git 
a/cli/cli/src/main/java/org/apache/sling/ide/cli/impl/DirWatcher.java 
b/cli/cli/src/main/java/org/apache/sling/ide/cli/impl/DirWatcher.java
index 3286445..31d4982 100644
--- a/cli/cli/src/main/java/org/apache/sling/ide/cli/impl/DirWatcher.java
+++ b/cli/cli/src/main/java/org/apache/sling/ide/cli/impl/DirWatcher.java
@@ -166,6 +166,11 @@ public class DirWatcher implements AutoCloseable {
         public Path getPath() {
             return path;
         }
+        
+        @Override
+        public String toString() {
+            return getClass().getSimpleName() + "[ kind: " + kind +", path: " 
+ path + "]";
+        }
     }
     
     static class DualMap {
diff --git 
a/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java 
b/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
index 4c6b173..ddb35ad 100644
--- a/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
+++ b/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
@@ -27,6 +27,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -171,7 +173,12 @@ public class DirWatcherTest {
             assertThat("event.kind", event.getKind(), equalTo(ENTRY_MODIFY));
             assertThat("event.path", event.getPath(), 
equalTo(Paths.get(created.getName())));
             
-            assertThat("queue.size", w.queueSize(), equalTo(0));
+            List<DirWatcher.Event> unexpected = new ArrayList<>();
+            while( w.queueSize() != 0 )
+                unexpected.add(w.poll());
+            
+            // don't use size comparison to print out unexpected events in 
case of an assertion failure
+            assertThat("unexpected events", unexpected, equalTo(new 
ArrayList<>()));
         }
     }
 }