MODE-1742 - Added explicit error messages for the GitConnectorTests's…

… tag tests. Also, enabled the connectors module in the main build.
ModeShape · Jan 2, 2013 · 1c501de · 1c501de
1 parent 3a2060a
commit 1c501de
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/...s/modeshape-connector-git/src/test/java/org/modeshape/connector/git/GitConnectorTest.java b/...s/modeshape-connector-git/src/test/java/org/modeshape/connector/git/GitConnectorTest.java
@@ -87,7 +87,7 @@ public void shouldReadFederatedNodeInProjection() throws Exception {
     public void shouldReadTags() throws Exception {
         Node git = gitNode();
         Node tags = git.getNode("tags");
-        assertChildrenInclude(tags, expectedTagNames());
+        assertChildrenInclude("Make sure you run <git fetch --tags>", tags, expectedTagNames());
     }
 
     @Test
@@ -175,7 +175,7 @@ public void shouldContainTagsAndBranchNamesAndCommitsUnderTreeNode() throws Exce
         Node tree = git.getNode("tree");
         assertThat(tree.getPrimaryNodeType().getName(), is("git:trees"));
         assertChildrenInclude(tree, expectedBranchNames());
-        assertChildrenInclude(tree, expectedTagNames());
+        assertChildrenInclude("Make sure you run <git fetch --tags>", tree, expectedTagNames());
     }
 
     @Test

diff --git a/modeshape-jcr/src/test/java/org/modeshape/jcr/AbstractJcrRepositoryTest.java b/modeshape-jcr/src/test/java/org/modeshape/jcr/AbstractJcrRepositoryTest.java
@@ -473,21 +473,36 @@ protected static int calculateTotalNumberOfNodesInTree( int numberOfChildrenPerN
 
     protected void assertChildrenInclude( Node parentNode,
                                           String... minimalChildNamesWithSns ) throws RepositoryException {
+        assertChildrenInclude(null, parentNode, minimalChildNamesWithSns);
+    }
+
+    protected void assertChildrenInclude( String errorMessage,
+                                          Node parentNode,
+                                          String... minimalChildNamesWithSns
+                                        ) throws RepositoryException {
         Set<String> childNames = new HashSet<String>();
-        for (String childName : minimalChildNamesWithSns) {
-            childNames.add(childName);
-        }
+        childNames.addAll(Arrays.asList(minimalChildNamesWithSns));
+
         NodeIterator iter = parentNode.getNodes();
         while (iter.hasNext()) {
             Node child = iter.nextNode();
             String name = child.getName();
-            if (child.getIndex() > 1) name = name + "[" + child.getIndex() + "]";
+            if (child.getIndex() > 1) {
+                name = name + "[" + child.getIndex() + "]";
+            }
             childNames.remove(name);
             // If we've found all of the expected child names, then return immediately
             // (in case there are a very large number of children) ...
-            if (childNames.isEmpty()) return;
+            if (childNames.isEmpty()) {
+                return;
+            }
+        }
+
+        String message = "Names of children not found under node: " + childNames;
+        if (!StringUtil.isBlank(errorMessage)) {
+            message += ". " + errorMessage;
         }
-        assertThat("Names of children not found under node: " + childNames, childNames.isEmpty(), is(true));
+        assertThat(message, childNames.isEmpty(), is(true));
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
         <module>extractors</module>
 
         <!--Connectors-->
-        <!--<module>connectors</module>-->
+        <module>connectors</module>
         <!--
           The REST client needs the JDBC driver
         -->