us_core_test_kit 0.6.5 → 0.7.1

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/{document_reference_patient_category_granular_scope_test.rb → document_reference_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class DocumentReferencePatientCategoryGranularScopeTest < Inferno::Test
+    class DocumentReferencePatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for DocumentReference search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_DocumentReference_patient_category_granular_scope_test
+      id :us_core_v700_ballot_DocumentReference_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/{document_reference_patient_granular_scope_test.rb → document_reference_patient_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class DocumentReferencePatientGranularScopeTest < Inferno::Test
+    class DocumentReferencePatientGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for DocumentReference search by patient based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_DocumentReference_patient_granular_scope_test
+      id :us_core_v700_ballot_DocumentReference_patient_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/{document_reference_patient_status_granular_scope_test.rb → document_reference_patient_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class DocumentReferencePatientStatusGranularScopeTest < Inferno::Test
+    class DocumentReferencePatientStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for DocumentReference search by patient + status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_DocumentReference_patient_status_granular_scope_test
+      id :us_core_v700_ballot_DocumentReference_patient_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/{document_reference_patient_type_granular_scope_test.rb → document_reference_patient_type_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class DocumentReferencePatientTypeGranularScopeTest < Inferno::Test
+    class DocumentReferencePatientTypeGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for DocumentReference search by patient + type based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_DocumentReference_patient_type_granular_scope_test
+      id :us_core_v700_ballot_DocumentReference_patient_type_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/{document_reference_patient_type_period_granular_scope_test.rb → document_reference_patient_type_period_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class DocumentReferencePatientTypePeriodGranularScopeTest < Inferno::Test
+    class DocumentReferencePatientTypePeriodGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for DocumentReference search by patient + type + period based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_DocumentReference_patient_type_period_granular_scope_test
+      id :us_core_v700_ballot_DocumentReference_patient_type_period_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/metadata.yml

@@ -314,20 +314,22 @@
 - :id: us_core_v400_document_reference_custodian_test
   :file_name: "../../custom_groups/v4.0.0/document_reference_custodian_test.rb"
 :granular_scope_tests:
-- :id: us_core_v700_ballot_DocumentReference_patient_granular_scope_test
-  :file_name: document_reference_patient_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference__id_granular_scope_test
-  :file_name: document_reference_id_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference_patient_category_granular_scope_test
-  :file_name: document_reference_patient_category_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference_patient_category_date_granular_scope_test
-  :file_name: document_reference_patient_category_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference_patient_type_period_granular_scope_test
-  :file_name: document_reference_patient_type_period_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference_patient_type_granular_scope_test
-  :file_name: document_reference_patient_type_granular_scope_test.rb
-- :id: us_core_v700_ballot_DocumentReference_patient_status_granular_scope_test
-  :file_name: document_reference_patient_status_granular_scope_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_granular_scope_search_test
+  :file_name: document_reference_patient_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference__id_granular_scope_search_test
+  :file_name: document_reference_id_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_category_granular_scope_search_test
+  :file_name: document_reference_patient_category_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_category_date_granular_scope_search_test
+  :file_name: document_reference_patient_category_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_type_period_granular_scope_search_test
+  :file_name: document_reference_patient_type_period_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_type_granular_scope_search_test
+  :file_name: document_reference_patient_type_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_patient_status_granular_scope_search_test
+  :file_name: document_reference_patient_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DocumentReference_granular_scope_read_test
+  :file_name: document_reference_granular_scope_read_test.rb
 :id: us_core_v700_ballot_document_reference_granular_scope_1_group
 :file_name: document_reference_granular_scope1_group.rb
 :delayed_references:

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/metadata.yml

@@ -273,16 +273,18 @@
 - :id: us_core_v700_ballot_observation_lab_reference_resolution_test
   :file_name: observation_lab_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v700_ballot_Observation_patient_category_granular_scope_test
-  :file_name: observation_patient_category_granular_scope_test.rb
-- :id: us_core_v700_ballot_Observation_patient_category_date_granular_scope_test
-  :file_name: observation_patient_category_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_Observation_patient_code_granular_scope_test
-  :file_name: observation_patient_code_granular_scope_test.rb
-- :id: us_core_v700_ballot_Observation_patient_category_status_granular_scope_test
-  :file_name: observation_patient_category_status_granular_scope_test.rb
-- :id: us_core_v700_ballot_Observation_patient_code_date_granular_scope_test
-  :file_name: observation_patient_code_date_granular_scope_test.rb
+- :id: us_core_v700_ballot_Observation_patient_category_granular_scope_search_test
+  :file_name: observation_patient_category_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Observation_patient_category_date_granular_scope_search_test
+  :file_name: observation_patient_category_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Observation_patient_code_granular_scope_search_test
+  :file_name: observation_patient_code_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Observation_patient_category_status_granular_scope_search_test
+  :file_name: observation_patient_category_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Observation_patient_code_date_granular_scope_search_test
+  :file_name: observation_patient_code_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Observation_granular_scope_read_test
+  :file_name: observation_granular_scope_read_test.rb
 :id: us_core_v700_ballot_observation_granular_scope_2_group
 :file_name: observation_granular_scope2_group.rb
 :delayed_references:

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_granular_scope_read_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../../generator/group_metadata'
+require_relative '../../../../granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV700_BALLOT
+    class ObservationGranularScopeReadTest < Inferno::Test
+      include USCoreTestKit::GranularScopeReadTest
+
+      title 'Server filters results for Observation reads based on granular scopes'
+      description %(
+This test attempts Observation reads 
+and verifies that the results have been
+filtered based on the granted granular scopes.
+
+      )
+
+      id :us_core_v700_ballot_Observation_granular_scope_read_test
+
+      def resource_type
+        'Observation'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_scope_read_test
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/{observation_patient_category_date_granular_scope_test.rb → observation_patient_category_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ObservationPatientCategoryDateGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category + date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_Observation_patient_category_date_granular_scope_test
+      id :us_core_v700_ballot_Observation_patient_category_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/{observation_patient_category_granular_scope_test.rb → observation_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ObservationPatientCategoryGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_Observation_patient_category_granular_scope_test
+      id :us_core_v700_ballot_Observation_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/{observation_patient_category_status_granular_scope_test.rb → observation_patient_category_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ObservationPatientCategoryStatusGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category + status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_Observation_patient_category_status_granular_scope_test
+      id :us_core_v700_ballot_Observation_patient_category_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/{observation_patient_code_date_granular_scope_test.rb → observation_patient_code_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ObservationPatientCodeDateGranularScopeTest < Inferno::Test
+    class ObservationPatientCodeDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + code + date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_Observation_patient_code_date_granular_scope_test
+      id :us_core_v700_ballot_Observation_patient_code_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/{observation_patient_code_granular_scope_test.rb → observation_patient_code_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ObservationPatientCodeGranularScopeTest < Inferno::Test
+    class ObservationPatientCodeGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + code based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_Observation_patient_code_granular_scope_test
+      id :us_core_v700_ballot_Observation_patient_code_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/metadata.yml

@@ -328,20 +328,22 @@
 - :id: us_core_v700_ballot_service_request_reference_resolution_test
   :file_name: service_request_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v700_ballot_ServiceRequest_patient_granular_scope_test
-  :file_name: service_request_patient_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest__id_granular_scope_test
-  :file_name: service_request_id_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest_patient_category_authored_granular_scope_test
-  :file_name: service_request_patient_category_authored_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest_patient_category_granular_scope_test
-  :file_name: service_request_patient_category_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest_patient_code_authored_granular_scope_test
-  :file_name: service_request_patient_code_authored_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest_patient_code_granular_scope_test
-  :file_name: service_request_patient_code_granular_scope_test.rb
-- :id: us_core_v700_ballot_ServiceRequest_patient_status_granular_scope_test
-  :file_name: service_request_patient_status_granular_scope_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_granular_scope_search_test
+  :file_name: service_request_patient_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest__id_granular_scope_search_test
+  :file_name: service_request_id_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_category_authored_granular_scope_search_test
+  :file_name: service_request_patient_category_authored_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_category_granular_scope_search_test
+  :file_name: service_request_patient_category_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_code_authored_granular_scope_search_test
+  :file_name: service_request_patient_code_authored_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_code_granular_scope_search_test
+  :file_name: service_request_patient_code_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_patient_status_granular_scope_search_test
+  :file_name: service_request_patient_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_ServiceRequest_granular_scope_read_test
+  :file_name: service_request_granular_scope_read_test.rb
 :id: us_core_v700_ballot_service_request_granular_scope_2_group
 :file_name: service_request_granular_scope2_group.rb
 :delayed_references:

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_granular_scope_read_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../../generator/group_metadata'
+require_relative '../../../../granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV700_BALLOT
+    class ServiceRequestGranularScopeReadTest < Inferno::Test
+      include USCoreTestKit::GranularScopeReadTest
+
+      title 'Server filters results for ServiceRequest reads based on granular scopes'
+      description %(
+This test attempts ServiceRequest reads 
+and verifies that the results have been
+filtered based on the granted granular scopes.
+
+      )
+
+      id :us_core_v700_ballot_ServiceRequest_granular_scope_read_test
+
+      def resource_type
+        'ServiceRequest'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_scope_read_test
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/{service_request_id_granular_scope_test.rb → service_request_id_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ServiceRequestIdGranularScopeTest < Inferno::Test
+    class ServiceRequestIdGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for ServiceRequest search by _id based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_ServiceRequest__id_granular_scope_test
+      id :us_core_v700_ballot_ServiceRequest__id_granular_scope_search_test
 
       def self.properties
         @properties ||= SearchTestProperties.new(
@@ -30,7 +30,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/{service_request_patient_category_authored_granular_scope_test.rb → service_request_patient_category_authored_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ServiceRequestPatientCategoryAuthoredGranularScopeTest < Inferno::Test
+    class ServiceRequestPatientCategoryAuthoredGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for ServiceRequest search by patient + category + authored based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_ServiceRequest_patient_category_authored_granular_scope_test
+      id :us_core_v700_ballot_ServiceRequest_patient_category_authored_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/{service_request_patient_category_granular_scope_test.rb → service_request_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ServiceRequestPatientCategoryGranularScopeTest < Inferno::Test
+    class ServiceRequestPatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for ServiceRequest search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_ServiceRequest_patient_category_granular_scope_test
+      id :us_core_v700_ballot_ServiceRequest_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/{service_request_patient_code_authored_granular_scope_test.rb → service_request_patient_code_authored_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
-    class ServiceRequestPatientCodeAuthoredGranularScopeTest < Inferno::Test
+    class ServiceRequestPatientCodeAuthoredGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for ServiceRequest search by patient + code + authored based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v700_ballot_ServiceRequest_patient_code_authored_granular_scope_test
+      id :us_core_v700_ballot_ServiceRequest_patient_code_authored_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end