fix bug, green test

Author: retailcoder

Rubberduck.Core/UI/Command/VersionCheckCommand.cs

@@ -53,40 +53,40 @@ protected override async void OnExecute(object parameter)
             Logger.Info("Executing version check...");
 
             var tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-            await _versionCheck
-                .GetLatestVersionAsync(settings, tokenSource.Token)
-                .ContinueWith(t =>
-                {
-                    if (t.IsFaulted)
-                    {
-                        Logger.Warn(t.Exception);
-                        return;
-                    }
+            Version latest = default;
 
-                    if (_versionCheck.CurrentVersion < t.Result)
-                    {
-                        var proceed = true;
-                        if (_versionCheck.IsDebugBuild || !settings.IncludePreRelease)
-                        {
-                            // if the latest version has a revision number and isn't a pre-release build,
-                            // avoid prompting since we can't know if the build already includes the latest version.
-                            proceed = t.Result.Revision == 0;
-                        }
+            try
+            {
+                latest = await _versionCheck.GetLatestVersionAsync(settings, tokenSource.Token);
+            }
+            catch(Exception e)
+            {
+                Logger.Warn(e, "Version check failed.");
+            }
 
-                        if (proceed)
-                        {
-                            PromptAndBrowse(t.Result, settings.IncludePreRelease);
-                        }
-                        else
-                        {
-                            Logger.Info("Version check skips notification of an existing newer version available.");
-                        }
-                    }
-                    else
-                    {
-                        Logger.Info("Version check completed: running current latest.");
-                    }
-                });
+            if (_versionCheck.CurrentVersion < latest)
+            {
+                var proceed = true;
+                if (_versionCheck.IsDebugBuild || !settings.IncludePreRelease)
+                {
+                    // if the latest version has a revision number and isn't a pre-release build,
+                    // avoid prompting since we can't know if the build already includes the latest version.
+                    proceed = latest.Revision == 0;
+                }
+
+                if (proceed)
+                {
+                    PromptAndBrowse(latest, settings.IncludePreRelease);
+                }
+                else
+                {
+                    Logger.Info("Version check skips notification of an existing newer version available.");
+                }
+            }
+            else if (latest != default)
+            {
+                Logger.Info("Version check completed: running current latest.");
+            }
         }
 
         private void PromptAndBrowse(Version latestVersion, bool includePreRelease)

Rubberduck.Core/VersionCheck/VersionCheckService.cs

@@ -36,15 +36,22 @@ public async Task<Version> GetLatestVersionAsync(GeneralSettings settings, Cance
                 return _latestVersion; 
             }
 
-            var tags = await _client.GetLatestTagsAsync(token);
+            try
+            {
+                var tags = await _client.GetLatestTagsAsync(token);
 
-            var next = tags.Single(e => e.IsPreRelease);
-            var main = tags.Single(e => !e.IsPreRelease);
-            _logger.Info($"Main: v{main.Version.ToString(3)}; Next: v{next.Version.ToString(4)}");
+                var next = tags.Single(e => e.IsPreRelease);
+                var main = tags.Single(e => !e.IsPreRelease);
+                _logger.Info($"Main: v{main.Version.ToString(3)}; Next: v{next.Version.ToString(4)}");
 
-            _latestVersion = settings.IncludePreRelease ? next.Version : main.Version;
-            _logger.Info($"Check prerelease: {settings.IncludePreRelease}; latest: v{_latestVersion.ToString(4)}");
+                _latestVersion = settings.IncludePreRelease ? next.Version : main.Version;
+                _logger.Info($"Check prerelease: {settings.IncludePreRelease}; latest: v{_latestVersion.ToString(4)}");
+            }
+            catch ( Exception ex )
+            {
+                _logger.Warn(ex, "Version check failed.");
 
+            }
             return _latestVersion;
         }
 

RubberduckTests/VersionCheckTests.cs

@@ -24,9 +24,9 @@ public async Task GetLatestVersionThrowsHttpException_IsHandled()
 
             var sut = new VersionCheckService(appVersion, apiClient.Object);
 
-            await sut.GetLatestVersionAsync(new GeneralSettings(), CancellationToken.None);
+            var result = await sut.GetLatestVersionAsync(new GeneralSettings(), CancellationToken.None);
 
-            Assert.IsTrue(true); // if we make it here, service isn't throwing.
+            Assert.IsNull(result);
         }
     }