From e32876d4168f7088f85e279d6ce97e5dce9329ea Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Mon, 26 Sep 2022 09:39:18 -0400
Subject: [PATCH] Use enhanced switches

---
 .../NavigationMenu.cs                         | 76 +++++--------------
 .../ScientificOperatorsPanel.cs               | 20 ++---
 2 files changed, 26 insertions(+), 70 deletions(-)

diff --git a/src/CalculatorUITestFramework/NavigationMenu.cs b/src/CalculatorUITestFramework/NavigationMenu.cs
index 13dab3ac..6de7ac15 100644
--- a/src/CalculatorUITestFramework/NavigationMenu.cs
+++ b/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;
-            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();
diff --git a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs b/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
index ce94241c..b1146f05 100644
--- a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
+++ b/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;
-            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();