Remove the use of the TestXXXX classes.

src/Benchmarks/Benchmarks.csproj

@@ -14,7 +14,6 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\Hl7.Fhir.R5\Hl7.Fhir.R5.csproj" />
-		<ProjectReference Include="..\Hl7.Fhir.Support.Poco.Tests\Hl7.Fhir.Support.Poco.Tests.csproj" />
 		<ProjectReference Include="..\Hl7.Fhir.Specification.Data.R5\Hl7.Fhir.Specification.Data.R5.csproj" />
 	</ItemGroup>
 

src/Benchmarks/DeserializationBenchmark.cs

@@ -28,18 +28,18 @@ public void BenchmarkSetup()
             var xmlFileName = Path.Combine("TestData", "fp-test-patient.xml");
             XmlData = File.ReadAllText(xmlFileName);
 
-            XmlDeserializer = new BaseFhirXmlPocoDeserializer(typeof(TestPatient).Assembly);
-            JsonDeserializer = new BaseFhirJsonPocoDeserializer(typeof(TestPatient).Assembly);
+            XmlDeserializer = new FhirXmlPocoDeserializer();
+            JsonDeserializer = new FhirJsonPocoDeserializer();
 
-            options = new JsonSerializerOptions().ForFhir(typeof(TestPatient).Assembly);
+            options = new JsonSerializerOptions().ForFhir();
         }
 
         [Benchmark]
         public Resource JsonDictionaryDeserializer()
         {
             try
             {
-                return JsonSerializer.Deserialize<TestPatient>(JsonData, options);
+                return JsonSerializer.Deserialize<Patient>(JsonData, options);
             }
             catch (DeserializationFailedException e)
             {
@@ -64,15 +64,15 @@ public Resource XmlDictionaryDeserializer()
 
 
         [Benchmark]
-        public TestPatient TypedElementDeserializerJson()
+        public Patient TypedElementDeserializerJson()
         {
-            return FhirJsonNode.Parse(JsonData).ToPoco<TestPatient>(ModelInspector.ForType<TestPatient>());
+            return FhirJsonNode.Parse(JsonData).ToPoco<Patient>();
         }
 
         [Benchmark]
         public Resource TypedElementDeserializerXml()
         {
-            return FhirXmlNode.Parse(XmlData).ToPoco<TestPatient>(ModelInspector.ForType<TestPatient>());
+            return FhirXmlNode.Parse(XmlData).ToPoco<Patient>();
         }
     }
-}
+}

src/Benchmarks/SerializationBenchmarks.cs

@@ -12,7 +12,7 @@ namespace Firely.Sdk.Benchmarks
     [MemoryDiagnoser]
     public class SerializationBenchmarks
     {
-        internal TestPatient Patient;
+        internal Patient Patient;
         JsonSerializerOptions Options;
         BaseFhirXmlPocoSerializer XmlSerializer;
 
@@ -24,9 +24,9 @@ public void BenchmarkSetup()
             var data = File.ReadAllText(filename);
             // For now, deserialize with the existing deserializer, until we have completed
             // the dynamicserializer too.
-            Patient = FhirJsonNode.Parse(data).ToPoco<TestPatient>(ModelInspector.ForType<TestPatient>());
-            Options = new JsonSerializerOptions().ForFhir(typeof(TestPatient).Assembly);
-            XmlSerializer = new BaseFhirXmlPocoSerializer(Hl7.Fhir.Specification.FhirRelease.STU3);
+            Patient = FhirJsonNode.Parse(data).ToPoco<Patient>();
+            Options = new JsonSerializerOptions().ForFhir();
+            XmlSerializer = new FhirXmlPocoSerializer();
         }
 
         [Benchmark]
@@ -44,13 +44,13 @@ public string XmlDictionarySerializer()
         [Benchmark]
         public string TypedElementSerializerJson()
         {
-            return Patient.ToTypedElement(ModelInspector.ForType<TestPatient>()).ToJson();
+            return Patient.ToTypedElement().ToJson();
         }
 
         [Benchmark]
         public string TypedElementSerializerXml()
         {
-            return Patient.ToTypedElement(ModelInspector.ForType<TestPatient>()).ToXml();
+            return Patient.ToTypedElement().ToXml();
         }
     }
-}
+}

src/Hl7.Fhir.Base/FhirPath/Expressions/ExpressionNode.cs

@@ -196,7 +196,7 @@ public class ConstantExpression : Expression, Sprache.IPositionAware<ConstantExp
         public ConstantExpression(object value, TypeSpecifier type, ISourcePositionInfo location = null) : base(type, location)
         {
             if (value == null) Error.ArgumentNull("value");
-            if (value is P.Any && (value is P.Boolean || value is P.Decimal || value is P.Integer || value is P.Long || value is P.String))
+            if (value is P.Any and (P.Boolean or P.Decimal or P.Integer or P.Long or P.String))
                 throw new ArgumentException("Internal error: not yet ready to handle Any-based primitives in FhirPath.");
 
             Value = value;
@@ -627,4 +627,4 @@ public string AxisName
         public static readonly AxisExpression That = new AxisExpression("that");
         AxisExpression IPositionAware<AxisExpression>.SetPos(Position startPos, int length) => SetPos<AxisExpression>(startPos, length);
     }
-}
+}

src/Hl7.Fhir.Base/Model/CodeOfT.cs

@@ -82,7 +82,7 @@ internal bool TryParseObjectValue(out T? value)
         {
             value = default;
 
-            if (ObjectValue is string s && EnumUtility.ParseLiteral<T>(s) is T parsed)
+            if (ObjectValue is string s && EnumUtility.ParseLiteral<T>(s) is { } parsed)
             {
                 value = parsed;
                 return true;
@@ -109,4 +109,4 @@ public override IEnumerable<ValidationResult> Validate(ValidationContext validat
             }
         }
     }
-}
+}

src/Hl7.Fhir.Base/Serialization/JsonSerializerOptionsExtensions.cs

@@ -156,7 +156,7 @@ public static JsonSerializerOptions Pretty(this JsonSerializerOptions options)
         }
 
         // internal for testing purposes
-        internal static JsonConverter? FindCustomConverter(IEnumerable<JsonConverter> converters)
+        internal static JsonConverter? FindCustomConverter(this IEnumerable<JsonConverter> converters)
         {
             return converters.FirstOrDefault(jsonConverter => jsonConverter.CanConvert(typeof(Resource)));
         }

src/Hl7.Fhir.Base/Serialization/PrimitiveValueReader.cs

@@ -36,7 +36,7 @@ internal object Deserialize(Type nativeType)
             {
                 // The POCO's know nothing about the special partial date/time classes used by ITypedElement, 
                 // instead FhirDateTime, Time and FhirDate all represent these values as simple strings.
-                if (primitiveValue is P.DateTime || primitiveValue is P.Time || primitiveValue is P.Date)
+                if (primitiveValue is P.DateTime or P.Time or P.Date)
                     return PrimitiveTypeConverter.ConvertTo(primitiveValue.ToString(), nativeType);
                 else
                     return PrimitiveTypeConverter.ConvertTo(primitiveValue, nativeType);
@@ -50,4 +50,4 @@ internal object Deserialize(Type nativeType)
         }
     }
 #pragma warning restore 612,618
-}
+}

src/Hl7.Fhir.Base/Specification/Terminology/CustomValueSetTerminologyService.cs

@@ -8,7 +8,7 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using T = System.Threading.Tasks;
+using Tasks = System.Threading.Tasks;
 
 namespace Hl7.Fhir.Specification.Terminology
 {
@@ -35,32 +35,32 @@ protected CustomValueSetTerminologyService(string terminologyType, string codeSy
         }
 
         ///<inheritdoc />
-        public T.Task<Resource> Closure(Parameters parameters, bool useGet = false) =>
+        public Tasks.Task<Resource> Closure(Parameters parameters, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public T.Task<Parameters>
+        public Tasks.Task<Parameters>
             CodeSystemValidateCode(Parameters parameters, string? id = null, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public T.Task<Resource> Expand(Parameters parameters, string? id = null, bool useGet = false) =>
+        public Tasks.Task<Resource> Expand(Parameters parameters, string? id = null, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public T.Task<Parameters> Lookup(Parameters parameters, bool useGet = false) =>
+        public Tasks.Task<Parameters> Lookup(Parameters parameters, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public T.Task<Parameters> Subsumes(Parameters parameters, string? id = null, bool useGet = false) =>
+        public Tasks.Task<Parameters> Subsumes(Parameters parameters, string? id = null, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public T.Task<Parameters> Translate(Parameters parameters, string? id = null, bool useGet = false) =>
+        public Tasks.Task<Parameters> Translate(Parameters parameters, string? id = null, bool useGet = false) =>
             throw new NotImplementedException();
 
         ///<inheritdoc />
-        public async T.Task<Parameters> ValueSetValidateCode(Parameters parameters, string? id = null,
+        public async Tasks.Task<Parameters> ValueSetValidateCode(Parameters parameters, string? id = null,
             bool useGet = false)
         {
             parameters.CheckForValidityOfValidateCodeParams();

src/Hl7.Fhir.Conformance/Specification/Navigation/StructureDefinitionWalker.cs

@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using T = System.Threading.Tasks;
+using Tasks = System.Threading.Tasks;
 
 namespace Hl7.Fhir.Specification
 {
@@ -90,7 +90,7 @@ public StructureDefinitionWalker(StructureDefinitionWalker other)
         public StructureDefinitionWalker FromCanonical(string canonical, IEnumerable<string>? targetProfiles = null) =>
             TaskHelper.Await(() => FromCanonicalAsync(canonical, targetProfiles));
 
-        public async T.Task<StructureDefinitionWalker> FromCanonicalAsync(string canonical, IEnumerable<string>? targetProfiles = null)
+        public async Tasks.Task<StructureDefinitionWalker> FromCanonicalAsync(string canonical, IEnumerable<string>? targetProfiles = null)
         {
             var sd = await AsyncResolver.FindStructureDefinitionAsync(canonical).ConfigureAwait(false);
             if (sd == null)

src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotBaseComponentGenerator.cs

@@ -13,7 +13,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using T = System.Threading.Tasks;
+using Tasks = System.Threading.Tasks;
 
 namespace Hl7.Fhir.Specification.Snapshot
 {
@@ -23,14 +23,14 @@ namespace Hl7.Fhir.Specification.Snapshot
 
     partial class SnapshotGenerator
     {
-        private T.Task ensureSnapshotBaseComponents(StructureDefinition structureDef, bool force = false) =>
+        private Tasks.Task ensureSnapshotBaseComponents(StructureDefinition structureDef, bool force = false) =>
             ensureBaseComponents(structureDef.Snapshot.Element, structureDef.BaseDefinition, force);
 
         /// <summary>(Re-)generate the <see cref="ElementDefinition.Base"/> components.</summary>
         /// <param name="elements">A list of <see cref="ElementDefinition"/> instances.</param>
         /// <param name="baseProfileUrl">The canonical url of the base profile, as defined by the <see cref="StructureDefinition.BaseDefinition"/> property.</param>
         /// <param name="force">If <c>true</c>, then always (re-)generate the Base component, even if it exists.</param>
-        private async T.Task ensureBaseComponents(IList<ElementDefinition> elements, string baseProfileUrl, bool force = false)
+        private async Tasks.Task ensureBaseComponents(IList<ElementDefinition> elements, string baseProfileUrl, bool force = false)
         {
             var nav = new ElementDefinitionNavigator(elements);
             if (nav.MoveToFirstChild() && !string.IsNullOrEmpty(baseProfileUrl))
@@ -56,7 +56,7 @@ private async T.Task ensureBaseComponents(IList<ElementDefinition> elements, str
             }
         }
 
-        private async T.Task ensureBaseComponents(ElementDefinitionNavigator nav, ElementDefinitionNavigator baseNav, bool force = false)
+        private async Tasks.Task ensureBaseComponents(ElementDefinitionNavigator nav, ElementDefinitionNavigator baseNav, bool force = false)
         {
             // Debug.Print($"[nameof(generateElementBase)}] Path = '{nav.Path}'  Base = '{baseNav.Path}'");
             var elem = nav.Current;
@@ -188,4 +188,4 @@ static ElementDefinition.BaseComponent createBaseComponent(FhirString maxElement
         }
 
     }
-}
+}