Use assertImageEquals when possible

Author: maarzt

pom.xml

@@ -200,6 +200,7 @@ Jean-Yves Tinevez and Michael Zinsmaier.</license.copyrightOwners>
 		<!-- NB: Deploy releases to the ImageJ Maven repository. -->
 		<releaseProfiles>deploy-to-imagej</releaseProfiles>
 
+		<imglib2.version>5.6.0</imglib2.version>
 		<imglib2-realtransform.version>2.0.0-beta-39</imglib2-realtransform.version>
 		<jitk-tps.version>3.0.0</jitk-tps.version>
 		<ojalgo.version>43.0</ojalgo.version>

src/test/java/net/imglib2/algorithm/convolution/kernel/SeparableKernelConvolutionTest.java

@@ -7,6 +7,7 @@
 import net.imglib2.algorithm.convolution.Convolution;
 import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgs;
+import net.imglib2.test.ImgLib2Assert;
 import net.imglib2.type.numeric.ARGBType;
 import net.imglib2.type.numeric.NumericType;
 import net.imglib2.type.numeric.integer.UnsignedByteType;
@@ -21,8 +22,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -76,7 +75,7 @@ private void testSeparableConvolution( Kernel1D[] kernels1d )
 		RandomAccessibleInterval< DoubleType > expected = getKernel( kernels1d );
 		RandomAccessibleInterval< DoubleType > result = createImg( expected );
 		SeparableKernelConvolution.convolve( kernels1d, dirac, result );
-		assertImagesEqual( expected, result, 0.0 );
+		ImgLib2Assert.assertImageEquals( expected, result );
 	}
 
 	private RandomAccessible< DoubleType > getDirac( int n )
@@ -119,24 +118,16 @@ private static RandomAccessibleInterval< DoubleType > createImg( Interval interv
 		return Views.translate( image, Intervals.minAsLongArray( interval ) );
 	}
 
-	private static void assertImagesEqual( RandomAccessibleInterval< DoubleType > expected, RandomAccessibleInterval< DoubleType > actual, double delta )
-	{
-		assertTrue( Intervals.equals( expected, actual ) );
-		Views.interval( Views.pair( expected, actual ), expected ).forEach( p -> assertEquals( p.getA().getRealDouble(), p.getB().getRealDouble(), delta ) );
-	}
-
 	@Test
 	public void testPrecisionOfTemporaryImages() {
 		// NB: This test assures that for convolution on UnsignedByteType,
 		// the pixel type to store intermediate results can store 0.1, hence
 		// is FloatType or DoubleType.
-		final byte[] inputPixels = { 1 };
-		final byte[] outputPixels = new byte[ 1 ];
 		final Kernel1D[] kernels = { Kernel1D.symmetric( 0.1 ), Kernel1D.symmetric( 10 ) };
-		Img< UnsignedByteType > input = ArrayImgs.unsignedBytes( inputPixels, 1, 1 );
-		Img< UnsignedByteType > output = ArrayImgs.unsignedBytes( outputPixels, 1, 1 );
+		Img< UnsignedByteType > input = ArrayImgs.unsignedBytes( new byte[] { 1 }, 1, 1 );
+		Img< UnsignedByteType > output = ArrayImgs.unsignedBytes( new byte[] { 0 }, 1, 1 );
 		SeparableKernelConvolution.convolution( kernels ).process( input, output );
-		assertArrayEquals( inputPixels, outputPixels );
+		ImgLib2Assert.assertImageEquals( input, output );
 	}
 
 	@Test

src/test/java/net/imglib2/algorithm/gauss3/SeparableSymmetricConvolutionTest.java

@@ -7,6 +7,7 @@
 import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgFactory;
 import net.imglib2.img.array.ArrayImgs;
+import net.imglib2.test.ImgLib2Assert;
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.util.Intervals;
 import net.imglib2.view.Views;
@@ -16,9 +17,6 @@
 import java.util.concurrent.Executors;
 import java.util.stream.IntStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * @author Matthias Arzt
  */
@@ -40,7 +38,7 @@ public void testConvolve() throws IncompatibleTypeException
 	{
 		RandomAccessibleInterval< DoubleType > target = createImg( expected );
 		SeparableSymmetricConvolution.convolve( halfKernels, getDirac( halfKernels.length ), target, service );
-		assertImagesEqual( expected, target, 0.0 );
+		ImgLib2Assert.assertImageEquals( expected, target );
 	}
 
 	@Test
@@ -50,7 +48,7 @@ public void testConvolve2()
 		ConvolverFactory< DoubleType, DoubleType > factory = FloatConvolverRealType.factory();
 		SeparableSymmetricConvolution.convolve( halfKernels, getDirac( halfKernels.length ), target,
 				factory, factory, factory, factory, new ArrayImgFactory<>(), new DoubleType(), service );
-		assertImagesEqual( expected, target, 0.0 );
+		ImgLib2Assert.assertImageEquals( expected, target );
 	}
 
 	@Test
@@ -76,10 +74,4 @@ public static RandomAccessibleInterval< DoubleType > createImg( Interval interva
 		Img< DoubleType > image = ArrayImgs.doubles( Intervals.dimensionsAsLongArray( interval ) );
 		return Views.translate( image, Intervals.minAsLongArray( interval ) );
 	}
-
-	public static void assertImagesEqual( RandomAccessibleInterval< DoubleType > expected, RandomAccessibleInterval< DoubleType > actual, double delta )
-	{
-		assertTrue( Intervals.equals( expected, actual ) );
-		Views.interval( Views.pair( expected, actual ), expected ).forEach( p -> assertEquals( p.getA().getRealDouble(), p.getB().getRealDouble(), delta ) );
-	}
 }