Use enhanced switches (#1908)

src/CalculatorUITestFramework/NavigationMenu.cs

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

src/CalculatorUITestFramework/ScientificOperatorsPanel.cs

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