us_core_test_kit 0.2.2 → 0.2.5

data/lib/us_core_test_kit/generated/v4.0.0/patient/patient_must_support_test.rb

@@ -20,9 +20,6 @@ module USCoreTestKit
         * Patient.address.state
         * Patient.birthDate
         * Patient.communication.language
-        * Patient.extension:birthsex
-        * Patient.extension:ethnicity
-        * Patient.extension:race
         * Patient.gender
         * Patient.identifier
         * Patient.identifier.system
@@ -30,12 +27,17 @@ module USCoreTestKit
         * Patient.name
         * Patient.name.family
         * Patient.name.given
-        * Patient.name.suffix
-        * Patient.name.use
-        * Patient.telecom
         * Patient.telecom.system
         * Patient.telecom.use
         * Patient.telecom.value
+
+        For ONC USCDI requirements, each Patient must support the following additional elements:
+
+        * Patient.extension:birthsex
+        * Patient.extension:ethnicity
+        * Patient.extension:race
+        * Patient.name.period.end or Patient.name.use
+        * Patient.name.suffix
       )
 
       id :us_core_v400_patient_must_support_test

data/lib/us_core_test_kit/generated/v4.0.0/patient/patient_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_bmi_for_age/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Observation
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
 :profile_name: US Core Pediatric BMI for Age Observation Profile
+:profile_version: 4.0.0
 :title: Pediatric BMI for Age Observation
 :short_description: Verify support for the server capabilities required by the US
   Core Pediatric BMI for Age Observation Profile.

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_bmi_for_age/pediatric_bmi_for_age_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_weight_for_height/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Observation
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
 :profile_name: US Core Pediatric Weight for Height Observation Profile
+:profile_version: 4.0.0
 :title: Pediatric Weight for Height Observation
 :short_description: Verify support for the server capabilities required by the US
   Core Pediatric Weight for Height Observation Profile.

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/practitioner/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Practitioner
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
 :profile_name: US Core Practitioner Profile
+:profile_version: 4.0.0
 :title: Practitioner
 :short_description: Verify support for the server capabilities required by the US
   Core Practitioner Profile.

data/lib/us_core_test_kit/generated/v4.0.0/practitioner/practitioner_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/procedure/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Procedure
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure
 :profile_name: US Core Procedure Profile
+:profile_version: 4.0.0
 :title: Procedure
 :short_description: Verify support for the server capabilities required by the US
   Core Procedure Profile.

data/lib/us_core_test_kit/generated/v4.0.0/procedure/procedure_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/provenance/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Provenance
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance
 :profile_name: US Core Provenance Profile
+:profile_version: 4.0.0
 :title: Provenance
 :short_description: Verify support for the server capabilities required by the US
   Core Provenance Profile.
@@ -64,7 +65,6 @@
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
-    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization
   - :path: agent.onBehalfOf
     :types:
     - Reference

data/lib/us_core_test_kit/generated/v4.0.0/provenance/provenance_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Observation
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry
 :profile_name: US Core Pulse Oximetry Profile
+:profile_version: 4.0.0
 :title: Pulse Oximetry
 :short_description: Verify support for the server capabilities required by the US
   Core Pulse Oximetry Profile.

data/lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry/pulse_oximetry_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Observation
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
 :profile_name: US Core Respiratory Rate Profile
+:profile_version: 4.0.0
 :title: Respiratory Rate
 :short_description: Verify support for the server capabilities required by the US
   Core Respiratory Rate Profile.

data/lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/respiratory_rate_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/smokingstatus/metadata.yml

@@ -6,6 +6,7 @@
 :resource: Observation
 :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus
 :profile_name: US Core Smoking Status Observation Profile
+:profile_version: 4.0.0
 :title: Smoking Status Observation
 :short_description: Verify support for the server capabilities required by the US
   Core Smoking Status Observation Profile.

data/lib/us_core_test_kit/generated/v4.0.0/smokingstatus/smokingstatus_validation_test.rb

@@ -32,6 +32,7 @@ fail if their code/system are not found in the valueset.
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus',
+                                '4.0.0',
                                 skip_if_empty: true)
       end
     end

data/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb

@@ -44,8 +44,8 @@ module USCoreTestKit
       VALIDATION_MESSAGE_FILTERS = [
         %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
         %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        /^Observation\.effective\.ofType\(Period\): vs-1:/, # Invalid invariant in FHIR v4.0.1
-        /^Observation\.effective\.ofType\(Period\): us-core-1:/ # Invalid invariant in US Core v3.1.1
+        /Observation\.effective\.ofType\(Period\): vs-1:/, # Invalid invariant in FHIR v4.0.1
+        /Observation\.effective\.ofType\(Period\): us-core-1:/ # Invalid invariant in US Core v3.1.1
       ].freeze
 
       def self.metadata

data/lib/us_core_test_kit/generator/group_metadata.rb

@@ -9,6 +9,7 @@ module USCoreTestKit
         :resource,
         :profile_url,
         :profile_name,
+        :profile_version,
         :title,
         :short_description,
         :interactions,

data/lib/us_core_test_kit/generator/group_metadata_extractor.rb

@@ -32,6 +32,7 @@ module USCoreTestKit
             resource: resource,
             profile_url: profile_url,
             profile_name: profile_name,
+            profile_version: profile_version,
             title: title,
             short_description: short_description,
             interactions: interactions,
@@ -169,6 +170,10 @@ module USCoreTestKit
         profile.title.gsub('  ', ' ')
       end
 
+      def profile_version
+        profile.version
+      end
+
       def title
         profile.title.gsub(/US\s*Core\s*/, '').gsub(/\s*Profile/, '').strip
       end

data/lib/us_core_test_kit/generator/ig_loader.rb

@@ -1,5 +1,6 @@
 require 'active_support/all'
 require 'fhir_models'
+require 'pathname'
 require 'rubygems/package'
 require 'zlib'
 require_relative 'ig_resources'
@@ -7,10 +8,10 @@ require_relative 'ig_resources'
 module USCoreTestKit
   class Generator
     class IGLoader
-      attr_accessor :base_ig_directory
+      attr_accessor :ig_file_name
 
-      def initialize(base_ig_directory)
-        self.base_ig_directory = base_ig_directory
+      def initialize(ig_file_name)
+        self.ig_file_name = ig_file_name
       end
 
       def ig_resources
@@ -23,7 +24,9 @@ module USCoreTestKit
       end
 
       def load_ig
-        tar = Gem::Package::TarReader.new(Zlib::GzipReader.open(File.join(base_ig_directory, 'package.tgz')))
+        tar = Gem::Package::TarReader.new(
+          Zlib::GzipReader.open(ig_file_name)
+        )
 
         tar.each do |entry|
           next if entry.directory?
@@ -49,7 +52,11 @@ module USCoreTestKit
       end
 
       def load_standalone_resources
-        Dir.glob(File.join(base_ig_directory, '*.json')).each do |file_path|
+        ig_directory = ig_file_name.chomp('.tgz')
+
+        return ig_resources unless File.exist? ig_directory
+
+        Dir.glob(File.join(ig_directory, '*.json')).each do |file_path|
           begin
             resource = FHIR.from_contents(File.read(file_path))
             next if resource.nil?

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -277,7 +277,6 @@ module USCoreTestKit
         when '4.0.0'
           add_device_distinct_identifier
           add_patient_uscdi_elements
-          add_provenance_agent_who
         end
       end
 
@@ -344,18 +343,23 @@ module USCoreTestKit
       def add_must_support_choices
         choices = []
 
-        choices << {paths: ['content.attachment.data', 'content.attachment.url']} if profile.type == 'DocumentReference'
+        choices << { paths: ['content.attachment.data', 'content.attachment.url'] } if profile.type == 'DocumentReference'
 
         case profile.version
         when '3.1.1'
-          choices << {paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF']} if profile.type == 'Device'
+          choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] } if profile.type == 'Device'
         when '4.0.0'
           case profile.type
           when 'Encounter'
-            choices << {paths: ['reasonCode', 'reasonReference']}
-            choices << {paths: ['location.location', 'serviceProvider']}
+            choices << { paths: ['reasonCode', 'reasonReference'] }
+            choices << { paths: ['location.location', 'serviceProvider'] }
           when 'MedicationRequest'
-            choices << {paths: ['reportedBoolean', 'reportedReference']}
+            choices << { paths: ['reportedBoolean', 'reportedReference'] }
+          when 'Patient'
+            choices << {
+              paths: ['name.period.end', 'name.use'],
+              uscdi_only: true
+            }
           end
         end
 
@@ -377,37 +381,34 @@ module USCoreTestKit
           #US Core 4.0.0 Section 10.112.1.1 Additional USCDI v1 Requirement:
           @must_supports[:extensions] << {
             id: 'Patient.extension:race',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race',
+            uscdi_only: true
           }
           @must_supports[:extensions] << {
             id: 'Patient.extension:ethnicity',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity',
+            uscdi_only: true
           }
           @must_supports[:extensions] << {
             id: 'Patient.extension:birthsex',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'telecom'
+            path: 'name.suffix',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.suffix'
+            path: 'name.use',
+            fixed_value: 'old',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.use',
-            fixed_value: 'old'
+            path: 'name.period.end',
+            uscdi_only: true
           }
         end
       end
-
-      def add_provenance_agent_who
-        # FHIR-36344 US Core 4.0.0 mistakenly not lable us-core-organization as MS for Provenance.agent.who
-        # This will be fixed in US Core 5.0.0
-        if profile.type == 'Provenance'
-          target_element = @must_supports[:elements].find { |element| element[:path] == 'agent.who'}
-          target_element[:target_profiles] << 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'
-        end
-      end
     end
   end
 end

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -68,9 +68,32 @@ module USCoreTestKit
       end
 
       def must_support_list_string
-        slice_names = group_metadata.must_supports[:slices].map { |slice| slice[:name] }
-        element_names = group_metadata.must_supports[:elements].map { |slice| "#{resource_type}.#{slice[:path]}" }
-        extension_names = group_metadata.must_supports[:extensions].map { |slice| slice[:id] }
+        build_must_support_list_string(false)
+      end
+
+      def uscdi_list_string
+        build_must_support_list_string(true)
+      end
+
+      def build_must_support_list_string(uscdi_only)
+        slice_names = group_metadata.must_supports[:slices]
+          .select { |slice| slice[:uscdi_only].presence == uscdi_only.presence }
+          .map { |slice| slice[:name] }
+
+        element_names = group_metadata.must_supports[:elements]
+          .select { |element| element[:uscdi_only].presence == uscdi_only.presence }
+          .map { |element| "#{resource_type}.#{element[:path]}" }
+
+        extension_names = group_metadata.must_supports[:extensions]
+          .select { |extension| extension[:uscdi_only].presence == uscdi_only.presence }
+          .map { |extension| extension[:id] }
+
+        group_metadata.must_supports[:choices]&.each do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
+          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+        end
+
         (slice_names + element_names + extension_names)
           .uniq
           .sort

data/lib/us_core_test_kit/generator/validation_test_generator.rb

@@ -64,6 +64,10 @@ module USCoreTestKit
         group_metadata.profile_name
       end
 
+      def profile_version
+        group_metadata.profile_version
+      end
+
       def test_id
         "us_core_#{group_metadata.reformatted_version}_#{profile_identifier}_validation_test"
       end

data/lib/us_core_test_kit/generator.rb

@@ -16,26 +16,21 @@ require_relative 'generator/validation_test_generator'
 module USCoreTestKit
   class Generator
     def self.generate
-      base_ig_directory = File.join(Dir.pwd, 'lib', 'us_core_test_kit', 'igs')
-      ig_directories =
-        Dir.entries(base_ig_directory)
-          .reject { |path| path.start_with? '.' }
-          .map { |path| File.join(base_ig_directory, path) }
-          .select { |path| File.directory? path }
-
-      ig_directories.each do |ig_directory|
-        new(ig_directory).generate
+      ig_packages = Dir.glob(File.join(Dir.pwd, 'lib', 'us_core_test_kit', 'igs', '*.tgz'))
+
+      ig_packages.each do |ig_package|
+        new(ig_package).generate
       end
     end
 
-    attr_accessor :ig_resources, :ig_metadata, :ig_directory
+    attr_accessor :ig_resources, :ig_metadata, :ig_file_name
 
-    def initialize(ig_directory)
-      self.ig_directory = ig_directory
+    def initialize(ig_file_name)
+      self.ig_file_name = ig_file_name
     end
 
     def generate
-      puts "Generating tests for IG in #{ig_directory}"
+      puts "Generating tests for IG #{File.basename(ig_file_name)}"
       load_ig_package
       extract_metadata
       generate_resource_list
@@ -68,7 +63,7 @@ module USCoreTestKit
 
     def load_ig_package
       FHIR.logger = Logger.new('/dev/null')
-      self.ig_resources = IGLoader.new(ig_directory).load
+      self.ig_resources = IGLoader.new(ig_file_name).load
     end
 
     def generate_resource_list

data/lib/us_core_test_kit/must_support_test.rb

@@ -36,8 +36,16 @@ module USCoreTestKit
       end
     end
 
+    def include_uscdi_only_test?
+      config.options[:include_uscdi_only_test] == true
+    end
+
     def must_support_extensions
-      metadata.must_supports[:extensions]
+      if include_uscdi_only_test?
+        metadata.must_supports[:extensions]
+      else
+        metadata.must_supports[:extensions].reject{ |extension| extension[:uscdi_only] }
+      end
     end
 
     def missing_extensions(resources = [])
@@ -50,7 +58,11 @@ module USCoreTestKit
     end
 
     def must_support_elements
-      metadata.must_supports[:elements]
+      if include_uscdi_only_test?
+        metadata.must_supports[:elements]
+      else
+        metadata.must_supports[:elements].reject{ |element| element[:uscdi_only] }
+      end
     end
 
     def missing_elements(resources = [])
@@ -85,7 +97,11 @@ module USCoreTestKit
     end
 
     def must_support_slices
-      metadata.must_supports[:slices]
+      if include_uscdi_only_test?
+        metadata.must_supports[:slices]
+      else
+        metadata.must_supports[:slices].reject{ |slice| slice[:uscdi_only] }
+      end
     end
 
     def missing_slices(resources = [])
@@ -124,6 +140,12 @@ module USCoreTestKit
             rescue ArgumentError
               false
             end
+          when 'DateTime'
+            begin
+              DateTime.parse(element)
+            rescue ArgumentError
+              false
+            end
           when 'String'
             element.is_a? String
           else