Skip to content

Commit

Permalink
Update the unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@bclothier
bclothier committed Jan 14, 2019
1 parent 2efc2a1 commit bce77cb
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 54 deletions.
2 changes: 1 addition & 1 deletion RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs
View file
Expand Up @@ -174,7 +174,7 @@ private void AssertVbaFragmentYieldsExpectedInspectionResultCount(string inputCo
internal static Mock<IPersistanceService<CodeInspectionSettings>> GetInspectionSettings()
{
var settings = new Mock<IPersistanceService<CodeInspectionSettings>>();
settings.Setup(s => s.Load(It.IsAny<CodeInspectionSettings>()))
settings.Setup(s => s.Load(It.IsAny<CodeInspectionSettings>(), null))
.Returns(new CodeInspectionSettings(Enumerable.Empty<CodeInspectionSetting>(), new[]
{
new WhitelistedIdentifierSetting("sss"),
Expand Down
4 changes: 2 additions & 2 deletions RubberduckTests/Settings/AutoCompleteSettingsTests.cs
View file
Expand Up @@ -77,7 +77,7 @@ public void AutoCompleteDisabledByDefault()
public void SaveConfigWorks()
{
var customConfig = GetNonDefaultConfig();
var viewModel = new AutoCompleteSettingsViewModel(customConfig);
var viewModel = new AutoCompleteSettingsViewModel(customConfig, null);

var config = GetDefaultConfig();
viewModel.UpdateConfig(config);
Expand All @@ -95,7 +95,7 @@ public void SaveConfigWorks()
[Test]
public void SetDefaultsWorks()
{
var viewModel = new AutoCompleteSettingsViewModel(GetNonDefaultConfig());
var viewModel = new AutoCompleteSettingsViewModel(GetNonDefaultConfig(), null);

var defaultConfig = GetDefaultConfig();
viewModel.SetToDefaults(defaultConfig);
Expand Down
6 changes: 3 additions & 3 deletions RubberduckTests/Settings/CodeInspectionConfigProviderTests.cs
View file
Expand Up @@ -45,7 +45,7 @@ public void UserSettingsAreCombinedWithDefaultSettings()
};

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

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

Expand All @@ -72,7 +72,7 @@ public void UserSettingsAreNotDuplicatedWithDefaultSettings()
};

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

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

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

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

Expand Down
17 changes: 10 additions & 7 deletions RubberduckTests/Settings/GeneralSettingsTests.cs
View file
Expand Up @@ -83,7 +83,7 @@ private Configuration GetNondefaultConfig()
public void SaveConfigWorks()
{
var customConfig = GetNondefaultConfig();
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);

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

var defaultConfig = GetDefaultConfig();
viewModel.SetToDefaults(defaultConfig);
Expand All @@ -120,7 +120,7 @@ public void SetDefaultsWorks()
public void LanguageIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>());
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, new List<Type>(), null, null);

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

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

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

Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
}
Expand All @@ -159,10 +159,13 @@ public void AutoSavePeriodIsSetInCtor()
[Test]
public void UserSettingsLoadedUsingDefaultWhenMissingFile()
{
var pathProviderMock = new Mock<IPersistancePathProvider>();
pathProviderMock.Setup(x => x.DataRootPath).Returns("C:\\rubberduck\\");
pathProviderMock.Setup(x => x.DataFolderPath(It.IsAny<string>())).Returns<string>(x => x);
// For this test, we need to use the actual object. Fortunately, the path is virtual, so we
// can override that property and force it to use an non-existent path to prove that settings
// will be still created using defaults without the file present.
var persisterMock = new Mock<XmlPersistanceService<GeneralSettings>>();
var persisterMock = new Mock<XmlPersistanceService<GeneralSettings>>(pathProviderMock.Object);
persisterMock.Setup(x => x.FilePath).Returns("C:\\some\\non\\existent\\path\\rubberduck");
persisterMock.CallBase = true;
var configProvider = new GeneralConfigProvider(persisterMock.Object);
Expand Down
40 changes: 20 additions & 20 deletions RubberduckTests/Settings/IndenterSettingsTests.cs
View file
Expand Up @@ -95,7 +95,7 @@ private Configuration GetNondefaultConfig()
public void SaveConfigWorks()
{
var customConfig = GetNondefaultConfig();
var viewModel = new IndenterSettingsViewModel(customConfig);
var viewModel = new IndenterSettingsViewModel(customConfig, null);

var config = GetDefaultConfig();
viewModel.UpdateConfig(config);
Expand Down Expand Up @@ -132,7 +132,7 @@ public void SaveConfigWorks()
[Test]
public void SetDefaultsWorks()
{
var viewModel = new IndenterSettingsViewModel(GetNondefaultConfig());
var viewModel = new IndenterSettingsViewModel(GetNondefaultConfig(), null);

var defaultConfig = GetDefaultConfig();
viewModel.SetToDefaults(defaultConfig);
Expand Down Expand Up @@ -170,7 +170,7 @@ public void SetDefaultsWorks()
public void AlignCommentsWithCodeIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignCommentsWithCode, viewModel.AlignCommentsWithCode);
}
Expand All @@ -180,7 +180,7 @@ public void AlignCommentsWithCodeIsSetInCtor()
public void AlignContinuationsIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignContinuations, viewModel.AlignContinuations);
}
Expand All @@ -190,7 +190,7 @@ public void AlignContinuationsIsSetInCtor()
public void AlignDimColumnIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignDimColumn, viewModel.AlignDimColumn);
}
Expand All @@ -200,7 +200,7 @@ public void AlignDimColumnIsSetInCtor()
public void AlignDimsIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.AlignDims, viewModel.AlignDims);
}
Expand All @@ -210,7 +210,7 @@ public void AlignDimsIsSetInCtor()
public void EndOfLineCommentColumnSpaceAlignmentIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EndOfLineCommentColumnSpaceAlignment, viewModel.EndOfLineCommentColumnSpaceAlignment);
}
Expand All @@ -220,7 +220,7 @@ public void EndOfLineCommentColumnSpaceAlignmentIsSetInCtor()
public void EndOfLineCommentStyleIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EndOfLineCommentStyle, viewModel.EndOfLineCommentStyle);
}
Expand All @@ -230,7 +230,7 @@ public void EndOfLineCommentStyleIsSetInCtor()
public void ForceCompilerDirectivesInColumn1IsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.ForceCompilerDirectivesInColumn1, viewModel.ForceCompilerDirectivesInColumn1);
}
Expand All @@ -240,7 +240,7 @@ public void ForceCompilerDirectivesInColumn1IsSetInCtor()
public void ForceDebugStatementsInColumn1IsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.ForceDebugStatementsInColumn1, viewModel.ForceDebugStatementsInColumn1);
}
Expand All @@ -250,7 +250,7 @@ public void ForceDebugStatementsInColumn1IsSetInCtor()
public void IgnoreOperatorsInContinuationsIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IgnoreOperatorsInContinuations, viewModel.IgnoreOperatorsInContinuations);
}
Expand All @@ -260,7 +260,7 @@ public void IgnoreOperatorsInContinuationsIsSetInCtor()
public void IndentCaseIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentCase, viewModel.IndentCase);
}
Expand All @@ -270,7 +270,7 @@ public void IndentCaseIsSetInCtor()
public void IndentEnumTypeAsProcedureIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentEnumTypeAsProcedure, viewModel.IndentEnumTypeAsProcedure);
}
Expand All @@ -280,7 +280,7 @@ public void IndentEnumTypeAsProcedureIsSetInCtor()
public void IndentCompilerDirectivesIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentCompilerDirectives, viewModel.IndentCompilerDirectives);
}
Expand All @@ -290,7 +290,7 @@ public void IndentCompilerDirectivesIsSetInCtor()
public void IndentEntireProcedureBodyIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentEntireProcedureBody, viewModel.IndentEntireProcedureBody);
}
Expand All @@ -300,7 +300,7 @@ public void IndentEntireProcedureBodyIsSetInCtor()
public void IndentFirstCommentBlockIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentFirstCommentBlock, viewModel.IndentFirstCommentBlock);
}
Expand All @@ -310,7 +310,7 @@ public void IndentFirstCommentBlockIsSetInCtor()
public void IndentFirstDeclarationBlockIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.IndentFirstDeclarationBlock, viewModel.IndentFirstDeclarationBlock);
}
Expand All @@ -320,7 +320,7 @@ public void IndentFirstDeclarationBlockIsSetInCtor()
public void VerticallySpaceProceduresIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.VerticallySpaceProcedures, viewModel.VerticallySpaceProcedures);
}
Expand All @@ -330,7 +330,7 @@ public void VerticallySpaceProceduresIsSetInCtor()
public void LinesBetweenProceduresIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.LinesBetweenProcedures, viewModel.LinesBetweenProcedures);
}
Expand All @@ -340,7 +340,7 @@ public void LinesBetweenProceduresIsSetInCtor()
public void EmptyLineHandlingMethodIsSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new IndenterSettingsViewModel(defaultConfig);
var viewModel = new IndenterSettingsViewModel(defaultConfig, null);

Assert.AreEqual(defaultConfig.UserSettings.IndenterSettings.EmptyLineHandlingMethod, viewModel.EmptyLineHandlingMethod);
}
Expand Down
8 changes: 4 additions & 4 deletions RubberduckTests/Settings/InspectionSettingsTests.cs
View file
Expand Up @@ -55,7 +55,7 @@ private Configuration GetNondefaultConfig()
public void SaveConfigWorks()
{
var customConfig = GetNondefaultConfig();
var viewModel = new InspectionSettingsViewModel(customConfig);
var viewModel = new InspectionSettingsViewModel(customConfig, null);

var config = GetDefaultConfig();
viewModel.UpdateConfig(config);
Expand All @@ -68,7 +68,7 @@ public void SaveConfigWorks()
[Test]
public void SetDefaultsWorks()
{
var viewModel = new InspectionSettingsViewModel(GetNondefaultConfig());
var viewModel = new InspectionSettingsViewModel(GetNondefaultConfig(), null);

var defaultConfig = GetDefaultConfig();
viewModel.SetToDefaults(defaultConfig);
Expand All @@ -82,7 +82,7 @@ public void SetDefaultsWorks()
public void InspectionsAreSetInCtor()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new InspectionSettingsViewModel(defaultConfig);
var viewModel = new InspectionSettingsViewModel(defaultConfig, null);

Assert.IsTrue(defaultConfig.UserSettings.CodeInspectionSettings.CodeInspections.SequenceEqual(
viewModel.InspectionSettings.SourceCollection.OfType<CodeInspectionSetting>()));
Expand All @@ -93,7 +93,7 @@ public void InspectionsAreSetInCtor()
public void InspectionSeveritiesAreUpdated()
{
var defaultConfig = GetDefaultConfig();
var viewModel = new InspectionSettingsViewModel(defaultConfig);
var viewModel = new InspectionSettingsViewModel(defaultConfig, null);

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

0 comments on commit bce77cb

Please sign in to comment.