Add some convenience types (#106)

Project.toml

@@ -1,7 +1,7 @@
 name = "FHIRClient"
 uuid = "b44d2ca2-8176-4fa9-8684-826e17b2a2da"
 authors = ["Dilum Aluthge", "Rhode Island Quality Institute", "contributors"]
-version = "0.7.4"
+version = "0.7.5"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/FHIRClient.jl

@@ -23,6 +23,7 @@ include("r4.jl")
 include("credentials.jl")
 include("fhir-to-julia.jl")
 include("headers.jl")
+include("other-fhir-versions.jl")
 include("requests.jl")
 
 end # end module FHIRClient

src/other-fhir-versions.jl

@@ -0,0 +1,11 @@
+struct DSTU2 <: FHIRVersion
+end
+
+struct STU3 <: FHIRVersion
+end
+
+struct UnknownFHIRVersion <: FHIRVersion
+end
+
+struct OtherFHIRVersion{V} <: FHIRVersion
+end

test/integration.jl

@@ -0,0 +1,4 @@
+@testset "Integration tests" begin
+    include("integration/json.jl")
+    include("integration/basic-read.jl")
+end

test/integration-tests/basic-read.jl → test/integration/basic-read.jl

@@ -1,9 +1,3 @@
-using FHIRClient
-using Test
-
-import Dates
-import .JSON3
-
 @testset "Basic reading" begin
     anonymous_auth = FHIRClient.AnonymousAuth()
     oauth2_auth = FHIRClient.OAuth2()

test/integration-tests/json.jl → test/integration/json.jl

@@ -1,9 +1,3 @@
-using FHIRClient
-using Test
-
-import Dates
-import .JSON3
-
 @testset "Raw JSON" begin
     fhir_version = FHIRClient.R4()
     base_url = FHIRClient.BaseURL("https://hapi.fhir.org/baseR4")

test/runtests.jl

@@ -8,7 +8,10 @@ import Test
 
 const JSON3 = FHIRClient.JSON3
 
+import Dates
+import .JSON3
+
 @testset "FHIRClient.jl" begin
-    include("unit-tests.jl")
-    include("integration-tests.jl")
+    include("unit.jl")
+    include("integration.jl")
 end

test/unit.jl

@@ -0,0 +1,6 @@
+@testset "Unit tests" begin
+    include("unit/auto-generated-source-files.jl")
+    include("unit/fhir-to-julia.jl")
+    include("unit/other-fhir-versions.jl")
+    include("unit/requests.jl")
+end

test/unit/auto-generated-source-files.jl

@@ -0,0 +1,9 @@
+@testset "Auto-generated source files" begin
+    @testset "R4" begin
+        @testset "Patient" begin
+            p = FHIRClient.R4Types.Patient()
+            @test p.resourceType isa String
+            @test p.resourceType == "Patient"
+        end
+    end
+end

test/unit/fhir-to-julia.jl

@@ -0,0 +1,19 @@
+@testset "fhir-to-julia.jl" begin
+    @testset "fhir_to_julia" begin
+        @test FHIRClient.fhir_to_julia(:end) == :end_fhir
+        @test FHIRClient.fhir_to_julia(:function) == :function_fhir
+        @test FHIRClient.fhir_to_julia(:global) == :global_fhir
+        @test FHIRClient.fhir_to_julia(:import) == :import_fhir
+        @test FHIRClient.fhir_to_julia(:for) == :for_fhir
+        @test FHIRClient.fhir_to_julia(:birthDate) == :birthDate
+    end
+
+    @testset "julia_to_fhir" begin
+        @test FHIRClient.julia_to_fhir(:end_fhir) == :end
+        @test FHIRClient.julia_to_fhir(:function_fhir) == :function
+        @test FHIRClient.julia_to_fhir(:global_fhir) == :global
+        @test FHIRClient.julia_to_fhir(:import_fhir) == :import
+        @test FHIRClient.julia_to_fhir(:for_fhir) == :for
+        @test FHIRClient.julia_to_fhir(:birthDate) == :birthDate
+    end
+end

test/unit/other-fhir-versions.jl

@@ -0,0 +1,7 @@
+@testset "other-fhir-versions.jl" begin
+    @test FHIRClient.DSTU2() isa FHIRClient.DSTU2
+    @test FHIRClient.STU3() isa FHIRClient.STU3
+    @test FHIRClient.UnknownFHIRVersion() isa FHIRClient.UnknownFHIRVersion
+    @test FHIRClient.OtherFHIRVersion{:DSTU2}() isa FHIRClient.OtherFHIRVersion
+    @test FHIRClient.OtherFHIRVersion{:DSTU2}() isa FHIRClient.OtherFHIRVersion{:DSTU2}
+end

test/unit/requests.jl

@@ -0,0 +1,4 @@
+@testset "requests.jl" begin
+    @test FHIRClient._add_trailing_slash(HTTP.URI("https://example.com")) == HTTP.URI("https://example.com/")
+    @test FHIRClient._add_trailing_slash(HTTP.URI("https://example.com/")) == HTTP.URI("https://example.com/")
+end