mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 01:08:18 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Settings V2] Updated general settings tests (#2971)

Browse Source 
* updated general settings tests

* reverted changes to solution files

* fetch test strings from a string resource

* updated bidning variable name to avoid confusion

Co-authored-by: Lavius Motileng <laviusmotileng-ms>
This commit is contained in:
Lavius Motileng 2020-05-15 09:38:47 -07:00 committed by GitHub
parent 4734cb3428
commit 8b0a995f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -545,10 +545,10 @@
<data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve"> <data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve">
<value>Always run as administrator</value> <value>Always run as administrator</value>
</data> </data>
<data name="GeneralSettings_Running as Adminstrator_IsNotElevated" xml:space="preserve"> <data name="GeneralSettings_RunningAsUserText" xml:space="preserve">
<value>Running as user</value> <value>Running as user</value>
</data> </data>
<data name="GeneralSettings_RunningAsAdminText_IsElevated" xml:space="preserve"> <data name="GeneralSettings_RunningAsAdminText" xml:space="preserve">
<value>Running as adminstrator</value> <value>Running as adminstrator</value>
</data> </data>
<data name="About_FancyZones.Text" xml:space="preserve"> <data name="About_FancyZones.Text" xml:space="preserve">

16
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
View File

@ -27,7 +27,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; } public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; }
private ResourceLoader loader = ResourceLoader.GetForCurrentView(); private ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
public readonly string RunningAsUserDefaultText;
public readonly string RunningAsAdminDefaultText;
public GeneralViewModel() public GeneralViewModel()
{ {
@ -97,6 +100,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_autoDownloadUpdates = GeneralSettingsConfigs.AutoDownloadUpdates; _autoDownloadUpdates = GeneralSettingsConfigs.AutoDownloadUpdates;
_isElevated = ShellPage.IsElevated; _isElevated = ShellPage.IsElevated;
_runElevated = GeneralSettingsConfigs.RunElevated; _runElevated = GeneralSettingsConfigs.RunElevated;
RunningAsUserDefaultText = loader.GetString("GeneralSettings_RunningAsUserText");
RunningAsAdminDefaultText = loader.GetString("GeneralSettings_RunningAsAdminText");
_isAdmin = ShellPage.IsUserAnAdmin; _isAdmin = ShellPage.IsUserAnAdmin;
} }
@ -147,17 +154,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
} }
} }
public string RunningAsAdminText public string RunningAsText
{ {
get get
{ {
if (!IsElevated) if (!IsElevated)
{ {
return loader.GetString("GeneralSettings_Running as Adminstrator_IsNotElevated"); return RunningAsUserDefaultText;
} }
else else
{ {
return loader.GetString("GeneralSettings_RunningAsAdminText_IsElevated"); return RunningAsAdminDefaultText;
} }
} }
@ -182,7 +189,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_isElevated = value; _isElevated = value;
OnPropertyChanged("IsElevated"); OnPropertyChanged("IsElevated");
OnPropertyChanged("IsAdminButtonEnabled"); OnPropertyChanged("IsAdminButtonEnabled");
//OnPropertyChanged("AlwaysRunAsAdminText");
OnPropertyChanged("RunningAsAdminText"); OnPropertyChanged("RunningAsAdminText");
} }
} }

4
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@ -54,8 +54,8 @@
x:Name="GeneralSettingsView"> x:Name="GeneralSettingsView">
<TextBlock x:Uid="Admin_Mode" <TextBlock x:Uid="Admin_Mode"
Style="{StaticResource SubtitleTextBlockStyle}"/> Style="{StaticResource SubtitleTextBlockStyle}"/>
<TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsAdminText, Source={StaticResource eventViewModel}}" <TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsText, Source={StaticResource eventViewModel}}"
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
<Button x:Uid="GeneralPage_RestartAsAdmin_Button" <Button x:Uid="GeneralPage_RestartAsAdmin_Button"

9
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/General.cs
View File

@ -49,18 +49,15 @@ namespace ViewModelTests
{ {
// Arrange // Arrange
GeneralViewModel viewModel = new GeneralViewModel(); GeneralViewModel viewModel = new GeneralViewModel();
string runningAsUserText = "Running as user."; Assert.AreEqual(viewModel.RunningAsUserDefaultText, viewModel.RunningAsText);
string runningAsAdminText = "Running as Adminstrator.";
Assert.AreEqual(runningAsUserText, viewModel.RunningAsAdminText);
Assert.IsFalse(viewModel.IsElevated); Assert.IsFalse(viewModel.IsElevated);
// Act // Act
viewModel.IsElevated = true; viewModel.IsElevated = true;
// Assert // Assert
Assert.AreEqual(runningAsAdminText, viewModel.RunningAsAdminText); Assert.AreEqual(viewModel.RunningAsAdminDefaultText, viewModel.RunningAsText);
Assert.IsTrue(viewModel.IsElevated); Assert.IsTrue(viewModel.IsElevated);
} }