plan_executor 1.0.2 → 1.8.0

data/lib/tests/suites/argonaut_provider_connectathon_test.rb

@@ -0,0 +1,234 @@
+module Crucible
+  module Tests
+    class ArgonautProviderConnectathonTest < BaseSuite
+      def id
+        'ArgonautProviderConnectathonTest'
+      end
+
+      def description
+        'Test suite for the Argonaut Provider Directory Virtual Connectathon'
+      end
+
+      def details
+        {
+          'Overview' => 'Test suite for the Argonaut Provider Directory Virtual Connectathon'
+        }
+      end
+
+      def initialize(client1, client2 = nil)
+        super(client1, client2)
+        @tags.append('provider')
+        @tags.append('connectathon')
+        @category = {id: 'argonaut', title: 'Argonaut'}
+      end
+
+      test 'APCT01', 'GET a set of Practitioners to test' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          links "#{REST_SPEC_LINK}#search"
+          requires resource: 'Practitioner', methods: ['read', 'search']
+          validates resource: 'Practitioner', methods: ['read', 'search']
+        }
+
+        # Basically just get a group of 10 Practitioners
+        options = {
+            :search => {
+              # :flag => true,
+              :compartment => nil,
+              :parameters => {
+                _count: 100
+              }
+            }
+          }
+
+          result = @client.search(FHIR::Practitioner, options)
+
+          assert_response_ok(result)
+
+          @practitioners = result.resource.try(:entry)
+
+          assert @practitioners, 'No Practitioners found'
+
+      end
+
+      test 'APCT02', 'Test ability to locate a Practitioner\'s Telecom/Physical Address' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          requires resource: 'Practitioner', methods: ['read']
+          validates resource: 'Practitioner', methods: ['read']
+        }
+
+        skip if !@practitioners
+
+        practitioner_id = @practitioners.select{ |p| !p.resource.role.empty? }.sample.try(:resource).try(:id)
+        assert practitioner_id, 'No practitioner found with a role'
+
+        @practitioner = @client.read(FHIR::Practitioner, practitioner_id).try(:resource)
+
+        assert @practitioner, "No Practitioner found for ID #{practitioner_id}"
+
+        assert @practitioner.role.select { |pr|
+          !pr.location.empty?
+        }.size >= 1, "None of the Roles associated with Practitioner #{@practitioner.identifier.first.value}'s contain Location information"
+
+        # Test for address presence
+        assert @practitioner.role.select { |pr|
+          pr.location.select { |locref|
+            # Try and find the Location in contained/Server resources
+            loc = resolve_reference(@practitioner, FHIR::Location, locref.reference)
+            loc && !loc.address.nil?
+          }.size >= 1
+        }.size >= 1, "None of the Locations associated with Practitioner #{@practitioner.identifier.first.value}'s Roles contain Address information"
+
+        # Test for telecom presence
+        assert @practitioner.role.select { |pr|
+          pr.location.select { |locref|
+            # Try and find the Location in contained/Server resources
+            loc = resolve_reference(@practitioner, FHIR::Location, locref.reference)
+             # See if any of the location resources have telecom elements on them
+            loc && !loc.telecom.nil? && !loc.telecom.empty?
+          }.size >= 1
+        }.size >= 1 || @practitioner.role.select { |pr| !pr.telecom.empty? }.size >= 1, "None of the roles associated with Practitioner #{@practitioner.identifier.first.value} contain Telecom information"
+
+      end
+
+      test 'APCT03', 'Test ability to locate a Provider\'s Direct Address' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          requires resource: 'Practitioner', methods: ['read', 'search']
+          requires resource: 'PractitionerRole', methods: ['read']
+          requires resource: 'Location', methods: ['read']
+          validates resource: 'Practitioner', methods: ['read', 'search']
+          validates resource: 'PractitionerRole', methods: ['read']
+          validates resource: 'Location', methods: ['read']
+        }
+        skip if !@practitioners || !@practitioner
+
+        assert @practitioner.role.select { |pr| !pr.endpoint.empty? }.size >= 1, "No Endpoints found for Practitioner #{@practitioner.identifier.first.value}"
+        assert @practitioner.role.select { |pr|
+          pr.endpoint.select { |endref|
+            endpoint = resolve_reference(@practitioner, FHIR::Endpoint, endref.reference)
+            endpoint && !endpoint.address.nil? && !endpoint.address.empty?
+          }.size >= 1
+        }.size >= 1, "No Endpoints found with direct address found for Practitioner #{@practitioner.identifier.first.value}"
+      end
+
+      test 'APCT04', 'Test ability to locate an Organization\'s Endpoint' do
+        metadata {
+          links "#{REST_SPEC_LINK}#read"
+          requires resource: 'Organization', methods: ['read', 'search']
+          requires resource: 'Endpoint', methods: ['read']
+          validates resource: 'Organization', methods: ['read', 'search']
+          validates resource: 'Endpoint', methods: ['read']
+        }
+
+        options = {
+            :search => {
+              # :flag => true,
+              :compartment => nil,
+              :parameters => {
+                _count: 100
+              }
+            }
+          }
+
+        result = @client.search(FHIR::Organization, options)
+
+        assert_response_ok(result)
+
+        orgs = result.resource.try(:entry)
+
+        assert orgs, 'No Organizations found'
+
+        assert orgs.select{ |org| !org.resource.endpoint.empty? }.size >= 1, "No Organization found with an Endpoint"
+      end
+
+      test 'APCT05', 'Test ability to locate a Location\'s Telecom/physical address' do
+        metadata {
+          requires resource: 'Location', methods: ['read']
+          validates resource: 'Location', methods: ['read']
+          requires resource: 'Address', methods: ['read']
+          validates resource: 'Address', methods: ['read']
+          requires resource: 'ContactPoint', methods: ['read']
+          validates resource: 'ContactPoint', methods: ['read']
+        }
+
+        options = {
+            :search => {
+              # :flag => true,
+              :compartment => nil,
+              :parameters => {
+                _count: 100
+              }
+            }
+          }
+
+        result = @client.search(FHIR::Location, options)
+
+        assert_response_ok(result)
+
+        locs = result.resource.try(:entry)
+
+        assert locs, "No Locations found"
+
+        assert locs.select { |loc| !loc.resource.address.nil? }.size >= 1, "No Locations found with non-empty Address"
+
+        assert locs.select { |loc| !loc.resource.telecom.nil? && !loc.resource.telecom.empty? }.size >= 1, "No Locations found with non-empty Telecom"
+
+      end
+
+      test 'APCT06', 'Test ability to locate a Location\'s Endpoint' do
+        metadata {
+          requires resource: 'Location', methods: ['read']
+          validates resource: 'Location', methods: ['read']
+          requires resource: 'Endpoint', methods: ['read']
+          validates resource: 'Endpoint', methods: ['read']
+        }
+
+        options = {
+            :search => {
+              # :flag => true,
+              :compartment => nil,
+              :parameters => {
+                _count: 100
+              }
+            }
+          }
+
+        result = @client.search(FHIR::Location, options)
+
+        assert_response_ok(result)
+
+        locs = result.resource.try(:entry)
+
+        assert locs, "No Locations found"
+
+        assert locs.select { |loc| !loc.resource.endpoint.nil? && !loc.resource.endpoint.empty? }.size >= 1, "No Locations found with non-empty Endpoint"
+      end
+
+      private
+
+      def resolve_reference(resource, reftype, id)
+        return id if id.class == reftype || id.nil?
+        loc = resource.contained.find { |con| con.id == id.gsub('#', '') }
+        #if that doesn't work, try to read it from the server
+        if loc.nil? || loc.try(:empty?)
+          if id.split("/").count > 1
+            res = @client.read(reftype, id.split("/")[1])
+
+            assert_response_ok(res)
+            loc = res.resource
+          else
+            res = @client.read(reftype, id)
+            assert_response_ok(res)
+
+            loc = res.resource
+          end
+        end
+        assert !loc.nil?, "Could not find #{reftype.to_s.split("::")[1]} resource #{id}"
+
+        loc
+      end
+    end
+  end
+end

data/lib/tests/suites/base_suite.rb

@@ -2,6 +2,8 @@ module Crucible
   module Tests
     class BaseSuite < BaseTest
 
+      EXCLUDED_RESOURCES = ['DomainResource', 'Resource', 'Parameters', 'OperationOutcome']
+
       def title
         self.class.name.demodulize
       end
@@ -10,7 +12,7 @@ module Crucible
         # body should be a String
         outcome = nil
         begin
-          outcome = FHIR::Resource.from_contents(body)
+          outcome = FHIR.from_contents(body)
           outcome = nil if outcome.class!=FHIR::OperationOutcome
         rescue
           outcome = nil
@@ -26,8 +28,8 @@ module Crucible
         messages
       end
 
-      def fhir_resources
-        Mongoid.models.select {|c| c.name.include?('FHIR') && !c.included_modules.find_index(FHIR::Resource).nil?}
+      def self.fhir_resources
+        FHIR::RESOURCES.select {|r| !EXCLUDED_RESOURCES.include?(r)}.map {|r| "FHIR::#{r}".constantize}
       end
 
       def requires(hash)
@@ -79,6 +81,8 @@ module Crucible
             result.update(STATUS[:fail], e.message, e.data)
           rescue SkipException => e
             result.update(STATUS[:skip], "Skipped: #{test_method}", '')
+          rescue ClientException => e
+            result.update(STATUS[:fail], e.message, '')
           rescue => e
             result.update(STATUS[:error], "Fatal Error: #{e.message}", e.backtrace.join("\n"))
           end

data/lib/tests/suites/connectathon_attachment_track_test.rb

@@ -0,0 +1,124 @@
+module Crucible
+  module Tests
+    class ConnectathonAttachmentTrackTest < BaseSuite
+      require "base64"
+
+      attr_accessor :attachments
+
+      def id
+        'ConnectathonAttachmentTrackTest'
+      end
+
+      def description
+        'Test support for using FHIR-based messaging for exchanging attachments, particularly for claims processing/payer provider interactions.'
+      end
+
+      def initialize(client1, client2=nil)
+        super(client1, client2)
+        @tags.append('connectathon')
+        @category = {id: 'connectathon', title: 'Connectathon'}
+      end
+
+      def setup
+        @attachments = {}
+        @mime_types = {}
+        @records = {}
+        @attachments["pdf"] = 'ccda_pdf.pdf'
+        @attachments["structured"] = 'ccda_structured.xml'
+        @attachments["unstructured"] = 'ccda_unstructured.xml'
+
+        @mime_types["pdf"] = "application/pdf"
+        @mime_types["structured"] = "application/xml"
+        @mime_types["unstructured"] = "application/xml"
+
+        @resources = Crucible::Generator::Resources.new
+
+        patient = @resources.load_fixture("patient/patient-register-create.xml")
+        practitioner = @resources.load_fixture("practitioner/practitioner-register-create.xml")
+
+
+        create_object(patient, :patient)
+        create_object(practitioner, :practitioner)
+      end
+
+      def teardown
+        @records.each_value do |value|
+          @client.destroy(value.class, value.id)
+        end
+      end
+
+      %w(pdf structured unstructured).each do |att_type|
+        test "A13_#{att_type}1", "Submit unsolicited attachment of #{att_type}" do
+          comm = FHIR::Communication.new()
+          comm.subject = [@records[:patient].to_reference]
+          comm.recipient = [@records[:practitioner].to_reference]
+
+          comm_att = FHIR::Attachment.new()
+          comm_att.contentType = @mime_types[att_type]
+          comm_att.data = base64_encoded(att_type)
+          comm_att.title = @attachments[att_type]
+
+          payload = FHIR::Communication::Payload.new
+          payload.contentAttachment = [comm_att]
+
+          comm.payload = payload
+          create_object(comm, "comm_#{att_type}")
+        end
+
+        test "A13_#{att_type}2", "Submit solicited attachment of #{att_type}" do
+          # find a suitable CommunicationRequest to respond to
+          options = {
+            :search => {
+              :flag => true,
+              :compartment => nil,
+              :parameters => {
+                _count: 10
+              }
+            }
+          }
+          reply = @client.search(FHIR::CommunicationRequest, options)
+          assert_response_ok(reply)
+          assert_bundle_response(reply)
+          comm_req = reply.resource.entry.sample.try(:resource)
+
+          assert comm_req, 'No CommunicationRequest returned from server'
+
+          comm = FHIR::Communication.new()
+          comm.subject = [comm_req.subject]
+          comm.recipient = [comm_req.sender]
+          comm.basedOn = [comm_req.to_reference]
+
+          comm_att = FHIR::Attachment.new()
+          comm_att.contentType = @mime_types[att_type]
+          comm_att.data = base64_encoded(att_type)
+          comm_att.title = @attachments[att_type]
+
+          payload = FHIR::Communication::Payload.new
+          payload.contentAttachment = [comm_att]
+
+          comm.payload = payload
+          create_object(comm, "comm_#{att_type}")
+        end
+      end
+
+      private
+
+      def base64_encoded(type)
+        Base64.encode64(File.read(File.join(Crucible::Generator::Resources::FIXTURE_DIR, "attachment", "#{@attachments[type]}")))
+      end
+
+      def create_object(obj, obj_sym)
+        reply = @client.create obj
+        assert_response_ok(reply)
+        obj.id = reply.id
+        @records[obj_sym] = obj
+
+        warning { assert_valid_resource_content_type_present(reply) }
+        warning { assert_valid_content_location_present(reply) }
+
+        warning { assert @records[obj_sym].equals? reply.resource }
+      end
+
+    end
+  end
+end

data/lib/tests/suites/connectathon_audit_track.rb

@@ -20,13 +20,13 @@ module Crucible
       end
 
       def teardown
-        @client.destroy(FHIR::Provenance, @provenance1.xmlId) if @provenance1 && !@provenance1.xmlId.nil?
-        @client.destroy(FHIR::Provenance, @provenance2.xmlId) if @provenance2 && !@provenance2.xmlId.nil?
-        @client.destroy(FHIR::Provenance, @provenance3.xmlId) if @provenance3 && !@provenance3.xmlId.nil?
-        @client.destroy(FHIR::Provenance, @provenance4.xmlId) if @provenance4 && !@provenance4.xmlId.nil?
-        @client.destroy(FHIR::Patient, @patient.xmlId) if @patient && !@patient.xmlId.nil?
-        @client.destroy(FHIR::Patient, @patient1.xmlId) if @patient1 && !@patient1.xmlId.nil?
-        @client.destroy(FHIR::Patient, @patient2.xmlId) if @patient2 && !@patient2.xmlId.nil?
+        @client.destroy(FHIR::Provenance, @provenance1.id) if @provenance1 && !@provenance1.id.nil?
+        @client.destroy(FHIR::Provenance, @provenance2.id) if @provenance2 && !@provenance2.id.nil?
+        @client.destroy(FHIR::Provenance, @provenance3.id) if @provenance3 && !@provenance3.id.nil?
+        @client.destroy(FHIR::Provenance, @provenance4.id) if @provenance4 && !@provenance4.id.nil?
+        @client.destroy(FHIR::Patient, @patient.id) if @patient && !@patient.id.nil?
+        @client.destroy(FHIR::Patient, @patient1.id) if @patient1 && !@patient1.id.nil?
+        @client.destroy(FHIR::Patient, @patient2.id) if @patient2 && !@patient2.id.nil?
         FHIR::ResourceAddress::DEFAULTS.delete('X-Provenance') # just in case
       end
 
@@ -42,29 +42,31 @@ module Crucible
           requires resource: 'AuditEvent', methods: ['search']
           validates resource: 'Patient', methods: ['create']
           validates resource: 'AuditEvent', methods: ['search']
-          validates resource: nil, methods: ['Audit Logging', 'audit event']
+          validates resource: nil, methods: ['Audit Logging']
         }
         @patient = @resources.minimal_patient
-        @patient.xmlId = nil # clear the identifier
+        @patient.id = nil # clear the identifier
         reply = @client.create(@patient)
         assert_response_ok(reply)
-        @patient.xmlId = reply.id
+        @patient.id = reply.id
 
         options = {
           :search => {
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'reference' => "Patient/#{@patient.xmlId}"
+              'entity' => "Patient/#{@patient.id}"
             }
           }
         }
+        sleep 5 # give a few seconds for the Audit Event to be generated
         reply = @client.search(FHIR::AuditEvent, options)
         assert_response_ok(reply)
         assert_bundle_response(reply)
         assert_equal(1, reply.resource.entry.size, 'There should only be one AuditEvent for the test Patient currently in the system.', reply.body)
-        assert(reply.resource.entry[0].try(:resource).try(:object).try(:reference).include?(@patient.xmlId), 'The correct AuditEvent was not returned.', reply.body)
-        warning { assert_equal('110110', reply.resource.entry[0].try(:resource).try(:event).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of 110110 (Patient Record).', reply.body) }
+        assert(reply.resource.entry[0].try(:resource).try(:entity).try(:first).try(:reference).try(:reference).include?(@patient.id), 'The correct AuditEvent was not returned.', reply.body)
+        warning { assert_equal('rest', reply.resource.entry[0].try(:resource).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of rest', reply.body) }
+        warning { assert_equal('http://hl7.org/fhir/audit-event-type', reply.resource.entry[0].try(:resource).try(:type).try(:system), 'Was expecting an AuditEvent.event.type.system of http://hl7.org/fhir/audit-event-type', reply.body) }
       end
 
       # Create a Patient with Provenance as a transaction
@@ -84,14 +86,21 @@ module Crucible
         }
 
         @patient1 = @resources.minimal_patient
-        @patient1.xmlId = 'foo'
+        @patient1.id = 'foo'
 
         @provenance1 = FHIR::Provenance.new
         @provenance1.target = [ FHIR::Reference.new ]
-        @provenance1.target[0].reference = "Patient/#{@patient1.xmlId}"
-        @provenance1.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ%z")
-        @provenance1.reason = [ FHIR::CodeableConcept.new ]
-        @provenance1.reason[0].text = 'New patient'
+        @provenance1.target[0].reference = "Patient/#{@patient1.id}"
+        @provenance1.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ")
+        @provenance1.reason = [ FHIR::Coding.new ]
+        @provenance1.reason[0].system = 'http://hl7.org/fhir/v3/ActReason'
+        @provenance1.reason[0].display = 'patient administration'
+        @provenance1.reason[0].code = 'PATADMIN'
+        @provenance1.agent = [ FHIR::Provenance::Agent.new ]
+        @provenance1.agent[0].role = FHIR::Coding.new
+        @provenance1.agent[0].role.system = 'http://hl7.org/fhir/provenance-participant-role'
+        @provenance1.agent[0].role.display = 'Author'
+        @provenance1.agent[0].role.code = 'author'
 
         @client.begin_transaction
         @client.add_transaction_request('POST',nil,@patient1)
@@ -100,21 +109,21 @@ module Crucible
 
         # set the patient id as nil, until we know that the transaction was successful, so teardown doesn't try
         # to delete something that wasn't created
-        @patient1.xmlId = nil
+        @patient1.id = nil
 
-        assert_response_ok(reply)
+        assert([200,201,202].include?(reply.code), 'Expected response code 200, 201, or 202', reply.body)
         assert_bundle_response(reply)
 
         # set the patient id back from nil to whatever the server created
-        @patient1.xmlId = FHIR::ResourceAddress.pull_out_id('Patient',reply.resource.entry[0].try(:response).try(:location))
-        @provenance1.xmlId = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
+        @patient1.id = FHIR::ResourceAddress.pull_out_id('Patient',reply.resource.entry[0].try(:response).try(:location))
+        @provenance1.id = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
 
         options = {
           :search => {
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'target' => "Patient/#{@patient1.xmlId}"
+              'target' => "Patient/#{@patient1.id}"
             }
           }
         }
@@ -122,7 +131,7 @@ module Crucible
         assert_response_ok(reply)
         assert_bundle_response(reply)
         assert_equal(1, reply.resource.entry.size, 'There should only be one Provenance for the test Patient currently in the system.', reply.body)
-        assert(reply.resource.entry[0].try(:resource).try(:target).try(:first).try(:reference).include?(@patient1.xmlId), 'The correct Provenance was not returned.', reply.body)
+        assert(reply.resource.entry[0].try(:resource).try(:target).try(:first).try(:reference).include?(@patient1.id), 'The correct Provenance was not returned.', reply.body)
       end
 
       # Create a Patient with a Provenance header:
@@ -138,31 +147,38 @@ module Crucible
           requires resource: 'Provenance', methods: ['search']
           validates resource: 'Patient', methods: ['create']
           validates resource: 'Provenance', methods: ['search']
+          validates resource: nil, methods: ['provenance']
         }
 
         @patient2 = @resources.minimal_patient
-        @patient2.xmlId = nil # clear the identifier
+        @patient2.id = nil # clear the identifier
 
         @provenance2 = FHIR::Provenance.new
         @provenance2.target = [ FHIR::Reference.new ]
-        # @provenance2.target[0].reference = "Patient/#{@patient2.xmlId}"
-        @provenance2.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ%z")
-        @provenance2.reason = [ FHIR::CodeableConcept.new ]
-        @provenance2.reason[0].text = 'New patient'
-
-        FHIR::ResourceAddress::DEFAULTS['X-Provenance'] = @provenance2.to_fhir_json
-        reply = @client.create(@patient2)
-        FHIR::ResourceAddress::DEFAULTS.delete('X-Provenance')
+        # @provenance2.target[0].reference = "Patient/#{@patient2.id}"
+        @provenance2.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ")
+        @provenance2.reason = [ FHIR::Coding.new ]
+        @provenance2.reason[0].system = 'http://hl7.org/fhir/v3/ActReason'
+        @provenance2.reason[0].display = 'patient administration'
+        @provenance2.reason[0].code = 'PATADMIN'
+        @provenance2.agent = [ FHIR::Provenance::Agent.new ]
+        @provenance2.agent[0].role = FHIR::Coding.new
+        @provenance2.agent[0].role.system = 'http://hl7.org/fhir/provenance-participant-role'
+        @provenance2.agent[0].role.display = 'Author'
+        @provenance2.agent[0].role.code = 'author'
+
+        options = { 'X-Provenance' => @provenance2.to_json }
+        reply = @client.base_create(@patient2, options, @client.default_format)
 
         assert_response_ok(reply)
-        @patient2.xmlId = reply.id
+        @patient2.id = reply.id
 
         options = {
           :search => {
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'target' => "Patient/#{@patient2.xmlId}"
+              'target' => "Patient/#{@patient2.id}"
             }
           }
         }
@@ -170,8 +186,8 @@ module Crucible
         assert_response_ok(reply)
         assert_bundle_response(reply)
         assert_equal(1, reply.resource.entry.size, 'There should only be one Provenance for the test Patient currently in the system.', reply.body)
-        assert(reply.resource.entry[0].try(:resource).try(:target).try(:first).try(:reference).include?(@patient2.xmlId), 'The correct Provenance was not returned.', reply.body)
-        @provenance2.xmlId = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[0].try(:response).try(:location))
+        assert(reply.resource.entry[0].try(:resource).try(:target).try(:first).try(:reference).include?(@patient2.id), 'The correct Provenance was not returned.', reply.body)
+        @provenance2.id = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[0].try(:response).try(:location))
       end
 
       # Update a Patient and check for AuditEvent
@@ -186,9 +202,10 @@ module Crucible
           requires resource: 'AuditEvent', methods: ['search']
           validates resource: 'Patient', methods: ['update']
           validates resource: 'AuditEvent', methods: ['search']
+          validates resource: nil, methods: ['Audit Logging']
         }
         @patient.gender = 'male'
-        reply = @client.update(@patient,@patient.xmlId)
+        reply = @client.update(@patient,@patient.id)
         assert_response_ok(reply)
 
         options = {
@@ -196,18 +213,25 @@ module Crucible
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'reference' => "Patient/#{@patient.xmlId}"
+              'entity' => "Patient/#{@patient.id}"
             }
           }
         }
+        sleep 5 # give a few seconds for the Audit Event to be generated
         reply = @client.search(FHIR::AuditEvent, options)
         assert_response_ok(reply)
         assert_bundle_response(reply)
-        assert_equal(2, reply.resource.entry.size, 'There should be two AuditEvents for the test Patient currently in the system.', reply.body)
+        found_update_type = false
         reply.resource.entry.each do |entry|
-          assert(entry.try(:resource).try(:object).try(:reference).include?(@patient.xmlId), 'An incorrect AuditEvent was returned.', reply.body)
-          warning { assert_equal('110110', entry.try(:resource).try(:event).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of 110110 (Patient Record).', reply.body) }
+          assert(entry.try(:resource).try(:entity).try(:first).try(:reference).try(:reference), 'An incorrect AuditEvent was returned.', reply.body)
+          assert(entry.try(:resource).try(:entity).try(:first).try(:reference).try(:reference).include?(@patient.id), 'An incorrect AuditEvent was returned.', reply.body)
+          if entry.try(:resource).try(:action) == 'U'
+            found_update_type = true
+            warning { assert_equal('rest', entry.try(:resource).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of rest', reply.body) }
+            warning { assert_equal('http://hl7.org/fhir/audit-event-type', entry.try(:resource).try(:type).try(:system), 'Was expecting an AuditEvent.event.type.system of http://hl7.org/fhir/audit-event-type', reply.body) }
+          end
         end
+        assert(found_update_type, 'No update AuditEvent returned', reply.body)
       end
 
       # Update a Patient with Provenance as a transaction
@@ -229,27 +253,34 @@ module Crucible
 
         @provenance3 = FHIR::Provenance.new
         @provenance3.target = [ FHIR::Reference.new ]
-        @provenance3.target[0].reference = "Patient/#{@patient1.xmlId}"
-        @provenance3.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ%z")
-        @provenance3.reason = [ FHIR::CodeableConcept.new ]
-        @provenance3.reason[0].text = 'Update Gender'
+        @provenance3.target[0].reference = "Patient/#{@patient1.id}"
+        @provenance3.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ")
+        @provenance3.reason = [ FHIR::Coding.new ]
+        @provenance3.reason[0].system = 'http://hl7.org/fhir/v3/ActReason'
+        @provenance3.reason[0].display = 'patient administration'
+        @provenance3.reason[0].code = 'PATADMIN'
+        @provenance3.agent = [ FHIR::Provenance::Agent.new ]
+        @provenance3.agent[0].role = FHIR::Coding.new
+        @provenance3.agent[0].role.system = 'http://hl7.org/fhir/provenance-participant-role'
+        @provenance3.agent[0].role.display = 'Author'
+        @provenance3.agent[0].role.code = 'author'
 
         @client.begin_transaction
         @client.add_transaction_request('PUT',nil,@patient1)
         @client.add_transaction_request('POST',nil,@provenance3)
         reply = @client.end_transaction
 
-        assert_response_ok(reply)
+        assert([200,201,202].include?(reply.code), 'Expected response code 200, 201, or 202', reply.body)
         assert_bundle_response(reply)
 
-        @provenance3.xmlId = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
+        @provenance3.id = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
 
         options = {
           :search => {
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'target' => "Patient/#{@patient1.xmlId}"
+              'target' => "Patient/#{@patient1.id}"
             }
           }
         }
@@ -258,7 +289,7 @@ module Crucible
         assert_bundle_response(reply)
         assert_equal(2, reply.resource.entry.size, 'There should be two Provenance resources for the test Patient currently in the system.', reply.body)
         reply.resource.entry.each do |entry|
-          assert(entry.try(:resource).try(:target).try(:first).try(:reference).include?(@patient1.xmlId), 'An incorrect Provenance was returned.', reply.body)
+          assert(entry.try(:resource).try(:target).try(:first).try(:reference).include?(@patient1.id), 'An incorrect Provenance was returned.', reply.body)
         end
       end
 
@@ -275,21 +306,26 @@ module Crucible
           requires resource: 'Provenance', methods: ['search']
           validates resource: 'Patient', methods: ['create']
           validates resource: 'Provenance', methods: ['search']
-          validates resource: nil, methods: ['provenance']
         }
 
         @patient2.gender = 'male'
 
         @provenance4 = FHIR::Provenance.new
         @provenance4.target = [ FHIR::Reference.new ]
-        @provenance4.target[0].reference = "Patient/#{@patient2.xmlId}"
-        @provenance4.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ%z")
-        @provenance4.reason = [ FHIR::CodeableConcept.new ]
-        @provenance4.reason[0].text = 'Update Gender'
-
-        FHIR::ResourceAddress::DEFAULTS['X-Provenance'] = @provenance4.to_fhir_json
-        reply = @client.update(@patient2,@patient2.xmlId)
-        FHIR::ResourceAddress::DEFAULTS.delete('X-Provenance')
+        # @provenance4.target[0].reference = "Patient/#{@patient2.id}"
+        @provenance4.recorded = DateTime.now.strftime("%Y-%m-%dT%T.%LZ")
+        @provenance4.reason = [ FHIR::Coding.new ]
+        @provenance4.reason[0].system = 'http://hl7.org/fhir/v3/ActReason'
+        @provenance4.reason[0].display = 'patient administration'
+        @provenance4.reason[0].code = 'PATADMIN'
+        @provenance4.agent = [ FHIR::Provenance::Agent.new ]
+        @provenance4.agent[0].role = FHIR::Coding.new
+        @provenance4.agent[0].role.system = 'http://hl7.org/fhir/provenance-participant-role'
+        @provenance4.agent[0].role.display = 'Author'
+        @provenance4.agent[0].role.code = 'author'
+
+        options = { 'X-Provenance' => @provenance4.to_json }
+        reply = @client.base_update(@patient2, @patient2.id, options, @client.default_format)
         assert_response_ok(reply)
 
 
@@ -298,7 +334,7 @@ module Crucible
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'target' => "Patient/#{@patient2.xmlId}"
+              'target' => "Patient/#{@patient2.id}"
             }
           }
         }
@@ -307,10 +343,11 @@ module Crucible
         assert_bundle_response(reply)
         assert_equal(2, reply.resource.entry.size, 'There should be two Provenance resources for the test Patient currently in the system.', reply.body)
         reply.resource.entry.each do |entry|
-          assert(entry.try(:resource).try(:target).try(:first).try(:reference).include?(@patient2.xmlId), 'An incorrect Provenance was returned.', reply.body)
+          assert(entry.try(:resource).try(:target).try(:first).try(:reference), 'An incorrect Provenance was returned.', reply.body)
+          assert(entry.try(:resource).try(:target).try(:first).try(:reference).include?(@patient2.id), 'An incorrect Provenance was returned.', reply.body)
         end
-        @provenance3.xmlId = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[0].try(:response).try(:location))
-        @provenance4.xmlId = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
+        @provenance3.id = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[0].try(:response).try(:location))
+        @provenance4.id = FHIR::ResourceAddress.pull_out_id('Provenance',reply.resource.entry[1].try(:response).try(:location))
       end
 
       # Read a Patient and check for AuditEvent
@@ -325,9 +362,9 @@ module Crucible
           requires resource: 'AuditEvent', methods: ['search']
           validates resource: 'Patient', methods: ['read']
           validates resource: 'AuditEvent', methods: ['search']
-          validates resource: nil, methods: ['Audit Logging', 'audit event']
+          validates resource: nil, methods: ['Audit Logging']
         }
-        reply = @client.read(FHIR::Patient,@patient.xmlId)
+        reply = @client.read(FHIR::Patient,@patient.id)
         assert_response_ok(reply)
 
         options = {
@@ -335,18 +372,25 @@ module Crucible
             :flag => false,
             :compartment => nil,
             :parameters => {
-              'reference' => "Patient/#{@patient.xmlId}"
+              'entity' => "Patient/#{@patient.id}"
             }
           }
         }
+        sleep 5 # give a few seconds for the Audit Event to be generated
         reply = @client.search(FHIR::AuditEvent, options)
         assert_response_ok(reply)
         assert_bundle_response(reply)
-        assert_equal(3, reply.resource.entry.size, 'There should be three AuditEvents for the test Patient currently in the system.', reply.body)
+        found_read_type = false
         reply.resource.entry.each do |entry|
-          assert(entry.try(:resource).try(:object).try(:reference).include?(@patient.xmlId), 'An incorrect AuditEvent was returned.', reply.body)
-          warning { assert_equal('110110', entry.try(:resource).try(:event).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of 110110 (Patient Record).', reply.body) }
+          assert(entry.try(:resource).try(:entity).try(:first).try(:reference).try(:reference), 'An incorrect AuditEvent was returned.', reply.body)
+          assert(entry.try(:resource).try(:entity).try(:first).try(:reference).try(:reference).include?(@patient.id), 'An incorrect AuditEvent was returned.', reply.body)
+          if entry.try(:resource).try(:action) == 'R'
+            found_read_type = true
+            warning { assert_equal('rest', entry.try(:resource).try(:type).try(:code), 'Was expecting an AuditEvent.event.type.code of rest', reply.body) }
+            warning { assert_equal('http://hl7.org/fhir/audit-event-type', entry.try(:resource).try(:type).try(:system), 'Was expecting an AuditEvent.event.type.system of http://hl7.org/fhir/audit-event-type', reply.body) }
+          end
         end
+        assert(found_read_type, 'No read AuditEvent returned', reply.body)
       end
 
     end