Further tweaks to FastZip exception handling and unit tests.

Author: jfreilly

src/Core/FileSystemScanner.cs

@@ -286,58 +286,6 @@ public bool ContinueRunning
 	public delegate void FileFailureHandler(object sender, ScanFailureEventArgs e);
 	#endregion
 
-    /// <summary>
-    /// An exception encountered dutring scanning.
-    /// </summary>
-#if !NETCF_1_0 && !NETCF_2_0
-    [Serializable]
-#endif
-    public class ScanException : SharpZipBaseException
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScanException"/> class.
-        /// </summary>
-        public ScanException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScanException"/> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public ScanException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScanException"/> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public ScanException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-#if !NETCF_1_0 && !NETCF_2_0
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScanException"/> class.
-        /// </summary>
-        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
-        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is null. </exception>
-        /// <exception cref="T:System.Runtime.Serialization.SerializationException">The class name is null or <see cref="P:System.Exception.HResult"/> is zero (0). </exception>
-        public ScanException(
-            System.Runtime.Serialization.SerializationInfo info,
-            System.Runtime.Serialization.StreamingContext context
-            )
-            : base(info, context)
-        {
-        }
-#endif
-    }
-
 	/// <summary>
 	/// FileSystemScanner provides facilities scanning of files and directories.
 	/// </summary>
@@ -417,36 +365,35 @@ public FileSystemScanner(IScanFilter fileFilter, IScanFilter directoryFilter)
 		/// </summary>
 		/// <param name="directory">The directory name.</param>
 		/// <param name="e">The exception detected.</param>
-		void OnDirectoryFailure(string directory, Exception e)
+		bool OnDirectoryFailure(string directory, Exception e)
 		{
             DirectoryFailureHandler handler = DirectoryFailure;
-            if (handler == null) {
-                alive_ = false;
-                throw new ScanException("Directory scan failure", e);
-            }
-            else {
+            bool result = (handler != null);
+            if ( result ) {
 				ScanFailureEventArgs args = new ScanFailureEventArgs(directory, e);
 				handler(this, args);
 				alive_ = args.ContinueRunning;
 			}
+            return result;
 		}
 
 		/// <summary>
 		/// Raise the FileFailure event.
 		/// </summary>
 		/// <param name="file">The file name.</param>
 		/// <param name="e">The exception detected.</param>
-		void OnFileFailure(string file, Exception e)
+		bool OnFileFailure(string file, Exception e)
 		{
             FileFailureHandler handler = FileFailure;
-			if ( handler == null ) {
-                alive_ = false;
-                throw new ScanException("File failure", e);
-			} else {
+
+            bool result = (handler != null);
+
+			if ( result ){
 				ScanFailureEventArgs args = new ScanFailureEventArgs(file, e);
 				FileFailure(this, args);
 				alive_ = args.ContinueRunning;
 			}
+            return result;
 		}
 
 		/// <summary>
@@ -534,13 +481,17 @@ void ScanDir(string directory, bool recurse)
 							}
 						}
 						catch (Exception e) {
-							OnFileFailure(fileName, e);
+                            if (!OnFileFailure(fileName, e)) {
+                                throw;
+                            }
 						}
 					}
 				}
 			}
 			catch (Exception e) {
-                OnDirectoryFailure(directory, e);
+                if (!OnDirectoryFailure(directory, e)) {
+                    throw;
+                }
 			}
 
 			if ( alive_ && recurse ) {
@@ -556,7 +507,9 @@ void ScanDir(string directory, bool recurse)
 					}
 				}
 				catch (Exception e) {
-                    OnDirectoryFailure(directory, e);
+                    if (!OnDirectoryFailure(directory, e)) {
+                        throw;
+                    }
 				}
 			}
 		}

src/Zip/FastZip.cs

@@ -101,10 +101,10 @@ public bool OnDirectoryFailure(string directory, Exception e)
 		/// <returns>A boolean indicating if execution should continue or not.</returns>
 		public bool OnFileFailure(string file, Exception e)
 		{
-			bool result = false;
 			FileFailureHandler handler = FileFailure;
+            bool result = (handler != null);
 
-			if ( handler != null ) {
+			if ( result ) {
 				ScanFailureEventArgs args = new ScanFailureEventArgs(file, e);
 				handler(this, args);
 				result = args.ContinueRunning;

tests/Zip/ZipTests.cs

@@ -2690,6 +2690,46 @@ public void Encryption()
 			}
 		}
 
+        [Test]
+        [Category("Zip")]
+        [ExpectedException(typeof(DirectoryNotFoundException))]
+        public void CreateExceptions()
+        {
+            FastZip 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);
+            }
+        }
+
+        [Test]
+        [Category("Zip")]
+        [ExpectedException(typeof(FileNotFoundException))]
+        public void ExtractExceptions()
+        {
+            FastZip fastZip = new FastZip();
+            string tempFilePath = GetTempFilePath();
+            Assert.IsNotNull(tempFilePath, "No permission to execute this test?");
+
+            string addFile = Path.Combine(tempFilePath, "test.zip");
+            try
+            {
+                fastZip.ExtractZip(addFile, @"z:\doesnt exist", null);
+            }
+            finally
+            {
+                File.Delete(addFile);
+            }
+        }
+
 		[Test]
 		[Category("Zip")]
 		public void NonAsciiPasswords()