Merge pull request #3343 from FirelyTeam/dependabot/nuget/src/multi-ddc29dd156

Bump MSTest.TestFramework and Verify.MSTest

Author: ewoutkramer

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

@@ -131,7 +131,7 @@ public void TestAutoDeriveTypeForPolymorphicElement()
             // But if you leave the type out, Add() will try to determine the type
             obs = ElementNode.Root(_provider, "Observation");
 #if !NET40
-            Assert.ThrowsException<ArgumentException>(() => obs.Add(_provider, "value", true));  // without an explicit type
+            Assert.Throws<ArgumentException>(() => obs.Add(_provider, "value", true));  // without an explicit type
 #endif
             value = obs.Add(_provider, "value", true, "boolean");  // with an explicit type
             Assert.AreEqual("boolean", value.InstanceType);

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

@@ -14,15 +14,17 @@ public class TypedElementOnSourceNodeTests
     {
         private readonly IStructureDefinitionSummaryProvider provider = new PocoStructureDefinitionSummaryProvider();
 
-        [ExpectedException(typeof(StructuralTypeException), "Should have thrown on .Value as complex types can't have a value")]
         [TestMethod]
         public async Task TestExceptionComplexTypeValue()
         {
-            var bundleJson = "{\"resourceType\":\"Bundle\", \"entry\":\"Invalid\"}";
-            var bundle = await FhirJsonNode.ParseAsync(bundleJson);
-            var typedBundle = bundle.ToTypedElement(provider, "Bundle");
+            await Assert.ThrowsAsync<StructuralTypeException>(async () =>
+            {
+                var bundleJson = "{\"resourceType\":\"Bundle\", \"entry\":\"Invalid\"}";
+                var bundle = await FhirJsonNode.ParseAsync(bundleJson);
+                var typedBundle = bundle.ToTypedElement(provider, "Bundle");
 
-            var _ = typedBundle.Children("entry").First().Value;
+                var _ = typedBundle.Children("entry").First().Value;
+            });
         }
 
         private SourceNode testPatient => SourceNode.Node("Patient",

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

@@ -74,7 +74,7 @@ public void TestFpFunctions()
 
             // FHIR specific function does not work for ITypedElement extension methods
             var data = ElementNode.ForPrimitive("hello!");
-            Assert.ThrowsException<ArgumentException>(() => data.IsTrue("hasValue()"));
+            Assert.Throws<ArgumentException>(() => data.IsTrue("hasValue()"));
         }
 
         [TestMethod]

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

@@ -226,10 +226,9 @@ public void TestTypeHierarchy()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
         public void TestCheckMinorVersionCompatibilityWithNull()
         {
-            ModelInfo.CheckMinorVersionCompatibility(null);
+            Assert.Throws<ArgumentNullException>(() => ModelInfo.CheckMinorVersionCompatibility(null));
         }
 
         [TestMethod]

src/Hl7.Fhir.STU3.Tests/Rest/FhirClientTests.cs

@@ -218,11 +218,10 @@ private async Tasks.Task testReadWithFormat(BaseFhirClient client)
         }
 
         [TestMethod, TestCategory("FhirClient"), TestCategory("IntegrationTest")]
-        [ExpectedException(typeof(FhirOperationException))]
         public async Tasks.Task ReadWrongResourceTypeHttpClient()
         {
             FhirClient client = new FhirClient(testEndpoint);
-            await testReadWrongResourceType(client);
+            await Assert.ThrowsAsync<FhirOperationException>(async () => await testReadWrongResourceType(client));
         }
 
         private static async Tasks.Task testReadWrongResourceType(BaseFhirClient client)
@@ -372,11 +371,10 @@ public async Tasks.Task SearchHttpClient()
         }
 
         [TestMethod, TestCategory("FhirClient")]
-        [ExpectedException(typeof(ArgumentException))]
         public async Tasks.Task SearchInvalidCriteriaHttpClient()
         {
             var client = new FhirClient(testEndpoint);
-            await testSearchInvalidCriteria(client);
+            await Assert.ThrowsAsync<ArgumentException>(async () => await testSearchInvalidCriteria(client));
         }
 
         private async Tasks.Task testSearchInvalidCriteria(BaseFhirClient client)

src/Hl7.Fhir.STU3.Tests/Serialization/ResourceParsingTests.cs

@@ -247,7 +247,7 @@ public void AcceptUnknownEnums()
             // Now, allow unknown enums and check support
             pser.Settings = pser.Settings with { AllowUnrecognizedEnums = true };
             p = pser.Deserialize<Patient>(xml2);
-            Assert.ThrowsException<CodedValidationException>(() => p.Gender);
+            Assert.Throws<CodedValidationException>(() => p.Gender);
             Assert.AreEqual("superman", p.GenderElement.JsonValue);
         }
 

src/Hl7.Fhir.Serialization.Shared.Tests/ParseDemoPatientJsonUntyped.cs

@@ -185,11 +185,13 @@ public async Task CatchesUnsupportedFeatures()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException), "Expected an InvalidOperationException about resourceType is missing.")]
         public async Task CatchResourceTypeMissing()
         {
-            var json = "{  \"resourceType\": \"\",  \"id\": \"rt1\",  \"meta\": {\"lastUpdated\": \"2020-04-23T13:45:32Z\"  } }";
-            _ = await FhirJsonNodeParse(json, null);
+            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+            {
+                var json = "{  \"resourceType\": \"\",  \"id\": \"rt1\",  \"meta\": {\"lastUpdated\": \"2020-04-23T13:45:32Z\"  } }";
+                _ = await FhirJsonNodeParse(json, null);
+            });
         }
 
         [TestMethod]

src/Hl7.Fhir.Serialization.Shared.Tests/RoundTripAttachments.cs

@@ -74,8 +74,8 @@ public void RoundTripAttachmentWithSizeOldParser()
         result.Should().Be(_attachmentJson);
     }
 
-    [DataTestMethod]
-    [DynamicData(nameof(attachmentSource), DynamicDataSourceType.Method)]
+    [TestMethod]
+    [DynamicData(nameof(attachmentSource))]
     public void ParseAttachment(string input, object? expectedAttachmentSize, string? errorCode)
     {
         var options = new JsonSerializerOptions().ForFhir(ModelInfo.ModelInspector);

src/Hl7.Fhir.Serialization.Shared.Tests/RoundtripAllSerializers.cs

@@ -92,27 +92,27 @@ public class RoundtripAllSerializers
     private const string XML_EXAMPLE_ZIP_NAME = "examples.zip";
     private const string JSON_EXAMPLE_ZIP_NAME = "examples-json.zip";
 
-    [DynamicData(nameof(prepareExampleZipFiles), DynamicDataSourceType.Method,
+    [DynamicData(nameof(prepareExampleZipFiles),
         DynamicDataDisplayName = nameof(GetTestDisplayNames))]
-    [DataTestMethod]
+    [TestMethod]
     [TestCategory("LongRunner")]
     public void FullRoundtripOfAllExamplesNewPocoSerializer(ZipArchiveEntry entry)
     {
         doRoundTrip(entry, NEW_POCO_ROUNDTRIPPER);
     }
 
-    [DynamicData(nameof(prepareExampleZipFiles), DynamicDataSourceType.Method,
+    [DynamicData(nameof(prepareExampleZipFiles),
         DynamicDataDisplayName = nameof(GetTestDisplayNames))]
-    [DataTestMethod]
+    [TestMethod]
     [TestCategory("LongRunner")]
     public void FullRoundtripOfAllExamplesPocoSdProvTypedElementSerializer(ZipArchiveEntry entry)
     {
         doRoundTrip(entry, TYPEDELEM_POCOSDPROV);
     }
 
-    [DynamicData(nameof(prepareExampleZipFiles), DynamicDataSourceType.Method,
+    [DynamicData(nameof(prepareExampleZipFiles),
         DynamicDataDisplayName = nameof(GetTestDisplayNames))]
-    [DataTestMethod]
+    [TestMethod]
     [TestCategory("LongRunner")]
     public void FullRoundtripOfAllExamplesSdProvTypedElementSerializer(ZipArchiveEntry entry)
     {
@@ -234,9 +234,9 @@ private static void compare(string expectedData, string actualData, string name,
         }
     }
 
-    [DynamicData(nameof(prepareExampleZipFiles), DynamicDataSourceType.Method,
+    [DynamicData(nameof(prepareExampleZipFiles),
         DynamicDataDisplayName = nameof(GetTestDisplayNames))]
-    [DataTestMethod]
+    [TestMethod]
     [TestCategory("LongRunner")]
     public void TestMatchAndExactly(ZipArchiveEntry entry)
     {

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

@@ -73,7 +73,7 @@ public void TestFpFunctions()
 
             // FHIR specific function does not work for ITypedElement extension methods
             var data = ElementNode.ForPrimitive("hello!");
-            Assert.ThrowsException<ArgumentException>(() => data.IsTrue("hasValue()"));
+            Assert.Throws<ArgumentException>(() => data.IsTrue("hasValue()"));
         }
 
         [TestMethod]