us_core_test_kit 0.8.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96c6f3f861e76af7890dece571af5e3c4ca97a8250438807218ac2affe33fce
-  data.tar.gz: 5b005b8775b3855768365acdc237ce371501187102672fbc5058d0214a18dc5f
+  metadata.gz: cb236072789c9942dda9a6a795a2213f6e61d1f8ca0a7597361d6764b6c37314
+  data.tar.gz: 82c2446cdf9298a13a889b00b07e63a60e16b6a500533fb56b58460a89a31a19
 SHA512:
-  metadata.gz: b210de56a48140207534ad50251d849da40023352e34d71b0e4d73d05a307ec02e5c2c04a81e6b40120246ab50e6e68ff8f138b54134c1c46c94906b453ec36a
-  data.tar.gz: e43c0f334ee18d8b7861328890ed0bc791bc4ef3175d439fafb37b0ecda10222b4e5e5100fd00307ce3f92abaaed35450845b556d6dc3e81e79530fea37328dd
+  metadata.gz: cc69744c6b52d9f8d11ed74d058ac519152bd9ce6b789c46853453dc9d1ea781477783a672b690856cedadc69ea10c7b86236f280a4004a9097fdb86efe4c6db
+  data.tar.gz: 9cfa1c3e2246e618fc1eb1e2c0a9663faacc6109ac187dadbfc2151e5a21b87a9cc27a10413320fa708c4eadd364c66eece4adf395eaaa33ac2960bd37318307

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

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

@@ -76,7 +76,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
@@ -89,11 +89,13 @@ module USCoreTestKit
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [
-        %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
-        %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
-        %r{Observation\.effective\.ofType\(Period\).*This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
+        %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|6.1.0},
+        %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|6.1.0},
+        %r{Observation\.effective\.ofType\(Period\)\.end: This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
       ].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)
@@ -104,7 +106,7 @@ module USCoreTestKit
 
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#6.1.0'
-        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+        message_filters = VALIDATION_MESSAGE_FILTERS
 
         exclude_message do |message|
 
@@ -130,6 +132,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
           }
         ]
 
@@ -210,6 +216,9 @@ module USCoreTestKit
 
       group from: :us_core_v610_smart_granular_scopes,
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
+      group from: :us_core_v610_smart_granular_scopes,
+            id: :us_core_v610_smart_granular_scopes_stu2_2,
+            required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT
       
     end
   end

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

@@ -9,6 +9,7 @@ require_relative '../../custom_groups/v7.0.0/screening_assessment_group'
 require_relative '../../provenance_validator'
 require_relative '../../us_core_options'
 require_relative '../../custom_groups/v7.0.0/smart_app_launch_group'
+require_relative '../../custom_groups/v7.0.0/smart_app_launch_stu2_2_group'
 
 require_relative 'patient_group'
 require_relative 'allergy_intolerance_group'
@@ -81,7 +82,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
@@ -95,6 +96,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)
@@ -105,7 +108,7 @@ module USCoreTestKit
 
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#7.0.0'
-        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+        message_filters = VALIDATION_MESSAGE_FILTERS
 
         exclude_message do |message|
 
@@ -131,10 +134,20 @@ 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
           }
         ]
 
-      group from: :us_core_v700_smart_app_launch
+      group from: :us_core_v700_smart_app_launch,
+            required_suite_options: USCoreOptions::SMART_1_REQUIREMENT
+      group from: :us_core_v700_smart_app_launch,
+            required_suite_options: USCoreOptions::SMART_2_REQUIREMENT,
+            id: :us_core_v700_smart_app_launch_stu2
+      group from: :us_core_v700_smart_app_launch_stu2_2,
+            required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT
 
       group do
         input :smart_credentials,
@@ -215,6 +228,9 @@ module USCoreTestKit
 
       group from: :us_core_v700_smart_granular_scopes,
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
+      group from: :us_core_v700_smart_granular_scopes,
+            id: :us_core_v700_smart_granular_scopes_stu2_2,
+            required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT
       
     end
   end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_6.rb

@@ -29,6 +29,7 @@ module USCoreTestKit
         add_patient_uscdi_elements
         update_smoking_status_effective
         remove_practitioner_address
+        remove_diagnosticreport_media
       end
 
       def add_must_support_choices
@@ -92,11 +93,19 @@ module USCoreTestKit
         must_supports[:elements] << { path: 'effective[x]' }
       end
 
+      # US Core v6.1.0 Patch FHIR-44693, Add MustSupport choice between Practitioner.address and PractitionerRole
+      # This is fixed formally in US Core v7
       def remove_practitioner_address
         return unless profile.type == 'Practitioner'
 
         must_supports[:elements].delete_if { |element| element[:path].start_with?('address') }
       end
+
+      # US Core v6.1.0 Patch FHIR-46240, Remove the Must Support on media and media.link
+      def remove_diagnosticreport_media
+        return unless profile.id == 'us-core-diagnosticreport-note'
+        must_supports[:elements].delete_if { |element| element[:path].start_with?('media') }
+      end
     end
   end
 end

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -21,9 +21,9 @@ module USCoreTestKit
         case ig_metadata.reformatted_version
         when 'v610'
           [
-            %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
-            %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
-            %r{Observation\.effective\.ofType\(Period\).*This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
+            %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|6.1.0},
+            %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|6.1.0},
+            %r{Observation\.effective\.ofType\(Period\)\.end: This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
           ]
         else
           []
@@ -84,7 +84,7 @@ module USCoreTestKit
       end
 
       def generate
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
       end
 
       def groups
@@ -146,6 +146,10 @@ module USCoreTestKit
         "../../custom_groups/#{ig_metadata.ig_version}/smart_app_launch_group"
       end
 
+      def stu2_2_smart_app_launch_file_name
+        "../../custom_groups/#{ig_metadata.ig_version}/smart_app_launch_stu2_2_group"
+      end
+
       def smart_app_launch_id
         if us_core_7_and_above?
           "us_core_#{ig_metadata.reformatted_version}_smart_app_launch"

data/lib/us_core_test_kit/us_core_options.rb

@@ -1,10 +1,11 @@
 module USCoreTestKit
-    module USCoreOptions
-      SMART_1 = 'smart_app_launch_1'.freeze
-      SMART_2 = 'smart_app_launch_2'.freeze
-  
-      SMART_1_REQUIREMENT = { smart_app_launch_version: SMART_1 }.freeze
-      SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze
-    end
+  module USCoreOptions
+    SMART_1 = 'smart_app_launch_1'.freeze
+    SMART_2 = 'smart_app_launch_2'.freeze
+    SMART_2_2 = 'smart_app_launch_2_2'.freeze
+
+    SMART_1_REQUIREMENT = { smart_app_launch_version: SMART_1 }.freeze
+    SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze
+    SMART_2_2_REQUIREMENT = { smart_app_launch_version: SMART_2_2 }.freeze
   end
-  
+end

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.8.2'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -131,13 +131,15 @@ files:
 - lib/us_core_test_kit/custom_groups/smart_app_launch_group.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu1.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2.rb
+- lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2_2.rb
 - lib/us_core_test_kit/custom_groups/smart_scopes_constants.rb
 - lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu1_group.rb
+- lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu2_2_group.rb
 - lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu2_group.rb
 - lib/us_core_test_kit/custom_groups/smart_well_known_capabilities_test.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/clinical_notes_guidance_group.rb
-- lib/us_core_test_kit/custom_groups/v3.1.1/profile_support_test.rb
+- lib/us_core_test_kit/custom_groups/v3.1.1/resource_support_test.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/clinical_notes_guidance_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb
@@ -148,6 +150,8 @@ files:
 - lib/us_core_test_kit/custom_groups/v7.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/screening_assessment_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_group.rb
+- lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_stu2_2_group.rb
+- lib/us_core_test_kit/custom_groups/v7.0.0/smart_discovery_stu2_2_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_discovery_stu2_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_granular_scopes_group.rb
 - lib/us_core_test_kit/date_search_validation.rb