Skip to content

Commit

Permalink
Move test data to separate files in TestData/R4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjrdk
jjrdk committed Mar 18, 2021
1 parent 3cda988 commit 4546499
Show file tree
Hide file tree
Showing 9 changed files with 177 additions and 169 deletions.
180 changes: 11 additions & 169 deletions ...t/Service/PatchApplicationServiceTests.cs → ....Engine.Test/Service/PatchServiceTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,20 @@
namespace Spark.Engine.Test.Service
{
using System.IO;
using System.Linq;
using System.Reflection;
using Engine.Extensions;
using Engine.Service.FhirServiceExtensions;
using Hl7.Fhir.Model;
using Hl7.Fhir.Serialization;
using Xunit;
using Task = System.Threading.Tasks.Task;

public class PatchApplicationServiceTests
public class PatchServiceTests
{
[Fact]
public void CanApplyPropertyAssignmentPatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""add""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient""/>
</part>
<part>
<name value=""name""/>
<valueString value=""birthDate""/>
</part>
<part>
<name value=""value""/>
<valueDate value=""1930-01-01""/>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "property-assignment-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -46,29 +26,9 @@ public void CanApplyPropertyAssignmentPatch()
}

[Fact]
public async System.Threading.Tasks.Task WhenApplyingPropertyAssignmentPatchToNonEmptyPropertyThenThrows()
public void WhenApplyingPropertyAssignmentPatchToNonEmptyPropertyThenThrows()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""add""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient""/>
</part>
<part>
<name value=""name""/>
<valueString value=""birthDate""/>
</part>
<part>
<name value=""value""/>
<valueDate value=""1930-01-01""/>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "property-assignment-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -81,33 +41,7 @@ public async System.Threading.Tasks.Task WhenApplyingPropertyAssignmentPatchToNo
[Fact]
public void CanApplyCollectionAddPatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""add""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient""/>
</part>
<part>
<name value=""name""/>
<valueString value=""name""/>
</part>
<part>
<name value=""value""/>
<part>
<name value=""name""/>
<valueHumanName>
<given value=""John""/>
<family value=""Doe""/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "collection-add-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -122,29 +56,7 @@ public void CanApplyCollectionAddPatch()
[Fact]
public void CanApplyCollectionReplacePatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""replace""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient.name[0]""/>
</part>
<part>
<name value=""value""/>
<part>
<name value=""name""/>
<valueHumanName>
<given value=""Jane""/>
<family value=""Doe""/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "collection-replace-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand Down Expand Up @@ -236,29 +148,7 @@ public void CanApplyCreatedDiffPatch()
[Fact]
public void CanApplyCollectionInsertPatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""insert""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient.name[0]""/>
</part>
<part>
<name value=""value""/>
<part>
<name value=""name""/>
<valueHumanName>
<given value=""Jane""/>
<family value=""Doe""/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "collection-insert-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -280,27 +170,7 @@ public void CanApplyCollectionInsertPatch()
[Fact]
public void CanApplyCollectionMovePatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""move""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient.name""/>
</part>
<part>
<name value=""source""/>
<valueString value=""1""/>
</part>
<part>
<name value=""destination""/>
<valueString value=""0""/>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "collection-move-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -326,23 +196,7 @@ public void CanApplyCollectionMovePatch()
[Fact]
public void CanApplyPropertyReplacementPatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""replace""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient.birthDate""/>
</part>
<part>
<name value=""value""/>
<valueDate value=""1930-01-01""/>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "property-replace-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand All @@ -356,19 +210,7 @@ public void CanApplyPropertyReplacementPatch()
[Fact]
public void CanApplyCollectionDeletePatch()
{
var xml = @"<Parameters xmlns=""http://hl7.org/fhir"">
<parameter>
<name value=""operation""/>
<part>
<name value=""type""/>
<valueCode value=""delete""/>
</part>
<part>
<name value=""path""/>
<valueString value=""Patient.name[0]""/>
</part>
</parameter>
</Parameters>";
var xml = File.ReadAllText(Path.Combine("TestData", "R4", "collection-delete-patch.xml"));
var parser = new FhirXmlParser();
var parameters = parser.Parse<Parameters>(xml);

Expand Down
21 changes: 21 additions & 0 deletions src/Spark.Engine.Test/Spark.Engine.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,33 @@
<None Update="TestData\R3\patient-example.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\collection-add-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\collection-delete-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\collection-insert-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\collection-move-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\collection-replace-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\patient-example.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\patient-example.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\property-assignment-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\R4\property-replace-patch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
27 changes: 27 additions & 0 deletions src/Spark.Engine.Test/TestData/R4/collection-add-patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Parameters xmlns="http://hl7.org/fhir">
<parameter>
<name value="operation"/>
<part>
<name value="type"/>
<valueCode value="add"/>
</part>
<part>
<name value="path"/>
<valueString value="Patient"/>
</part>
<part>
<name value="name"/>
<valueString value="name"/>
</part>
<part>
<name value="value"/>
<part>
<name value="name"/>
<valueHumanName>
<given value="John"/>
<family value="Doe"/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>
13 changes: 13 additions & 0 deletions src/Spark.Engine.Test/TestData/R4/collection-delete-patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Parameters xmlns="http://hl7.org/fhir">
<parameter>
<name value="operation"/>
<part>
<name value="type"/>
<valueCode value="delete"/>
</part>
<part>
<name value="path"/>
<valueString value="Patient.name[0]"/>
</part>
</parameter>
</Parameters>
23 changes: 23 additions & 0 deletions src/Spark.Engine.Test/TestData/R4/collection-insert-patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Parameters xmlns="http://hl7.org/fhir">
<parameter>
<name value="operation"/>
<part>
<name value="type"/>
<valueCode value="insert"/>
</part>
<part>
<name value="path"/>
<valueString value="Patient.name[0]"/>
</part>
<part>
<name value="value"/>
<part>
<name value="name"/>
<valueHumanName>
<given value="Jane"/>
<family value="Doe"/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>
21 changes: 21 additions & 0 deletions src/Spark.Engine.Test/TestData/R4/collection-move-patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Parameters xmlns="http://hl7.org/fhir">
<parameter>
<name value="operation"/>
<part>
<name value="type"/>
<valueCode value="move"/>
</part>
<part>
<name value="path"/>
<valueString value="Patient.name"/>
</part>
<part>
<name value="source"/>
<valueString value="1"/>
</part>
<part>
<name value="destination"/>
<valueString value="0"/>
</part>
</parameter>
</Parameters>
23 changes: 23 additions & 0 deletions src/Spark.Engine.Test/TestData/R4/collection-replace-patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Parameters xmlns="http://hl7.org/fhir">
<parameter>
<name value="operation"/>
<part>
<name value="type"/>
<valueCode value="replace"/>
</part>
<part>
<name value="path"/>
<valueString value="Patient.name[0]"/>
</part>
<part>
<name value="value"/>
<part>
<name value="name"/>
<valueHumanName>
<given value="Jane"/>
<family value="Doe"/>
</valueHumanName>
</part>
</part>
</parameter>
</Parameters>
Loading

0 comments on commit 4546499

Please sign in to comment.