diff --git a/tests/ImageSharp.Tests/Formats/Png/Adler32Tests.cs b/tests/ImageSharp.Tests/Formats/Png/Adler32Tests.cs
new file mode 100644
index 0000000000..a0d4030c3f
--- /dev/null
+++ b/tests/ImageSharp.Tests/Formats/Png/Adler32Tests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the GNU Affero General Public License, Version 3.
+
+using System;
+using SixLabors.ImageSharp.Formats.Png.Zlib;
+using Xunit;
+using SharpAdler32 = ICSharpCode.SharpZipLib.Checksum.Adler32;
+
+namespace SixLabors.ImageSharp.Tests.Formats.Png
+{
+ public class Adler32Tests
+ {
+ [Theory]
+ [InlineData(0)]
+ [InlineData(8)]
+ [InlineData(215)]
+ [InlineData(1024)]
+ [InlineData(1024 + 15)]
+ [InlineData(2034)]
+ [InlineData(4096)]
+ public void MatchesReference(int length)
+ {
+ var data = GetBuffer(length);
+ var adler = new SharpAdler32();
+ adler.Update(data);
+
+ long expected = adler.Value;
+ long actual = Adler32.Calculate(data);
+
+ Assert.Equal(expected, actual);
+ }
+
+ private static byte[] GetBuffer(int length)
+ {
+ var data = new byte[length];
+ new Random(1).NextBytes(data);
+
+ return data;
+ }
+ }
+}
diff --git a/tests/ImageSharp.Tests/Formats/Png/Crc32Tests.cs b/tests/ImageSharp.Tests/Formats/Png/Crc32Tests.cs
new file mode 100644
index 0000000000..b40e210e3e
--- /dev/null
+++ b/tests/ImageSharp.Tests/Formats/Png/Crc32Tests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the GNU Affero General Public License, Version 3.
+
+using System;
+using SixLabors.ImageSharp.Formats.Png.Zlib;
+using Xunit;
+using SharpCrc32 = ICSharpCode.SharpZipLib.Checksum.Crc32;
+
+namespace SixLabors.ImageSharp.Tests.Formats.Png
+{
+ public class Crc32Tests
+ {
+ [Theory]
+ [InlineData(0)]
+ [InlineData(8)]
+ [InlineData(215)]
+ [InlineData(1024)]
+ [InlineData(1024 + 15)]
+ [InlineData(2034)]
+ [InlineData(4096)]
+ public void MatchesReference(int length)
+ {
+ var data = GetBuffer(length);
+ var crc = new SharpCrc32();
+ crc.Update(data);
+
+ long expected = crc.Value;
+ long actual = Crc32.Calculate(data);
+
+ Assert.Equal(expected, actual);
+ }
+
+ private static byte[] GetBuffer(int length)
+ {
+ var data = new byte[length];
+ new Random(1).NextBytes(data);
+
+ return data;
+ }
+ }
+}
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
index 1a9dedc54e..52393a7f1c 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
@@ -83,57 +83,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
}
}
- [Fact]
- public void CalculateCrc_Works_LongerRun()
- {
- // Longer run, enough to require moving the point in SIMD implementation with
- // offset for dropping back to scalar.
- var data = new byte[]
- {
- 0, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 213, 214, 215
- };
-
- // assert
- uint crc = Crc32.Calculate(data);
- Assert.Equal(0xC1125402, crc);
- }
-
- [Fact]
- public void CalculateCrc_Works()
- {
- // Short run, less than 64.
- var data = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
- uint crc = Crc32.Calculate(data);
-
- Assert.Equal(0x88AA689F, crc);
- }
-
private static string GetChunkTypeName(uint value)
{
var data = new byte[4];
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index fdb280ca99..98f8e95745 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -21,6 +21,7 @@
+