Fix misleading exception message, cleanup code (dotnet#25211)

MarcoRossignoli · Dan Moseley · commit 421306d0aa0f · 2017-11-19T05:54:45.000Z
* Fix misleading exception message, cleanup code #24817 * Fix misleading exception message, cleanup code #24817 * Fix misleading exception message, cleanup code #24817 * Fix misleading exception message, cleanup code #24817 * Fix misleading exception message, cleanup code #24817 * Revert "Fix misleading exception message, cleanup code #24817" This reverts commit 87e87a1. * Revert "Fix misleading exception message, cleanup code #24817" This reverts commit 05f4a5a. * Revert "Revert "Fix misleading exception message, cleanup code #24817"" This reverts commit 4e35169. * Fix misleading exception message, cleanup code. fixes #24817 * Fix misleading exception message, cleanup code. fixes #24817 * Fix misleading exception message, cleanup code. fixes #24817 * Fix misleading exception message, cleanup code. fixes #24817 * Fix misleading exception message, cleanup code. fixes #24817 * Fix misleading exception message, cleanup code dotnet#25211
diff --git a/src/System.IO.FileSystem.Watcher/src/Resources/Strings.resx b/src/System.IO.FileSystem.Watcher/src/Resources/Strings.resx
@@ -129,6 +129,9 @@
   <data name="InvalidDirName" xml:space="preserve">
     <value>The directory name {0} is invalid.</value>
   </data>
+  <data name="InvalidDirName_NotExists" xml:space="preserve">
+    <value>The directory name '{0}' does not exist.</value>
+  </data>
   <data name="InvalidEnumArgument" xml:space="preserve">
     <value>The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.</value>
   </data>
@@ -189,4 +192,4 @@
   <data name="IO_PathTooLong_Path" xml:space="preserve">
     <value>The path '{0}' is too long, or a component of the specified path is too long.</value>
   </data>
-</root>
+</root>
diff --git a/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs b/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
@@ -105,9 +105,12 @@ public FileSystemWatcher(string path, string filter)
                 throw new ArgumentNullException(nameof(filter));
 
             // Early check for directory parameter so that an exception can be thrown as early as possible.
-            if (path.Length == 0 || !Directory.Exists(path))
+            if (path.Length == 0)
                 throw new ArgumentException(SR.Format(SR.InvalidDirName, path), nameof(path));
 
+            if (!Directory.Exists(path))
+                throw new ArgumentException(SR.Format(SR.InvalidDirName_NotExists, path), nameof(path));
+
             _directory = path;
             _filter = filter;
         }
@@ -150,13 +153,13 @@ public bool EnableRaisingEvents
                 {
                     return;
                 }
-                
+
                 if (IsSuspended())
                 {
                     _enabled = value; // Alert the Component to start watching for events when EndInit is called.
                 }
                 else
-                { 
+                {
                     if (value)
                     {
                         StartRaisingEventsIfNotDisposed(); // will set _enabled to true once successfully started
@@ -416,7 +419,7 @@ private void NotifyRenameEventArgs(WatcherChangeTypes action, string name, strin
         {
             // filter if there's no handler or neither new name or old name match a specified pattern
             RenamedEventHandler handler = _onRenamedHandler;
-            if (handler != null && 
+            if (handler != null &&
                 (MatchPattern(name) || MatchPattern(oldName)))
             {
                 handler(this, new RenamedEventArgs(action, _directory, name, oldName));
@@ -525,7 +528,7 @@ protected void OnRenamed(RenamedEventArgs e)
             }
         }
 
-        public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) => 
+        public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) =>
             WaitForChanged(changeType, Timeout.Infinite);
 
         public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType, int timeout)
diff --git a/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Directory.Create.cs b/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Directory.Create.cs
@@ -9,6 +9,28 @@ namespace System.IO.Tests
 {
     public class Directory_Create_Tests : FileSystemWatcherTest
     {
+        [Fact]        
+        public void FileSystemWatcher_Directory_EmptyPath()
+        {
+            Assert.Throws<ArgumentException>(() =>
+            {
+                using (var watcher = new FileSystemWatcher(""))
+                {
+                }
+            });
+        }
+
+        [Fact]        
+        public void FileSystemWatcher_Directory_PathNotExists()
+        {
+            Assert.Throws<ArgumentException>(() =>
+            {
+                using (var watcher = new FileSystemWatcher(GetTestFilePath()))
+                {
+                }
+            });
+        }
+
         [Fact]
         public void FileSystemWatcher_Directory_Create()
         {
@@ -81,4 +103,4 @@ public void FileSystemWatcher_Directory_Create_SymLink()
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,12 @@ public FileSystemWatcher(string path, string filter)`
`105`	`105`	`throw new ArgumentNullException(nameof(filter));`
`106`	`106`
`107`	`107`	`// Early check for directory parameter so that an exception can be thrown as early as possible.`
`108`		`- if (path.Length == 0 \|\| !Directory.Exists(path))`
	`108`	`+ if (path.Length == 0)`
`109`	`109`	`throw new ArgumentException(SR.Format(SR.InvalidDirName, path), nameof(path));`
`110`	`110`
	`111`	`+ if (!Directory.Exists(path))`
	`112`	`+ throw new ArgumentException(SR.Format(SR.InvalidDirName_NotExists, path), nameof(path));`
	`113`	`+`
`111`	`114`	`_directory = path;`
`112`	`115`	`_filter = filter;`
`113`	`116`	`}`
`@@ -150,13 +153,13 @@ public bool EnableRaisingEvents`
`150`	`153`	`{`
`151`	`154`	`return;`
`152`	`155`	`}`
`153`		`-`
	`156`	`+`
`154`	`157`	`if (IsSuspended())`
`155`	`158`	`{`
`156`	`159`	`_enabled = value; // Alert the Component to start watching for events when EndInit is called.`
`157`	`160`	`}`
`158`	`161`	`else`
`159`		`- {`
	`162`	`+ {`
`160`	`163`	`if (value)`
`161`	`164`	`{`
`162`	`165`	`StartRaisingEventsIfNotDisposed(); // will set _enabled to true once successfully started`
`@@ -416,7 +419,7 @@ private void NotifyRenameEventArgs(WatcherChangeTypes action, string name, strin`
`416`	`419`	`{`
`417`	`420`	`// filter if there's no handler or neither new name or old name match a specified pattern`
`418`	`421`	`RenamedEventHandler handler = _onRenamedHandler;`
`419`		`- if (handler != null &&`
	`422`	`+ if (handler != null &&`
`420`	`423`	`(MatchPattern(name) \|\| MatchPattern(oldName)))`
`421`	`424`	`{`
`422`	`425`	`handler(this, new RenamedEventArgs(action, _directory, name, oldName));`
`@@ -525,7 +528,7 @@ protected void OnRenamed(RenamedEventArgs e)`
`525`	`528`	`}`
`526`	`529`	`}`
`527`	`530`
`528`		`- public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) =>`
	`531`	`+ public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) =>`
`529`	`532`	`WaitForChanged(changeType, Timeout.Infinite);`
`530`	`533`
`531`	`534`	`public WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType, int timeout)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,28 @@ namespace System.IO.Tests`
`9`	`9`	`{`
`10`	`10`	`public class Directory_Create_Tests : FileSystemWatcherTest`
`11`	`11`	`{`
	`12`	`+ [Fact]`
	`13`	`+ public void FileSystemWatcher_Directory_EmptyPath()`
	`14`	`+ {`
	`15`	`+ Assert.Throws<ArgumentException>(() =>`
	`16`	`+ {`
	`17`	`+ using (var watcher = new FileSystemWatcher(""))`
	`18`	`+ {`
	`19`	`+ }`
	`20`	`+ });`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ [Fact]`
	`24`	`+ public void FileSystemWatcher_Directory_PathNotExists()`
	`25`	`+ {`
	`26`	`+ Assert.Throws<ArgumentException>(() =>`
	`27`	`+ {`
	`28`	`+ using (var watcher = new FileSystemWatcher(GetTestFilePath()))`
	`29`	`+ {`
	`30`	`+ }`
	`31`	`+ });`
	`32`	`+ }`
	`33`	`+`
`12`	`34`	`[Fact]`
`13`	`35`	`public void FileSystemWatcher_Directory_Create()`
`14`	`36`	`{`
`@@ -81,4 +103,4 @@ public void FileSystemWatcher_Directory_Create_SymLink()`
`81`	`103`	`}`
`82`	`104`	`}`
`83`	`105`	`}`
`84`		`-}`
	`106`	`+}`