Code Coverage for DownloadFile Review 1St

src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/MyServices/Internal/WebClientCopy.vb

@@ -158,14 +158,22 @@ Namespace Microsoft.VisualBasic.MyServices.Internal
             Debug.Assert((Not String.IsNullOrWhiteSpace(destinationFileName)) _
                 AndAlso IO.Directory.Exists(path), $"Invalid {NameOf(path)}")
 
-            ' If we have a dialog we need to set up an async download
-            If _progressDialog IsNot Nothing Then
-                _webClient.DownloadFileAsync(address, destinationFileName)
-                'returns when the download sequence is over, whether due to success, error, or being canceled
-                _progressDialog.ShowProgressDialog()
-            Else
-                _webClient.DownloadFile(address, destinationFileName)
-            End If
+            Try
+
+                ' If we have a dialog we need to set up an async download
+                If _progressDialog IsNot Nothing Then
+                    _webClient.DownloadFileAsync(address, destinationFileName)
+                    'returns when the download sequence is over, whether due to success, error, or being canceled
+                    _progressDialog.ShowProgressDialog()
+                Else
+                    _webClient.DownloadFile(address, destinationFileName)
+                End If
+            Catch ex As WebException
+                If ex.Message.Contains("401") Then
+                    Throw New WebException(SR.net_webstatus_Unauthorized)
+                End If
+                Throw New WebException(SR.net_webstatus_Timeout)
+            End Try
 
             'Now that we are back on the main thread, throw the exception we encountered if the user didn't cancel.
             If _exceptionEncounteredDuringFileTransfer IsNot Nothing Then
@@ -186,17 +194,26 @@ Namespace Microsoft.VisualBasic.MyServices.Internal
             Debug.Assert(address IsNot Nothing, $"No {NameOf(address)}")
             Debug.Assert((Not String.IsNullOrWhiteSpace(sourceFileName)) _
                 AndAlso IO.File.Exists(sourceFileName), "Invalid file")
-
-            ' If we have a dialog we need to set up an async download
-            If _progressDialog IsNot Nothing Then
-                _webClient.UploadFileAsync(address, sourceFileName)
-
-                ' Returns when the download sequence is over,
-                ' whether due to success, error, or being canceled
-                _progressDialog.ShowProgressDialog()
-            Else
-                _webClient.UploadFile(address, sourceFileName)
-            End If
+            Try
+                ' If we have a dialog we need to set up an async download
+                If _progressDialog IsNot Nothing Then
+                    _webClient.UploadFileAsync(address, sourceFileName)
+
+                    ' Returns when the download sequence is over,
+                    ' whether due to success, error, or being canceled
+                    _progressDialog.ShowProgressDialog()
+                Else
+                    _webClient.UploadFile(address, sourceFileName)
+                End If
+            Catch ex As WebException
+                If ex.Message.Contains("401") Then
+                    Throw New WebException(SR.net_webstatus_Unauthorized)
+                End If
+                If ex.Message.Contains("500") Then
+                    Throw
+                End If
+                Throw New WebException(SR.net_webstatus_Timeout)
+            End Try
 
             ' Now that we are back on the main thread, throw the exception we
             ' encountered if the user didn't cancel.

src/Microsoft.VisualBasic.Forms/src/Resources/SR.resx

@@ -221,4 +221,10 @@
   <data name="EnvVarNotFound_Name" xml:space="preserve">
     <value>Environment variable is not defined: '{0}'.</value>
   </data>
+  <data name="net_webstatus_Timeout" xml:space="preserve">
+    <value>The network operation has timed out.</value>
+  </data>
+  <data name="net_webstatus_Unauthorized" xml:space="preserve">
+    <value>The network operation is unauthorized.</value>
+  </data>
 </root>