Skip to content

Commit 4cd2e7b

Browse files
retailcoderretailcoder
committed
Fixed broken tests
1 parent d0691f9 commit 4cd2e7b

File tree

11 files changed

+23
-15
lines changed

11 files changed

+23
-15
lines changed

‎Rubberduck.Core/Settings/ConfigurationLoader.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,19 @@ public class ConfigurationLoader : IGeneralConfigService
2828
{
2929
private readonly IConfigProvider<GeneralSettings> _generalProvider;
3030
private readonly IConfigProvider<HotkeySettings> _hotkeyProvider;
31+
private readonly IConfigProvider<AutoCompleteSettings> _autoCompleteProvider;
3132
private readonly IConfigProvider<ToDoListSettings> _todoProvider;
3233
private readonly IConfigProvider<CodeInspectionSettings> _inspectionProvider;
3334
private readonly IConfigProvider<UnitTestSettings> _unitTestProvider;
3435
private readonly IConfigProvider<IndenterSettings> _indenterProvider;
3536
private readonly IConfigProvider<WindowSettings> _windowProvider;
3637

37-
public ConfigurationLoader(IConfigProvider<GeneralSettings> generalProvider, IConfigProvider<HotkeySettings> hotkeyProvider, IConfigProvider<ToDoListSettings> todoProvider,
38+
public ConfigurationLoader(IConfigProvider<GeneralSettings> generalProvider, IConfigProvider<HotkeySettings> hotkeyProvider, IConfigProvider<AutoCompleteSettings> autoCompleteProvider, IConfigProvider<ToDoListSettings> todoProvider,
3839
IConfigProvider<CodeInspectionSettings> inspectionProvider, IConfigProvider<UnitTestSettings> unitTestProvider, IConfigProvider<IndenterSettings> indenterProvider, IConfigProvider<WindowSettings> windowProvider)
3940
{
4041
_generalProvider = generalProvider;
4142
_hotkeyProvider = hotkeyProvider;
43+
_autoCompleteProvider = autoCompleteProvider;
4244
_todoProvider = todoProvider;
4345
_inspectionProvider = inspectionProvider;
4446
_unitTestProvider = unitTestProvider;
@@ -57,6 +59,7 @@ public virtual Configuration LoadConfiguration()
5759
(
5860
_generalProvider.Create(),
5961
_hotkeyProvider.Create(),
62+
_autoCompleteProvider.Create(),
6063
_todoProvider.Create(),
6164
_inspectionProvider.Create(),
6265
_unitTestProvider.Create(),
@@ -75,6 +78,7 @@ public Configuration GetDefaultConfiguration()
7578
(
7679
_generalProvider.CreateDefaults(),
7780
_hotkeyProvider.CreateDefaults(),
81+
_autoCompleteProvider.CreateDefaults(),
7882
_todoProvider.CreateDefaults(),
7983
_inspectionProvider.CreateDefaults(),
8084
_unitTestProvider.CreateDefaults(),
@@ -93,6 +97,7 @@ public void SaveConfiguration(Configuration toSerialize)
9397

9498
_generalProvider.Save(toSerialize.UserSettings.GeneralSettings);
9599
_hotkeyProvider.Save(toSerialize.UserSettings.HotkeySettings);
100+
_autoCompleteProvider.Save(toSerialize.UserSettings.AutoCompleteSettings);
96101
_todoProvider.Save(toSerialize.UserSettings.ToDoListSettings);
97102
_inspectionProvider.Save(toSerialize.UserSettings.CodeInspectionSettings);
98103
_unitTestProvider.Save(toSerialize.UserSettings.UnitTestSettings);

‎Rubberduck.Core/Settings/UserSettings.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class UserSettings
88
{
99
public GeneralSettings GeneralSettings { get; set; }
1010
public HotkeySettings HotkeySettings { get; set; }
11+
public AutoCompleteSettings AutoCompleteSettings { get; set; }
1112
public ToDoListSettings ToDoListSettings { get; set; }
1213
public CodeInspectionSettings CodeInspectionSettings { get; set; }
1314
public UnitTestSettings UnitTestSettings { get; set; }
@@ -16,6 +17,7 @@ public class UserSettings
1617

1718
public UserSettings(GeneralSettings generalSettings,
1819
HotkeySettings hotkeySettings,
20+
AutoCompleteSettings autoCompleteSettings,
1921
ToDoListSettings todoSettings,
2022
CodeInspectionSettings codeInspectionSettings,
2123
UnitTestSettings unitTestSettings,
@@ -24,6 +26,7 @@ public UserSettings(GeneralSettings generalSettings,
2426
{
2527
GeneralSettings = generalSettings;
2628
HotkeySettings = hotkeySettings;
29+
AutoCompleteSettings = autoCompleteSettings;
2730
ToDoListSettings = todoSettings;
2831
CodeInspectionSettings = codeInspectionSettings;
2932
UnitTestSettings = unitTestSettings;

‎RubberduckTests/CodeExplorer/CodeExplorerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,7 @@ private Configuration GetDefaultUnitTestConfig()
22902290
}
22912291
};
22922292

2293-
var userSettings = new UserSettings(generalSettings, null, null, null, unitTestSettings, null, null);
2293+
var userSettings = new UserSettings(generalSettings, null, null, null, null, unitTestSettings, null, null);
22942294
return new Configuration(userSettings);
22952295
}
22962296

‎RubberduckTests/Commands/UnitTestCommandTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ private Configuration GetUnitTestConfig()
343343
{
344344
var unitTestSettings = new UnitTestSettings(BindingMode.LateBinding, AssertMode.StrictAssert, false, false, false);
345345

346-
var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
346+
var userSettings = new UserSettings(null, null, null, null, null, unitTestSettings, null, null);
347347
return new Configuration(userSettings);
348348
}
349349
}

‎RubberduckTests/Inspections/InspectionsHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static Configuration GetTestConfig(IInspection inspection)
3737
});
3838
return new Configuration
3939
{
40-
UserSettings = new UserSettings(null, null, null, settings, null, null, null)
40+
UserSettings = new UserSettings(null, null, null, null, settings, null, null, null)
4141
};
4242
}
4343
}

‎RubberduckTests/Settings/GeneralSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private Configuration GetDefaultConfig()
5151
new HotkeySetting {CommandTypeName = "BarCommand", IsEnabled = true, Key1 = "B"}
5252
});
5353

54-
var userSettings = new UserSettings(generalSettings, hotkeySettings, null, null, null, null, null);
54+
var userSettings = new UserSettings(generalSettings, hotkeySettings, null, null, null, null, null, null);
5555
return new Configuration(userSettings);
5656
}
5757

@@ -74,7 +74,7 @@ private Configuration GetNondefaultConfig()
7474
}
7575
};
7676

77-
var userSettings = new UserSettings(generalSettings, hotkeySettings, null, null, null, null, null);
77+
var userSettings = new UserSettings(generalSettings, hotkeySettings, null, null, null, null, null, null);
7878
return new Configuration(userSettings);
7979
}
8080

‎RubberduckTests/Settings/IndenterSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ public static Rubberduck.SmartIndenter.IndenterSettings GetMockIndenterSettings(
9898

9999
private Configuration GetDefaultConfig()
100100
{
101-
var userSettings = new UserSettings(null, null, null, null, null, GetMockIndenterSettings(), null);
101+
var userSettings = new UserSettings(null, null, null, null, null, null, GetMockIndenterSettings(), null);
102102
return new Configuration(userSettings);
103103
}
104104

105105
private Configuration GetNondefaultConfig()
106106
{
107-
var userSettings = new UserSettings(null, null, null, null, null, GetMockIndenterSettings(true), null);
107+
var userSettings = new UserSettings(null, null, null, null, null, null, GetMockIndenterSettings(true), null);
108108
return new Configuration(userSettings);
109109
}
110110

‎RubberduckTests/Settings/InspectionSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private Configuration GetDefaultConfig()
2626
.ThenBy(cis => cis.Description)) // Explicit sorting is to match InspectionSettingsViewModel.cs
2727
};
2828

29-
var userSettings = new UserSettings(null, null, null, inspectionSettings, null, null, null);
29+
var userSettings = new UserSettings(null, null, null, null, inspectionSettings, null, null, null);
3030
return new Configuration(userSettings);
3131
}
3232

@@ -46,7 +46,7 @@ private Configuration GetNondefaultConfig()
4646
.ThenBy(cis => cis.Description)) // Explicit sorting is to match InspectionSettingsViewModel.cs
4747
};
4848

49-
var userSettings = new UserSettings(null, null, null, inspectionSettings, null, null, null);
49+
var userSettings = new UserSettings(null, null, null, null, inspectionSettings, null, null, null);
5050
return new Configuration(userSettings);
5151
}
5252

‎RubberduckTests/Settings/TodoSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private Configuration GetDefaultConfig()
2020
}
2121
};
2222

23-
var userSettings = new UserSettings(null, null, todoSettings, null, null, null, null);
23+
var userSettings = new UserSettings(null, null, null, todoSettings, null, null, null, null);
2424
return new Configuration(userSettings);
2525
}
2626

@@ -34,7 +34,7 @@ private Configuration GetNondefaultConfig()
3434
}
3535
};
3636

37-
var userSettings = new UserSettings(null, null, todoSettings, null, null, null, null);
37+
var userSettings = new UserSettings(null, null, null, todoSettings, null, null, null, null);
3838
return new Configuration(userSettings);
3939
}
4040

‎RubberduckTests/Settings/UnitTestSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ private Configuration GetDefaultConfig()
1212
{
1313
var unitTestSettings = new UnitTestSettings(BindingMode.LateBinding, AssertMode.StrictAssert, true, true, false);
1414

15-
var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
15+
var userSettings = new UserSettings(null, null, null, null, null, unitTestSettings, null, null);
1616
return new Configuration(userSettings);
1717
}
1818

1919
private Configuration GetNondefaultConfig()
2020
{
2121
var unitTestSettings = new UnitTestSettings(BindingMode.EarlyBinding, AssertMode.PermissiveAssert, false, false, true);
2222

23-
var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
23+
var userSettings = new UserSettings(null, null, null, null, null, unitTestSettings, null, null);
2424
return new Configuration(userSettings);
2525
}
2626

0 commit comments

Comments
 (0)