Skip to content

Commit

Permalink
Merge pull request #926 from FirelyTeam/release-r4/stu3-changes-into-r4
Browse files Browse the repository at this point in the history
Merge DSTU3 1.2.0 changes into R4 1.2.0
  • Loading branch information
ewoutkramer authored Mar 29, 2019
2 parents ed70ef1 + 69dc555 commit f0548e3
Show file tree
Hide file tree
Showing 315 changed files with 643 additions and 555 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ and develop branches in this repository below:

|Spec version|Git branch|Core NuGet|Specification NuGet|
|---|---|---|---|
|R4|https://github.com/ewoutkramer/fhir-net-api/tree/develop-r4|https://www.myget.org/feed/fhir-net-api/package/nuget/Hl7.Fhir.R4/|https://www.myget.org/feed/fhir-net-api/package/nuget/Hl7.Fhir.Specification.R4/|
|STU3|https://github.com/ewoutkramer/fhir-net-api/tree/develop-stu3|https://www.nuget.org/packages/Hl7.Fhir.STU3/|https://www.nuget.org/packages/Hl7.Fhir.Specification.STU3/|
|R4|https://github.com/FirelyTeam/fhir-net-api/tree/develop-r4|https://www.nuget.org/packages/Hl7.Fhir.R4/|https://www.nuget.org/packages/Hl7.Fhir.Specification.R4/|
|STU3|https://github.com/FirelyTeam/fhir-net-api/tree/develop-stu3|https://www.nuget.org/packages/Hl7.Fhir.STU3/|https://www.nuget.org/packages/Hl7.Fhir.Specification.STU3/|
|DSTU 2.1|N/A|https://www.nuget.org/packages/Hl7.Fhir.DSTU21/|https://www.nuget.org/packages/Hl7.Fhir.Specification.DSTU21/|
|DSTU2| https://github.com/ewoutkramer/fhir-net-api/tree/develop|https://www.nuget.org/packages/Hl7.Fhir.DSTU2/ | https://www.nuget.org/packages/Hl7.Fhir.Specification.DSTU2/ |
|DSTU1| https://github.com/ewoutkramer/fhir-net-api/tree/master-dstu1|https://www.nuget.org/packages/Hl7.Fhir.DSTU/ | https://www.nuget.org/packages/Hl7.Fhir.Specification.DSTU/ |
|DSTU2| https://github.com/FirelyTeam/fhir-net-api/tree/develop|https://www.nuget.org/packages/Hl7.Fhir.DSTU2/ | https://www.nuget.org/packages/Hl7.Fhir.Specification.DSTU2/ |
|DSTU1| https://github.com/FirelyTeam/fhir-net-api/tree/master-dstu1|https://www.nuget.org/packages/Hl7.Fhir.DSTU/ | https://www.nuget.org/packages/Hl7.Fhir.Specification.DSTU/ |

## Support
We actively monitor the issues coming in through the GitHub repository at [https://github.com/ewoutkramer/fhir-net-api/issues](https://github.com/ewoutkramer/fhir-net-api/issues). You are welcome to register your bugs and feature suggestions there. For questions and broader discussions, we use the .NET FHIR Implementers chat on [Zulip][netapi-zulip].
We actively monitor the issues coming in through the GitHub repository at [https://github.com/FirelyTeam/fhir-net-api/issues](https://github.com/FirelyTeam/fhir-net-api/issues). You are welcome to register your bugs and feature suggestions there. For questions and broader discussions, we use the .NET FHIR Implementers chat on [Zulip][netapi-zulip].

## Contributing ##
We are welcoming contributors!
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/FhirPathExtensionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System.Diagnostics;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Introspection/ClassMappingTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/AnnotationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/BundleExtensionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/CodeEnumTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/DateTimeOperatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/DeepCompareTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/DeepCopyTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/DeepMatchTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Model/ModelTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/OldJsonAssert.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Core.Tests/PocoNavigatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void TestPocoPath()
v2.MoveToNext();
Assert.AreEqual("Patient.active[0].extension[1].value[0]", v2.Location);
Assert.AreEqual("Patient.active.extension[1].value", v2.ShortPath);
Assert.AreEqual("Patient.active.extension('http://something.org').value", v2.CommonPath);
//Assert.AreEqual("Patient.active.extension('http://something.org').value", v2.CommonPath);

PocoNavigator v3 = new PocoNavigator(p);
v3.MoveToFirstChild(); System.Diagnostics.Trace.WriteLine($"{v3.ShortPath} = {v3.FhirValue.ToString()}");
Expand All @@ -95,7 +95,7 @@ public void TestPocoPath()
v3.MoveToFirstChild("system"); System.Diagnostics.Trace.WriteLine($"{v3.ShortPath} = {v3.FhirValue.ToString()}");
Assert.AreEqual("Patient.telecom[0].system[0]", v3.Location);
Assert.AreEqual("Patient.telecom[0].system", v3.ShortPath);
Assert.AreEqual("Patient.telecom.where(system='phone').system", v3.CommonPath);
//Assert.AreEqual("Patient.telecom.where(system='phone').system", v3.CommonPath);

// Now check navigation bits
Assert.AreEqual("Patient.telecom[0].system",
Expand Down
17 changes: 13 additions & 4 deletions src/Hl7.Fhir.Core.Tests/Rest/FhirClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down Expand Up @@ -131,6 +131,15 @@ public void ReadWithFormatWebClient()
Assert.IsNotNull(loc);
}

[TestMethod, TestCategory("FhirClient"), TestCategory("IntegrationTest")]
[ExpectedException(typeof(FhirOperationException))]
public void ReadWrongResourceType()
{
FhirClient client = new FhirClient(testEndpoint);

var loc = client.Read<Patient>("Location/1");
}

[TestMethod, TestCategory("FhirClient"), TestCategory("IntegrationTest")]
public void ReadWebClient()
{
Expand Down Expand Up @@ -557,8 +566,8 @@ public void CreateEditDeleteWebClient()

[TestMethod]
[TestCategory("FhirClient"), TestCategory("IntegrationTest")]
//Test for github issue https://github.com/ewoutkramer/fhir-net-api/issues/145
public void Create_ObservationWithValueAsSimpleQuantity_ReadReturnsValueAsQuantityWebClient()
//Test for github issue https://github.com/FirelyTeam/fhir-net-api/issues/145
public void Create_ObservationWithValueAsSimpleQuantity_ReadReturnsValueAsQuantity()
{
FhirClient client = new FhirClient(testEndpoint);
var observation = new Observation();
Expand Down Expand Up @@ -1259,7 +1268,7 @@ public void TestAuthenticationOnBeforeWebClient()
}

/// <summary>
/// Test for showing issue https://github.com/ewoutkramer/fhir-net-api/issues/128
/// Test for showing issue https://github.com/FirelyTeam/fhir-net-api/issues/128
/// </summary>
[TestMethod, TestCategory("IntegrationTest"), TestCategory("FhirClient")]
public void TestCreatingBinaryResource()
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/NewSearchParamsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/OperationsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/ReferenceExtensionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/SearchParamsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/TestResourceIdentifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/TestRestUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Core.Tests/Rest/TransactionBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down Expand Up @@ -194,7 +194,7 @@ public void TestConditionalUpdate()

/// <summary>
/// Unit test to prove issue 536:
/// https://github.com/ewoutkramer/fhir-net-api/issues/536
/// https://github.com/FirelyTeam/fhir-net-api/issues/536
/// </summary>
[TestMethod]
public void TestTransactionWithForwardSlash()
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Rest/UtilityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
27 changes: 14 additions & 13 deletions src/Hl7.Fhir.Core.Tests/Serialization/DefaultModelFactoryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down Expand Up @@ -41,20 +41,21 @@ public void TestSupportedTypes()
Assert.IsTrue(factory.CanCreate(typeof(int?)));
Assert.IsNotNull(factory.Create(typeof(int?)));

// 20190329 - removed support for creating ICollection - too expensive at runtime
// Test handling of collection interfaces
object collection = null;
Assert.IsTrue(factory.CanCreate(typeof(ICollection<string>)));
collection = factory.Create(typeof(ICollection<string>));
Assert.IsNotNull(collection);
Assert.IsTrue(collection is List<string>);

Assert.IsTrue(factory.CanCreate(typeof(IList<HumanName>)));
Assert.IsNotNull(factory.Create(typeof(ICollection<HumanName>)));
//object collection = null;
//Assert.IsTrue(factory.CanCreate(typeof(ICollection<string>)));
//collection = factory.Create(typeof(ICollection<string>));
//Assert.IsNotNull(collection);
//Assert.IsTrue(collection is List<string>);

//Assert.IsTrue(factory.CanCreate(typeof(IList<HumanName>)));
//Assert.IsNotNull(factory.Create(typeof(ICollection<HumanName>)));

Assert.IsTrue(factory.CanCreate(typeof(IList<int?>)));
collection = factory.Create(typeof(ICollection<int?>));
Assert.IsNotNull(collection);
Assert.IsTrue(collection is List<int?>);
//Assert.IsTrue(factory.CanCreate(typeof(IList<int?>)));
//collection = factory.Create(typeof(ICollection<int?>));
//Assert.IsNotNull(collection);
//Assert.IsTrue(collection is List<int?>);

// Test handling of closed generics
Assert.IsTrue(factory.CanCreate(typeof(Code<Address.AddressUse>)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Core.Tests/Serialization/QueryParserTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using Hl7.Fhir.Model;
Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Core.Tests/Serialization/ResourceParsingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/ewoutkramer/fhir-net-api/master/LICENSE
* available at https://raw.githubusercontent.com/FirelyTeam/fhir-net-api/master/LICENSE
*/

using System;
Expand Down Expand Up @@ -79,7 +79,7 @@ public void ReturnsLineNumbersJson()
public void RequiresHl7Namespace()
{
var xml = "<Patient><active value='false' /></Patient>";
var parser = new FhirXmlParser();
var parser = new FhirXmlParser(new ParserSettings() { PermissiveParsing = false});

try
{
Expand Down
Loading

0 comments on commit f0548e3

Please sign in to comment.