us_core_test_kit 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf568ad98ad25b70c1ae8993657adb8eccc83f9ffeee841e6bb3a51b79ed9f56
-  data.tar.gz: 2c2761194d8edf9c70744ff832016d4f9643851041690c0c8bd71004e947083f
+  metadata.gz: d0b4059c21c91aac9937415541f2104a2f15ea911181d73e0e71b37efdb30d80
+  data.tar.gz: bc52f233f6620307ab10c64c03bfc3e223f7a9d6bd5e80e5bcecc4ace255a399
 SHA512:
-  metadata.gz: ea6bce62760d108adaeb3905bca2611b52059391a99b5ade0515fa2de61069a4d8bfa7479bb4c79dc0637297c9123bd28c274a276776330c8076ae2c2065a8ac
-  data.tar.gz: a29e81c48dd8965fa62a064ff69552e64e7b4cab0bab917c55e9b6ff402e3a8566d234c879852674d271156f46d656149d5de1b66023c853194327d43a06edba
+  metadata.gz: b786a061e34bb45029cebf15641f360607d89f6c5b4c2249bd11171b6ca74403958795c7579ef170bee76a8061cb4f4b23dac257a3cdee91675510de3901eed5
+  data.tar.gz: b8ebd86009a0fc9cd4b3ab35a5f8078320d4c81612f3445793d524367cc446096a537461c1f30aaf5686f27110282a6717ed44f3460415b7def5ddd61ab905ae

data/lib/us_core_test_kit/custom_groups/base_smart_granular_scopes_group.rb

@@ -1,12 +1,12 @@
 require 'inferno'
 require 'smart_app_launch_test_kit'
-require_relative './smart_ehr_launch_stu2'
-require_relative './smart_scopes_constants'
-require_relative './smart_standalone_launch_stu2_group'
+require_relative 'smart_ehr_launch_stu2'
+require_relative 'smart_scopes_constants'
+require_relative 'smart_standalone_launch_stu2_group'
 require_relative '../granular_scope_search_test'
 require_relative '../granular_scope_read_test'
 require_relative '../us_core_options'
-require_relative './granted_granular_scopes_test'
+require_relative 'granted_granular_scopes_test'
 
 module USCoreTestKit
   class BaseSmartGranularScopesGroup < Inferno::TestGroup
@@ -54,8 +54,29 @@ module USCoreTestKit
             smart_credentials: {
               name: :granular_scopes_1_credentials
             }
-          }        )
+          }
+        )
         group from: :us_core_smart_standalone_launch_stu2,
+              required_suite_options: USCoreOptions::SMART_2_REQUIREMENT,
+              optional: true,
+              config: {
+                inputs: {
+                  smart_credentials: {
+                    name: :granular_scopes_1_credentials
+                  }
+                }
+              } do
+          groups[1].test from: :us_core_granted_granular_scopes,
+                         config: {
+                           inputs: {
+                             received_scopes: {
+                               name: :standalone_received_scopes
+                             }
+                           }
+                         }
+        end
+        group from: :us_core_smart_standalone_launch_stu2_2,
+              required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
               optional: true,
               config: {
                 inputs: {
@@ -73,7 +94,28 @@ module USCoreTestKit
                            }
                          }
         end
+
         group from: :us_core_smart_ehr_launch_stu2,
+              required_suite_options: USCoreOptions::SMART_2_REQUIREMENT,
+              optional: true,
+              config: {
+                inputs: {
+                  smart_credentials: {
+                    name: :granular_scopes_1_credentials
+                  }
+                }
+              } do
+          groups[1].test from: :us_core_granted_granular_scopes,
+                         config: {
+                           inputs: {
+                             received_scopes: {
+                               name: :ehr_received_scopes
+                             }
+                           }
+                         }
+        end
+        group from: :us_core_smart_ehr_launch_stu2_2,
+              required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
               optional: true,
               config: {
                 inputs: {
@@ -113,6 +155,26 @@ module USCoreTestKit
         )
 
         group from: :us_core_smart_standalone_launch_stu2,
+              required_suite_options: USCoreOptions::SMART_2_REQUIREMENT,
+              optional: true,
+              config: {
+                inputs: {
+                  smart_credentials: {
+                    name: :granular_scopes_2_credentials
+                  }
+                }
+              } do
+          groups[1].test from: :us_core_granted_granular_scopes,
+                         config: {
+                           inputs: {
+                             received_scopes: {
+                               name: :standalone_received_scopes
+                             }
+                           }
+                         }
+        end
+        group from: :us_core_smart_standalone_launch_stu2_2,
+              required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
               optional: true,
               config: {
                 inputs: {
@@ -130,9 +192,28 @@ module USCoreTestKit
                            }
                          }
         end
-
 
         group from: :us_core_smart_ehr_launch_stu2,
+              required_suite_options: USCoreOptions::SMART_2_REQUIREMENT,
+              optional: true,
+              config: {
+                inputs: {
+                  smart_credentials: {
+                    name: :granular_scopes_2_credentials
+                  }
+                }
+              } do
+          groups[1].test from: :us_core_granted_granular_scopes,
+                         config: {
+                           inputs: {
+                             received_scopes: {
+                               name: :ehr_received_scopes
+                             }
+                           }
+                         }
+        end
+        group from: :us_core_smart_ehr_launch_stu2_2,
+              required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
               optional: true,
               config: {
                 inputs: {

data/lib/us_core_test_kit/custom_groups/smart_app_launch_group.rb

@@ -1,18 +1,22 @@
 require 'smart_app_launch_test_kit'
 require_relative '../us_core_options'
-require_relative './smart_ehr_launch_stu1'
-require_relative './smart_ehr_launch_stu2'
-require_relative './smart_standalone_launch_stu1_group'
-require_relative './smart_standalone_launch_stu2_group'
+require_relative 'smart_ehr_launch_stu1'
+require_relative 'smart_ehr_launch_stu2'
+require_relative 'smart_ehr_launch_stu2_2'
+require_relative 'smart_standalone_launch_stu1_group'
+require_relative 'smart_standalone_launch_stu2_group'
+require_relative 'smart_standalone_launch_stu2_2_group'
 
 module USCoreTestKit
   class SmartAppLaunchGroup < Inferno::TestGroup
     id :us_core_smart_app_launch
     title 'SMART App Launch'
 
-    SMART_V1_RESOURCE_LEVEL_SCOPES = "launch/patient openid fhirUser offline_access patient/Medication.read patient/AllergyIntolerance.read patient/CarePlan.read patient/CareTeam.read patient/Condition.read patient/Device.read patient/DiagnosticReport.read patient/DocumentReference.read patient/Encounter.read patient/Goal.read patient/Immunization.read patient/Location.read patient/MedicationRequest.read patient/Observation.read patient/Organization.read patient/Patient.read patient/Practitioner.read patient/Procedure.read patient/Provenance.read patient/PractitionerRole.read patient/ServiceRequest.read patient/RelatedPerson.read patient/Specimen.read patient/MedicationDispense.read patient/Coverage.read patient/Location.read patient/media.read".freeze
+    SMART_V1_RESOURCE_LEVEL_SCOPES = 'launch/patient openid fhirUser offline_access patient/Medication.read patient/AllergyIntolerance.read patient/CarePlan.read patient/CareTeam.read patient/Condition.read patient/Device.read patient/DiagnosticReport.read patient/DocumentReference.read patient/Encounter.read patient/Goal.read patient/Immunization.read patient/Location.read patient/MedicationRequest.read patient/Observation.read patient/Organization.read patient/Patient.read patient/Practitioner.read patient/Procedure.read patient/Provenance.read patient/PractitionerRole.read patient/ServiceRequest.read patient/RelatedPerson.read patient/Specimen.read patient/MedicationDispense.read patient/Coverage.read patient/Location.read patient/media.read'.freeze
 
-    SMART_V2_RESOURCE_LEVEL_SCOPES = "launch/patient openid fhirUser offline_access patient/Medication.rs patient/AllergyIntolerance.rs patient/CarePlan.rs patient/CareTeam.rs patient/Condition.rs patient/Device.rs patient/DiagnosticReport.rs patient/DocumentReference.rs patient/Encounter.rs patient/Goal.rs patient/Immunization.rs patient/Location.rs patient/MedicationRequest.rs patient/Observation.rs patient/Organization.rs patient/Patient.rs patient/Practitioner.rs patient/Procedure.rs patient/Provenance.rs patient/PractitionerRole.rs patient/ServiceRequest.rs patient/RelatedPerson.rs patient/Specimen.rs patient/MedicationDispense.rs patient/Coverage.rs patient/Location.rs patient/Media.rs".freeze
+    SMART_V2_RESOURCE_LEVEL_SCOPES = 'launch/patient openid fhirUser offline_access patient/Medication.rs patient/AllergyIntolerance.rs patient/CarePlan.rs patient/CareTeam.rs patient/Condition.rs patient/Device.rs patient/DiagnosticReport.rs patient/DocumentReference.rs patient/Encounter.rs patient/Goal.rs patient/Immunization.rs patient/Location.rs patient/MedicationRequest.rs patient/Observation.rs patient/Organization.rs patient/Patient.rs patient/Practitioner.rs patient/Procedure.rs patient/Provenance.rs patient/PractitionerRole.rs patient/ServiceRequest.rs patient/RelatedPerson.rs patient/Specimen.rs patient/MedicationDispense.rs patient/Coverage.rs patient/Location.rs patient/Media.rs'.freeze
+
+    SMART_V2_2_RESOURCE_LEVEL_SCOPES = 'launch/patient openid fhirUser offline_access patient/Medication.rs patient/AllergyIntolerance.rs patient/CarePlan.rs patient/CareTeam.rs patient/Condition.rs patient/Device.rs patient/DiagnosticReport.rs patient/DocumentReference.rs patient/Encounter.rs patient/Goal.rs patient/Immunization.rs patient/Location.rs patient/MedicationRequest.rs patient/Observation.rs patient/Organization.rs patient/Patient.rs patient/Practitioner.rs patient/Procedure.rs patient/Provenance.rs patient/PractitionerRole.rs patient/ServiceRequest.rs patient/RelatedPerson.rs patient/Specimen.rs patient/MedicationDispense.rs patient/Coverage.rs patient/Location.rs patient/Media.rs'.freeze
 
     group from: :us_core_smart_standalone_launch_stu1,
           required_suite_options: USCoreOptions::SMART_1_REQUIREMENT,
@@ -49,5 +53,23 @@ module USCoreTestKit
               requested_scopes: { default: SmartAppLaunchGroup::SMART_V2_RESOURCE_LEVEL_SCOPES }
             }
           }
+
+    group from: :us_core_smart_standalone_launch_stu2_2,
+          required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
+          optional: true,
+          config: {
+            inputs: {
+              requested_scopes: { default: SmartAppLaunchGroup::SMART_V2_2_RESOURCE_LEVEL_SCOPES }
+            }
+          }
+
+    group from: :us_core_smart_ehr_launch_stu2_2,
+          required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT,
+          optional: true,
+          config: {
+            inputs: {
+              requested_scopes: { default: SmartAppLaunchGroup::SMART_V2_2_RESOURCE_LEVEL_SCOPES }
+            }
+          }
   end
 end

data/lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2_2.rb

@@ -0,0 +1,40 @@
+module USCoreTestKit
+  class SmartEHRLaunchSTU22 < Inferno::TestGroup
+    id :us_core_smart_ehr_launch_stu2_2
+    title 'EHR Launch'
+
+    run_as_group
+
+    group from: :smart_discovery_stu2_2,
+          run_as_group: true
+    group from: :smart_ehr_launch_stu2_2,
+          run_as_group: true
+
+    group from: :smart_openid_connect_stu2_2 do
+      run_as_group
+      optional
+      config(
+        inputs: {
+          id_token: { name: :ehr_id_token },
+          client_id: { name: :ehr_client_id },
+          requested_scopes: { name: :ehr_requested_scopes },
+          access_token: { name: :ehr_access_token },
+          smart_credentials: { name: :ehr_smart_credentials }
+        }
+      )
+    end
+
+    group from: :smart_token_refresh_stu2 do
+      run_as_group
+      optional
+      config(
+        inputs: {
+          refresh_token: { name: :ehr_refresh_token },
+          client_id: { name: :ehr_client_id },
+          client_secret: { name: :ehr_client_secret },
+          received_scopes: { name: :ehr_received_scopes }
+        }
+      )
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu2_2_group.rb

@@ -0,0 +1,40 @@
+module USCoreTestKit
+  class SmartStandaloneLaunchSTU22 < Inferno::TestGroup
+    id :us_core_smart_standalone_launch_stu2_2
+    title 'Standalone Launch'
+
+    run_as_group
+
+    group from: :smart_discovery_stu2_2,
+          run_as_group: true
+    group from: :smart_standalone_launch_stu2_2,
+          run_as_group: true
+
+    group from: :smart_openid_connect_stu2_2 do
+      run_as_group
+      optional
+      config(
+        inputs: {
+          id_token: { name: :standalone_id_token },
+          client_id: { name: :standalone_client_id },
+          requested_scopes: { name: :standalone_requested_scopes },
+          access_token: { name: :standalone_access_token },
+          smart_credentials: { name: :standalone_smart_credentials }
+        }
+      )
+    end
+
+    group from: :smart_token_refresh_stu2 do
+      run_as_group
+      optional
+      config(
+        inputs: {
+          refresh_token: { name: :standalone_refresh_token },
+          client_id: { name: :standalone_client_id },
+          client_secret: { name: :standalone_client_secret },
+          received_scopes: { name: :standalone_received_scopes }
+        }
+      )
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb

@@ -2,7 +2,7 @@ require 'tls_test_kit'
 require_relative '../capability_statement/conformance_support_test'
 require_relative '../capability_statement/fhir_version_test'
 require_relative '../capability_statement/json_support_test'
-require_relative './profile_support_test'
+require_relative './resource_support_test'
 
 module USCoreTestKit
   module USCoreV311
@@ -100,7 +100,7 @@ module USCoreTestKit
       test from: :us_core_fhir_version
       test from: :us_core_json_support
 
-      test from: :us_core_profile_support do
+      test from: :us_core_v311_resource_support do
         config(
           options: { us_core_resources: PROFILES.keys }
         )

data/lib/us_core_test_kit/custom_groups/v3.1.1/{profile_support_test.rb → resource_support_test.rb}

@@ -1,7 +1,7 @@
 module USCoreTestKit
   module USCoreV311
     class ProfileSupportTest < Inferno::Test
-      id :us_core_profile_support
+      id :us_core_v311_resource_support
       title 'Capability Statement lists support for required US Core Resoruce Types'
       description %(
         The US Core Implementation Guide states:

data/lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_group.rb

@@ -1,5 +1,5 @@
 require_relative '../smart_app_launch_group'
-require_relative './smart_discovery_stu2_group'
+require_relative 'smart_discovery_stu2_group'
 
 module USCoreTestKit
   module USCoreV700
@@ -9,8 +9,8 @@ module USCoreTestKit
       groups[2].group from: :us_core_v700_smart_discovery_stu2
       groups[2].children[0] = groups[2].children.pop
 
-      groups.last.group from: :us_core_v700_smart_discovery_stu2
-      groups.last.children[0] = groups.last.children.pop
+      groups[3].group from: :us_core_v700_smart_discovery_stu2
+      groups[3].children[0] = groups[3].children.pop
     end
   end
 end

data/lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_stu2_2_group.rb

@@ -0,0 +1,16 @@
+require_relative '../smart_app_launch_group'
+require_relative 'smart_discovery_stu2_2_group'
+
+module USCoreTestKit
+  module USCoreV700
+    class SmartAppLaunchSTU22Group < USCoreTestKit::SmartAppLaunchGroup
+      id :us_core_v700_smart_app_launch_stu2_2
+
+      groups[4].group from: :us_core_v700_smart_discovery_stu2_2
+      groups[4].children[0] = groups[4].children.pop
+
+      groups.last.group from: :us_core_v700_smart_discovery_stu2_2
+      groups.last.children[0] = groups.last.children.pop
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/v7.0.0/smart_discovery_stu2_2_group.rb

@@ -0,0 +1,11 @@
+require_relative '../smart_well_known_capabilities_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class USCoreDiscoverySTU22Group < SMARTAppLaunch::DiscoverySTU22Group
+      id :us_core_v700_smart_discovery_stu2_2
+
+      test from: :us_core_smart_well_known_capabilities
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb

@@ -57,7 +57,7 @@ module USCoreTestKit
       )
       version VERSION
 
-      VALIDATION_MESSAGE_FILTERS = [
+      GENERAL_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
@@ -71,6 +71,8 @@ module USCoreTestKit
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
 
+      VALIDATION_MESSAGE_FILTERS = GENERAL_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
             Generator::GroupMetadata.new(raw_metadata)
@@ -81,7 +83,7 @@ module USCoreTestKit
 
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#3.1.1'
-        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+        message_filters = VALIDATION_MESSAGE_FILTERS
 
         exclude_message do |message|
 
@@ -107,6 +109,10 @@ module USCoreTestKit
           {
             label: 'SMART App Launch 2.0.0',
             value: USCoreOptions::SMART_2
+          },
+          {
+            label: 'SMART App Launch 2.2.0',
+            value: USCoreOptions::SMART_2_2
           }
         ]
 

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

@@ -59,7 +59,7 @@ module USCoreTestKit
       )
       version VERSION
 
-      VALIDATION_MESSAGE_FILTERS = [
+      GENERAL_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
@@ -73,6 +73,8 @@ module USCoreTestKit
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
 
+      VALIDATION_MESSAGE_FILTERS = GENERAL_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
             Generator::GroupMetadata.new(raw_metadata)
@@ -83,7 +85,7 @@ module USCoreTestKit
 
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#4.0.0'
-        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+        message_filters = VALIDATION_MESSAGE_FILTERS
 
         exclude_message do |message|
 
@@ -109,6 +111,10 @@ module USCoreTestKit
           {
             label: 'SMART App Launch 2.0.0',
             value: USCoreOptions::SMART_2
+          },
+          {
+            label: 'SMART App Launch 2.2.0',
+            value: USCoreOptions::SMART_2_2
           }
         ]
 

data/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb

@@ -69,7 +69,7 @@ module USCoreTestKit
       )
       version VERSION
 
-      VALIDATION_MESSAGE_FILTERS = [
+      GENERAL_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
@@ -83,6 +83,8 @@ module USCoreTestKit
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
 
+      VALIDATION_MESSAGE_FILTERS = GENERAL_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
             Generator::GroupMetadata.new(raw_metadata)
@@ -93,7 +95,7 @@ module USCoreTestKit
 
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#5.0.1'
-        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+        message_filters = VALIDATION_MESSAGE_FILTERS
 
         exclude_message do |message|
 
@@ -119,6 +121,10 @@ module USCoreTestKit
           {
             label: 'SMART App Launch 2.0.0',
             value: USCoreOptions::SMART_2
+          },
+          {
+            label: 'SMART App Launch 2.2.0',
+            value: USCoreOptions::SMART_2_2
           }
         ]
 

data/lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_note_must_support_test.rb

@@ -18,8 +18,6 @@ module USCoreTestKit
         * DiagnosticReport.effectiveDateTime
         * DiagnosticReport.encounter
         * DiagnosticReport.issued
-        * DiagnosticReport.media
-        * DiagnosticReport.media.link
         * DiagnosticReport.performer
         * DiagnosticReport.presentedForm
         * DiagnosticReport.result

data/lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_note_reference_resolution_test.rb

@@ -16,7 +16,6 @@ module USCoreTestKit
         Elements which may provide external references include:
 
         * DiagnosticReport.encounter
-        * DiagnosticReport.media.link
         * DiagnosticReport.performer
         * DiagnosticReport.result
         * DiagnosticReport.subject

data/lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/metadata.yml

@@ -192,10 +192,6 @@
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-result
-  - :path: media
-  - :path: media.link
-    :types:
-    - Reference
   - :path: presentedForm
 :mandatory_elements:
 - DiagnosticReport.status

data/lib/us_core_test_kit/generated/v6.1.0/metadata.yml

@@ -1887,10 +1887,6 @@
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-result
-    - :path: media
-    - :path: media.link
-      :types:
-      - Reference
     - :path: presentedForm
   :mandatory_elements:
   - DiagnosticReport.status
@@ -7111,12 +7107,6 @@
         :path: ''
         :code: social-history
         :system: http://terminology.hl7.org/CodeSystem/observation-category
-    - :slice_id: Observation.effective[x]:effectiveDateTime
-      :slice_name: effectiveDateTime
-      :path: effective[x]
-      :discriminator:
-        :type: type
-        :code: DateTime
     :elements:
     - :path: status
     - :path: category
@@ -7128,6 +7118,7 @@
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
     - :path: valueCodeableConcept
       :original_path: value[x]
+    - :path: effective[x]
   :mandatory_elements:
   - Observation.status
   - Observation.category
@@ -10732,12 +10723,6 @@
     - :path: telecom
     - :path: telecom.system
     - :path: telecom.value
-    - :path: address
-    - :path: address.line
-    - :path: address.city
-    - :path: address.state
-    - :path: address.postalCode
-    - :path: address.country
   :mandatory_elements:
   - Practitioner.identifier
   - Practitioner.identifier.system
@@ -10794,6 +10779,8 @@
     :file_name: practitioner_validation_test.rb
   - :id: us_core_v610_practitioner_must_support_test
     :file_name: practitioner_must_support_test.rb
+  - :id: us_core_v610_practitioner_address_test
+    :file_name: practitioner_address_test.rb
   :id: us_core_v610_practitioner
   :file_name: practitioner_group.rb
   :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/metadata.yml

@@ -100,12 +100,6 @@
   - :path: telecom
   - :path: telecom.system
   - :path: telecom.value
-  - :path: address
-  - :path: address.line
-  - :path: address.city
-  - :path: address.state
-  - :path: address.postalCode
-  - :path: address.country
 :mandatory_elements:
 - Practitioner.identifier
 - Practitioner.identifier.system
@@ -162,6 +156,8 @@
   :file_name: practitioner_validation_test.rb
 - :id: us_core_v610_practitioner_must_support_test
   :file_name: practitioner_must_support_test.rb
+- :id: us_core_v610_practitioner_address_test
+  :file_name: practitioner_address_test.rb
 :id: us_core_v610_practitioner
 :file_name: practitioner_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_address_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../practitioner_address_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class PractitionerAddressTest < Inferno::Test
+      include USCoreTestKit::PractitionerAddressTest
+
+      title 'Server support either Practitioner.address or PractitionerRole'
+      description %(
+        US Core Responders SHALL support either US Core PractitionerRole Profile or
+        these data elements in US Core Practitioner Profile
+
+        * Practitioner.address
+        * Practitioner.address.city
+        * Practitioner.address.country
+        * Practitioner.address.line
+        * Practitioner.address.postalCode
+        * Practitioner.address.state
+      )
+
+      id :us_core_v610_practitioner_address_test
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        verify_practitioner_address
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_must_support_test.rb

@@ -12,12 +12,6 @@ module USCoreTestKit
         Statement. This test will look through the Practitioner resources
         found previously for the following must support elements:
 
-        * Practitioner.address
-        * Practitioner.address.city
-        * Practitioner.address.country
-        * Practitioner.address.line
-        * Practitioner.address.postalCode
-        * Practitioner.address.state
         * Practitioner.identifier
         * Practitioner.identifier.system
         * Practitioner.identifier.value

data/lib/us_core_test_kit/generated/v6.1.0/practitioner_group.rb

@@ -4,6 +4,7 @@ require_relative 'practitioner/practitioner_name_search_test'
 require_relative 'practitioner/practitioner_identifier_search_test'
 require_relative 'practitioner/practitioner_validation_test'
 require_relative 'practitioner/practitioner_must_support_test'
+require_relative 'practitioner/practitioner_address_test'
 
 module USCoreTestKit
   module USCoreV610
@@ -82,6 +83,7 @@ read succeeds.
       test from: :us_core_v610_practitioner_identifier_search_test
       test from: :us_core_v610_practitioner_validation_test
       test from: :us_core_v610_practitioner_must_support_test
+      test from: :us_core_v610_practitioner_address_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v6.1.0/smokingstatus/metadata.yml

@@ -144,12 +144,6 @@
       :path: ''
       :code: social-history
       :system: http://terminology.hl7.org/CodeSystem/observation-category
-  - :slice_id: Observation.effective[x]:effectiveDateTime
-    :slice_name: effectiveDateTime
-    :path: effective[x]
-    :discriminator:
-      :type: type
-      :code: DateTime
   :elements:
   - :path: status
   - :path: category
@@ -161,6 +155,7 @@
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: valueCodeableConcept
     :original_path: value[x]
+  - :path: effective[x]
 :mandatory_elements:
 - Observation.status
 - Observation.category