Update test suite

Author: lahma

benchmark/ICSharpCode.SharpZipLib.Benchmark/ICSharpCode.SharpZipLib.Benchmark.csproj

@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net462;net6.0</TargetFrameworks>
+	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet">
-			<Version>0.12.1</Version>
-		</PackageReference>
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.csproj" />
+		<ProjectReference Include="..\..\src\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.csproj" />
 	</ItemGroup>
 
 </Project>

benchmark/ICSharpCode.SharpZipLib.Benchmark/Program.cs

@@ -9,9 +9,8 @@ public class MultipleRuntimes : ManualConfig
 	{
 		public MultipleRuntimes()
 		{
-			AddJob(Job.Default.WithToolchain(CsProjClassicNetToolchain.Net461).AsBaseline()); // NET 4.6.1
-			AddJob(Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp21)); // .NET Core 2.1
-			AddJob(Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp31)); // .NET Core 3.1
+			AddJob(Job.Default.WithToolchain(CsProjClassicNetToolchain.Net462).AsBaseline()); // NET 4.6.2
+			AddJob(Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp60)); // .NET 6.0
 		}
 	}
 

benchmark/ICSharpCode.SharpZipLib.Benchmark/Zip/ZipInputStream.cs

@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace ICSharpCode.SharpZipLib.Benchmark.Zip
 {
@@ -14,14 +17,16 @@ public class ZipInputStream
 
 		byte[] zippedData;
 		byte[] readBuffer = new byte[4096];
+		private string zipFileWithLargeAmountOfEntriesPath;
 
-		public ZipInputStream()
+		[GlobalSetup]
+		public async Task GlobalSetup()
 		{
 			using (var memoryStream = new MemoryStream())
 			{
 				using (var zipOutputStream = new SharpZipLib.Zip.ZipOutputStream(memoryStream))
 				{
-					zipOutputStream.PutNextEntry(new SharpZipLib.Zip.ZipEntry("0"));
+					zipOutputStream.PutNextEntry(new ZipEntry("0"));
 
 					var inputBuffer = new byte[ChunkSize];
 
@@ -33,6 +38,29 @@ public ZipInputStream()
 
 				zippedData = memoryStream.ToArray();
 			}
+
+			// large real-world test file from test262 repository
+			string commitSha = "2e4e0e6b8ebe3348a207144204cb6d7a5571c863";
+			zipFileWithLargeAmountOfEntriesPath = Path.Combine(Path.GetTempPath(), $"{commitSha}.zip");
+			if (!File.Exists(zipFileWithLargeAmountOfEntriesPath))
+			{
+				var uri = $"https://github.com/tc39/test262/archive/{commitSha}.zip";
+
+				Console.WriteLine("Loading test262 repository archive from {0}", uri);
+
+				using (var client = new HttpClient())
+				{
+					using (var downloadStream = await client.GetStreamAsync(uri))
+					{
+						using (var writeStream = File.OpenWrite(zipFileWithLargeAmountOfEntriesPath))
+						{
+							await downloadStream.CopyToAsync(writeStream);
+							Console.WriteLine("File downloaded and saved to {0}", zipFileWithLargeAmountOfEntriesPath);
+						}
+					}
+				}
+			}
+
 		}
 
 		[Benchmark]
@@ -46,12 +74,28 @@ public long ReadZipInputStream()
 
 					while (zipInputStream.Read(readBuffer, 0, readBuffer.Length) > 0)
 					{
-
 					}
 
 					return entry.Size;
 				}
 			}
 		}
+
+		[Benchmark]
+		public void ReadLargeZipFile()
+		{
+			using (var file = new ZipFile(zipFileWithLargeAmountOfEntriesPath))
+			{
+				foreach (ZipEntry entry in file)
+				{
+					using (var stream = file.GetInputStream(entry))
+					{
+						while (stream.Read(readBuffer, 0, readBuffer.Length) > 0)
+						{
+						}
+					}
+				}
+			}
+		}
 	}
 }