Merge pull request #44 from JesseMckinzie/java_groupby

Fix groupby in iterator
PolusAI · Oct 31, 2023 · 44660c0 · 44660c0
2 parents e808977 + 338dd6c
commit 44660c0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/filepattern/java/FilePattern.java b/src/filepattern/java/FilePattern.java
@@ -244,7 +244,7 @@ public Iterator<?> iterator() {
      */
     public Iterator<?> iterator(String ... groups) {
 
-        this.fp.setGroup(new FilePatternBindings.StringVector(groups));
+        this.setGroup(groups);
 
         return new FilePatternGroupedIterator(this);
 

diff --git a/tests/java/TestFilePattern.java b/tests/java/TestFilePattern.java
@@ -87,7 +87,7 @@ public void testGetMatching() {
     }
 
     @Test
-    public void testGroupBy() {
+    public void testSetGroup() {
 
         FilePattern fp = null;
         try {
@@ -119,4 +119,36 @@ public void testGroupBy() {
 
     }
 
+    @Test
+    public void testGroupBy() {
+
+        FilePattern fp = null;
+        try {
+            fp = new FilePattern.FilePatternBuilder("test_fp_data")
+                    .recursive(false)
+                    .filePattern("img_r00{r:d}_c00{c:d}_{channel:c+}.tif")
+                    .suppressWarnings(false)
+                    .blockSize("")
+                    .recursive(false).build();
+        } catch (Exception e) {
+            fail("Error creating FilePattern object.");
+        }
+
+        ArrayList<Pair<ArrayList<Pair<String, Object>>, ArrayList<Pair<HashMap<String, Object>, ArrayList<Path>>>>> result = new ArrayList<>();
+
+
+        for (Iterator<?> i = fp.iterator("r"); i.hasNext(); ) {
+            result.add((Pair<ArrayList<Pair<String, Object>>, ArrayList<Pair<HashMap<String, Object>, ArrayList<Path>>>>) i.next());
+        }
+
+        ArrayList<Pair<ArrayList<Pair<String, Object>>, ArrayList<Pair<HashMap<String, Object>, ArrayList<Path>>>>> truth = TestData.getGroupedResults();
+
+        System.out.println(result.size());
+        System.out.println(truth.size());
+
+        assertEquals(result.size(), truth.size());
+        assertEquals(result, truth);
+
+    }
+
 }