You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/06/20 21:52:51 UTC

svn commit: r1604263 - in /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers: HasFileMatcher.java HasFolderMatcher.java

Author: rombert
Date: Fri Jun 20 19:52:50 2014
New Revision: 1604263

URL: http://svn.apache.org/r1604263
Log:
SLING-3656 - nested nodes below file/jcr:content cause problems on
import and export

Improve diagnostics for HasFileMatcher and HasFolderMatcher.

Modified:
    sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFileMatcher.java
    sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFolderMatcher.java

Modified: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFileMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFileMatcher.java?rev=1604263&r1=1604262&r2=1604263&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFileMatcher.java (original)
+++ sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFileMatcher.java Fri Jun 20 19:52:50 2014
@@ -45,6 +45,12 @@ public class HasFileMatcher extends Type
         description.appendText("project with a filed named " + fileName + " and contents (elided)");
     }
 
+    @Override
+    protected void describeMismatchSafely(IProject item, Description mismatchDescription) {
+        mismatchDescription.appendText("at location ").appendText(fileName).appendText(" found member ")
+                .appendValue(item.findMember(fileName)).appendText("; contents (elided)");
+    }
+
     /*
      * (non-Javadoc)
      * 

Modified: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFolderMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFolderMatcher.java?rev=1604263&r1=1604262&r2=1604263&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFolderMatcher.java (original)
+++ sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/HasFolderMatcher.java Fri Jun 20 19:52:50 2014
@@ -39,6 +39,12 @@ public class HasFolderMatcher extends Ty
         description.appendText("project with a folder located at " + folderName);
     }
 
+    @Override
+    protected void describeMismatchSafely(IProject item, Description mismatchDescription) {
+        mismatchDescription.appendText("at location ").appendText(folderName).appendText(" found member ")
+                .appendValue(item.findMember(folderName));
+    }
+
     /*
      * (non-Javadoc)
      *