us_core_test_kit 0.2.4 → 0.2.5

data/lib/us_core_test_kit/generator/validation_test_generator.rb

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

data/lib/us_core_test_kit/generator.rb

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

data/lib/us_core_test_kit/must_support_test.rb

@@ -140,6 +140,12 @@ module USCoreTestKit
             rescue ArgumentError
               false
             end
+          when 'DateTime'
+            begin
+              DateTime.parse(element)
+            rescue ArgumentError
+              false
+            end
           when 'String'
             element.is_a? String
           else

data/lib/us_core_test_kit/search_test.rb

@@ -228,8 +228,9 @@ module USCoreTestKit
 
           search_and_check_response(params_with_comparator)
 
-          fetch_all_bundled_resources
-            .each { |resource| check_resource_against_params(resource, params_with_comparator) }
+          fetch_all_bundled_resources.each do |resource| 
+            check_resource_against_params(resource, params_with_comparator) if resource.resourceType == resource_type
+          end
         end
 
         search_variant_test_records[:comparator_searches] << name

data/lib/us_core_test_kit/validation_test.rb

@@ -5,6 +5,7 @@ module USCoreTestKit
 
     def perform_validation_test(resources,
                                 profile_url,
+                                profile_version,
                                 skip_if_empty: true)
 
       skip_if skip_if_empty && resources.blank?,
@@ -13,14 +14,15 @@ module USCoreTestKit
       omit_if resources.blank?,
               "No #{resource_type} resources provided so the #{profile_url} profile does not apply"
 
+      profile_with_version = "#{profile_url}|#{profile_version}"
       resources.each do |resource|
-        resource_is_valid?(resource: resource, profile_url: profile_url)
+        resource_is_valid?(resource: resource, profile_url: profile_with_version)
         check_for_dar(resource)
       end
 
       errors_found = messages.any? { |message| message[:type] == 'error' }
 
-      assert !errors_found, "Resource does not conform to the profile #{profile_url}"
+      assert !errors_found, "Resource does not conform to the profile #{profile_with_version}"
     end
 
     def check_for_dar(resource)

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Stephen MacVicar
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -818,14 +818,14 @@ files:
 - lib/us_core_test_kit/generator/suite_generator.rb
 - lib/us_core_test_kit/generator/terminology_binding_metadata_extractor.rb
 - lib/us_core_test_kit/generator/validation_test_generator.rb
-- lib/us_core_test_kit/igs/v311/StructureDefinition-bodyheight.json
-- lib/us_core_test_kit/igs/v311/StructureDefinition-bodytemp.json
-- lib/us_core_test_kit/igs/v311/StructureDefinition-bodyweight.json
-- lib/us_core_test_kit/igs/v311/StructureDefinition-bp.json
-- lib/us_core_test_kit/igs/v311/StructureDefinition-heartrate.json
-- lib/us_core_test_kit/igs/v311/StructureDefinition-resprate.json
-- lib/us_core_test_kit/igs/v311/package.tgz
-- lib/us_core_test_kit/igs/v400/package.tgz
+- lib/us_core_test_kit/igs/us_core_311.tgz
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodyheight.json
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodytemp.json
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodyweight.json
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bp.json
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-heartrate.json
+- lib/us_core_test_kit/igs/us_core_311/StructureDefinition-resprate.json
+- lib/us_core_test_kit/igs/us_core_400.tgz
 - lib/us_core_test_kit/must_support_test.rb
 - lib/us_core_test_kit/read_test.rb
 - lib/us_core_test_kit/reference_resolution_test.rb
@@ -840,7 +840,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/inferno_framework/us-core-test-kit
   source_code_uri: https://github.com/inferno_framework/us-core-test-kit
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -856,7 +856,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: US Core Inferno tests
 test_files: []