Skip to content

Commit bce77cb

Browse files
bclothierbclothier
committed
Update the unit tests
1 parent 2efc2a1 commit bce77cb

9 files changed

+57
-54
lines changed

‎RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ private void AssertVbaFragmentYieldsExpectedInspectionResultCount(string inputCo
174174
internal static Mock<IPersistanceService<CodeInspectionSettings>> GetInspectionSettings()
175175
{
176176
var settings = new Mock<IPersistanceService<CodeInspectionSettings>>();
177-
settings.Setup(s => s.Load(It.IsAny<CodeInspectionSettings>()))
177+
settings.Setup(s => s.Load(It.IsAny<CodeInspectionSettings>(), null))
178178
.Returns(new CodeInspectionSettings(Enumerable.Empty<CodeInspectionSetting>(), new[]
179179
{
180180
new WhitelistedIdentifierSetting("sss"),

‎RubberduckTests/Settings/AutoCompleteSettingsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void AutoCompleteDisabledByDefault()
7777
public void SaveConfigWorks()
7878
{
7979
var customConfig = GetNonDefaultConfig();
80-
var viewModel = new AutoCompleteSettingsViewModel(customConfig);
80+
var viewModel = new AutoCompleteSettingsViewModel(customConfig, null);
8181

8282
var config = GetDefaultConfig();
8383
viewModel.UpdateConfig(config);
@@ -95,7 +95,7 @@ public void SaveConfigWorks()
9595
[Test]
9696
public void SetDefaultsWorks()
9797
{
98-
var viewModel = new AutoCompleteSettingsViewModel(GetNonDefaultConfig());
98+
var viewModel = new AutoCompleteSettingsViewModel(GetNonDefaultConfig(), null);
9999

100100
var defaultConfig = GetDefaultConfig();
101101
viewModel.SetToDefaults(defaultConfig);

‎RubberduckTests/Settings/CodeInspectionConfigProviderTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void UserSettingsAreCombinedWithDefaultSettings()
4545
};
4646

4747
var persisterMock = new Mock<IPersistanceService<CodeInspectionSettings>>();
48-
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>())).Returns(userSettings);
48+
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>(), null)).Returns(userSettings);
4949

5050
var configProvider = new CodeInspectionConfigProvider(persisterMock.Object, inspectionProviderMock.Object);
5151

@@ -72,7 +72,7 @@ public void UserSettingsAreNotDuplicatedWithDefaultSettings()
7272
};
7373

7474
var persisterMock = new Mock<IPersistanceService<CodeInspectionSettings>>();
75-
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>())).Returns(userSettings);
75+
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>(), null)).Returns(userSettings);
7676

7777
var configProvider = new CodeInspectionConfigProvider(persisterMock.Object, inspectionProviderMock.Object);
7878
var settings = configProvider.Create().CodeInspections;
@@ -97,7 +97,7 @@ public void UserSettingForUnknownInspectionIsIgnored()
9797
};
9898

9999
var persisterMock = new Mock<IPersistanceService<CodeInspectionSettings>>();
100-
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>())).Returns(userSettings);
100+
persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>(), null)).Returns(userSettings);
101101

102102
var configProvider = new CodeInspectionConfigProvider(persisterMock.Object, inspectionProviderMock.Object);
103103

‎RubberduckTests/Settings/GeneralSettingsTests.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private Configuration GetNondefaultConfig()
8383
public void SaveConfigWorks()
8484
{
8585
var customConfig = GetNondefaultConfig();
86-
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
86+
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
8787

8888
var config = GetDefaultConfig();
8989
viewModel.UpdateConfig(config);
@@ -101,7 +101,7 @@ public void SaveConfigWorks()
101101
[Test]
102102
public void SetDefaultsWorks()
103103
{
104-
var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
104+
var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
105105

106106
var defaultConfig = GetDefaultConfig();
107107
viewModel.SetToDefaults(defaultConfig);
@@ -120,7 +120,7 @@ public void SetDefaultsWorks()
120120
public void LanguageIsSetInCtor()
121121
{
122122
var defaultConfig = GetDefaultConfig();
123-
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
123+
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
124124

125125
Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.Language, viewModel.SelectedLanguage);
126126
}
@@ -130,7 +130,7 @@ public void LanguageIsSetInCtor()
130130
public void HotkeysAreSetInCtor()
131131
{
132132
var defaultConfig = GetDefaultConfig();
133-
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
133+
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
134134

135135
Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));
136136
}
@@ -140,7 +140,7 @@ public void HotkeysAreSetInCtor()
140140
public void AutoSaveEnabledIsSetInCtor()
141141
{
142142
var defaultConfig = GetDefaultConfig();
143-
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
143+
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
144144

145145
Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.IsAutoSaveEnabled, viewModel.AutoSaveEnabled);
146146
}
@@ -150,7 +150,7 @@ public void AutoSaveEnabledIsSetInCtor()
150150
public void AutoSavePeriodIsSetInCtor()
151151
{
152152
var defaultConfig = GetDefaultConfig();
153-
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
153+
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);
154154

155155
Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
156156
}
@@ -159,10 +159,13 @@ public void AutoSavePeriodIsSetInCtor()
159159
[Test]
160160
public void UserSettingsLoadedUsingDefaultWhenMissingFile()
161161
{
162+
var pathProviderMock = new Mock<IPersistancePathProvider>();
163+
pathProviderMock.Setup(x => x.DataRootPath).Returns("C:\\rubberduck\\");
164+
pathProviderMock.Setup(x => x.DataFolderPath(It.IsAny<string>())).Returns<string>(x => x);
162165
// For this test, we need to use the actual object. Fortunately, the path is virtual, so we
163166
// can override that property and force it to use an non-existent path to prove that settings
164167
// will be still created using defaults without the file present.
165-
var persisterMock = new Mock<XmlPersistanceService<GeneralSettings>>();
168+
var persisterMock = new Mock<XmlPersistanceService<GeneralSettings>>(pathProviderMock.Object);
166169
persisterMock.Setup(x => x.FilePath).Returns("C:\\some\\non\\existent\\path\\rubberduck");
167170
persisterMock.CallBase = true;
168171
var configProvider = new GeneralConfigProvider(persisterMock.Object);

‎RubberduckTests/Settings/IndenterSettingsTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private Configuration GetNondefaultConfig()
9595
public void SaveConfigWorks()
9696
{
9797
var customConfig = GetNondefaultConfig();
98-
var viewModel = new IndenterSettingsViewModel(customConfig);
98+
var viewModel = new IndenterSettingsViewModel(customConfig, null);
9999

100100
var config = GetDefaultConfig();
101101
viewModel.UpdateConfig(config);
@@ -132,7 +132,7 @@ public void SaveConfigWorks()
132132
[Test]
133133
public void SetDefaultsWorks()
134134
{
135-
var viewModel = new IndenterSettingsViewModel(GetNondefaultConfig());
135+
var viewModel = new IndenterSettingsViewModel(GetNondefaultConfig(), null);
136136

137137
var defaultConfig = GetDefaultConfig();
138138
viewModel.SetToDefaults(defaultConfig);
@@ -170,7 +170,7 @@ public void SetDefaultsWorks()
170170
public void AlignCommentsWithCodeIsSetInCtor()
171171
{
172172
var defaultConfig = GetDefaultConfig();
173-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
173+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
174174

175175
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignCommentsWithCode, viewModel.AlignCommentsWithCode);
176176
}
@@ -180,7 +180,7 @@ public void AlignCommentsWithCodeIsSetInCtor()
180180
public void AlignContinuationsIsSetInCtor()
181181
{
182182
var defaultConfig = GetDefaultConfig();
183-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
183+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
184184

185185
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignContinuations, viewModel.AlignContinuations);
186186
}
@@ -190,7 +190,7 @@ public void AlignContinuationsIsSetInCtor()
190190
public void AlignDimColumnIsSetInCtor()
191191
{
192192
var defaultConfig = GetDefaultConfig();
193-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
193+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
194194

195195
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignDimColumn, viewModel.AlignDimColumn);
196196
}
@@ -200,7 +200,7 @@ public void AlignDimColumnIsSetInCtor()
200200
public void AlignDimsIsSetInCtor()
201201
{
202202
var defaultConfig = GetDefaultConfig();
203-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
203+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
204204

205205
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignDims, viewModel.AlignDims);
206206
}
@@ -210,7 +210,7 @@ public void AlignDimsIsSetInCtor()
210210
public void EndOfLineCommentColumnSpaceAlignmentIsSetInCtor()
211211
{
212212
var defaultConfig = GetDefaultConfig();
213-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
213+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
214214

215215
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EndOfLineCommentColumnSpaceAlignment, viewModel.EndOfLineCommentColumnSpaceAlignment);
216216
}
@@ -220,7 +220,7 @@ public void EndOfLineCommentColumnSpaceAlignmentIsSetInCtor()
220220
public void EndOfLineCommentStyleIsSetInCtor()
221221
{
222222
var defaultConfig = GetDefaultConfig();
223-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
223+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
224224

225225
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EndOfLineCommentStyle, viewModel.EndOfLineCommentStyle);
226226
}
@@ -230,7 +230,7 @@ public void EndOfLineCommentStyleIsSetInCtor()
230230
public void ForceCompilerDirectivesInColumn1IsSetInCtor()
231231
{
232232
var defaultConfig = GetDefaultConfig();
233-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
233+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
234234

235235
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.ForceCompilerDirectivesInColumn1, viewModel.ForceCompilerDirectivesInColumn1);
236236
}
@@ -240,7 +240,7 @@ public void ForceCompilerDirectivesInColumn1IsSetInCtor()
240240
public void ForceDebugStatementsInColumn1IsSetInCtor()
241241
{
242242
var defaultConfig = GetDefaultConfig();
243-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
243+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
244244

245245
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.ForceDebugStatementsInColumn1, viewModel.ForceDebugStatementsInColumn1);
246246
}
@@ -250,7 +250,7 @@ public void ForceDebugStatementsInColumn1IsSetInCtor()
250250
public void IgnoreOperatorsInContinuationsIsSetInCtor()
251251
{
252252
var defaultConfig = GetDefaultConfig();
253-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
253+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
254254

255255
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IgnoreOperatorsInContinuations, viewModel.IgnoreOperatorsInContinuations);
256256
}
@@ -260,7 +260,7 @@ public void IgnoreOperatorsInContinuationsIsSetInCtor()
260260
public void IndentCaseIsSetInCtor()
261261
{
262262
var defaultConfig = GetDefaultConfig();
263-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
263+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
264264

265265
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentCase, viewModel.IndentCase);
266266
}
@@ -270,7 +270,7 @@ public void IndentCaseIsSetInCtor()
270270
public void IndentEnumTypeAsProcedureIsSetInCtor()
271271
{
272272
var defaultConfig = GetDefaultConfig();
273-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
273+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
274274

275275
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentEnumTypeAsProcedure, viewModel.IndentEnumTypeAsProcedure);
276276
}
@@ -280,7 +280,7 @@ public void IndentEnumTypeAsProcedureIsSetInCtor()
280280
public void IndentCompilerDirectivesIsSetInCtor()
281281
{
282282
var defaultConfig = GetDefaultConfig();
283-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
283+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
284284

285285
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentCompilerDirectives, viewModel.IndentCompilerDirectives);
286286
}
@@ -290,7 +290,7 @@ public void IndentCompilerDirectivesIsSetInCtor()
290290
public void IndentEntireProcedureBodyIsSetInCtor()
291291
{
292292
var defaultConfig = GetDefaultConfig();
293-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
293+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
294294

295295
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentEntireProcedureBody, viewModel.IndentEntireProcedureBody);
296296
}
@@ -300,7 +300,7 @@ public void IndentEntireProcedureBodyIsSetInCtor()
300300
public void IndentFirstCommentBlockIsSetInCtor()
301301
{
302302
var defaultConfig = GetDefaultConfig();
303-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
303+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
304304

305305
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentFirstCommentBlock, viewModel.IndentFirstCommentBlock);
306306
}
@@ -310,7 +310,7 @@ public void IndentFirstCommentBlockIsSetInCtor()
310310
public void IndentFirstDeclarationBlockIsSetInCtor()
311311
{
312312
var defaultConfig = GetDefaultConfig();
313-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
313+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
314314

315315
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentFirstDeclarationBlock, viewModel.IndentFirstDeclarationBlock);
316316
}
@@ -320,7 +320,7 @@ public void IndentFirstDeclarationBlockIsSetInCtor()
320320
public void VerticallySpaceProceduresIsSetInCtor()
321321
{
322322
var defaultConfig = GetDefaultConfig();
323-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
323+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
324324

325325
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.VerticallySpaceProcedures, viewModel.VerticallySpaceProcedures);
326326
}
@@ -330,7 +330,7 @@ public void VerticallySpaceProceduresIsSetInCtor()
330330
public void LinesBetweenProceduresIsSetInCtor()
331331
{
332332
var defaultConfig = GetDefaultConfig();
333-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
333+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
334334

335335
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.LinesBetweenProcedures, viewModel.LinesBetweenProcedures);
336336
}
@@ -340,7 +340,7 @@ public void LinesBetweenProceduresIsSetInCtor()
340340
public void EmptyLineHandlingMethodIsSetInCtor()
341341
{
342342
var defaultConfig = GetDefaultConfig();
343-
var viewModel = new IndenterSettingsViewModel(defaultConfig);
343+
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);
344344

345345
Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EmptyLineHandlingMethod, viewModel.EmptyLineHandlingMethod);
346346
}

‎RubberduckTests/Settings/InspectionSettingsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private Configuration GetNondefaultConfig()
5555
public void SaveConfigWorks()
5656
{
5757
var customConfig = GetNondefaultConfig();
58-
var viewModel = new InspectionSettingsViewModel(customConfig);
58+
var viewModel = new InspectionSettingsViewModel(customConfig, null);
5959

6060
var config = GetDefaultConfig();
6161
viewModel.UpdateConfig(config);
@@ -68,7 +68,7 @@ public void SaveConfigWorks()
6868
[Test]
6969
public void SetDefaultsWorks()
7070
{
71-
var viewModel = new InspectionSettingsViewModel(GetNondefaultConfig());
71+
var viewModel = new InspectionSettingsViewModel(GetNondefaultConfig(), null);
7272

7373
var defaultConfig = GetDefaultConfig();
7474
viewModel.SetToDefaults(defaultConfig);
@@ -82,7 +82,7 @@ public void SetDefaultsWorks()
8282
public void InspectionsAreSetInCtor()
8383
{
8484
var defaultConfig = GetDefaultConfig();
85-
var viewModel = new InspectionSettingsViewModel(defaultConfig);
85+
var viewModel = new InspectionSettingsViewModel(defaultConfig, null);
8686

8787
Assert.IsTrue(defaultConfig.UserSettings.CodeInspectionSettings.CodeInspections.SequenceEqual(
8888
viewModel.InspectionSettings.SourceCollection.OfType<CodeInspectionSetting>()));
@@ -93,7 +93,7 @@ public void InspectionsAreSetInCtor()
9393
public void InspectionSeveritiesAreUpdated()
9494
{
9595
var defaultConfig = GetDefaultConfig();
96-
var viewModel = new InspectionSettingsViewModel(defaultConfig);
96+
var viewModel = new InspectionSettingsViewModel(defaultConfig, null);
9797

9898
viewModel.InspectionSettings.SourceCollection.OfType<CodeInspectionSetting>().First().Severity =
9999
GetNondefaultConfig().UserSettings.CodeInspectionSettings.CodeInspections.First().Severity;

0 commit comments

Comments
 (0)