Fix verification.

Author: unknown

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs

@@ -1039,7 +1039,7 @@ public void AzureServiceDiagnosticsExtensionTest()
 
                 DiagnosticExtensionContext resultContext = vmPowershellCmdlets.GetAzureServiceDiagnosticsExtension(serviceName)[0];
 
-                Assert.IsTrue(VerifyDiagExtContext(resultContext, "AllRoles", defaultExtensionId, storage, daConfig));
+                VerifyDiagExtContext(resultContext, "AllRoles", defaultExtensionId, storage, daConfig);
 
                 vmPowershellCmdlets.RemoveAzureServiceDiagnosticsExtension(serviceName, true);
 
@@ -1592,51 +1592,33 @@ private bool GetVNetState(string vnet, Microsoft.Azure.Commands.Network.Provisio
             return vnetState.Equals(expectedState);
         }
 
-        private bool VerifyDiagExtContext(DiagnosticExtensionContext resultContext, string role, string extID, string storage, string config)
+        private void VerifyDiagExtContext(DiagnosticExtensionContext resultContext, string role, string extID, string storage, string config)
         {
             Utilities.PrintContext(resultContext);
 
-            try
-            {
-                Assert.AreEqual(role, resultContext.Role.RoleType.ToString(), "role is not same");
-                Assert.AreEqual(Utilities.PaaSDiagnosticsExtensionName, resultContext.Extension, "extension is not Diagnostics");
-                Assert.AreEqual(extID, resultContext.Id, "extension id is not same");
-                //Assert.AreEqual(storage, resultContext.StorageAccountName, "storage account name is not same");
+            Assert.AreEqual(role, resultContext.Role.RoleType.ToString(), "role is not same");
+            Assert.AreEqual(Utilities.PaaSDiagnosticsExtensionName, resultContext.Extension, "extension is not Diagnostics");
+            Assert.AreEqual(extID, resultContext.Id, "extension id is not same");
+            //Assert.AreEqual(storage, resultContext.StorageAccountName, "storage account name is not same");
 
-                XmlDocument doc = new XmlDocument();
-                doc.Load("@./da.xml");
-                string inner = Utilities.GetInnerXml(resultContext.WadCfg, "WadCfg");
-                Assert.IsTrue(Utilities.CompareWadCfg(inner, doc), "xml is not same");
-
-                return true;
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Error happens: {0}", e.ToString());
-                return false;
-            }
+            XmlDocument doc = new XmlDocument();
+            doc.Load("@./da.xml");
+            string inner = Utilities.GetInnerXml(resultContext.WadCfg, "WadCfg");
+            Assert.IsTrue(Utilities.CompareWadCfg(inner, doc), "xml is not same");
         }
 
         private void VerifyRDPExtContext(RemoteDesktopExtensionContext resultContext, string role, string extID, string userName, DateTime exp, string version = null)
         {
             Utilities.PrintContextAndItsBase(resultContext);
 
-            try
+            Assert.AreEqual(role, resultContext.Role.RoleType.ToString(), "role is not same");
+            Assert.AreEqual("RDP", resultContext.Extension, "extension is not RDP");
+            Assert.AreEqual(extID, resultContext.Id, "extension id is not same");
+            Assert.AreEqual(userName, resultContext.UserName, "storage account name is not same");
+            Assert.IsTrue(Utilities.CompareDateTime(exp, resultContext.Expiration), "expiration is not same");
+            if (!string.IsNullOrEmpty(version))
             {
-                Assert.AreEqual(role, resultContext.Role.RoleType.ToString(), "role is not same");
-                Assert.AreEqual("RDP", resultContext.Extension, "extension is not RDP");
-                Assert.AreEqual(extID, resultContext.Id, "extension id is not same");
-                Assert.AreEqual(userName, resultContext.UserName, "storage account name is not same");
-                Assert.IsTrue(Utilities.CompareDateTime(exp, resultContext.Expiration), "expiration is not same");
-                if (!string.IsNullOrEmpty(version))
-                {
-                    Assert.AreEqual(version, resultContext.Version, "version numbers are not same");
-                }
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Error happens: {0}", e.ToString());
-                throw;
+                Assert.AreEqual(version, resultContext.Version, "version numbers are not same");
             }
         }
     }