Update tests (#236)

* Update/add performance tests for streams
* Update RingBuffer to allow for token cancelation

Author: piksel

.gitignore

@@ -250,3 +250,4 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+/test/ICSharpCode.SharpZipLib.TestBootstrapper/Properties/launchSettings.json

test/ICSharpCode.SharpZipLib.TestBootstrapper/Program.cs

@@ -9,8 +9,8 @@ public class Program
     {
 		static void Main(string[] args)
 		{
-			new AutoRun(typeof(ICSharpCode.SharpZipLib.Tests.Base.InflaterDeflaterTestSuite).GetTypeInfo().Assembly)
-			.Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
+			new AutoRun(typeof(Tests.Base.InflaterDeflaterTestSuite).GetTypeInfo().Assembly)
+			.Execute(args);
 		}
 
     }

test/ICSharpCode.SharpZipLib.Tests/BZip2/Bzip2Tests.cs

@@ -4,6 +4,7 @@
 using ICSharpCode.SharpZipLib.Tests.TestSupport;
 using NUnit.Framework;
 using System.Threading;
+using System.Diagnostics;
 
 namespace ICSharpCode.SharpZipLib.Tests.BZip2
 {
@@ -86,90 +87,29 @@ public void CreateEmptyArchive()
 
 		[Test]
 		[Category("BZip2")]
-		[Ignore("TODO : Fix this")]
-		public void Performance()
+		[Category("Performance")]
+		[Explicit("Long-running")]
+		public void WriteThroughput()
 		{
-			window_ = new WindowedStream(0x150000);
-
-			outStream_ = new BZip2OutputStream(window_, 1);
-
-			const long Target = 0x10000000;
-			readTarget_ = writeTarget_ = Target;
-
-			Thread reader = new Thread(Reader);
-			reader.Name = "Reader";
-
-			Thread writer = new Thread(Writer);
-			writer.Name = "Writer";
-
-			DateTime startTime = DateTime.Now;
-			writer.Start();
-
-			inStream_ = new BZip2InputStream(window_);
-
-			reader.Start();
-
-			Assert.IsTrue(writer.Join(TimeSpan.FromMinutes(5.0D)));
-			Assert.IsTrue(reader.Join(TimeSpan.FromMinutes(5.0D)));
-
-			DateTime endTime = DateTime.Now;
-			TimeSpan span = endTime - startTime;
-			Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (Target / 1024) / span.TotalSeconds);
+			PerformanceTesting.TestWrite(
+				size: TestDataSize.Small,
+				output: w => new BZip2OutputStream(w)
+			);
 		}
 
-		void Reader()
+		[Test]
+		[Category("BZip2")]
+		[Category("Performance")]
+		[Explicit("Long-running")]
+		public void ReadWriteThroughput()
 		{
-			const int Size = 8192;
-			int readBytes = 1;
-			byte[] buffer = new byte[Size];
-
-			long passifierLevel = readTarget_ - 0x10000000;
-
-			while ((readTarget_ > 0) && (readBytes > 0)) {
-				int count = Size;
-				if (count > readTarget_) {
-					count = (int)readTarget_;
-				}
-
-				readBytes = inStream_.Read(buffer, 0, count);
-				readTarget_ -= readBytes;
-
-				if (readTarget_ <= passifierLevel) {
-					Console.WriteLine("Reader {0} bytes remaining", readTarget_);
-					passifierLevel = readTarget_ - 0x10000000;
-				}
-			}
-
-			Assert.IsTrue(window_.IsClosed, "Window should be closed");
-
-			// This shouldnt read any data but should read the footer
-			readBytes = inStream_.Read(buffer, 0, 1);
-			Assert.AreEqual(0, readBytes, "Stream should be empty");
-			Assert.AreEqual(0, window_.Length, "Window should be closed");
-			inStream_.Close();
+			PerformanceTesting.TestReadWrite(
+				size: TestDataSize.Small,
+				input: w => new BZip2InputStream(w),
+				output: w => new BZip2OutputStream(w)
+			);
 		}
 
-		void WriteTargetBytes()
-		{
-			const int Size = 8192;
-
-			byte[] buffer = new byte[Size];
 
-			while (writeTarget_ > 0) {
-				int thisTime = Size;
-				if (thisTime > writeTarget_) {
-					thisTime = (int)writeTarget_;
-				}
-
-				outStream_.Write(buffer, 0, thisTime);
-				writeTarget_ -= thisTime;
-			}
-		}
-
-		void Writer()
-		{
-			WriteTargetBytes();
-			outStream_.Close();
-		}
 	}
 }

test/ICSharpCode.SharpZipLib.Tests/GZip/GZipTests.cs

@@ -4,6 +4,7 @@
 using ICSharpCode.SharpZipLib.Tests.TestSupport;
 using NUnit.Framework;
 using System.Threading;
+using System.Diagnostics;
 
 namespace ICSharpCode.SharpZipLib.Tests.GZip
 {
@@ -280,90 +281,32 @@ public void TrailingGarbage()
 
 		[Test]
 		[Category("GZip")]
+		[Category("Performance")]
 		[Category("Long Running")]
-		[Ignore("TODO : Fix this")]
-		public void BigStream()
+		[Explicit("Long Running")]
+		public void WriteThroughput()
 		{
-			window_ = new WindowedStream(0x3ffff);
-			outStream_ = new GZipOutputStream(window_);
-			inStream_ = new GZipInputStream(window_);
+			PerformanceTesting.TestWrite(
+				size: TestDataSize.Large,
+				output: w => new GZipOutputStream(w)
+			);
 
-			long target = 0x10000000;
-			readTarget_ = writeTarget_ = target;
-
-			Thread reader = new Thread(Reader);
-			reader.Name = "Reader";
-			reader.Start();
-
-			Thread writer = new Thread(Writer);
-			writer.Name = "Writer";
-
-			DateTime startTime = DateTime.Now;
-			writer.Start();
-
-			writer.Join();
-			reader.Join();
-
-			DateTime endTime = DateTime.Now;
-
-			TimeSpan span = endTime - startTime;
-			Console.WriteLine("Time {0}  processes {1} KB/Sec", span, (target / 1024) / span.TotalSeconds);
 		}
 
-		void Reader()
+		[Test]
+		[Category("GZip")]
+		[Category("Performance")]
+		[Explicit("Long Running")]
+		public void ReadWriteThroughput()
 		{
-			const int Size = 8192;
-			int readBytes = 1;
-			byte[] buffer = new byte[Size];
-
-			long passifierLevel = readTarget_ - 0x10000000;
-
-			while ((readTarget_ > 0) && (readBytes > 0)) {
-				int count = Size;
-				if (count > readTarget_) {
-					count = (int)readTarget_;
-				}
-
-				readBytes = inStream_.Read(buffer, 0, count);
-				readTarget_ -= readBytes;
+			PerformanceTesting.TestReadWrite(
+				size: TestDataSize.Large,
+				input: w => new GZipInputStream(w),
+				output: w => new GZipOutputStream(w)
+			);
 
-				if (readTarget_ <= passifierLevel) {
-					Console.WriteLine("Reader {0} bytes remaining", readTarget_);
-					passifierLevel = readTarget_ - 0x10000000;
-				}
-			}
-
-			Assert.IsTrue(window_.IsClosed, "Window should be closed");
-
-			// This shouldnt read any data but should read the footer
-			readBytes = inStream_.Read(buffer, 0, 1);
-			Assert.AreEqual(0, readBytes, "Stream should be empty");
-			Assert.AreEqual(0, window_.Length, "Window should be closed");
-			inStream_.Close();
 		}
 
-		void Writer()
-		{
-			const int Size = 8192;
-
-			byte[] buffer = new byte[Size];
-
-			while (writeTarget_ > 0) {
-				int thisTime = Size;
-				if (thisTime > writeTarget_) {
-					thisTime = (int)writeTarget_;
-				}
-
-				outStream_.Write(buffer, 0, thisTime);
-				writeTarget_ -= thisTime;
-			}
-			outStream_.Close();
-		}
 
-		WindowedStream window_;
-		GZipOutputStream outStream_;
-		GZipInputStream inStream_;
-		long readTarget_;
-		long writeTarget_;
 	}
 }

test/ICSharpCode.SharpZipLib.Tests/Tar/TarTests.cs

@@ -612,5 +612,65 @@ public void InputStreamOwnership()
 			Assert.IsFalse(memStream.IsClosed, "Should not be closed after parent owner close");
 			Assert.IsFalse(memStream.IsDisposed, "Should not be disposed after parent owner close");
 		}
+
+		[Test]
+		[Category("Tar")]
+		[Category("Performance")]
+		[Explicit("Long Running")]
+		public void WriteThroughput()
+		{
+			const string EntryName = "LargeTarEntry";
+
+			PerformanceTesting.TestWrite(TestDataSize.Large, bs =>
+			{
+				var tos = new TarOutputStream(bs);
+				tos.PutNextEntry(new TarEntry(new TarHeader()
+				{
+					Name = EntryName,
+					Size = (int)TestDataSize.Large,
+				}));
+				return tos;
+			},
+			stream =>
+			{
+				((TarOutputStream)stream).CloseEntry();
+			});
+		}
+
+		[Test]
+		[Category("Tar")]
+		[Category("Performance")]
+		[Explicit("Long Running")]
+		public void SingleLargeEntry()
+		{
+			const string EntryName = "LargeTarEntry";
+			const TestDataSize dataSize = TestDataSize.Large;
+
+			PerformanceTesting.TestReadWrite(
+				size: dataSize,
+				input: bs =>
+				{
+					var tis = new TarInputStream(bs);
+					var entry = tis.GetNextEntry();
+
+					Assert.AreEqual(entry.Name, EntryName);
+					return tis;
+				},
+				output: bs =>
+				{
+					var tos = new TarOutputStream(bs);
+					tos.PutNextEntry(new TarEntry(new TarHeader()
+					{
+						Name = EntryName,
+						Size = (int)dataSize,
+					}));
+					return tos;
+				},
+				outputClose: stream =>
+				{
+					((TarOutputStream)stream).CloseEntry();
+				}
+			);
+		}
 	}
 }