Upgrade ExpectedException to nunit3.

Author: hypersw

ICSharpCode.SharpZipLib.Tests/Zip/ZipTests.cs

@@ -1350,7 +1350,6 @@ public void UnsupportedCompressionMethod()
 		/// </summary>
 		[Test]
 		[Category("Zip")]
-		//[ExpectedException(typeof(ZipException))]
 		public void InvalidPasswordSeekable()
 		{
 			byte[] originalData = null;
@@ -1367,13 +1366,16 @@ public void InvalidPasswordSeekable()
 
 			ZipEntry entry2 = inStream.GetNextEntry();
 
-			while (true) {
-				int numRead = inStream.Read(buf2, pos, buf2.Length);
-				if (numRead <= 0) {
-					break;
+			Assert.Throws<ZipException>(() => 
+			{
+				while (true) {
+					int numRead = inStream.Read(buf2, pos, buf2.Length);
+					if (numRead <= 0) {
+						break;
+					}
+					pos += numRead;
 				}
-				pos += numRead;
-			}
+			});
 		}
 
 		/// <summary>
@@ -1413,7 +1415,6 @@ public void ExerciseGetNextEntry()
 		/// </summary>
 		[Test]
 		[Category("Zip")]
-		//[ExpectedException(typeof(ZipException))]
 		public void InvalidPasswordNonSeekable()
 		{
 			byte[] originalData = null;
@@ -1430,13 +1431,16 @@ public void InvalidPasswordNonSeekable()
 
 			ZipEntry entry2 = inStream.GetNextEntry();
 
-			while (true) {
-				int numRead = inStream.Read(buf2, pos, buf2.Length);
-				if (numRead <= 0) {
-					break;
+			Assert.Throws<ZipException>(() => 
+			{
+				while (true) {
+					int numRead = inStream.Read(buf2, pos, buf2.Length);
+					if (numRead <= 0) {
+						break;
+					}
+					pos += numRead;
 				}
-				pos += numRead;
-			}
+			});
 		}
 
 		/// <summary>
@@ -2680,19 +2684,21 @@ public void Encryption()
 
 		[Test]
 		[Category("Zip")]
-		//[ExpectedException(typeof(DirectoryNotFoundException))]
 		public void CreateExceptions()
 		{
 			var fastZip = new FastZip();
 			string tempFilePath = GetTempFilePath();
 			Assert.IsNotNull(tempFilePath, "No permission to execute this test?");
 
-			string addFile = Path.Combine(tempFilePath, "test.zip");
-			try {
-				fastZip.CreateZip(addFile, @"z:\doesnt exist", false, null);
-			} finally {
-				File.Delete(addFile);
-			}
+			Assert.Throws<DirectoryNotFoundException>(() => 
+			{
+				string addFile = Path.Combine(tempFilePath, "test.zip");
+				try {
+					fastZip.CreateZip(addFile, @"z:\doesnt exist", false, null);
+				} finally {
+					File.Delete(addFile);
+				}
+			});
 		}
 
 		[Test]