Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate tests in maven #11

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Activate tests in maven #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,42 +118,15 @@

</dependencies>

<properties>
<properties>
<project.rootdir>${basedir}/../..</project.rootdir>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<!-- <build> -->
<!-- <sourceDirectory>${project.basedir}/src</sourceDirectory> -->
<!-- <resources> -->
<!-- <resource> -->
<!-- <directory>${project.basedir}/src</directory> -->
<!-- <excludes> -->
<!-- <exclude>**/*.java</exclude> -->
<!-- <exclude>**/package.html</exclude> -->
<!-- <exclude>**/*.properties</exclude> -->
<!-- </excludes> -->
<!-- </resource> -->
<!-- <resource> -->
<!-- <directory>${project.basedir}/src</directory> -->
<!-- <includes> -->
<!-- <include>**/*.properties</include> -->
<!-- </includes> -->
<!-- <filtering>true</filtering> -->
<!-- </resource> -->
<!-- <resource> -->
<!-- <directory>${project.basedir}</directory> -->
<!-- <includes> -->
<!-- <include>**/*.cpp</include> -->
<!-- </includes> -->
<!-- <filtering>true</filtering> -->
<!-- </resource> -->
<!-- </resources> -->

<!-- </build> -->
<build>
<sourceDirectory>${project.basedir}/src</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
5 changes: 5 additions & 0 deletions src/loci/formats/in/ZarrReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.xml.parsers.ParserConfigurationException;
Expand Down Expand Up @@ -460,6 +461,10 @@ private void parseResolutionCount(String root, String key) throws IOException, F
list.add(key.isEmpty() ? scalePath : key + File.separator + scalePath);
resSeries.put(resCounts.size() - 1, list);
}
List<String> multiscaleAxes = (List<String>)datasets.get("axes");
for (int i = 0; i < multiscaleAxes.size(); i++) {
String axis = (String) multiscaleAxes.get(i);
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/test/loci/formats/utests/ZarrReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Expand Down Expand Up @@ -64,6 +65,7 @@ public void setUp() throws Exception {
multiscalePaths.add(multiScale2);
multiscalePaths.add(multiScale3);
datasets.put("datasets", multiscalePaths);
datasets.put("axes", Arrays.asList("t", "c", "z", "y", "x"));
multiscales.add(datasets);
topLevelAttributes.put("multiscales", multiscales);

Expand Down