Skip to content

Commit f1409e7

Browse files

36 files changed

+231
-1749
lines changed

src/ConnectedMode.UnitTests/Binding/BindingProcessFactoryTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void MefCtor_CheckIsExported()
3838
{
3939
MefTestHelpers.CheckTypeCanBeImported<BindingProcessFactory, IBindingProcessFactory>(
4040
MefTestHelpers.CreateExport<ISonarQubeService>(),
41-
MefTestHelpers.CreateExport<IExclusionSettingsStorage>(),
4241
MefTestHelpers.CreateExport<IQualityProfileDownloader>(),
4342
MefTestHelpers.CreateExport<ILogger>());
4443
}
@@ -57,16 +56,14 @@ public void Create_ReturnsProcessImpl()
5756

5857
private static BindingProcessFactory CreateTestSubject(
5958
ISonarQubeService service = null,
60-
IExclusionSettingsStorage exclusionSettingsStorage = null,
6159
IQualityProfileDownloader qualityProfileDownloader = null,
6260
ILogger logger = null)
6361
{
6462
service ??= Mock.Of<ISonarQubeService>();
65-
exclusionSettingsStorage ??= Mock.Of<IExclusionSettingsStorage>();
6663
qualityProfileDownloader ??= Mock.Of<IQualityProfileDownloader>();
6764
logger ??= new TestLogger(logToConsole: true);
6865

69-
return new BindingProcessFactory(service, exclusionSettingsStorage, qualityProfileDownloader, logger);
66+
return new BindingProcessFactory(service, qualityProfileDownloader, logger);
7067
}
7168

7269
}

src/ConnectedMode.UnitTests/Binding/BindingProcessImplTests.cs

Lines changed: 6 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -44,96 +44,27 @@ public class BindingProcessImplTests
4444
public void Ctor_ArgChecks()
4545
{
4646
var bindingArgs = CreateBindCommandArgs();
47-
var exclusionSettingsStorage = Mock.Of<IExclusionSettingsStorage>();
4847
var qpDownloader = Mock.Of<IQualityProfileDownloader>();
4948
var sonarQubeService = Mock.Of<ISonarQubeService>();
5049
var logger = Mock.Of<ILogger>();
5150

5251
// 1. Null binding args
53-
Action act = () => new BindingProcessImpl(null, exclusionSettingsStorage, sonarQubeService, qpDownloader, logger);
52+
Action act = () => new BindingProcessImpl(null, sonarQubeService, qpDownloader, logger);
5453
act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("bindingArgs");
5554

56-
// 2. Null exclusion settings storage
57-
act = () => new BindingProcessImpl(bindingArgs, null, sonarQubeService, qpDownloader, logger);
58-
act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("exclusionSettingsStorage");
59-
6055
// 3. Null SonarQube service
61-
act = () => new BindingProcessImpl(bindingArgs, exclusionSettingsStorage, null, qpDownloader, logger);
56+
act = () => new BindingProcessImpl(bindingArgs, null, qpDownloader, logger);
6257
act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("sonarQubeService");
6358

6459
// 4. Null QP downloader
65-
act = () => new BindingProcessImpl(bindingArgs, exclusionSettingsStorage, sonarQubeService, null, logger);
60+
act = () => new BindingProcessImpl(bindingArgs, sonarQubeService, null, logger);
6661
act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("qualityProfileDownloader");
6762

6863
// 5. Null logger
69-
act = () => new BindingProcessImpl(bindingArgs, exclusionSettingsStorage, sonarQubeService, qpDownloader, null);
64+
act = () => new BindingProcessImpl(bindingArgs, sonarQubeService, qpDownloader, null);
7065
act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("logger");
7166
}
7267

73-
[TestMethod]
74-
public async Task SaveServerExclusionsAsync_ReturnsTrue()
75-
{
76-
var bindingArgs = CreateBindCommandArgs(projectKey: "projectKey");
77-
var logger = new TestLogger(logToConsole: true);
78-
79-
ServerExclusions settings = CreateSettings();
80-
81-
var sonarQubeService = new Mock<ISonarQubeService>();
82-
sonarQubeService.Setup(s => s.GetServerExclusions("projectKey", It.IsAny<CancellationToken>())).Returns(Task.FromResult(settings));
83-
84-
var exclusionSettingsStorage = new Mock<IExclusionSettingsStorage>();
85-
86-
var testSubject = CreateTestSubject(bindingArgs: bindingArgs,
87-
sonarQubeService: sonarQubeService.Object,
88-
exclusionSettingsStorage: exclusionSettingsStorage.Object,
89-
logger: logger);
90-
91-
await testSubject.SaveServerExclusionsAsync(CancellationToken.None);
92-
93-
exclusionSettingsStorage.Verify(fs => fs.SaveSettings(settings), Times.Once);
94-
logger.AssertOutputStrings(0);
95-
}
96-
97-
[TestMethod]
98-
public async Task SaveServerExclusionsAsync_HasError_ReturnsFalse()
99-
{
100-
var logger = new TestLogger(logToConsole: true);
101-
var bindingArgs = CreateBindCommandArgs(projectKey: "projectKey");
102-
103-
var sonarQubeService = new Mock<ISonarQubeService>();
104-
sonarQubeService.Setup(s => s.GetServerExclusions("projectKey", It.IsAny<CancellationToken>())).Throws(new Exception("Expected Error"));
105-
106-
var testSubject = CreateTestSubject(
107-
bindingArgs: bindingArgs,
108-
sonarQubeService: sonarQubeService.Object,
109-
logger: logger);
110-
111-
var result = await testSubject.SaveServerExclusionsAsync(CancellationToken.None);
112-
113-
result.Should().BeFalse();
114-
logger.AssertOutputStrings(1);
115-
logger.AssertPartialOutputStrings("Expected Error");
116-
}
117-
118-
[TestMethod]
119-
public void SaveServerExclusionsAsync_HasCriticalError_Throws()
120-
{
121-
var logger = new TestLogger(logToConsole: true);
122-
var bindingArgs = CreateBindCommandArgs(projectKey: "projectKey");
123-
124-
var sonarQubeService = new Mock<ISonarQubeService>();
125-
sonarQubeService.Setup(s => s.GetServerExclusions("projectKey", It.IsAny<CancellationToken>())).Throws(new StackOverflowException("Critical Error"));
126-
127-
var testSubject = CreateTestSubject(bindingArgs: bindingArgs,
128-
sonarQubeService: sonarQubeService.Object,
129-
logger: logger);
130-
131-
Func<Task<bool>> act = async () => await testSubject.SaveServerExclusionsAsync(CancellationToken.None);
132-
133-
act.Should().ThrowExactly<StackOverflowException>().WithMessage("Critical Error");
134-
logger.AssertOutputStrings(0);
135-
}
136-
13768
private static ServerExclusions CreateSettings()
13869
{
13970
return new ServerExclusions
@@ -159,7 +90,7 @@ public async Task DownloadQualityProfile_CreatesBoundProjectAndCallsQPDownloader
15990
var result = await testSubject.DownloadQualityProfileAsync(progress, CancellationToken.None);
16091

16192
result.Should().BeTrue();
162-
93+
16394
qpDownloader.Verify(x => x.UpdateAsync(It.IsAny<BoundServerProject>(), progress, It.IsAny<CancellationToken>()),
16495
Times.Once);
16596

@@ -171,7 +102,7 @@ public async Task DownloadQualityProfile_CreatesBoundProjectAndCallsQPDownloader
171102
actualProject.ServerProjectKey.Should().Be("the project key");
172103
}
173104

174-
[TestMethod]
105+
[TestMethod]
175106
public async Task DownloadQualityProfile_HandlesInvalidOperationException()
176107
{
177108
var qpDownloader = new Mock<IQualityProfileDownloader>();
@@ -201,19 +132,16 @@ public async Task DownloadQualityProfile_HandlesInvalidOperationException()
201132
#region Helpers
202133

203134
private BindingProcessImpl CreateTestSubject(BindCommandArgs bindingArgs = null,
204-
IExclusionSettingsStorage exclusionSettingsStorage = null,
205135
ISonarQubeService sonarQubeService = null,
206136
IQualityProfileDownloader qpDownloader = null,
207137
ILogger logger = null)
208138
{
209139
bindingArgs = bindingArgs ?? CreateBindCommandArgs();
210140
sonarQubeService ??= Mock.Of<ISonarQubeService>();
211-
exclusionSettingsStorage ??= Mock.Of<IExclusionSettingsStorage>();
212141
qpDownloader ??= Mock.Of<IQualityProfileDownloader>();
213142
logger ??= new TestLogger(logToConsole: true);
214143

215144
return new BindingProcessImpl(bindingArgs,
216-
exclusionSettingsStorage,
217145
sonarQubeService,
218146
qpDownloader,
219147
logger);

src/ConnectedMode.UnitTests/Binding/CompositeBindingConfigProviderTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ public void Ctor_PublicConstructor_ContainsExpectedBindingConfigProviders()
5454

5555
// Assert
5656
testSubject.Providers.Count().Should().Be(2);
57-
testSubject.Providers.Select(x => x.GetType()).Should().BeEquivalentTo(
58-
typeof(NonRoslynBindingConfigProvider),
59-
typeof(CSharpVBBindingConfigProvider));
57+
testSubject.Providers.Select(x => x.GetType()).Should().BeEquivalentTo(typeof(NonRoslynDummyBindingConfigProvider), typeof(CSharpVBBindingConfigProvider));
6058
}
6159

6260
[TestMethod]

src/ConnectedMode.UnitTests/Binding/NonRoslynBindingConfigFileTests.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)