bugfix: listMatchingNodes() should also return matching directories to be...

bugfix: listMatchingNodes() should also return matching directories to be compatible with the results coming from the PathInfoDB

SVN: 21135

common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContent.java

@@ -207,15 +207,13 @@ class DefaultFileBasedHierarchicalContent implements IHierarchicalContent
         assert dirNode.isDirectory() : "expected a directory node, got: " + dirNode;
         for (IHierarchicalContentNode childNode : dirNode.getChildNodes())
         {
+            if (filter.accept(childNode))
+            {
+                result.add(childNode);
+            }
             if (childNode.isDirectory())
             {
                 findMatchingNodes(childNode, filter, result);
-            } else
-            {
-                if (filter.accept(childNode))
-                {
-                    result.add(childNode);
-                }
             }
         }
     }

common/sourceTest/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentTest.java

@@ -343,12 +343,13 @@ public class DefaultFileBasedHierarchicalContentTest extends AbstractFileSystemT
         // matches in levels > 1
         List<IHierarchicalContentNode> matchingSubDirFiles =
                 rootContent.listMatchingNodes("subDir/.*");
-        assertEquals(4, matchingSubDirFiles.size());
+        assertEquals(5, matchingSubDirFiles.size());
         sortNodes(matchingSubDirFiles);
-        checkNodeMatchesFile(matchingSubDirFiles.get(0), subFile1);
-        checkNodeMatchesFile(matchingSubDirFiles.get(1), subFile2);
-        checkNodeMatchesFile(matchingSubDirFiles.get(2), subFile3);
-        checkNodeMatchesFile(matchingSubDirFiles.get(3), subSubFile);
+        checkNodeMatchesFile(matchingSubDirFiles.get(0), subSubDir);
+        checkNodeMatchesFile(matchingSubDirFiles.get(1), subFile1);
+        checkNodeMatchesFile(matchingSubDirFiles.get(2), subFile2);
+        checkNodeMatchesFile(matchingSubDirFiles.get(3), subFile3);
+        checkNodeMatchesFile(matchingSubDirFiles.get(4), subSubFile);
 
         context.assertIsSatisfied();
     }