Update manifest tests to newest format

firely-validator-api-tests.props

@@ -30,6 +30,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
+		<PackageReference Include="Firely.Fhir.Packages" Version="4.2.0"  />
 	</ItemGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTests/WipValidator.cs → test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTests/DotNetValidator.cs

@@ -1,5 +1,6 @@
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Model;
+using Hl7.Fhir.Serialization;
 using Hl7.Fhir.Specification.Source;
 using Hl7.Fhir.Specification.Terminology;
 using Hl7.Fhir.Support;
@@ -8,11 +9,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using static Hl7.Fhir.Model.OperationOutcome;
 
 namespace Firely.Fhir.Validation.Compilation.Tests
 {
-    internal class WipValidator : ITestValidator
+    internal class DotNetValidator : ITestValidator
     {
         private readonly string[] _unsupportedTests = new[]
         {
@@ -25,21 +28,54 @@ internal class WipValidator : ITestValidator
         private static readonly IResourceResolver BASE_RESOLVER = new CachedResolver(new StructureDefinitionCorrectionsResolver(ZipSource.CreateValidationSource()));
         private static readonly IElementSchemaResolver SCHEMA_RESOLVER = StructureDefinitionToElementSchemaResolver.CreatedCached(BASE_RESOLVER.AsAsync());
         private readonly Stopwatch _stopWatch;
+        private readonly JsonSerializerOptions _serializerOptions;
 
-        public WipValidator(Stopwatch? stopwatch = null)
+        public DotNetValidator(Stopwatch? stopwatch = null)
         {
             _stopWatch = stopwatch ?? new();
+            _serializerOptions = new JsonSerializerOptions().ForFhir(ModelInfo.ModelInspector).Pretty();
         }
 
-        public static ITestValidator Create() => new WipValidator();
+        public static ITestValidator Create() => new DotNetValidator();
 
-        public string Name => "Wip";
+        public string Name => "dotnet-current";
 
         public string[] UnvalidatableTests => _unsupportedTests;
 
         public bool CannotValidateTest(TestCase c) => UnvalidatableTests.Contains(c.Name);
-        public ExpectedResult? GetExpectedResults(IValidatorEnginesResults engine) => engine.FirelySDKWip;
-        public void SetExpectedResults(IValidatorEnginesResults engine, ExpectedResult result) => engine.FirelySDKWip = result;
+
+        public OperationOutcome? GetExpectedOperationOutcome(IValidatorEnginesResults engine)
+        {
+            var json = engine.FirelyDotNet?.Outcome;
+            if (json is null)
+            {
+                return null;
+            }
+            else
+            {
+                try
+                {
+                    return JsonSerializer.Deserialize<OperationOutcome>(json.ToJsonString(), _serializerOptions);
+                }
+                catch (DeserializationFailedException e)
+                {
+                    return e.PartialResult as OperationOutcome;
+                }
+            }
+        }
+
+        public void SetOperationOutcome(IValidatorEnginesResults engine, OperationOutcome outcome)
+        {
+            var oo = JsonSerializer.Serialize(outcome, _serializerOptions);
+            if (engine.FirelyDotNet is null)
+            {
+                engine.FirelyDotNet = new ExpectedOutcome() { Outcome = JsonNode.Parse(oo)?.AsObject() };
+            }
+            else
+            {
+                engine.FirelyDotNet.Outcome = JsonNode.Parse(oo)?.AsObject();
+            }
+        }
 
         /// <summary>
         /// Validator engine based in this solution: the work in progress (wip) validator

test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTests/ITestValidator.cs

@@ -28,8 +28,8 @@ internal interface ITestValidator
 
         OperationOutcome Validate(ITypedElement instance, IResourceResolver? resolver, string? profile = null);
 
-        ExpectedResult? GetExpectedResults(IValidatorEnginesResults engine);
+        OperationOutcome? GetExpectedOperationOutcome(IValidatorEnginesResults engine);
 
-        void SetExpectedResults(IValidatorEnginesResults engine, ExpectedResult result);
+        void SetOperationOutcome(IValidatorEnginesResults engine, OperationOutcome outcome);
     }
 }

test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTests/Manifest.cs

@@ -5,17 +5,26 @@
  */
 
 using System.Collections.Generic;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 namespace Firely.Fhir.Validation.Compilation.Tests
 {
     public interface IValidatorEnginesResults
     {
-        public ExpectedResult? Java { get; set; }
+        public ExpectedOutcome? Java { get; set; }
 
-        public ExpectedResult? FirelySDKCurrent { get; set; }
+        public ExpectedOutcome? FirelyDotNet { get; set; }
+    }
 
-        public ExpectedResult? FirelySDKWip { get; set; }
+    public class ExpectedOutcome
+    {
+        [JsonPropertyName("outcome")]
+        public JsonObject? Outcome { get; set; }
+        [JsonPropertyName("comment")]
+        public string? Comment { get; set; }
+        [JsonPropertyName("explanation")]
+        public string? Explanation { get; set; }
     }
 
     public class ExpectedResult
@@ -50,6 +59,9 @@ public class Profile : IValidatorEnginesResults
         [JsonPropertyName("source")]
         public string? Source { get; set; }
 
+        [JsonPropertyName("packages")]
+        public string[]? Packages { get; set; }
+
         // Is this needed? Should be a part of ExpectedResult
         [JsonPropertyName("errorCount")]
         public int? ErrorCount { get; set; }
@@ -61,13 +73,10 @@ public class Profile : IValidatorEnginesResults
         public List<string>? Supporting { get; set; }
 
         [JsonPropertyName("java")]
-        public ExpectedResult? Java { get; set; }
-
-        [JsonPropertyName("firely-sdk-current")]
-        public ExpectedResult? FirelySDKCurrent { get; set; }
+        public ExpectedOutcome? Java { get; set; }
 
-        [JsonPropertyName("firely-sdk-wip")]
-        public ExpectedResult? FirelySDKWip { get; set; }
+        [JsonPropertyName("firely-dotnet")]
+        public ExpectedOutcome? FirelyDotNet { get; set; }
     }
 
     public class BundleParameter
@@ -90,17 +99,14 @@ public class Logical
         [JsonPropertyName("expressions")]
         public string[]? Expressions { get; set; }
 
-        [JsonPropertyName("explanation")]
-        public string? Explanation { get; set; }
+        [JsonPropertyName("format")]
+        public string? Format { get; set; }
 
         [JsonPropertyName("java")]
-        public ExpectedResult? Java { get; set; }
-
-        [JsonPropertyName("firely-sdk-current")]
-        public ExpectedResult? FirelySDKCurrent { get; set; }
+        public ExpectedOutcome? Java { get; set; }
 
-        [JsonPropertyName("firely-sdk-wip")]
-        public ExpectedResult? FirelySDKWip { get; set; }
+        [JsonPropertyName("firely-dotnet")]
+        public ExpectedOutcome? FirelyDotNet { get; set; }
     }
 
     public class TestCase : IValidatorEnginesResults
@@ -111,15 +117,54 @@ public class TestCase : IValidatorEnginesResults
         [JsonPropertyName("file")]
         public string? FileName { get; set; }
 
+        [JsonPropertyName("default-version")]
+        public bool? DefaultVersion { get; set; }
+
         [JsonPropertyName("description")]
         public string? Description { get; set; }
 
+        [JsonPropertyName("documentation")]
+        public string? Documentation { get; set; }
+
+        [JsonPropertyName("noHtmlInMarkDown")]
+        public bool? NoHtmlInMarkdown { get; set; }
+
+        [JsonPropertyName("for-publication")]
+        public string? ForPublication { get; set; }
+
         [JsonPropertyName("fetcher")]
         public string? Fetcher { get; set; }
 
+        [JsonPropertyName("module")]
+        public string? Module { get; set; }
+
+        [JsonPropertyName("allow-comments")]
+        public bool? AllowComments { get; set; }
+
+        [JsonPropertyName("no-tx")]
+        public bool? NoTx { get; set; }
+
+        [JsonPropertyName("ips")]
+        public string? Ips { get; set; }
+
+        [JsonPropertyName("close-up")]
+        public bool? CloseUp { get; set; }
+
+        [JsonPropertyName("packages")]
+        public List<string>? Packages { get; set; }
+
         [JsonPropertyName("version")]
         public string? Version { get; set; }
 
+        [JsonPropertyName("supporting")]
+        public List<string>? Supporting { get; set; }
+
+        [JsonPropertyName("validateReference")]
+        public string? ValidateReference { get; set; }
+
+        [JsonPropertyName("validateContains")]
+        public string? ValidateContains { get; set; }
+
         // Is this needed? 
         [JsonPropertyName("x-errors")]
         public string[]? XErrors { get; set; }
@@ -146,11 +191,6 @@ public class TestCase : IValidatorEnginesResults
         [JsonPropertyName("language")]
         public string? Language { get; set; }
 
-        [JsonPropertyName("packages")]
-        public List<string>? Packages { get; set; }
-
-        [JsonPropertyName("supporting")]
-        public List<string>? Supporting { get; set; }
 
         [JsonPropertyName("error")]
         public string? Error { get; set; }
@@ -182,31 +222,52 @@ public class TestCase : IValidatorEnginesResults
         [JsonPropertyName("crumb-trail")]
         public bool? CrumbTrail { get; set; }
 
-        [JsonPropertyName("profile")]
-        public Profile? Profile { get; set; }
-
         [JsonPropertyName("explanation")]
         public string? Explanation { get; set; }
 
         [JsonPropertyName("logical")]
         public Logical? Logical { get; set; }
 
         [JsonPropertyName("java")]
-        public ExpectedResult? Java { get; set; }
+        public ExpectedOutcome? Java { get; set; }
 
-        [JsonPropertyName("firely-sdk-current")]
-        public ExpectedResult? FirelySDKCurrent { get; set; }
+        [JsonPropertyName("firely-dotnet")]
+        public ExpectedOutcome? FirelyDotNet { get; set; }
 
-        [JsonPropertyName("firely-sdk-wip")]
-        public ExpectedResult? FirelySDKWip { get; set; }
+        [JsonPropertyName("profile")]
+        public Profile? Profile { get; set; }
     }
 
     public class Manifest
     {
         [JsonPropertyName("documentation")]
         public List<string>? Documentation { get; set; }
 
+        [JsonPropertyName("modules")]
+        public Modules? Modules { get; set; }
+
         [JsonPropertyName("test-cases")]
         public List<TestCase>? TestCases { get; set; }
     }
+
+    public class Modules
+    {
+        [JsonPropertyName("(default)")]
+        public string? Default { get; set; }
+
+        [JsonPropertyName("cda")]
+        public string? Cda { get; set; }
+
+        [JsonPropertyName("cdshooks")]
+        public string? CdsHooks { get; set; }
+
+        [JsonPropertyName("shc")]
+        public string? Hhc { get; set; }
+
+        [JsonPropertyName("notes:")]
+        public string? Notes { get; set; }
+
+        [JsonPropertyName("json5")]
+        public string? Json5 { get; set; }
+    }
 }