Some cleanup and sonar fixes (#206)

coenm · Oct 14, 2024 · 9ef0c18 · 9ef0c18
1 parent c2f7ddb
commit 9ef0c18
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 124 deletions.
diff --git a/src/RepoM.Api/IO/IPathFinder.cs b/src/RepoM.Api/IO/IPathFinder.cs
diff --git a/src/RepoM.App/NotifyIconResources.xaml b/src/RepoM.App/NotifyIconResources.xaml
@@ -10,7 +10,10 @@
         reuse the same context menu (which is a resource) again (which will have its DataContext set to the old TaskbarIcon)
   -->
 	<controls:AcrylicContextMenu x:Shared="false" x:Key="SysTrayMenu">
-		<controls:AcrylicMenuItem Header="{DynamicResource Open}" Command="{Binding OpenCommand}" />
+        <controls:AcrylicContextMenu.DataContext>
+            <app:NotifyIconViewModel/>
+        </controls:AcrylicContextMenu.DataContext>
+        <controls:AcrylicMenuItem Header="{DynamicResource Open}" Command="{Binding OpenCommand}" />
         <controls:AcrylicMenuItem Header="{DynamicResource StartWithWindows}" 
                   Command="{Binding StartWithWindows}"
                   Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"

diff --git a/src/RepoM.App/NotifyIconViewModel.cs b/src/RepoM.App/NotifyIconViewModel.cs
@@ -16,21 +16,21 @@ public class NotifyIconViewModel
     /// <summary>
     /// Shows a window, if none is already open.
     /// </summary>
-    public ICommand OpenCommand =>
+    public static ICommand OpenCommand =>
         new DelegateCommand
             {
                 CanExecuteFunc = () => (Application.Current.MainWindow as MainWindow)?.IsShown == false,
                 CommandAction = () => (Application.Current.MainWindow as MainWindow)?.ShowAndActivate(),
             };
 
-    public ICommand StartWithWindows =>
+    public static ICommand StartWithWindows =>
         new DelegateCommand
             {
                 CanExecuteFunc = () => !AutoStart.IsStartup(APP_NAME),
                 CommandAction = () => AutoStart.SetStartup(APP_NAME, true),
             };
 
-    public ICommand DoNotStartWithWindows =>
+    public static ICommand DoNotStartWithWindows =>
         new DelegateCommand
             {
                 CanExecuteFunc = () => AutoStart.IsStartup(APP_NAME),
@@ -40,7 +40,7 @@ public class NotifyIconViewModel
     /// <summary>
     /// Shuts down the application.
     /// </summary>
-    public ICommand ExitApplicationCommand =>
+    public static ICommand ExitApplicationCommand =>
         new DelegateCommand
             {
                 CommandAction = () => Application.Current.Shutdown(),

diff --git a/src/RepoM.Plugin.AzureDevOps/Internal/AzureDevOpsPullRequestService.cs b/src/RepoM.Plugin.AzureDevOps/Internal/AzureDevOpsPullRequestService.cs
@@ -44,8 +44,7 @@ public AzureDevOpsPullRequestService(IAzureDevopsConfiguration configuration, IL
         {
             if (string.IsNullOrEmpty(configuration.AzureDevOpsPersonalAccessToken))
             {
-                //throw new ArgumentNullException(nameof(configuration.AzureDevOpsPersonalAccessToken));
-                _logger.LogInformation("No Azure configuration present");
+                _logger.LogInformation("No Azure configuration present. Module will not be enabled.");
             }
             else
             {
@@ -56,7 +55,6 @@ public AzureDevOpsPullRequestService(IAzureDevopsConfiguration configuration, IL
                 _httpClient.DefaultRequestHeaders.Accept.Add(new("application/json"));
                 _httpClient.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($":{_configuration.AzureDevOpsPersonalAccessToken}")));
             }
-
         }
         catch (Exception e)
         {
@@ -124,7 +122,7 @@ public async Task CreatePullRequestWithAutoCompleteAsync(IRepository repository,
 
         if (!response.IsSuccessStatusCode)
         {
-            var content = await response.Content.ReadAsStringAsync();
+            var content = await response.Content.ReadAsStringAsync(CancellationToken.None);
             _logger.LogError("PR creation went wrong with following response: {Message}", content);
             throw new HttpRequestException(content, null, response.StatusCode);
         }

diff --git a/src/RepoM.Plugin.Heidi/Internal/ExtractRepositoryFromHeidi.cs b/src/RepoM.Plugin.Heidi/Internal/ExtractRepositoryFromHeidi.cs
@@ -77,7 +77,7 @@ public bool TryExtract(HeidiSingleDatabaseConfiguration config, [NotNullWhen(tru
         return true;
     }
 
-    private static ReadOnlySpan<char> HandleHashTag(ReadOnlySpan<char> comment, ICollection<string> tags)
+    private static ReadOnlySpan<char> HandleHashTag(ReadOnlySpan<char> comment, List<string> tags)
     {
         comment = comment["#".Length..];
 
@@ -91,7 +91,7 @@ private static ReadOnlySpan<char> HandleHashTag(ReadOnlySpan<char> comment, ICol
         return comment;
     }
 
-    private static ReadOnlySpan<char> HandleHashTagName(ReadOnlySpan<char> comment, ICollection<string> names)
+    private static ReadOnlySpan<char> HandleHashTagName(ReadOnlySpan<char> comment, List<string> names)
     {
         comment = comment[HASH_TAG_NAME.Length..];
 
@@ -124,7 +124,7 @@ private static ReadOnlySpan<char> HandleHashTagName(ReadOnlySpan<char> comment,
         return comment;
     }
 
-    private static ReadOnlySpan<char> HandleHashTagOrder(ReadOnlySpan<char> comment, ICollection<int> orders)
+    private static ReadOnlySpan<char> HandleHashTagOrder(ReadOnlySpan<char> comment, List<int> orders)
     {
         comment = comment[HASH_TAG_ORDER.Length..];
 
@@ -150,7 +150,7 @@ private static ReadOnlySpan<char> HandleHashTagOrder(ReadOnlySpan<char> comment,
         return comment;
     }
 
-    private static ReadOnlySpan<char> HandleHashTagRepo(ReadOnlySpan<char> comment, ICollection<string> repos)
+    private static ReadOnlySpan<char> HandleHashTagRepo(ReadOnlySpan<char> comment, List<string> repos)
     {
         comment = comment[HASH_TAG_REPO.Length..];
 

diff --git a/src/RepoM.Plugin.WindowsExplorerGitInfo/PInvoke/WindowFinder.cs b/src/RepoM.Plugin.WindowsExplorerGitInfo/PInvoke/WindowFinder.cs
diff --git a/tests/RepoM.Plugin.AzureDevOps.Tests/AzureDevOpsPackageTests.cs b/tests/RepoM.Plugin.AzureDevOps.Tests/AzureDevOpsPackageTests.cs
@@ -1,3 +1,5 @@
+using FluentAssertions;
+
 namespace RepoM.Plugin.AzureDevOps.Tests;
 
 using System;
@@ -76,9 +78,10 @@ public async Task RegisterServices_ShouldFail_WhenExternalDependenciesAreNotRegi
 
         // act
         await sut.RegisterServicesAsync(_container, _packageConfiguration);
+        Action act = () => _container.Verify(VerificationOption.VerifyAndDiagnose);
 
         // assert
-        Assert.Throws<InvalidOperationException>(() => _container.Verify(VerificationOption.VerifyAndDiagnose));
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     [Theory]

diff --git a/tests/RepoM.Plugin.Heidi.Tests/HeidiPackageTest.cs b/tests/RepoM.Plugin.Heidi.Tests/HeidiPackageTest.cs
@@ -4,6 +4,7 @@ namespace RepoM.Plugin.Heidi.Tests;
 using System.IO.Abstractions;
 using System.Threading.Tasks;
 using FakeItEasy;
+using FluentAssertions;
 using Microsoft.Extensions.Logging;
 using RepoM.Core.Plugin;
 using RepoM.Plugin.Heidi.PersistentConfiguration;
@@ -93,9 +94,10 @@ public async Task RegisterServices_ShouldFail_WhenExternalDependenciesAreNotRegi
 
         // act
         await sut.RegisterServicesAsync(_container, _packageConfiguration);
+        Action act = () => _container.Verify(VerificationOption.VerifyAndDiagnose);
 
         // assert
-        Assert.Throws<InvalidOperationException>(() => _container.Verify(VerificationOption.VerifyAndDiagnose));
+        act.Should().ThrowExactly<InvalidOperationException>(); ;
     }
 
     private static void RegisterExternals(Container container)

diff --git a/tests/RepoM.Plugin.LuceneQueryParser.Tests/LuceneQueryParserPackageTest.cs b/tests/RepoM.Plugin.LuceneQueryParser.Tests/LuceneQueryParserPackageTest.cs
@@ -57,9 +57,10 @@ public void RegisterServices_ShouldFail_WhenExternalDependenciesAreNotRegistered
 
         // act
         sut.RegisterServices(_container);
+        Action act = () => _container.Verify(VerificationOption.VerifyAndDiagnose);
 
         // assert
-        Assert.Throws<InvalidOperationException>(() => _container.Verify(VerificationOption.VerifyAndDiagnose));
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     private static void RegisterExternals(Container container)

diff --git a/tests/RepoM.Plugin.Misc.Tests/PluginInformationTests.cs b/tests/RepoM.Plugin.Misc.Tests/PluginInformationTests.cs
@@ -21,8 +21,8 @@ public void PluginAssembly_ShouldContainPackageAttributeWithValidValues(Assembly
         PackageAttribute? result = assembly.GetCustomAttribute<PackageAttribute>();
 
         // assert
-        Assert.NotNull(result);
-        result.Name.Should().NotBeNullOrWhiteSpace();
+        result.Should().NotBeNull();
+        result!.Name.Should().NotBeNullOrWhiteSpace();
         result.ToolTip.Should().NotBeNullOrWhiteSpace();
     }
 
@@ -53,7 +53,7 @@ public void AssemblyDescription_ShouldBeUnique()
     private static PackageAttribute GetFromAssembly(Assembly assembly)
     {
         PackageAttribute? result = assembly.GetCustomAttribute<PackageAttribute>();
-        Assert.NotNull(result);
-        return result;
+        result.Should().NotBeNull();
+        return result!;
     }
 }
diff --git a/tests/RepoM.Plugin.SonarCloud.Tests/SonarCloudPackageTest.cs b/tests/RepoM.Plugin.SonarCloud.Tests/SonarCloudPackageTest.cs
@@ -9,6 +9,7 @@ namespace RepoM.Plugin.SonarCloud.Tests;
 using Microsoft.Extensions.Logging;
 using RepoM.Core.Plugin;
 using RepoM.Plugin.SonarCloud.PersistentConfiguration;
+using FluentAssertions;
 
 public class SonarCloudPackageTest
 {
@@ -76,9 +77,10 @@ public async Task RegisterServices_ShouldFail_WhenExternalDependenciesAreNotRegi
 
         // act
         await sut.RegisterServicesAsync(_container, _packageConfiguration);
+        Action act = () => _container.Verify(VerificationOption.VerifyAndDiagnose);
 
         // assert
-        Assert.Throws<InvalidOperationException>(() => _container.Verify(VerificationOption.VerifyAndDiagnose));
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     private void RegisterExternals(Container container)

diff --git a/tests/RepoM.Plugin.Statistics.Tests/StatisticsPackageTest.cs b/tests/RepoM.Plugin.Statistics.Tests/StatisticsPackageTest.cs
@@ -4,6 +4,7 @@ namespace RepoM.Plugin.Statistics.Tests;
 using System.IO.Abstractions;
 using System.Threading.Tasks;
 using FakeItEasy;
+using FluentAssertions;
 using Microsoft.Extensions.Logging;
 using RepoM.Core.Plugin;
 using RepoM.Core.Plugin.Common;
@@ -75,9 +76,10 @@ public async Task RegisterServices_ShouldFail_WhenExternalDependenciesAreNotRegi
 
         // act
         await sut.RegisterServicesAsync(_container, _packageConfiguration);
+        Action act = () => _container.Verify(VerificationOption.VerifyAndDiagnose);
 
         // assert
-        Assert.Throws<InvalidOperationException>(() => _container.Verify(VerificationOption.VerifyAndDiagnose));
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     private static void RegisterExternals(Container container)