SLVS-1474 Fix notifications are always disabled when creating DTO for…

… connection needed for SlCore
SonarSource · Oct 1, 2024 · b568d66 · b568d66
1 parent 5bfcc5d
commit b568d66
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/SLCore.UnitTests/State/ServerConnectionsProviderTests.cs b/src/SLCore.UnitTests/State/ServerConnectionsProviderTests.cs
@@ -54,7 +54,24 @@ public void GetServerConnections_CorrectlyReturnsSonarQubeConnection()
         serverConnections.Should().HaveCount(1);
         serverConnections[connection.Id].Should().BeOfType<SonarQubeConnectionConfigurationDto>().Which.serverUrl.Should().Be(servierUriString);
     }
-
+
+    [TestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void GetServerConnections_CorrectlyReturnsSonarQubeNotifications(bool isSmartNotificationsEnabled)
+    {
+        const string servierUriString = "http://localhost/";
+        var serverUri = new Uri(servierUriString);
+        var connection = new ServerConnection.SonarQube(serverUri, settings: new ServerConnectionSettings(isSmartNotificationsEnabled));
+        var serverConnectionsRepository = SetServerConnectionsRepository(succeeded: true, connection);
+        var testSubject = CreateTestSubject(serverConnectionsRepository);
+
+        var serverConnections = testSubject.GetServerConnections();
+
+        serverConnections.Should().HaveCount(1);
+        serverConnections[connection.Id].Should().BeOfType<SonarQubeConnectionConfigurationDto>().Which.disableNotification.Should().Be(!isSmartNotificationsEnabled);
+    }
+
     [TestMethod]
     public void GetServerConnections_CorrectlyReturnsSonarCloudConnection()
     {
@@ -68,7 +85,23 @@ public void GetServerConnections_CorrectlyReturnsSonarCloudConnection()
         serverConnections.Should().HaveCount(1);
         serverConnections[connection.Id].Should().BeOfType<SonarCloudConnectionConfigurationDto>().Which.organization.Should().Be(organizationKey);
     }
-
+
+    [TestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void GetServerConnections_CorrectlyReturnsSonarCloudNotifications(bool isSmartNotificationsEnabled)
+    {
+        const string organizationKey = "org";
+        var connection = new ServerConnection.SonarCloud(organizationKey, settings: new ServerConnectionSettings(isSmartNotificationsEnabled));
+        var serverConnectionsRepository = SetServerConnectionsRepository(succeeded: true, connection);
+        var testSubject = CreateTestSubject(serverConnectionsRepository);
+
+        var serverConnections = testSubject.GetServerConnections();
+
+        serverConnections.Should().HaveCount(1);
+        serverConnections[connection.Id].Should().BeOfType<SonarCloudConnectionConfigurationDto>().Which.disableNotification.Should().Be(!isSmartNotificationsEnabled);
+    }
+
     [TestMethod]
     public void GetServerConnections_CorrectlyHandlesMultipleConnections()
     {

diff --git a/src/SLCore/State/ServerConnectionsProvider.cs b/src/SLCore/State/ServerConnectionsProvider.cs
@@ -55,10 +55,10 @@ private static List<ServerConnectionConfiguration> GetServerConnectionConfigurat
             switch (serverConnection)
             {
                 case ServerConnection.SonarQube sonarQubeConnection:
-                    serverConnectionConfigurations.Add(new SonarQubeConnectionConfigurationDto(sonarQubeConnection.Id, sonarQubeConnection.Settings.IsSmartNotificationsEnabled, sonarQubeConnection.ServerUri.ToString()));
+                    serverConnectionConfigurations.Add(new SonarQubeConnectionConfigurationDto(sonarQubeConnection.Id, !sonarQubeConnection.Settings.IsSmartNotificationsEnabled, sonarQubeConnection.ServerUri.ToString()));
                     break;
                 case ServerConnection.SonarCloud sonarCloudConnection:
-                    serverConnectionConfigurations.Add(new SonarCloudConnectionConfigurationDto(sonarCloudConnection.Id, sonarCloudConnection.Settings.IsSmartNotificationsEnabled, sonarCloudConnection.OrganizationKey));
+                    serverConnectionConfigurations.Add(new SonarCloudConnectionConfigurationDto(sonarCloudConnection.Id, !sonarCloudConnection.Settings.IsSmartNotificationsEnabled, sonarCloudConnection.OrganizationKey));
                     break;
                 default:
                     throw new InvalidOperationException(SLCoreStrings.UnexpectedServerConnectionType);