Fixing minor test issues

Author: markcowl

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/GetAzureRmActionGroupCommandTests.cs

@@ -109,16 +109,8 @@ public void GetActionGroupCommandParametersProcessing()
             // Error
             cmdlet.ResourceGroupName = "   ";
             cmdlet.Name = Utilities.Name;
-            try
-            {
-                cmdlet.ExecuteCmdlet();
-                Assert.True(false, "Did not throw exception");
-            }
-            catch (PSInvalidOperationException ex)
-            {
-                string message = ex.ToString();
-                Assert.True(message.Contains("PSArgumentException"), "Wrong exception thrown");
-            }
+            var argException = Assert.Throws<PSInvalidOperationException>(() => cmdlet.ExecuteCmdlet());
+            Assert.Contains("PSArgumentException", argException.ToString());
         }
     }
 }

src/ResourceManager/Insights/Commands.Insights.Test/Diagnostics/SetDiagnosticSettingCommandTests.cs

@@ -209,17 +209,8 @@ public void SetSomeCategories()
             cmdlet.Categories = new List<string> { "TestCategory3" };
             cmdlet.Enabled = false;
             cmdlet.MyInvocation.BoundParameters[SetAzureRmDiagnosticSettingCommand.EnabledParamName] = false;
-
-            try
-            {
-                cmdlet.ExecuteCmdlet();
-                Assert.True(false, "Did not throw exception");
-            }
-            catch (PSInvalidOperationException ex)
-            {
-                string message = ex.ToString();
-                Assert.True(message.Contains("ArgumentException"), "Not the right type of exception");
-            }
+            var argException = Assert.Throws<PSInvalidOperationException>(() => cmdlet.ExecuteCmdlet());
+            Assert.Contains("ArgumentException", argException.ToString());
 
             // Testing the new metric categories must be known before the cmdlet can add them
             expectedSettings.Metrics[0].Enabled = false;
@@ -235,16 +226,8 @@ public void SetSomeCategories()
             cmdlet.MetricCategory = new List<string> { "MetricCat3" };
             cmdlet.Enabled = false;
             cmdlet.MyInvocation.BoundParameters[SetAzureRmDiagnosticSettingCommand.EnabledParamName] = false;
-            try
-            {
-                cmdlet.ExecuteCmdlet();
-                Assert.True(false, "Did not throw exception #2");
-            }
-            catch (PSInvalidOperationException ex)
-            {
-                string message = ex.ToString();
-                Assert.True(message.Contains("ArgumentException"), "Not the right type of exception #2");
-            }
+            argException = Assert.Throws<PSInvalidOperationException>(() => cmdlet.ExecuteCmdlet());
+            Assert.Contains("ArgumentException", argException.ToString());
         }
 
         [Fact]

src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/ActionGroupsTests.cs

@@ -30,7 +30,7 @@ public ActionGroupsTests(Xunit.Abstractions.ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(_logger);
         }
 
-        [Fact(Skip = "Needs to be recorded again")]
+        [Fact(Skip = "TODO: #7024: Needs to be recorded again")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAddGetListSetRemoveActionGroup()
         {