github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-19 21:03:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use enhanced switches (#1908)

Browse source
This commit is contained in:
Rose 2022-09-26 13:03:00 -04:00 • committed by GitHub
commit 2addaae64c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/CalculatorUITestFramework/NavigationMenu.cs
View file

@ -41,63 +41,27 @@ namespace CalculatorUITestFramework
/// <param name="mode">The mode to be changed to</param>
public void ChangeCalculatorMode(CalculatorMode mode)
{
string modeAccessibilityId;
switch (mode)
string modeAccessibilityId = mode switch
{
case CalculatorMode.StandardCalculator:
modeAccessibilityId = "Standard";
break;
case CalculatorMode.ScientificCalculator:
modeAccessibilityId = "Scientific";
break;
case CalculatorMode.ProgrammerCalculator:
modeAccessibilityId = "Programmer";
break;
case CalculatorMode.DateCalculator:
modeAccessibilityId = "Date";
break;
case CalculatorMode.Currency:
modeAccessibilityId = "Currency";
break;
case CalculatorMode.Volume:
modeAccessibilityId = "Volume";
break;
case CalculatorMode.Length:
modeAccessibilityId = "Length";
break;
case CalculatorMode.Weight:
modeAccessibilityId = "Weight";
break;
case CalculatorMode.Temperature:
modeAccessibilityId = "Temperature";
break;
case CalculatorMode.Energy:
modeAccessibilityId = "Energy";
break;
case CalculatorMode.Area:
modeAccessibilityId = "Area";
break;
case CalculatorMode.Speed:
modeAccessibilityId = "Speed";
break;
case CalculatorMode.Time:
modeAccessibilityId = "Time";
break;
case CalculatorMode.Power:
modeAccessibilityId = "Power";
break;
case CalculatorMode.Data:
modeAccessibilityId = "Data";
break;
case CalculatorMode.Pressure:
modeAccessibilityId = "Pressure";
break;
case CalculatorMode.Angle:
modeAccessibilityId = "Angle";
break;
default:
throw (new ArgumentException("The mode is not valid"));
}
CalculatorMode.StandardCalculator => "Standard",
CalculatorMode.ScientificCalculator => "Scientific",
CalculatorMode.ProgrammerCalculator => "Programmer",
CalculatorMode.DateCalculator => "Date",
CalculatorMode.Currency => "Currency",
CalculatorMode.Volume => "Volume",
CalculatorMode.Length => "Length",
CalculatorMode.Weight => "Weight",
CalculatorMode.Temperature => "Temperature",
CalculatorMode.Energy => "Energy",
CalculatorMode.Area => "Area",
CalculatorMode.Speed => "Speed",
CalculatorMode.Time => "Time",
CalculatorMode.Power => "Power",
CalculatorMode.Data => "Data",
CalculatorMode.Pressure => "Pressure",
CalculatorMode.Angle => "Angle",
_ => throw (new ArgumentException("The mode is not valid"))
};
this.NavigationMenuButton.Click();
this.NavigationMenuPane.WaitForDisplayed();

20
src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
View file

@ -109,21 +109,13 @@ namespace CalculatorUITestFramework
public void SetAngleOperator(AngleOperatorState value)
{
//set the desired string value for the button
string desiredId;
switch (value)
string desiredId = value switch
{
case AngleOperatorState.Degrees:
desiredId = "degButton";
break;
case AngleOperatorState.Gradians:
desiredId = "gradButton";
break;
case AngleOperatorState.Radians:
desiredId = "radButton";
break;
default:
throw new NotImplementedException();
}
AngleOperatorState.Degrees => "degButton",
AngleOperatorState.Gradians => "gradButton",
AngleOperatorState.Radians => "radButton",
_ => throw new NotImplementedException()
};
while (this.DegRadGradButton.GetAttribute("AutomationId") != desiredId)
{
this.DegRadGradButton.Click();