wip: investigate windows macro test

saalfeldlab · Apr 26, 2024 · eace7bc · eace7bc
1 parent 08b369a
commit eace7bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 29 deletions.
diff --git a/src/test/java/org/janelia/saalfeldlab/n5/ij/MacroTests.java b/src/test/java/org/janelia/saalfeldlab/n5/ij/MacroTests.java
@@ -83,17 +83,19 @@ protected String tempN5Location() throws URISyntaxException {
 		return new URI("file", null, basePath, null).toString();
 	}
 
-//	@Test
-//	public void testMacroContentPath() throws IOException {
-//		System.out.println("testMacroContentPath");
-//		testMacroContentHelper("url=%s/%s");
-//	}
-//
-//	@Test
-//	public void testMacroContentUri() throws IOException {
-//		System.out.println("testMacroContentUri");
-//		testMacroContentHelper("url=%s?%s");
-//	}
+	@Test
+	public void testMacroContentPath() throws IOException {
+		System.out.println("testMacroContent Path style");
+		testMacroContentHelper("url=%s/%s");
+	}
+
+	@Test
+	public void testMacroContentUri() throws IOException {
+		System.out.println("testMacroContent URI style skip windows");
+		final String os = System.getProperty("os.name").toLowerCase();
+		if( !os.startsWith("windows"))
+			testMacroContentHelper("url=%s?%s");
+	}
 
 	public void testMacroContentHelper( String urlFormat ) throws IOException {
 
@@ -130,6 +132,8 @@ public void testMacroContentHelper( String urlFormat ) throws IOException {
 	@Test
 	public void testMacro() {
 
+		System.out.println("testMacro: " + n5rootF);
+
 		final N5Importer plugin = (N5Importer)IJ.runPlugIn("org.janelia.saalfeldlab.n5.ij.N5Importer",
 				String.format("url=%s?%s hide", n5rootF.getAbsolutePath(), "cosem" ));
 

diff --git a/src/test/java/org/janelia/saalfeldlab/n5/metadata/ome/ngff/v04/WriteAxesTests.java b/src/test/java/org/janelia/saalfeldlab/n5/metadata/ome/ngff/v04/WriteAxesTests.java
@@ -219,23 +219,6 @@ public void testXYCZT() throws IOException, InterruptedException, ExecutionExcep
 		remove(rootLocation);
 	}
 
-	@Test
-	public void testFormatParsing() throws IOException, InterruptedException, ExecutionException, URISyntaxException {
-
-		final int nc = 1;
-		final int nz = 3;
-		final int nt = 1;
-		final String dataset = "";
-		final ImagePlus imp = createImage(nc, nz, nt);
-		final String rootLocation = createDataset("xyz_fmtTest.zarr", dataset, imp);
-
-		final Pair<StorageFormat, URI> fmtUri = N5Factory.StorageFormat.parseUri(rootLocation);
-		System.out.println(fmtUri.getA());
-		System.out.println(fmtUri.getB());
-
-		remove(rootLocation);
-	}
-
 	private ImagePlus createImage(final int nc, final int nz, final int nt) {
 
 		final ImagePlus imp = NewImage.createImage("test", nx, ny, nc * nz * nt, 8, NewImage.FILL_NOISE);
@@ -256,7 +239,6 @@ private String createDataset(final String containerName, final String dataset, f
 				N5ScalePyramidExporter.DOWN_SAMPLE, N5Importer.MetadataOmeZarrKey, compression);
 		writer.run(); // run() closes the n5 writer
 
-		System.out.println("createDataset returned: " + rootLocation);
 		return rootLocation;
 	}