onc_certification_g10_test_kit 2.3.0 → 3.0.0

data/lib/onc_certification_g10_test_kit/base_token_refresh_group.rb

@@ -11,8 +11,7 @@ module ONCCertificationG10TestKit
       resources on the server.
 
       Token refreshes are accomplished through a `POST` request to the token
-      exchange endpoint as described in the [SMART App Launch
-      Framework](http://hl7.org/fhir/smart-app-launch/1.0.0/index.html#step-5-later-app-uses-a-refresh-token-to-obtain-a-new-access-token).
+      exchange endpoint as described in the SMART App Launch Framework.
 
       # Test Methodology
 
@@ -24,8 +23,10 @@ module ONCCertificationG10TestKit
 
       * [The OAuth 2.0 Authorization
         Framework](https://tools.ietf.org/html/rfc6749)
-      * [Using a refresh token to obtain a new access
-        token](http://hl7.org/fhir/smart-app-launch/1.0.0/index.html#step-5-later-app-uses-a-refresh-token-to-obtain-a-new-access-token)
+      * [Using a refresh token to obtain a new access token
+        (STU1)](http://hl7.org/fhir/smart-app-launch/1.0.0/index.html#step-5-later-app-uses-a-refresh-token-to-obtain-a-new-access-token)
+      * [Using a refresh token to obtain a new access token
+        (STU2)](http://hl7.org/fhir/smart-app-launch/STU2/app-launch.html#refresh-access-token)
     )
     id :g10_token_refresh
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -265,6 +265,11 @@ module ONCCertificationG10TestKit
           ['type', 'url'].each do |key|
             assert file.key?(key), "Output file did not contain \"#{key}\" as required"
           end
+
+          if config.options[:require_absolute_urls_in_output]
+            assert file['url'].to_s.match?(%r{\Ahttps?://}),
+                   "URLs in output file must be absolute, but found `#{file['url']}`."
+          end
         end
       end
     end

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu2.rb

@@ -6,6 +6,8 @@ module ONCCertificationG10TestKit
     title 'Group Compartment Export Tests STU2'
     id :bulk_data_group_export_stu2
 
+    config(options: { require_absolute_urls_in_output: true })
+
     test do
       title 'Bulk Data Server supports "_outputFormat" query parameter'
       description <<~DESCRIPTION

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_validation.rb

@@ -79,8 +79,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Patient resources returned conform to the US Core Patient Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This#{' '}
-        includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Patient profile. This includes checking for missing data
+        elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'
 
@@ -136,7 +137,9 @@ module ONCCertificationG10TestKit
     test do
       title 'AllergyIntolerance resources returned conform to the US Core AllergyIntolerance Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core AllergyIntolerance profile. This includes
+        checking for missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-allergyintolerance'
 
@@ -154,7 +157,9 @@ module ONCCertificationG10TestKit
     test do
       title 'CarePlan resources returned conform to the US Core CarePlan Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core CarePlan profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-careplan'
 
@@ -172,7 +177,9 @@ module ONCCertificationG10TestKit
     test do
       title 'CareTeam resources returned conform to the US Core CareTeam Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core CareTeam profile. This includes checking for missing data
+        elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-careteam'
 
@@ -188,11 +195,23 @@ module ONCCertificationG10TestKit
     end
 
     test do
-      title 'Condition resources returned conform to the US Core Condition Profile'
+      title 'Condition resources returned conform to the relevant US Core Condition Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the server can provide evidence of support for
+        the following US Core Condition profiles.  This includes checking for
+        missing data elements and value set verification.
+
+        For US Core v3.1.1 and v4.0.0 all resources must conform to the following profile:
+
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition
+
+
+        For US Core v5.0.1, evidence of support for the following two profiles must be demonstrated:
+
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns
+
       DESCRIPTION
-      # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition'
 
       include BulkExportValidationTester
 
@@ -208,7 +227,13 @@ module ONCCertificationG10TestKit
     test do
       title 'Device resources returned conform to the US Core Implantable Device Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that relevant resources returned from bulk data export
+        conform to the US Core Implantable Device profile. This includes
+        checking for missing data elements and value set verification.
+
+        Because not all Device resources on a system must conform to the Implantable Device
+        profile, the tester may choose to provide a list of relevant Device Type Codes
+        as an input to this test.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device'
 
@@ -224,14 +249,16 @@ module ONCCertificationG10TestKit
     end
 
     test do
-      title 'DiagnosticReport resources returned conform to the US Core DiagnosticReport Profile'
+      title 'DiagnosticReport resources returned conform to the relevant US Core DiagnosticReport Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the following US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the server can provide evidence of support for
+        the following US Core DiagnosticReport profile based on the category of
+        the DiagnosticReport. This includes checking for missing data elements
+        and value set verification.
 
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-note
       DESCRIPTION
-      # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-l'
 
       include BulkExportValidationTester
 
@@ -247,7 +274,9 @@ module ONCCertificationG10TestKit
     test do
       title 'DocumentReference resources returned conform to the US Core DocumentReference Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core DocumenReference profile. This includes checking
+        for missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference'
 
@@ -265,7 +294,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Goal resources returned conform to the US Core Goal Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Goal profile. This includes checking for missing
+        data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-goal'
 
@@ -283,7 +314,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Immunization resources returned conform to the US Core Immunization Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Immunization profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-Immunization'
 
@@ -301,7 +334,9 @@ module ONCCertificationG10TestKit
     test do
       title 'MedicationRequest resources returned conform to the US Core MedicationRequest Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core MedicationRequest profile. This includes checking
+        for missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest'
 
@@ -317,11 +352,14 @@ module ONCCertificationG10TestKit
     end
 
     test do
-      title 'Observation resources returned conform to the US Core Observation Profile'
+      title 'Observation resources returned conform to the relevant US Core Observation Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data
-        export conform to the following US Core profiles. This includes
-        checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the following US Core profiles, based on the category or code
+        associated with the Observation. This includes checking for missing data
+        elements and value set verification.
+
+        For US Core v3.1.1, this test expects evidence of the following US Core profiles
 
         * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
         * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
@@ -335,8 +373,47 @@ module ONCCertificationG10TestKit
         * http://hl7.org/fhir/StructureDefinition/bodyweight
         * http://hl7.org/fhir/StructureDefinition/heartrate
         * http://hl7.org/fhir/StructureDefinition/resprate
+
+        For US Core v4.0.0, this test expects evidence of the following US Core profiles
+
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus
+        * http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
+
+        For US Core v5.0.1, this test expects evidence of the following US Core profiles
+
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-test
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-imaging
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sexual-orientation
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-social-history
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sdoh-assessment
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus
+        * http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
+
       DESCRIPTION
-      # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab'
 
       include BulkExportValidationTester
 
@@ -352,7 +429,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Procedure resources returned conform to the US Core Procedure Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Procedure profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure'
 
@@ -370,7 +449,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Encounter resources returned conform to the US Core Encounter Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Encounter profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter'
 
@@ -388,7 +469,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Organization resources returned conform to the US Core Organization Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Organization profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'
 
@@ -406,7 +489,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Practitioner resources returned conform to the US Core Practitioner Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Practioner profile. This includes checking for
+        missing data elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner'
 
@@ -424,7 +509,9 @@ module ONCCertificationG10TestKit
     test do
       title 'Provenance resources returned conform to the US Core Provenance Profile'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core profiles. This includes checking for missing data
+        elements and value set verification.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance'
 
@@ -443,7 +530,10 @@ module ONCCertificationG10TestKit
       title 'Location resources returned conform to the HL7 FHIR Specification Location Resource if bulk data export ' \
             'has Location resources'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification. This test is omitted if bulk data export does not return any Location resources.
+        This test verifies that the resources returned from bulk data export
+        conform to the HL7 FHIR Specification Location Resource. This includes
+        checking for missing data elements and value set verification. This test
+        is omitted if bulk data export does not return any Location resources.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-location'
 
@@ -462,7 +552,10 @@ module ONCCertificationG10TestKit
       title 'Medication resources returned conform to the US Core Medication Profile if bulk data export has ' \
             'Medication resources'
       description <<~DESCRIPTION
-        This test verifies that the resources returned from bulk data export conform to the US Core profiles. This includes checking for missing data elements and value set verification. This test is omitted if bulk data export does not return any Medication resources.
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Medication profile, if available. This includes
+        checking for missing data elements and value set verification. This test
+        is omitted if bulk data export does not return any Medication resources.
       DESCRIPTION
       # link 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication'
 
@@ -476,5 +569,90 @@ module ONCCertificationG10TestKit
         perform_bulk_export_validation
       end
     end
+
+    test do
+      title 'ServiceRequest resources returned conform to the US Core ServiceRequest Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core ServiceRequest profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      required_suite_options us_core_version: 'us_core_5'
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'ServiceRequest'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'RelatedPerson resources returned conform to the US Core RelatedPerson Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core RelatedPerson profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+      required_suite_options us_core_version: 'us_core_5'
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'RelatedPerson'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'QuestionnaireResponse resources returned conform to the US Core QuestionnaireResponse Profile if ' \
+            'bulk data has QuestionnaireResponse resources'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core QuestionnaireResponse profile. This includes checking for missing
+        data elements and value set verification. This test is omitted if bulk
+        data export does not return any QuestionnaireResponse resources.
+      DESCRIPTION
+      required_suite_options us_core_version: 'us_core_5'
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'QuestionnaireResponse'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'PractionerRole resources returned conform to the US Core PractionerRole Profile if bulk data export ' \
+            'has PractionerRole resources'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core PractitionerRole profile. This includes checking for missing
+        data elements and value set verification. This test is omitted if bulk
+        data export does not return any  resources.
+      DESCRIPTION
+      required_suite_options us_core_version: 'us_core_5'
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'PractitionerRole'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
   end
 end

data/lib/onc_certification_g10_test_kit/bulk_export_validation_tester.rb

@@ -1,54 +1,32 @@
-require_relative 'profile_guesser'
+require_relative 'profile_selector'
 
 module ONCCertificationG10TestKit
   module BulkExportValidationTester
     include USCoreTestKit::MustSupportTest
-    include ProfileGuesser
+    include ProfileSelector
 
     attr_reader :metadata
 
     MAX_NUM_COLLECTED_LINES = 100
     MIN_RESOURCE_COUNT = 2
-    OMIT_KLASS = ['Medication', 'Location'].freeze
-
-    def observation_metadata
-      [
-        USCoreTestKit::USCoreV311::PediatricBmiForAgeGroup.metadata,
-        USCoreTestKit::USCoreV311::PediatricWeightForHeightGroup.metadata,
-        USCoreTestKit::USCoreV311::ObservationLabGroup.metadata,
-        USCoreTestKit::USCoreV311::PulseOximetryGroup.metadata,
-        USCoreTestKit::USCoreV311::SmokingstatusGroup.metadata,
-        USCoreTestKit::USCoreV311::HeadCircumferenceGroup.metadata,
-        USCoreTestKit::USCoreV311::BpGroup.metadata,
-        USCoreTestKit::USCoreV311::BodyheightGroup.metadata,
-        USCoreTestKit::USCoreV311::BodytempGroup.metadata,
-        USCoreTestKit::USCoreV311::BodyweightGroup.metadata,
-        USCoreTestKit::USCoreV311::HeartrateGroup.metadata,
-        USCoreTestKit::USCoreV311::ResprateGroup.metadata
-      ]
-    end
-
-    def diagnostic_metadata
-      [
-        USCoreTestKit::USCoreV311::DiagnosticReportLabGroup.metadata,
-        USCoreTestKit::USCoreV311::DiagnosticReportNoteGroup.metadata
-      ]
-    end
-
-    def determine_metadata
-      return observation_metadata if resource_type == 'Observation'
-      return diagnostic_metadata if resource_type == 'DiagnosticReport'
-
-      if resource_type == 'Location' || resource_type == 'Medication'
-        return Array.wrap(USCoreTestKit::USCoreV311::USCoreTestSuite.metadata.find do |meta|
-                            meta.resource == resource_type
-                          end)
+    OMIT_KLASS = ['Medication', 'Location', 'QuestionnaireResponse', 'PractitionerRole'].freeze
+
+    def versioned_us_core_module
+      case suite_options[:us_core_version]
+      when 'us_core_5'
+        USCoreTestKit::USCoreV501
+      when 'us_core_4'
+        USCoreTestKit::USCoreV400
+      else
+        USCoreTestKit::USCoreV311
       end
-      ["USCoreTestKit::USCoreV311::#{resource_type}Group".constantize.metadata]
     end
 
     def metadata_list
-      @metadata_list ||= determine_metadata
+      @metadata_list ||=
+        versioned_us_core_module::USCoreTestSuite
+          .metadata
+          .select { |metadata| metadata.resource == resource_type }
     end
 
     def resources_from_all_files
@@ -122,7 +100,7 @@ module ONCCertificationG10TestKit
     def determine_profile(resource)
       return if resource.resourceType == 'Device' && !predefined_device_type?(resource)
 
-      guess_profile(resource)
+      select_profile(resource)
     end
 
     def validate_conformance(resources)
@@ -143,6 +121,12 @@ module ONCCertificationG10TestKit
       end
     end
 
+    def versioned_profile_url(profile_url)
+      profile_version = metadata_list.find { |metadata| metadata.profile_url == profile_url }&.profile_version
+
+      profile_version ? "#{profile_url}|#{profile_version}" : profile_url
+    end
+
     def check_file_request(url) # rubocop:disable Metrics/CyclomaticComplexity
       line_count = 0
       resources = Hash.new { |h, k| h[k] = [] }
@@ -169,7 +153,8 @@ module ONCCertificationG10TestKit
         resources[profile_url] << resource
         scratch[:patient_ids_seen] = patient_ids_seen | [resource.id] if resource_type == 'Patient'
 
-        unless resource_is_valid?(resource: resource, profile_url: profile_url)
+        profile_with_version = versioned_profile_url(profile_url)
+        unless resource_is_valid?(resource: resource, profile_url: profile_with_version)
           if first_error.key?(:line_number)
             @invalid_resource_count += 1
           else

data/lib/onc_certification_g10_test_kit/encounter_context_test.rb

@@ -0,0 +1,30 @@
+module ONCCertificationG10TestKit
+  class EncounterContextTest < Inferno::Test
+    title 'OAuth token exchange response body contains encounter context and encounter resource can be retrieved'
+    description %(
+      The `encounter` field is a String value with a encounter id, indicating that
+      the app was launched in the context of this FHIR Encounter.
+    )
+    id :g10_encounter_context
+    input :encounter_id, :url
+    input :smart_credentials, type: :oauth_credentials
+
+    fhir_client :authenticated do
+      url :url
+      oauth_credentials :smart_credentials
+    end
+
+    run do
+      skip_if smart_credentials.access_token.blank?, 'No access token was received during the SMART launch'
+
+      skip_if encounter_id.blank?, 'Token response did not contain `encounter` field'
+
+      skip_if request.status != 200, 'Token was not successfully refreshed' if config.options[:refresh_test]
+
+      fhir_read(:encounter, encounter_id, client: :authenticated)
+
+      assert_response_status(200)
+      assert_resource_type(:encounter)
+    end
+  end
+end

data/lib/onc_certification_g10_test_kit/feature.rb

@@ -1,13 +1,10 @@
 module ONCCertificationG10TestKit
   module Feature
-    class << self
-      def us_core_v4?
-        ENV.fetch('US_CORE_4_ENABLED', 'false')&.casecmp?('true')
-      end
-
-      def bulk_data_v2?
-        ENV.fetch('BULk_DATA_V2_ENABLED', 'false')&.casecmp?('true')
-      end
+    class << self # rubocop:disable Lint/EmptyClass
+      # This is how you can define feature flags to be used in the g10 test kit
+      # def us_core_v4?
+      #   ENV.fetch('US_CORE_4_ENABLED', 'false')&.casecmp?('true')
+      # end
     end
   end
 end

data/lib/onc_certification_g10_test_kit/limited_scope_grant_test.rb

@@ -12,7 +12,7 @@ module ONCCertificationG10TestKit
 
     input :received_scopes, :expected_resources
 
-    def possible_resources
+    POSSIBLE_RESOURCES =
       [
         'AllergyIntolerance',
         'CarePlan',
@@ -27,13 +27,26 @@ module ONCCertificationG10TestKit
         'Observation',
         'Procedure',
         'Patient'
-      ]
+      ].freeze
+
+    V5_POSSIBLE_RESOURCES =
+      (POSSIBLE_RESOURCES + ['Encounter', 'ServiceRequest']).freeze
+
+    def possible_resources
+      return V5_POSSIBLE_RESOURCES if suite_options[:us_core_version] == 'us_core_5'
+
+      POSSIBLE_RESOURCES
     end
 
     def scope_granting_access?(resource_type, scopes)
-      scopes.any? do |scope|
-        scope.start_with?("patient/#{resource_type}", 'patient/*') && scope.end_with?('*', 'read')
-      end
+      scopes
+        .select { |scope| scope.start_with?("patient/#{resource_type}", 'patient/*') }
+        .any? do |scope|
+          _type, resource_access = scope.split('/')
+          _resource, access_level = resource_access.split('.')
+
+          access_level.match?(/\A(\*|read|c?ru?d?s?\b)/)
+        end
     end
 
     run do