plan_executor 1.0.2 → 1.8.0

data/lib/tests/suites/connectathon_terminology_track.rb

@@ -12,6 +12,7 @@ module Crucible
 
       def initialize(client1, client2=nil)
         super(client1, client2)
+        @tags.append('connectathon')
         @category = {id: 'connectathon', title: 'Connectathon'}
       end
 
@@ -32,13 +33,40 @@ module Crucible
           bundle = reply.resource
           @valueset = bundle.entry[0].resource if bundle.entry.size > 0
         end
+
+        @resources = Crucible::Generator::Resources.new
+
+        if @valueset.nil?
+          # The resource was not found, try to create it in case the server
+          # dynamically calculates terminology operations based on local resources
+          codesystem_types = @resources.load_fixture('terminology/codesystem-data-types.json')
+          codesystem_rsrcs = @resources.load_fixture('terminology/codesystem-resource-types.json')
+          valueset_defined = @resources.load_fixture('terminology/valueset-defined-types.json')
+          @codesystem_types_id = @client.create(codesystem_types).id
+          @codesystem_rsrcs_id = @client.create(codesystem_rsrcs).id
+          @valueset_defined_id = @client.create(valueset_defined).id
+          @valueset_defined.id = @valueset_defined_id
+          @valueset = valueset_defined
+        end
+
+        v2_codesystem = @resources.load_fixture('terminology/v2-codesystem.json')
+        v2_valueset = @resources.load_fixture('terminology/v2-valueset.json')
+        @v2_codesystem_id = @client.create(v2_codesystem).id
+        @v2_valueset_id = @client.create(v2_valueset).id
       end
 
       def teardown
-        # not required
+        @client.destroy(FHIR::ValueSet, @valueset_defined_id) if @valueset_defined_id
+        @client.destroy(FHIR::CodeSystem, @codesystem_types_id) if @codesystem_types_id
+        @client.destroy(FHIR::CodeSystem, @codesystem_rsrcs_id) if @codesystem_rsrcs_id
+        @client.destroy(FHIR::ValueSet, @v2_valueset_id) if @v2_valueset_id
+        @client.destroy(FHIR::CodeSystem, @v2_codesystem_id) if @v2_codesystem_id
+        # CT13 does # DELETE codesystem_simple
+        # CT13 does # DELETE valueset_simple
+        # CT17 does # DELETE conceptmap_created_id
       end
 
-      ['GET','POST'].each do |how|  
+      ['GET','POST'].each do |how|
 
         test "CT01#{how[0]}", "Expand a specific ValueSet (#{how})" do
           metadata {
@@ -48,7 +76,7 @@ module Crucible
           }
           skip if @valueset.nil?
           options = {
-            :id => @valueset.xmlId,
+            :id => @valueset.id,
             :operation => {
               :method => how
             }
@@ -56,7 +84,8 @@ module Crucible
           reply = @client.value_set_expansion(options)
           assert_response_ok(reply)
           assert_resource_type(reply, FHIR::ValueSet)
-          check_expansion_for_concepts(reply.resource)
+          reference_set = FHIR::StructureDefinition::METADATA['type']['valid_codes'].values.flatten
+          check_expansion_for_concepts(reply.resource, reference_set)
         end
 
         test "CT02#{how[0]}", "Expand a ValueSet by context (#{how})" do
@@ -69,14 +98,15 @@ module Crucible
             :operation => {
               :method => how,
               :parameters => {
-                'context' => { type: 'Uri', value: 'http://hl7.org/fhir/StructureDefinition/StructureDefinition#StructureDefinition.constrainedType' }
+                'context' => { type: 'Uri', value: 'http://hl7.org/fhir/StructureDefinition/StructureDefinition#StructureDefinition.type' }
               }
             }
           }
           reply = @client.value_set_expansion(options)
           assert_response_ok(reply)
           assert_resource_type(reply, FHIR::ValueSet)
-          check_expansion_for_concepts(reply.resource)
+          reference_set = FHIR::StructureDefinition::METADATA['type']['valid_codes'].values.flatten
+          check_expansion_for_concepts(reply.resource, reference_set)
         end
 
         test "CT03#{how[0]}", "Validate a code using identifier (#{how})" do
@@ -85,12 +115,14 @@ module Crucible
             links "#{BASE_SPEC_LINK}/valueset-operations.html#validate-code"
             validates resource: 'ValueSet', methods: ['$validate-code']
           }
+          skip if @valueset.nil?
           options = {
             :operation => {
               :method => how,
               :parameters => {
-                'code' => { type: 'Code', value: 'female' },
-                'identifier' => { type: 'Uri', value: 'http://hl7.org/fhir/ValueSet/administrative-gender' }
+                'identifier' => { type: 'Uri', value: 'http://hl7.org/fhir/ValueSet/data-types' },
+                'code' => { type: 'Code', value: 'base64Binary' },
+                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/data-types' }
               }
             }
           }
@@ -111,6 +143,7 @@ module Crucible
               :method => how,
               :parameters => {
                 'code' => { type: 'Code', value: 'BRN' },
+                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/v2/0487' },
                 'identifier' => { type: 'Uri', value: 'http://hl7.org/fhir/ValueSet/v2-0487' }
               }
             }
@@ -120,28 +153,28 @@ module Crucible
           check_response_params(reply.body,'result','valueBoolean','true')
         end
 
-        # lookup a v2 code
-        test "CT05#{how[0]}", "Lookup a v2 code using identifier (#{how})" do
+        test "CT06#{how[0]}", "Validate a code by system (#{how})" do
           metadata {
             links "#{BASE_SPEC_LINK}/operations.html#executing"
             links "#{BASE_SPEC_LINK}/valueset-operations.html#validate-code"
-            validates resource: 'ValueSet', methods: ['$lookup']
+            validates resource: 'ValueSet', methods: ['$validate-code']
           }
           options = {
             :operation => {
               :method => how,
               :parameters => {
-                'code' => { type: 'Code', value: 'BRN' },
-                'identifier' => { type: 'Uri', value: 'http://hl7.org/fhir/ValueSet/v2-0487' }
+                'code' => { type: 'Code', value: 'base64Binary' },
+                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/data-types' }
               }
             }
           }
-          reply = @client.value_set_code_lookup(options)
+          reply = @client.value_set_code_validation(options)
           assert_response_ok(reply)
-          check_response_params(reply.body,'display','valueString','Burn')
+          check_response_params(reply.body,'result','valueBoolean','true')
         end
 
-        test "CT06#{how[0]}", "Validate a code by system (#{how})" do
+        # validate v2 code
+        test "CT07#{how[0]}", "Validate a v2 code by system (#{how})" do
           metadata {
             links "#{BASE_SPEC_LINK}/operations.html#executing"
             links "#{BASE_SPEC_LINK}/valueset-operations.html#validate-code"
@@ -151,8 +184,8 @@ module Crucible
             :operation => {
               :method => how,
               :parameters => {
-                'code' => { type: 'Code', value: 'female' },
-                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/administrative-gender' }
+                'code' => { type: 'Code', value: 'BRN' },
+                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/v2/0487' }
               }
             }
           }
@@ -160,20 +193,70 @@ module Crucible
           assert_response_ok(reply)
           check_response_params(reply.body,'result','valueBoolean','true')
         end
+      end # ['GET','POST'].each
 
-        # validate v2 code
-        test "CT07#{how[0]}", "Validate a v2 code by system (#{how})" do
+      test "CT09", "Create a ValueSet that points to a local CodeSystem" do
+        metadata {
+          links "#{REST_SPEC_LINK}#create"
+          links "#{BASE_SPEC_LINK}/codesystem.html"
+          links "#{BASE_SPEC_LINK}/valueset.html#create"
+          validates resource: 'CodeSystem', methods: ['create']
+          validates resource: 'ValueSet', methods: ['create']
+        }
+
+        @resources = Crucible::Generator::Resources.new
+        @codesystem_simple = @resources.codesystem_simple
+        @valueset_simple = @resources.valueset_simple
+
+        # make more unique in case this valueset & codesystem already exists
+        @valueset_simple.url = @valueset_simple.url + rand(10000000).to_s
+        @codesystem_simple.url = @codesystem_simple.url + rand(10000000).to_s
+        @valueset_simple.compose.include.first.system = @codesystem_simple.url
+
+        reply = @client.create @codesystem_simple
+        assert_response_code(reply, 201)
+        @codesystem_created_id = reply.id
+        reply = @client.create @valueset_simple
+        assert_response_code(reply, 201)
+        @valueset_created_id = reply.id
+      end
+
+      ['GET','POST'].each do |how|
+
+        test "CT10#{how[0]}", "Expand a ValueSet that points to a local CodeSystem(#{how})" do
+          metadata {
+            links "#{BASE_SPEC_LINK}/operations.html#executing"
+            links "#{BASE_SPEC_LINK}/valueset-operations.html#expand"
+            validates resource: 'ValueSet', methods: ['$expand']
+          }
+          skip if @valueset_created_id.nil? || @codesystem_created_id.nil?
+          options = {
+            :id => @valueset_created_id,
+            :operation => {
+              :method => how
+            }
+          }
+          reply = @client.value_set_expansion(options)
+          assert_response_ok(reply)
+          assert_resource_type(reply, FHIR::ValueSet)
+          reference_set = @codesystem_simple.concept.map(&:code)
+          check_expansion_for_concepts(reply.resource, reference_set)
+        end
+
+        test "CT11#{how[0]}", "Validate a code from local CodeSystem using identifier(#{how})" do
           metadata {
             links "#{BASE_SPEC_LINK}/operations.html#executing"
             links "#{BASE_SPEC_LINK}/valueset-operations.html#validate-code"
             validates resource: 'ValueSet', methods: ['$validate-code']
           }
+          skip if @valueset_created_id.nil? || @codesystem_created_id.nil?
           options = {
             :operation => {
               :method => how,
               :parameters => {
-                'code' => { type: 'Code', value: 'BRN' },
-                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/v2/0487' }
+                'code' => { type: 'Code', value: @codesystem_simple.concept.first.code },
+                'system' => { type: 'Uri', value: @codesystem_simple.url },
+                'identifier' => { type: 'Uri', value: @valueset_simple.url }
               }
             }
           }
@@ -182,40 +265,134 @@ module Crucible
           check_response_params(reply.body,'result','valueBoolean','true')
         end
 
-        # lookup a v2 code
-        test "CT08#{how[0]}", "Lookup a v2 code by system (#{how})" do
+        test "CT12#{how[0]}", "Lookup code from local CodeSystem using identifier(#{how})" do
           metadata {
             links "#{BASE_SPEC_LINK}/operations.html#executing"
-            links "#{BASE_SPEC_LINK}/valueset-operations.html#validate-code"
+            links "#{BASE_SPEC_LINK}/codesystem-operations.html#lookup"
             validates resource: 'ValueSet', methods: ['$lookup']
           }
+          skip if @codesystem_created_id.nil?
           options = {
             :operation => {
               :method => how,
               :parameters => {
-                'code' => { type: 'Code', value: 'BRN' },
-                'system' => { type: 'Uri', value: 'http://hl7.org/fhir/v2/0487' }
+                'code' => { type: 'Code', value: @codesystem_simple.concept.first.code },
+                'system' => { type: 'Uri', value: @codesystem_simple.url }
               }
             }
           }
-          reply = @client.value_set_code_lookup(options)
+          reply = @client.code_system_lookup(options)
           assert_response_ok(reply)
-          check_response_params(reply.body,'display','valueString','Burn')
+          check_response_params(reply.body,'display','valueString',@codesystem_simple.concept.first.display)
         end
+      end
 
-      end # ['GET','POST'].each
+      test "CT13", "Delete CodeSystem and ValueSet" do
+        metadata {
+          links "#{REST_SPEC_LINK}#delete"
+          links "#{BASE_SPEC_LINK}/valueset.html"
+          links "#{BASE_SPEC_LINK}/codesystem.html"
+          validates resource: 'CodeSystem', methods: ['delete']
+          validates resource: 'ValueSet', methods: ['delete']
+        }
+
+        skip if @codesystem_created_id.nil?
+        reply = @client.destroy FHIR::CodeSystem, @codesystem_created_id
+        assert_response_code(reply, 204)
+
+        skip if @valueset_created_id.nil?
+        @client.destroy FHIR::ValueSet, @valueset_created_id
+        assert_response_code(reply, 204)
+      end
+
+      test "CT14", "Create ConceptMap" do
+        metadata {
+          links "#{REST_SPEC_LINK}#create"
+          links "#{BASE_SPEC_LINK}/conceptmap.html"
+          validates resource: 'ConceptMap', methods: ['create']
+        }
+
+        @resources = Crucible::Generator::Resources.new
+        @conceptmap_simple = @resources.conceptmap_simple
+        @conceptmap_simple.id = nil
+        @conceptmap_simple.url = @conceptmap_simple.url + rand(10000000).to_s
+
+        reply = @client.create @conceptmap_simple
+        assert_response_code(reply, 201)
+        @conceptmap_created_id = reply.id
+      end
+
+      ['GET','POST'].each do |how|
+        test "CT15#{how[0]}", "$translate a code using a ConceptMap (#{how})" do
+          metadata {
+            links "#{BASE_SPEC_LINK}/operations.html#executing"
+            links "#{BASE_SPEC_LINK}/conceptmap-operations.html#translate"
+            validates resource: 'ConceptMap', methods: ['$translate']
+          }
+          skip if @conceptmap_created_id.nil?
+          assert @conceptmap_simple.group.first.try(:element).try(:first), "ConceptMap #{@conceptmap_simple.id} does not have a code to translate in group"
+          options = {
+            :operation => {
+              :method => how,
+              :parameters => {
+                'code' => { type: 'Code', value: @conceptmap_simple.group.first.element.first.code },
+                'system' => { type: 'Uri', value: @conceptmap_simple.group.first.source },
+                'target' => { type: 'Uri', value: @conceptmap_simple.targetReference.reference }
+              }
+            }
+          }
+          reply = @client.concept_map_translate(options)
+          assert_response_ok(reply)
+          check_response_params(reply.body,'result','valueBoolean','true')
+        end
+      end
+
+      test "CT16", "$closure table maintenance" do
+        metadata {
+          links "#{BASE_SPEC_LINK}/operations.html#executing"
+          links "#{BASE_SPEC_LINK}/conceptmap-operations.html#closure"
+          validates resource: 'ConceptMap', methods: ['$closure']
+        }
+        coding = FHIR::Coding.new({'system'=>'http://snomed.info/sct','code'=>'22298006'})
+        options = {
+          :operation => {
+            :method => 'POST',
+            :parameters => {
+              'name' => { type: 'String', value: 'crucible-test-closure' },
+              'concept' => { type: 'Coding', value: coding }
+            }
+          }
+        }
+        reply = @client.closure_table_maintenance(options)
+        assert_response_ok(reply)
+        assert_resource_type(reply, FHIR::ConceptMap)
+        code = reply.resource.element.find{|x|x.code=='22298006'}
+        assert code, 'Closure Table Operation should return the code that was supplied in the request.'
+      end
+
+      test "CT17", "Delete ConceptMap" do
+        metadata {
+          links "#{REST_SPEC_LINK}#delete"
+          links "#{BASE_SPEC_LINK}/conceptmap.html"
+          validates resource: 'ConceptMap', methods: ['delete']
+        }
+
+        skip if @conceptmap_created_id.nil?
+        reply = @client.destroy FHIR::ConceptMap, @conceptmap_created_id
+        assert_response_code(reply, 204)
+      end
 
-      def check_expansion_for_concepts(vs)
+      def check_expansion_for_concepts(vs, ref)
         assert(vs.expansion,'ValueSet should contain expansion.')
         assert(vs.expansion.contains,'ValueSet.expansion.contains elements are missing.')
 
         concepts = vs.expansion.contains.map{|c|c.code}
 
-        expansion_missing = FHIR::ElementDefinition::TypeRefComponent::VALID_CODES[:code] - concepts
-        expansion_added = concepts - FHIR::ElementDefinition::TypeRefComponent::VALID_CODES[:code]
+        expansion_missing = ref - concepts
+        expansion_added = concepts - ref
 
         assert(expansion_missing.empty?,"ValueSet expansion is missing the following concepts: #{expansion_missing}")
-        assert(expansion_added.empty?,"ValueSet expansion contained some unexpected concepts: #{expansion_added}")        
+        assert(expansion_added.empty?,"ValueSet expansion contained some unexpected concepts: #{expansion_added}")
       end
 
       def check_response_params(contents,name,attribute,value)

data/lib/tests/suites/daf_profiles_test.rb

@@ -13,6 +13,7 @@ module Crucible
       def initialize(client1, client2=nil)
         super(client1, client2)
         @tags.append('argonaut')
+        @tags.append('connectathon')
         @category = {id: 'core_functionality', title: 'Core Functionality'}
       end
 
@@ -27,26 +28,31 @@ module Crucible
         # required by DAF. This is a read-only test.
         @daf_patient = Crucible::Tests::DAFResourceGenerator.daf_patient
         reply = @client.create(@daf_patient)
-        @daf_patient.xmlId = reply.id if !reply.id.nil?
+        @daf_patient.id = reply.id if !reply.id.nil?
         # assert_response_created(reply)
       end
 
       def teardown
         # delete resources
-        @client.destroy(FHIR::Patient, @daf_patient.xmlId) if @daf_patient && !@daf_patient.xmlId.nil?
+        @client.destroy(FHIR::Patient, @daf_patient.id) if @daf_patient && !@daf_patient.id.nil?
       end
 
-      # Check Conformance for DAF Profiles
-      test 'DAF00','Check Conformance for DAF Profiles' do
+      # Check CapabilityStatement for DAF Profiles
+      test 'DAF00','Check CapabilityStatement for DAF Profiles' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
-        @conformance = @client.conformanceStatement
+        @conformance = @client.conformance_statement
+        assert(@conformance, 'No capability statement found.')
 
         # Collect the list of DAF profiles
         daf_profiles = @daf_conformance.profile.map{|x|x.reference}
@@ -56,26 +62,31 @@ module Crucible
         rest_profiles = @conformance.rest.map{|r|r.resource.map{|r|r.try(:profile).try(:reference)}}.flatten.compact
 
         missing_daf_profiles = daf_profiles - root_profiles - rest_profiles
-        assert(missing_daf_profiles.compact.empty?, "The Conformance statement does not declare support for the following DAF profiles: #{missing_daf_profiles}", @conformance.to_xml)
+        assert(missing_daf_profiles.compact.empty?, "The CapabilityStatement statement does not declare support for the following DAF profiles: #{missing_daf_profiles}", @conformance.to_xml)
       end
 
-      # Check Conformance for SMART Security Extensions
-      test 'DAF01','Check Conformance for SMART-on-FHIR Security Extensions' do
+      # Check CapabilityStatement for SMART Security Extensions
+      test 'DAF01','Check CapabilityStatement for SMART-on-FHIR Security Extensions' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
         smart_security_base = 'http://fhir-registry.smarthealthit.org/StructureDefinition/oauth-uris'
         smart_security_extensions = ['register','authorize','token']
 
         @rest_index = nil
-        @found_smart_code = false 
+        @found_smart_code = false
         found_smart_base = false
 
+        assert(@conformance, 'No capability statement found.')
         @conformance.rest.each_with_index do |rest,index|
           service = rest.try(:security).try(:service)
           if !service.nil? && !service.empty?
@@ -98,104 +109,119 @@ module Crucible
           end
         end # each restful endpoint
 
-        assert(@found_smart_code,'Conformance does not declare the SMART-on-FHIR security service for any REST endpoints.',@conformance.to_xml)
-        assert((found_smart_base && smart_security_extensions.empty?),"Conformance does not declare the SMART-on-FHIR security extensions: #{smart_security_base} #{smart_security_extensions}",@conformance.to_xml)
+        assert(@found_smart_code,'CapabilityStatement does not declare the SMART-on-FHIR security service for any REST endpoints.',@conformance.to_xml)
+        assert((found_smart_base && smart_security_extensions.empty?),"CapabilityStatement does not declare the SMART-on-FHIR security extensions: #{smart_security_base} #{smart_security_extensions}",@conformance.to_xml)
       end
 
-      # Check that Conformance Resource Interactions
-      test 'DAF02','Check Conformance Resource Interactions against DAF Conformance' do
-        metadata {
+      # Check that CapabilityStatement Resource Interactions
+      test 'DAF02','Check CapabilityStatement Resource Interactions against DAF CapabilityStatement' do
+         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
+        assert(@conformance, 'No capability statement found.')
         rest = @conformance.rest.first
         rest = @conformance.rest[@rest_index] if @found_smart_code
 
         @daf_conformance.rest.first.resource.each do |daf_resource|
-          resource = rest.resource.select{|r|r.fhirType==daf_resource.fhirType}.first
-          assert(!resource.nil?, "Server does not declare support for the #{daf_resource.fhirType} resource.")
+          resource = rest.resource.select{|r|r.type==daf_resource.type}.first
+          assert(!resource.nil?, "Server does not declare support for the #{daf_resource.type} resource.")
 
           # TODO move rest.resource.profile checks into DAF00
           # check profile match
-          warning { assert(resource.profile.reference==daf_resource.profile.reference,"Profile for #{resource.fhirType} does not match #{daf_resource.profile.reference}",resource.profile.reference) }
+          warning { assert(resource.profile.reference==daf_resource.profile.reference,"Profile for #{resource.type} does not match #{daf_resource.profile.reference}",resource.profile.reference) }
 
           # check interaction.code (and interaction.extension.valueCode for SHALL/SHOULD)
-          shall_interactions = daf_resource.interaction.select{|x|x.extension.first.value.value=='SHALL'}.map{|x|x.code}
-          should_interactions = daf_resource.interaction.select{|x|x.extension.first.value.value=='SHOULD'}.map{|x|x.code}
+          shall_interactions = daf_resource.interaction.select{|x|x.extension.first.value=='SHALL'}.map{|x|x.code}
+          should_interactions = daf_resource.interaction.select{|x|x.extension.first.value=='SHOULD'}.map{|x|x.code}
 
           resource.interaction.each do |interaction|
             should_interactions.delete(interaction.code)
             shall_interactions.delete(interaction.code)
           end
 
-          warning { assert(should_interactions.empty?,"Server does not declare support for the following SHOULD interactions on #{resource.fhirType}: #{should_interactions}") }
-          assert(shall_interactions.empty?,"Server does not declare support for the following SHALL interactions on #{resource.fhirType}: #{shall_interactions}")
+          warning { assert(should_interactions.empty?,"Server does not declare support for the following SHOULD interactions on #{resource.type}: #{should_interactions}") }
+          assert(shall_interactions.empty?,"Server does not declare support for the following SHALL interactions on #{resource.type}: #{shall_interactions}")
         end
-      end      
+      end
 
-      # Check that Conformance searchParams
-      test 'DAF03','Check Conformance Search Parameters against DAF Conformance' do
+      # Check that CapabilityStatement searchParams
+      test 'DAF03','Check CapabilityStatement Search Parameters against DAF CapabilityStatement' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
+        assert(@conformance, 'No capability statement found.')
         rest = @conformance.rest.first
         rest = @conformance.rest[@rest_index] if @found_smart_code
 
         @daf_conformance.rest.first.resource.each do |daf_resource|
-          resource = rest.resource.select{|r|r.fhirType==daf_resource.fhirType}.first
-          assert(!resource.nil?, "Server does not declare support for the #{daf_resource.fhirType} resource.")
+          resource = rest.resource.select{|r|r.type==daf_resource.type}.first
+          assert(!resource.nil?, "Server does not declare support for the #{daf_resource.type} resource.")
 
           # check searchParam.name
-          shall_params = daf_resource.searchParam.select{|x|x.extension.first.value.value=='SHALL'}.map{|x|x.name}
-          should_params = daf_resource.searchParam.select{|x|x.extension.first.value.value=='SHOULD'}.map{|x|x.name}
+          shall_params = daf_resource.searchParam.select{|x|x.extension.first.value=='SHALL'}.map{|x|x.name}
+          should_params = daf_resource.searchParam.select{|x|x.extension.first.value=='SHOULD'}.map{|x|x.name}
 
           resource.searchParam.each do |searchParam|
             should_params.delete(searchParam.name)
             shall_params.delete(searchParam.name)
           end
 
-          warning { assert(should_params.empty?,"Server does not declare support for the following SHOULD searchParams on #{resource.fhirType}: #{should_params}") }
-          assert(shall_params.empty?,"Server does not declare support for the following SHALL searchParams on #{resource.fhirType}: #{shall_params}")
+          warning { assert(should_params.empty?,"Server does not declare support for the following SHOULD searchParams on #{resource.type}: #{should_params}") }
+          assert(shall_params.empty?,"Server does not declare support for the following SHALL searchParams on #{resource.type}: #{shall_params}")
 
           # search chains
-          shall_chain = daf_resource.searchParam.select{|x|x.extension.first.value.value=='SHALL'}.map{|x|x.chain}.flatten
-          should_chain = daf_resource.searchParam.select{|x|x.extension.first.value.value=='SHOULD'}.map{|x|x.chain}.flatten
+          shall_chain = daf_resource.searchParam.select{|x|x.extension.first.value=='SHALL'}.map{|x|x.chain}.flatten
+          should_chain = daf_resource.searchParam.select{|x|x.extension.first.value=='SHOULD'}.map{|x|x.chain}.flatten
 
           resource.searchParam.each do |searchParam|
             should_chain -= searchParam.chain
             shall_chain -= searchParam.chain
           end
 
-          warning { assert(should_chain.empty?,"Server does not declare support for the following SHOULD searchParam.chain on #{resource.fhirType}: #{should_chain}") }
-          assert(shall_chain.empty?,"Server does not declare support for the following SHALL searchParam.chain on #{resource.fhirType}: #{shall_chain}")
+          warning { assert(should_chain.empty?,"Server does not declare support for the following SHOULD searchParam.chain on #{resource.type}: #{should_chain}") }
+          assert(shall_chain.empty?,"Server does not declare support for the following SHALL searchParam.chain on #{resource.type}: #{shall_chain}")
 
           # search includes
           search_includes = daf_resource.searchInclude.map(&:clone)
           search_includes -= resource.searchInclude
-          assert(search_includes.empty?,"Server does not declare support for the following SHALL searchIncludes on #{resource.fhirType}: #{search_includes}")
+          assert(search_includes.empty?,"Server does not declare support for the following SHALL searchIncludes on #{resource.type}: #{search_includes}")
         end
-      end      
+      end
 
-      # Check Conformance for $everything on Patient and Encounter
-      test 'DAF04','Check Conformance for $everything on Patient and Encounter' do
+      # Check CapabilityStatement for $everything on Patient and Encounter
+      test 'DAF04','Check CapabilityStatement for $everything on Patient and Encounter' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           links "#{BASE_SPEC_LINK}/patient-operations.html#everything"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
+        assert(@conformance, 'No capability statement found.')
         rest = @conformance.rest.first
         rest = @conformance.rest[@rest_index] if @found_smart_code
 
@@ -208,21 +234,26 @@ module Crucible
         assert((supports_patient_everything || supports_encounter_everything || supports_ambiguous_everything), message)
         warning{ assert((supports_patient_everything || supports_encounter_everything), "Ambiguous everything operation: cannot determine applicable resources. #{message}") }
         warning{ assert(supports_patient_everything, "Cannot find Patient $everything operation. #{message}")}
-        warning{ assert(supports_encounter_everything, "Cannot find Encounter $everything operation. #{message}")}        
+        warning{ assert(supports_encounter_everything, "Cannot find Encounter $everything operation. #{message}")}
       end
 
-      # Check Conformance for $validate operation support
+      # Check CapabilityStatement for $validate operation support
       # NOT REQUIRED BY DAF IMPLEMENTATION GUIDE -- WARNING ONLY
-      test 'DAF05','Optional: Check Conformance for $validate Operation Support' do
+      test 'DAF05','Optional: Check CapabilityStatement for $validate Operation Support' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           links "#{BASE_SPEC_LINK}/resource-operations.html#validate"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
+        assert(@conformance, 'No capability statement found.')
         rest = @conformance.rest.first
         rest = @conformance.rest[@rest_index] if @found_smart_code
 
@@ -231,23 +262,28 @@ module Crucible
         warning{ assert(@supports_validate, message) }
       end
 
-      # Check Conformance for transaction support
+      # Check CapabilityStatement for transaction support
       # NOT REQUIRED BY DAF IMPLEMENTATION GUIDE -- WARNING ONLY
-      test 'DAF06','Optional: Check Conformance for Transaction Support' do
+      test 'DAF06','Optional: Check CapabilityStatement for Transaction Support' do
         metadata {
           links "#{REST_SPEC_LINK}#conformance"
           links "#{BASE_SPEC_LINK}/conformance.html"
+          links "#{REST_SPEC_LINK}#capabilitystatement"
+          links "#{BASE_SPEC_LINK}/capabilitystatement.html"
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           links "#{REST_SPEC_LINK}#transaction"
           requires resource: 'Conformance', methods: ['read']
+          requires resource: 'CapabilityStatement', methods: ['read']
           validates resource: 'Conformance', methods: ['read']
+          validates resource: 'CapabilityStatement', methods: ['read']
         }
 
+        assert(@conformance, 'No capability statement found.')
         rest = @conformance.rest.first
         rest = @conformance.rest[@rest_index] if @found_smart_code
 
         has_transaction_interaction = rest.interaction.any?{|x|x.code=='transaction'}
-        has_transaction_mode = (!rest.transactionMode.nil? && rest.transactionMode!='not-supported')
+        has_transaction_mode = (!rest.interaction.try(:first).nil? && rest.interaction.first !=' not-supported')
 
         message = 'Although not required by the DAF Implementation Guide, the server should support transaction (preferred) or batch, to facilitate the transfer of patient records.'
 
@@ -263,18 +299,20 @@ module Crucible
       # TRY TO SEARCH FOR DAF PROFILED RESOURCES... AND THEN HAVE OUR CLIENT VALIDATE THEM, IF THEY EXIST.
       resources = Crucible::Generator::Resources.new
       daf_conformance = resources.daf_conformance
-      daf_conformance.rest.first.resource.each do |daf_resource|
+      daf_conformance.rest.first.resource.each_with_index do |daf_resource,index|
+
+        key = ((index+1)*10)
 
-        test "DAFS0_#{daf_resource.fhirType}", "Search #{daf_resource.fhirType} for DAF-#{daf_resource.fhirType} compliant resources" do
+        test "DAF#{key+1}_#{daf_resource.type}", "Search #{daf_resource.type} for DAF-#{daf_resource.type} compliant resources" do
           metadata {
             links "#{BASE_SPEC_LINK}/resource.html#profile-tags"
-            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.fhirType.downcase}.html"
+            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.type.downcase}.html"
             links "#{REST_SPEC_LINK}#search"
-            requires resource: "#{daf_resource.fhirType}", methods: ['search']
-            validates resource: "#{daf_resource.fhirType}", methods: ['search']
+            requires resource: "#{daf_resource.type}", methods: ['search']
+            validates resource: "#{daf_resource.type}", methods: ['search']
           }
 
-          klass = "FHIR::#{daf_resource.fhirType}".constantize
+          klass = "FHIR::#{daf_resource.type}".constantize
           options = {
             :search => {
               :parameters => {
@@ -286,48 +324,48 @@ module Crucible
           reply = @client.search(klass,options)
           assert_response_ok(reply)
           assert_bundle_response(reply)
-          warning{ assert((1 >= reply.resource.entry.size), "The server did not return any DAF-#{daf_resource.fhirType}s.") }
+          warning{ assert((1 >= reply.resource.entry.size), "The server did not return any DAF-#{daf_resource.type}s.") }
 
           if reply.resource.entry.size > 0
             # store any results to a @server_side_resources
-            @server_side_resources[daf_resource.fhirType] = reply.resource.entry.map{|x|x.resource}
+            @server_side_resources[daf_resource.type] = reply.resource.entry.map{|x|x.resource}
           end
         end
 
-        test "DAFV0_#{daf_resource.fhirType}", "Client-side validation of DAF-#{daf_resource.fhirType} search results" do
+        test "DAF#{key+2}_#{daf_resource.type}", "Client-side validation of DAF-#{daf_resource.type} search results" do
           metadata {
             links "#{BASE_SPEC_LINK}/resource-operations.html#validate"
-            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.fhirType.downcase}.html"
+            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.type.downcase}.html"
           }
-          resource = @server_side_resources[daf_resource.fhirType]
+          resource = @server_side_resources[daf_resource.type]
           skip if resource.nil? || resource.empty?
-          
-          profiles = FHIR::StructureDefinition.get_profiles_for_resource(daf_resource.fhirType)
-          profile = profiles.select{|x|x.xmlId.start_with?'daf'}.first
+
+          profiles = FHIR::Definitions.get_profiles_for_resource(daf_resource.type)
+          profile = profiles.select{|x|x.id.start_with?'daf'}.first
           skip if profile.nil?
 
           resource.each do |r|
-            assert(profile.is_valid?(r),"The #{daf_resource.fhirType} with ID #{r.xmlId} is not DAF compliant but claims to be.",r.to_xml)
+            assert(profile.is_valid?(r),"The #{daf_resource.type} with ID #{r.id} is not DAF compliant but claims to be.",r.to_xml)
           end
         end
 
         # if there are any profiled results in the @variable, and the server supports $validate, then $validate them
-        test "DAFV1_#{daf_resource.fhirType}", "Server-side validation of DAF-#{daf_resource.fhirType} search results" do
+        test "DAF#{key+3}_#{daf_resource.type}", "Server-side validation of DAF-#{daf_resource.type} search results" do
           metadata {
             links "#{BASE_SPEC_LINK}/resource-operations.html#validate"
-            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.fhirType.downcase}.html"
-            validates resource: "#{daf_resource.fhirType}", methods: ['$validate']
+            links "#{BASE_SPEC_LINK}/daf/daf-#{daf_resource.type.downcase}.html"
+            validates resource: "#{daf_resource.type}", methods: ['$validate']
             validates profiles: ['validate-profile']
           }
           skip unless @supports_validate
-          resource = @server_side_resources[daf_resource.fhirType]
+          resource = @server_side_resources[daf_resource.type]
           skip if resource.nil? || resource.empty?
 
           resource.each do |r|
             reply = @client.validate(r,{profile_uri: daf_resource.profile.reference})
             assert_response_ok(reply)
             if !reply.id.nil?
-              assert( !reply.id.include?('validate'), "Server created an #{daf_resource.fhirType} with the ID `#{reply.resource.xmlId}` rather than validate the resource.", reply.id)
+              assert( !reply.id.include?('validate'), "Server created an #{daf_resource.type} with the ID `#{reply.resource.id}` rather than validate the resource.", reply.id)
             end
           end
         end
@@ -335,7 +373,7 @@ module Crucible
       end
 
       # Validate invalid DAF patient
-      test 'DAFV2', 'Optional: Server should not $validate an invalid DAF-Patient' do
+      test 'DAF07', 'Optional: Server should not $validate an invalid DAF-Patient' do
         metadata {
           links "#{BASE_SPEC_LINK}/patient.html"
           links "#{BASE_SPEC_LINK}/daf/daf-patient.html"
@@ -346,7 +384,7 @@ module Crucible
         }
         skip unless @supports_validate
 
-        # Removing the identifier and adding an "animal" to the 
+        # Removing the identifier and adding an "animal" to the
         # Patient violates the DAF-Patient profile.
         patient = Crucible::Tests::DAFResourceGenerator.daf_patient
         patient.identifier = nil
@@ -354,6 +392,8 @@ module Crucible
 
         reply = @client.validate(patient,{profile_uri: patient.meta.profile.first})
         assert_response_ok(reply)
+        reply_resource = @client.parse_reply(FHIR::OperationOutcome, @client.default_format, reply)
+        reply.resource = reply_resource
         assert_resource_type(reply,FHIR::OperationOutcome)
         failed = reply.resource.issue.any?{|x|['fatal','error'].include?(x.severity) || x.code=='invalid' }
         assert(failed,'The server failed to reject an invalid DAF-Patient.')
@@ -364,7 +404,7 @@ module Crucible
       # Search for DAF Profile fixtures (including by using DAF extensions)
 
       # Test $everything on Patient and Encounter
-      test 'DAF20','Test $everything on Patient' do
+      test 'DAF08','Test $everything on Patient' do
         metadata {
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           links "#{BASE_SPEC_LINK}/patient-operations.html#everything"
@@ -388,13 +428,13 @@ module Crucible
         end
         skip if resource.nil? || resource.empty?
 
-        reply = @client.fetch_patient_record(resource.first.xmlId)
+        reply = @client.fetch_patient_record(resource.first.id)
 
         assert_response_ok(reply)
         assert_bundle_response(reply)
       end
 
-      test 'DAF21','Test $everything on Encounter' do
+      test 'DAF09','Test $everything on Encounter' do
         metadata {
           links "#{BASE_SPEC_LINK}/daf/daf.html"
           links "#{BASE_SPEC_LINK}/encounter-operations.html#everything"
@@ -415,17 +455,17 @@ module Crucible
           assert_response_ok(reply)
           assert_bundle_response(reply)
           resource = reply.resource.entry.map{|x|x.resource}
-        end     
+        end
         skip if resource.nil? || resource.empty?
 
-        reply = @client.fetch_encounter_record(resource.first.xmlId)
+        reply = @client.fetch_encounter_record(resource.first.id)
 
         assert_response_ok(reply)
         assert_bundle_response(reply)
       end
 
       # The DAF Responder SHALL identify the DAF profile(s) supported as part of the FHIR BaseResource.Meta.profile attribute for each instance.
-      
+
     end
   end
 end