Returning successful result

Author: StanleyGoldman

src/GitHub.Api/Tasks/DownloadTask.cs

@@ -90,7 +90,7 @@ public static WebResponse GetResponseWithoutException(this WebRequest request)
         }
     }
 
-    class DownloadTask : TaskBase
+    class DownloadTask : TaskBase<bool>
     {
         private IFileSystem fileSystem;
         private long bytes;
@@ -108,22 +108,16 @@ public DownloadTask(CancellationToken token, IFileSystem fileSystem, string url,
             Name = "DownloadTask";
         }
 
-        protected override void Run(bool success)
+        protected override bool RunWithReturn(bool success)
         {
-            base.Run(success);
+            base.RunWithReturn(success);
 
             RaiseOnStart();
 
-            var downloadResult = new DownloadResult
-            {
-                Url = Url,
-                Destination = Destination
-            };
-
+            var result = false;
             try
             {
-                downloadResult.Success = Download();
-                downloadResult.MD5Sum = fileSystem.CalculateMD5(Destination);
+                result = Download();
             }
             catch (Exception ex)
             {
@@ -133,8 +127,10 @@ protected override void Run(bool success)
             }
             finally
             {
-                RaiseOnEnd();
+                RaiseOnEnd(result);
             }
+
+            return result;
         }
 
         protected virtual void UpdateProgress(float progress)
@@ -144,7 +140,7 @@ protected virtual void UpdateProgress(float progress)
 
         public bool Download()
         {
-            FileInfo fileInfo = new FileInfo(Destination);
+            var fileInfo = new FileInfo(Destination);
             if (fileSystem.FileExists(Destination))
             {
                 var fileLength = fileSystem.FileLength(Destination);

src/tests/IntegrationTests/Download/DownloadTaskTests.cs

@@ -26,7 +26,9 @@ public async Task TestDownloadTask()
             var downloadHalfPath = TestBasePath.Combine("5MB-split.zip");
 
             var downloadTask = new DownloadTask(CancellationToken.None, fileSystem, TestDownload, downloadPath);
-            await downloadTask.StartAwait();
+            var downloadResult = await downloadTask.StartAwait();
+
+            downloadResult.Should().BeTrue();
 
             var downloadPathBytes = fileSystem.ReadAllBytes(downloadPath);
             Logger.Trace("File size {0} bytes", downloadPathBytes.Length);
@@ -43,7 +45,9 @@ public async Task TestDownloadTask()
             fileSystem.WriteAllBytes(downloadHalfPath, cutDownloadPathBytes);
 
             downloadTask = new DownloadTask(CancellationToken.None, fileSystem, TestDownload, downloadHalfPath);
-            await downloadTask.StartAwait();
+            downloadResult = await downloadTask.StartAwait();
+
+            downloadResult.Should().BeTrue();
 
             var downloadHalfPathBytes = fileSystem.ReadAllBytes(downloadHalfPath);
             Logger.Trace("File size {0} Bytes", downloadHalfPathBytes.Length);

src/tests/IntegrationTests/SetUpFixture.cs

@@ -14,7 +14,7 @@ public void Setup()
 
             Logging.LogAdapter = new MultipleLogAdapter(
                 new FileLogAdapter($"..\\{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-integration-tests.log")
-                //, new ConsoleLogAdapter()
+                , new ConsoleLogAdapter()
             );
         }
     }