Merge pull request #3347 from FirelyTeam/copilot/address-mstest-analyzer-warnings

Address MSTest 4.0 analyzer warnings (1,424 of 1,866 fixed)

Author: ewoutkramer

src/Hl7.Fhir.ElementModel.Shared.Tests/ElementNodeTests.cs

@@ -82,7 +82,7 @@ public void TestFpNavigate()
             // Select on the root of the resource, path should match with resource name included
             var active = patient.Select("Patient.active");
             Assert.IsNotNull(active);
-            Assert.AreEqual(true, active.FirstOrDefault().Value);
+            Assert.IsTrue((bool?)active.FirstOrDefault().Value);
 
             // Select on the root of the resource, resource type does not match
             var id = obs.Select("Patient.id");
@@ -91,7 +91,7 @@ public void TestFpNavigate()
             // Select on root of the resource, path does not include the resourceType
             active = patient.Select("active");
             Assert.IsNotNull(active);
-            Assert.AreEqual(true, active.FirstOrDefault().Value);
+            Assert.IsTrue((bool?)active.FirstOrDefault().Value);
 
             // Select on the root of the resource, path is for a generic Resource / DomainResource element
             id = obs.Select("Resource.id");
@@ -113,11 +113,11 @@ public void TestFpNavigateCustomResource()
 
             var result = customResource.Select("UpperCaseElement");
             Assert.IsNotNull(result.FirstOrDefault());
-            Assert.AreEqual(true, result.FirstOrDefault().Value);
+            Assert.IsTrue((bool?)result.FirstOrDefault().Value);
 
             result = customResource.Select("lowerCaseElement");
             Assert.IsNotNull(result.FirstOrDefault());
-            Assert.AreEqual(false, result.FirstOrDefault().Value);
+            Assert.IsFalse((bool?)result.FirstOrDefault().Value);
         }
 
         [TestMethod]
@@ -166,7 +166,7 @@ public void TestConstruction()
 
             data = patient[1];
             Assert.AreEqual("active", data.Name);
-            Assert.AreEqual(true, data.Value);
+            Assert.IsTrue((bool?)data.Value);
             Assert.AreEqual("boolean", data.InstanceType);
         }
 
@@ -304,7 +304,7 @@ public void ReplaceChildInElement()
             newActive.Value = false;
             patient.Replace(_provider, patient["active"].Single(), newActive);
             Assert.AreEqual(1, patient["active"].Count);
-            Assert.AreEqual(false, patient["active"].Single().Value);
+            Assert.IsFalse((bool?)patient["active"].Single().Value);
 
             var newIdentifier = ElementNode.Root(_provider, "Identifier");
             newIdentifier.Add(_provider, "system", "http://nos.nl");
@@ -324,7 +324,7 @@ public void FromElementClonesCorrectly()
 
             var activeChild = newElement["active"].Single();
             Assert.IsTrue((bool)activeChild.Value);
-            Assert.IsTrue(activeChild.Annotations<string>().Single() == "a string annotation");
+            Assert.AreEqual("a string annotation", activeChild.Annotations<string>().Single());
 
             var identifierSystemChild = newElement["identifier"][0]["system"].Single();
 

src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeOnBaseTests.cs

@@ -28,7 +28,7 @@ public void GetContainedAndBundledResources()
             Assert.AreEqual(0, _bundleNode!.ContainedResources().Count());
 
             var entries = _bundleNode.Child<PocoListNode>("entry")?.Pocos.OfType<Bundle.EntryComponent>().ToList();
-            Assert.AreEqual(7, entries.Count);
+            Assert.HasCount(7, entries);
 
             Assert.AreEqual("urn:uuid:04121321-4af5-424c-a0e1-ed3aab1c349d", entries[1].FullUrl);
             Assert.AreEqual("http://example.org/fhir/Patient/b", entries[3].FullUrl);
@@ -114,7 +114,7 @@ public void TestResolve()
             Assert.IsNull(inner7.Resolve("http://nu.nl/3"));
 
             Assert.AreEqual("Bundle.entry[6].resource[0].contained[1]", inner7.Resolve()!.GetLocation());
-            Assert.IsTrue(inner7!.Child("reference") is not null);
+            Assert.IsNotNull(inner7!.Child("reference"));
             Assert.AreEqual("Bundle.entry[6].resource[0].contained[1]", inner7.Child("reference")!.First().Resolve()!.GetLocation());
 
             string lastUrlResolved = "";

src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeTests.cs

@@ -285,7 +285,7 @@ static bool CCDATypeNameMapper(string typeName, out string canonical)
 
             var errors = typedElement.VisitAndCatch();
 
-            Assert.IsTrue(!errors.Any());
+            Assert.IsFalse(errors.Any());
 
             var assertXHtml = typedElement.Children("text");
 

src/Hl7.Fhir.R4.Tests/Model/ModelTests.cs

@@ -17,6 +17,7 @@
 
 namespace Hl7.Fhir.Tests.Model
 {
+    [TestClass]
     public partial class ModelTests
     {
         [TestMethod]
@@ -103,7 +104,6 @@ public void DateGetHashCodeWithNullValue()
             try
             {
                 int hashCode = date.GetHashCode();
-                Assert.IsTrue(true, "GetHashCode completed without throwing an exception");
             }
             catch (NullReferenceException ex)
             {
@@ -133,8 +133,6 @@ public void AllPrimitiveTypesGetHashCodeWithNullValue()
                 int hashCode2 = dateTime.GetHashCode();
                 int hashCode3 = instant.GetHashCode();
                 int hashCode4 = time.GetHashCode();
-                
-                Assert.IsTrue(true, "All GetHashCode calls completed without throwing exceptions");
             }
             catch (NullReferenceException ex)
             {

src/Hl7.Fhir.R4B.Tests/Model/ModelTests.cs

@@ -13,6 +13,7 @@
 
 namespace Hl7.Fhir.Tests.Model
 {
+    [TestClass]
     public partial class ModelTests
     {
         [TestMethod]
@@ -49,12 +50,12 @@ public void TestCheckMinorVersionCompatibiliy()
             Assert.IsFalse(ModelInfo.CheckMinorVersionCompatibility("3"));
         }
 
-        //If failed: change the description of the "STN" in the Currency enum of Money.cs from "SC#o TomC) and PrC-ncipe dobra" to "São Tomé and Príncipe dobra".
+        //If failed: change the description of the "STN" in the Currency enum of Money.cs from "SC#o TomC) and PrC-ncipe dobra" to "São Tomé and Príncipe dobra".
         [TestMethod]
         public void TestCorrectCurrencyDescription()
         {
             var currency = Money.Currencies.STN;
-            currency.GetDocumentation().Should().Be("São Tomé and Príncipe dobra");
+            currency.GetDocumentation().Should().Be("São Tomé and Príncipe dobra");
         }
     }
 }

src/Hl7.Fhir.R5.Tests/Model/ModelTests.cs

@@ -13,6 +13,7 @@
 
 namespace Hl7.Fhir.Tests.Model
 {
+    [TestClass]
     public partial class ModelTests
     {
         [TestMethod]
@@ -46,12 +47,12 @@ public void TestCheckMinorVersionCompatibiliy()
             Assert.IsFalse(ModelInfo.CheckMinorVersionCompatibility("3"));
         }
 
-        //If failed: change the description of the "STN" in the Currency enum of Money.cs from "SC#o TomC) and PrC-ncipe dobra" to "São Tomé and Príncipe dobra".
+        //If failed: change the description of the "STN" in the Currency enum of Money.cs from "SC#o TomC) and PrC-ncipe dobra" to "São Tomé and Príncipe dobra".
         [TestMethod]
         public void TestCorrectCurrencyDescription()
         {
             var currency = Currencies.STN;
-            currency.GetDocumentation().Should().Be("São Tomé and Príncipe dobra");
+            currency.GetDocumentation().Should().Be("São Tomé and Príncipe dobra");
         }
     }
 }

src/Hl7.Fhir.STU3.Tests/ElementModel/PocoTypedElementTests.cs

@@ -54,8 +54,8 @@ public void PocoExtensionTest()
             p.ActiveElement.AddExtension("http://something.org", new FhirBoolean(false));
             p.ActiveElement.AddExtension("http://something.org", new Integer(314));
 
-            Assert.AreEqual(true, p.Scalar("Patient.active.first()"));
-            Assert.AreEqual(true, p.Scalar("Patient.active[0]"));
+            Assert.IsTrue((bool?)p.Scalar("Patient.active.first()"));
+            Assert.IsTrue((bool?)p.Scalar("Patient.active[0]"));
             Assert.AreEqual("314", p.Scalar("Patient.active[0].id[0]"));
 
             var extensions = p.Select("Patient.active[0].extension");
@@ -82,21 +82,21 @@ public void PocoHasValueTest()
         {
             Patient p = new Patient();
 
-            Assert.AreEqual(false, p.Predicate("Patient.active.hasValue()"));
-            Assert.AreEqual(false, p.Predicate("Patient.active.exists()"));
+            Assert.IsFalse(p.Predicate("Patient.active.hasValue()"));
+            Assert.IsFalse(p.Predicate("Patient.active.exists()"));
 
             p.Active = true;
-            Assert.AreEqual(true, p.Predicate("Patient.active.hasValue()"));
-            Assert.AreEqual(true, p.Predicate("Patient.active.exists()"));
+            Assert.IsTrue(p.Predicate("Patient.active.hasValue()"));
+            Assert.IsTrue(p.Predicate("Patient.active.exists()"));
 
             p.ActiveElement.AddExtension("http://something.org", new FhirBoolean(false));
-            Assert.AreEqual(true, p.Predicate("Patient.active.hasValue()"));
-            Assert.AreEqual(true, p.Predicate("Patient.active.exists()"));
+            Assert.IsTrue(p.Predicate("Patient.active.hasValue()"));
+            Assert.IsTrue(p.Predicate("Patient.active.exists()"));
 
             p.ActiveElement = new FhirBoolean();
             p.ActiveElement.AddExtension("http://something.org", new FhirBoolean(false));
-            Assert.AreEqual(false, p.Predicate("Patient.active.hasValue()"));
-            Assert.AreEqual(true, p.Predicate("Patient.active.exists()"));
+            Assert.IsFalse(p.Predicate("Patient.active.hasValue()"));
+            Assert.IsTrue(p.Predicate("Patient.active.exists()"));
         }
 
         [TestMethod]
@@ -137,7 +137,7 @@ public void IncorrectPathInTwoSuccessiveRepeatingMembers()
 
             Assert.IsNotNull(rest);
 
-            Assert.IsTrue(rest.Location.Contains("CapabilityStatement.rest[0]"));
+            Assert.Contains("CapabilityStatement.rest[0]", rest.Location);
         }
 
 

src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs

@@ -109,8 +109,8 @@ private void searchExtractionAllExamplesInternal()
             errorCount++;
         }
 
-        Assert.IsTrue(43 >= errorCount,
-            $"Failed search parameter data extraction, missing data in {missingSearchValues.Length} of " +
+        Assert.IsGreaterThanOrEqualTo(errorCount,
+43, $"Failed search parameter data extraction, missing data in {missingSearchValues.Length} of " +
             $"{exampleSearchValues.Count} search parameters");
         Assert.AreEqual(0, parserErrorCount,
             $"Failed search parameter data extraction, {parserErrorCount} files failed parsing");