plan_executor 1.0.2 → 1.8.0

data/lib/tests/suites/connectathon_patient_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
 
@@ -19,11 +20,11 @@ module Crucible
         @resources = Crucible::Generator::Resources.new
 
         @patient = @resources.example_patient
-        @patient.xmlId = nil # clear the identifier, in case the server checks for duplicates
+        @patient.id = nil # clear the identifier, in case the server checks for duplicates
         @patient.identifier = nil # clear the identifier, in case the server checks for duplicates
 
         @patient_us = @resources.example_patient_us
-        @patient_us.xmlId = nil # clear the identifier, in case the server checks for duplicates
+        @patient_us.id = nil # clear the identifier, in case the server checks for duplicates
         @patient_us.identifier = nil # clear the identifier, in case the server checks for duplicates
       end
 
@@ -48,10 +49,10 @@ module Crucible
         assert_response_ok(reply)
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
+          temp = reply.resource.id
+          reply.resource.id = nil
           warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -73,15 +74,15 @@ module Crucible
 
         reply = @client.create @patient_us
         @patient_us_id = reply.id
-        @patient_us.xmlId = reply.resource.xmlId || reply.id
+		    @patient_us.id = reply.resource.id || reply.id
 
         assert_response_ok(reply)
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
+          temp = reply.resource.id
+          reply.resource.id = nil
           warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -101,7 +102,7 @@ module Crucible
         }
         skip unless @patient_id
 
-        @patient.xmlId = @patient_id
+		    @patient.id = @patient_id
         @patient.telecom[0].value='1-800-TOLL-FREE'
         @patient.telecom[0].system='phone'
         @patient.name[0].given = ['Crocodile','Pants']
@@ -111,10 +112,10 @@ module Crucible
         assert_response_ok(reply)
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
+          temp = reply.resource.id
+          reply.resource.id = nil
           warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -135,18 +136,19 @@ module Crucible
         }
         skip unless @patient_us_id
 
-        @patient_us.xmlId = @patient_us_id
-        @patient_us.extension[0].value.value.coding[0].code = '1569-3'
-        @patient_us.extension[1].value.value.coding[0].code = '2186-5'
+        @patient_us.id = @patient_us_id
+
+        @patient_us.extension[0].extension[0].valueCoding.code = '1569-3'
+        @patient_us.extension[1].extension[0].valueCoding.code = '2186-5'
 
         reply = @client.update @patient_us, @patient_us_id
         assert_response_ok(reply)
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
-          warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          temp = reply.resource.id
+          reply.resource.id = nil
+          warning { assert @patient_us.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -167,10 +169,11 @@ module Crucible
         }
         skip unless @patient_us_id
 
-        @patient_us.xmlId = @patient_us_id
+		    @patient_us.id = @patient_us_id
+        @patient_us.modifierExtension ||= []
         @patient_us.modifierExtension << FHIR::Extension.new
         @patient_us.modifierExtension[0].url='http://projectcrucible.org/modifierExtension/foo'
-        @patient_us.modifierExtension[0].value = FHIR::AnyType.new('Boolean',true)
+        @patient_us.modifierExtension[0].valueBoolean = true
 
         reply = @client.update @patient_us, @patient_us_id
 
@@ -179,10 +182,10 @@ module Crucible
         assert([200,201,422].include?(reply.code), 'The server should except a modifierExtension, or return 422 if it chooses to reject a modifierExtension it does not understand.',"Server response code: #{reply.code}\n#{reply.body}")
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
+          temp = reply.resource.id
+          reply.resource.id = nil
           warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -192,41 +195,43 @@ module Crucible
 
       #
       # Test if we can update a patient with primitive extensions.
-      #
-      test 'C8T1_2D','Update a patient - BONUS: Primitive Extensions' do
-        metadata {
-          links "#{REST_SPEC_LINK}#update"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_8#2._Update_a_patient'
-          requires resource: 'Patient', methods: ['create','update']
-          validates resource: 'Patient', methods: ['update']
-          validates extensions: ['primitive extensions']
-        }
-        skip unless @patient_us_id
-
-        @patient_us.xmlId = @patient_us_id
-        @patient_us.gender = 'male'
-        pe = FHIR::PrimitiveExtension.new
-        pe.path='_gender'
-        pe['extension'] = [ FHIR::Extension.new ]
-        pe['extension'][0].url = 'http://hl7.org/test/gender'
-        pe['extension'][0].value = FHIR::AnyType.new('String','Male')
-        @patient_us.primitiveExtension << pe
-
-        reply = @client.update @patient_us, @patient_us_id
-
-        assert_response_ok(reply)
-
-        if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
-          warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
-        end
-
-        warning { assert_valid_resource_content_type_present(reply) }
-        warning { assert_last_modified_present(reply) }
-        warning { assert_valid_content_location_present(reply) }
-      end
+      # TODO: Currently primitive extensions are not supported
+      # test 'C8T1_2D','Update a patient - BONUS: Primitive Extensions' do
+      #   metadata {
+      #     links "#{REST_SPEC_LINK}#update"
+      #     links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_8#2._Update_a_patient'
+      #     requires resource: 'Patient', methods: ['create','update']
+      #     validates resource: 'Patient', methods: ['update']
+      #     validates extensions: ['primitive extensions']
+      #   }
+      #   skip unless @patient_us_id
+      #   skip # Primitive Extensions are not supported in the STU3 models
+
+      #   @patient_us.id = @patient_us_id
+      #   @patient_us.gender = 'male'
+      #   pe = FHIR::PrimitiveExtension.new
+      #   pe.path='_gender'
+      #   pe['extension'] = [ FHIR::Extension.new ]
+      #   pe['extension'][0].url = 'http://hl7.org/test/gender'
+      #   pe['extension'][0].valueString = 'Male'
+      #   @patient_us.primitiveExtension ||= []
+      #   @patient_us.primitiveExtension << pe
+
+      #   reply = @client.update @patient_us, @patient_us_id
+
+      #   assert_response_ok(reply)
+
+      #   if !reply.resource.nil?
+      #     temp = reply.resource.id
+      #     reply.resource.id = nil
+      #     warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
+      #     reply.resource.id = temp
+      #   end
+
+      #   warning { assert_valid_resource_content_type_present(reply) }
+      #   warning { assert_last_modified_present(reply) }
+      #   warning { assert_valid_content_location_present(reply) }
+      # end
 
       #
       # Test if we can update a patient with complex extensions.
@@ -241,7 +246,7 @@ module Crucible
         }
         skip unless @patient_us_id
 
-        @patient_us.xmlId = @patient_us_id
+        @patient_us.id = @patient_us_id
         begin
           @patient_us.primitiveExtension.clear
         rescue Exception => e
@@ -249,9 +254,11 @@ module Crucible
         end
         ext = FHIR::Extension.new
         ext.url = 'http://hl7.org/complex/foo'
+        ext.extension ||= []
         ext.extension << FHIR::Extension.new
         ext.extension[0].url='http://complex/foo/bar'
-        ext.extension[0].value=FHIR::AnyType.new('String','foobar')
+        ext.extension[0].valueString = 'foobar'
+        @patient.extension ||= []
         @patient.extension << ext
 
         reply = @client.update @patient_us, @patient_us_id
@@ -259,10 +266,10 @@ module Crucible
         assert_response_ok(reply)
 
         if !reply.resource.nil?
-          temp = reply.resource.xmlId
-          reply.resource.xmlId = nil
+          temp = reply.resource.id
+          reply.resource.id = nil
           warning { assert @patient.equals?(reply.resource), 'The server did not correctly preserve the Patient data.' }
-          reply.resource.xmlId = temp
+          reply.resource.id = temp
         end
 
         warning { assert_valid_resource_content_type_present(reply) }
@@ -285,7 +292,7 @@ module Crucible
         result = @client.resource_instance_history(FHIR::Patient,@patient_id)
         assert_response_ok result
         assert_equal 2, result.resource.total, 'The number of returned versions is not correct'
-        warning { assert_equal 'history', result.resource.fhirType, 'The bundle does not have the correct type: history' }
+        warning { assert_equal 'history', result.resource.type, 'The bundle does not have the correct type: history' }
         warning { check_sort_order(result.resource.entry) }
       end
 
@@ -347,8 +354,8 @@ module Crucible
 
         skip unless @patient_id
 
-        reply = @client.destroy(FHIR::Patient,@patient_id)
-        assert_response_code(reply,204)
+        reply = @client.destroy(FHIR::Patient, @patient_id)
+        assert_response_code(reply, 204)
 
         reply = @client.read(FHIR::Patient, @patient_id)
 

data/lib/tests/suites/connectathon_profile_validation.rb

@@ -12,6 +12,7 @@ module Crucible
 
       def initialize(client1, client2=nil)
         super(client1, client2)
+        @tags.append('connectathon')
         @category = {id: 'connectathon', title: 'Connectathon'}
       end
 
@@ -19,13 +20,13 @@ module Crucible
         @resources = Crucible::Generator::Resources.new
 
         @profile = @resources.track3_profile
-        @profile.xmlId = nil
+        @profile.id = nil
         @profile.identifier = nil # clear the identifiers, in case the server checks for duplicates
         reply = @client.create @profile
-        @profile.xmlId = reply.id if !reply.id.nil?
+        @profile.id = reply.id if !reply.id.nil?
 
         options = {
-          id: @profile.xmlId,
+          id: @profile.id,
           resource: @profile.class,
           format: nil
         }
@@ -34,16 +35,16 @@ module Crucible
 
         @obs = @resources.track3_observations
         @obs.each do |x|
-          x.xmlId = nil
+          x.id = nil
           x.identifier = nil # clear the identifiers, in case the server checks for duplicates
           x.meta = nil
         end
       end
 
       def teardown
-        @client.destroy(FHIR::StructureDefinition, @profile.xmlId) if !@profile.xmlId.nil?
+        @client.destroy(FHIR::StructureDefinition, @profile.id) if !@profile.id.nil?
         # @obs.each do |x|
-        #   @client.destroy(FHIR::Observation, x.xmlId) if !x.xmlId.nil?
+        #   @client.destroy(FHIR::Observation, x.id) if !x.id.nil?
         # end
       end
 
@@ -83,10 +84,10 @@ module Crucible
           validates resource: 'Observation', methods: ['$validate']
           validates profiles: ['validate-profile']
         }
-        
+        skip if @profile.id.nil?
         # @profile_url = "http://hl7.org/fhir/StructureDefinition/#{resource_class.name.demodulize}" # the profile to validate with
         @obs.each do |x|
-          x.meta = FHIR::Resource::ResourceMetaComponent.new
+          x.meta = FHIR::Meta.new
           x.meta.profile = [ @profile_url ]
           reply = @client.validate(x,{profile_uri: @profile_url})
           assert_response_ok(reply)

data/lib/tests/suites/connectathon_scheduling_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
 
@@ -20,43 +21,43 @@ module Crucible
 
         # Create a patient
         @patient = @resources.minimal_patient
-        @patient.xmlId = nil # clear the identifier, in case the server checks for duplicates
-        reply = @client.create(@patient)      
+        @patient.id = nil # clear the identifier, in case the server checks for duplicates
+        reply = @client.create(@patient)
         assert_response_ok(reply)
-        @patient.xmlId = reply.id
+        @patient.id = reply.id
 
         # Create a practitioner
         @practitioner = @resources.scheduling_practitioner
-        @practitioner.xmlId = nil # clear the identifier, in case the server checks for duplicates
-        reply = @client.create(@practitioner)      
+        @practitioner.id = nil # clear the identifier, in case the server checks for duplicates
+        reply = @client.create(@practitioner)
         assert_response_ok(reply)
-        @practitioner.xmlId = reply.id
+        @practitioner.id = reply.id
 
         # Create a schedule
         @schedule = @resources.scheduling_schedule
-        @schedule.xmlId = nil # clear the identifier, in case the server checks for duplicates
-        @schedule.actor.reference = "Practitioner/#{@practitioner.xmlId}"
-        reply = @client.create(@schedule)      
+        @schedule.id = nil # clear the identifier, in case the server checks for duplicates
+        @schedule.actor.reference = "Practitioner/#{@practitioner.id}"
+        reply = @client.create(@schedule)
         assert_response_ok(reply)
-        @schedule.xmlId = reply.id
+        @schedule.id = reply.id
 
         # Create a slot
         @slot = @resources.scheduling_slot
-        @slot.xmlId = nil # clear the identifier, in case the server checks for duplicates
-        @slot.schedule.reference = "Schedule/#{@schedule.xmlId}"
-        reply = @client.create(@slot)      
+        @slot.id = nil # clear the identifier, in case the server checks for duplicates
+        @slot.schedule.reference = "Schedule/#{@schedule.id}"
+        reply = @client.create(@slot)
         assert_response_ok(reply)
-        @slot.xmlId = reply.id
+        @slot.id = reply.id
       end
 
       def teardown
-        @client.destroy(FHIR::Patient, @patient.xmlId) if !@patient.xmlId.nil?
-        @client.destroy(FHIR::Practitioner, @practitioner.xmlId) if !@practitioner.xmlId.nil?
-        @client.destroy(FHIR::Schedule, @schedule.xmlId) if !@schedule.xmlId.nil?
-        @client.destroy(FHIR::Slot, @slot.xmlId) if !@slot.xmlId.nil?
-        @client.destroy(FHIR::Appointment, @appointment.xmlId) if @appointment && !@appointment.xmlId.nil?
-        @client.destroy(FHIR::AppointmentResponse, @appointment_response_patient.xmlId) if @appointment_response_patient && !@appointment_response_patient.xmlId.nil?
-        @client.destroy(FHIR::AppointmentResponse, @appointment_response_practitioner.xmlId) if @appointment_response_practitioner && !@appointment_response_practitioner.xmlId.nil?
+        @client.destroy(FHIR::Patient, @patient.id) if !@patient.id.nil?
+        @client.destroy(FHIR::Practitioner, @practitioner.id) if !@practitioner.try(:id).nil?
+        @client.destroy(FHIR::Schedule, @schedule.id) if !@schedule.try(:id).nil?
+        @client.destroy(FHIR::Slot, @slot.id) if !@slot.try(:id).nil?
+        @client.destroy(FHIR::Appointment, @appointment.id) if @appointment && !@appointment.id.nil?
+        @client.destroy(FHIR::AppointmentResponse, @appointment_response_patient.id) if @appointment_response_patient && !@appointment_response_patient.id.nil?
+        @client.destroy(FHIR::AppointmentResponse, @appointment_response_practitioner.id) if @appointment_response_practitioner && !@appointment_response_practitioner.id.nil?
       end
 
       # Find Practitioner's schedule
@@ -64,7 +65,7 @@ module Crucible
         metadata {
           links "#{REST_SPEC_LINK}#search"
           links "#{BASE_SPEC_LINK}/schedule.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Schedule', methods: ['search']
           validates resource: 'Schedule', methods: ['search']
         }
@@ -74,7 +75,7 @@ module Crucible
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'actor' => "Practitioner/#{@practitioner.xmlId}"
+              'actor' => "Practitioner/#{@practitioner.id}"
             }
           }
         }
@@ -82,7 +83,7 @@ module Crucible
         assert_response_ok(reply)
         assert_bundle_response(reply)
         assert_equal(1, reply.resource.entry.size, 'There should only be one Schedule for the test Practitioner currently in the system.', reply.body)
-        assert_equal(@schedule.xmlId, reply.resource.entry[0].try(:resource).try(:xmlId), 'The correct Schedule was not returned.', reply.body)
+        assert_equal(@schedule.id, reply.resource.entry[0].try(:resource).try(:id), 'The correct Schedule was not returned.', reply.body)
       end
 
       # Find Slot in Practitioner's schedule
@@ -90,7 +91,7 @@ module Crucible
         metadata {
           links "#{REST_SPEC_LINK}#search"
           links "#{BASE_SPEC_LINK}/slot.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Slot', methods: ['search']
           validates resource: 'Slot', methods: ['search']
         }
@@ -100,7 +101,7 @@ module Crucible
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'schedule' => "Schedule/#{@schedule.xmlId}"
+              'schedule' => "Schedule/#{@schedule.id}"
             }
           }
         }
@@ -108,69 +109,70 @@ module Crucible
         assert_response_ok(reply)
         assert_bundle_response(reply)
         assert_equal(1, reply.resource.entry.size, 'There should only be one Slot for the test Practitioner\'s Schedule currently in the system.', reply.body)
-        assert_equal(@slot.xmlId, reply.resource.entry[0].try(:resource).try(:xmlId), 'The correct Slot was not returned.', reply.body)
+        assert_equal(@slot.id, reply.resource.entry[0].try(:resource).try(:id), 'The correct Slot was not returned.', reply.body)
       end
 
-      # Create appointment in slot (proposed) 
+      # Create appointment in slot (proposed)
       test 'CST03','Create Proposed Appointment in Slot' do
         metadata {
           links "#{REST_SPEC_LINK}#create"
           links "#{BASE_SPEC_LINK}/appointment.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Appointment', methods: ['create']
           validates resource: 'Appointment', methods: ['create']
         }
         @appointment = @resources.scheduling_appointment
-        @appointment.xmlId = nil # clear the identifier
-        @appointment.participant[0].actor.reference = "Patient/#{@patient.xmlId}"
-        @appointment.participant[1].actor.reference = "Practitioner/#{@practitioner.xmlId}"
-        reply = @client.create(@appointment)      
+        @appointment.id = nil # clear the identifier
+        @appointment.participant[0].actor.reference = "Patient/#{@patient.id}"
+        @appointment.participant[1].actor.reference = "Practitioner/#{@practitioner.id}"
+        reply = @client.create(@appointment)
         assert_response_ok(reply)
-        @appointment.xmlId = reply.id
-      end 
+        @appointment.id = reply.id
+      end
 
       # Update slot status (busy-tentative)
       test 'CST04','Update Slot status to busy-tentative' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/slot.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Slot', methods: ['update']
           validates resource: 'Slot', methods: ['update']
         }
-        @slot.freeBusyType = 'busy-tentative'
-        reply = @client.update(@slot,@slot.xmlId)      
+        @slot.status = 'busy-tentative'
+        reply = @client.update(@slot,@slot.id)
         assert_response_ok(reply)
-      end   
+      end
 
       # Create appointment response for patient (accepted)
       test 'CST05','Create AppointmentResponse for Patient (accepted)' do
         metadata {
           links "#{REST_SPEC_LINK}#create"
           links "#{BASE_SPEC_LINK}/appointmentresponse.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'AppointmentResponse', methods: ['create']
           validates resource: 'AppointmentResponse', methods: ['create']
         }
         @appointment_response_patient = @resources.scheduling_response_patient
-        @appointment_response_patient.xmlId = nil # clear the identifier
-        @appointment_response_patient.appointment.reference = "Appointment/#{@appointment.xmlId}"
-        reply = @client.create(@appointment_response_patient)      
+        @appointment_response_patient.id = nil # clear the identifier
+        @appointment_response_patient.appointment = @appointment.to_reference
+        @appointment_response_patient.actor = @patient.to_reference
+        reply = @client.create(@appointment_response_patient)
         assert_response_ok(reply)
-        @appointment_response_patient.xmlId = reply.id
-      end 
+        @appointment_response_patient.id = reply.id
+      end
 
       # Update appointment.participant.status for patient (accepted)
       test 'CST06','Update Appointment.participant.status for Patient (accepted)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/appointment.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Appointment', methods: ['update']
           validates resource: 'Appointment', methods: ['update']
         }
         @appointment.participant[0].status = 'accepted'
-        reply = @client.update(@appointment,@appointment.xmlId)      
+        reply = @client.update(@appointment,@appointment.id)
         assert_response_ok(reply)
       end
 
@@ -179,87 +181,142 @@ module Crucible
         metadata {
           links "#{REST_SPEC_LINK}#create"
           links "#{BASE_SPEC_LINK}/appointmentresponse.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'AppointmentResponse', methods: ['create']
           validates resource: 'AppointmentResponse', methods: ['create']
         }
         @appointment_response_practitioner = @resources.scheduling_response_practitioner
-        @appointment_response_practitioner.xmlId = nil # clear the identifier
-        @appointment_response_practitioner.appointment.reference = "Appointment/#{@appointment.xmlId}"
-        reply = @client.create(@appointment_response_practitioner)      
+        @appointment_response_practitioner.id = nil # clear the identifier
+        @appointment_response_practitioner.appointment = @appointment.to_reference
+        @appointment_response_practitioner.actor = @practitioner.to_reference
+        reply = @client.create(@appointment_response_practitioner)
         assert_response_ok(reply)
-        @appointment_response_practitioner.xmlId = reply.id
-      end 
+        @appointment_response_practitioner.id = reply.id
+      end
 
       # Update appointment.participant.status for Practitioner (accepted)
       test 'CST08','Update Appointment.participant.status for Practitioner (accepted)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/appointment.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Appointment', methods: ['update']
           validates resource: 'Appointment', methods: ['update']
         }
         @appointment.participant[1].status = 'accepted'
-        reply = @client.update(@appointment,@appointment.xmlId)      
+        reply = @client.update(@appointment,@appointment.id)
         assert_response_ok(reply)
       end
- 
+
       # Update slot status (busy)
       test 'CST09','Update Slot status (busy)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/slot.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Slot', methods: ['update']
           validates resource: 'Slot', methods: ['update']
         }
-        @slot.freeBusyType = 'busy'
-        reply = @client.update(@slot,@slot.xmlId)      
+        @slot.status = 'busy'
+        reply = @client.update(@slot,@slot.id)
         assert_response_ok(reply)
-      end  
+      end
 
       # Update appointment status (booked)
       test 'CST10','Update Appointment status (booked)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/appointment.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Appointment', methods: ['update']
           validates resource: 'Appointment', methods: ['update']
         }
         @appointment.status = 'booked'
-        reply = @client.update(@appointment,@appointment.xmlId)      
+        reply = @client.update(@appointment,@appointment.id)
         assert_response_ok(reply)
-      end 
+      end
 
       # Update appointment status (cancelled)
       test 'CST11','Update Appointment status (cancelled)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/appointment.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Appointment', methods: ['update']
           validates resource: 'Appointment', methods: ['update']
         }
         @appointment.status = 'cancelled'
-        reply = @client.update(@appointment,@appointment.xmlId)      
+        reply = @client.update(@appointment,@appointment.id)
         assert_response_ok(reply)
-      end 
+      end
 
       # Update slot status (free)
       test 'CST12','Update Slot status (free)' do
         metadata {
           links "#{REST_SPEC_LINK}#update"
           links "#{BASE_SPEC_LINK}/slot.html"
-          links 'http://wiki.hl7.org/index.php?title=FHIR_Connectathon_10#Track_6_-_Scheduling'
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
           requires resource: 'Slot', methods: ['update']
           validates resource: 'Slot', methods: ['update']
         }
-        @slot.freeBusyType = 'free'
-        reply = @client.update(@slot,@slot.xmlId)      
+        @slot.status = 'free'
+        reply = @client.update(@slot,@slot.id)
+        assert_response_ok(reply)
+      end
+
+      test 'CT13', 'Search for Practitioner' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
+          requires resource: 'Practitioner', methods: ['read']
+          validates resource: 'Practitioner', methods: ['read']
+        }
+
+        options = {
+          :search => {
+            :flag => true,
+            :compartment => nil,
+            :parameters => {
+              _count: 1
+            }
+          }
+        }
+
+        reply = @client.search(FHIR::Practitioner, options)
         assert_response_ok(reply)
-      end 
+
+        practitioner = reply.resource.entry.try(:first).try(:resource)
+
+        skip unless practitioner
+
+      end
+
+      test 'CT14', 'Search for HealthcareService' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          links 'http://wiki.hl7.org/index.php?title=201605_ServicesDirectoryAndScheduling_Track'
+          requires resource: 'HealthcareService', methods: ['read']
+          validates resource: 'HealthcareService', methods: ['read']
+        }
+
+        options = {
+          :search => {
+            :flag => true,
+            :compartment => nil,
+            :parameters => {
+              _count: 1
+            }
+          }
+        }
+
+        reply = @client.search(FHIR::HealthcareService, options)
+        assert_response_ok(reply)
+
+        service = reply.resource.entry.try(:first).try(:resource)
+
+        skip unless service
+
+      end
 
     end
   end