plan_executor 1.0.2 → 1.8.0

data/lib/tests/suites/history_test.rb

@@ -16,29 +16,37 @@ module Crucible
       end
 
       def setup
-        @resources = Crucible::Generator::Resources.new
-        @patient = @resources.minimal_patient
-
-        @create_date = Time.now.utc
-
-        @version = []
-        result = @client.create(@patient)
-        assert_response_ok(result)
-        @id = result.id
-        @version << result.version
-
-        @patient.xmlId = @id
-        @patient.telecom << FHIR::ContactPoint.new(system: 'email', value: 'foo@example.com')
-
-        update_result = @client.update(@patient, @id)
-        assert_response_ok(update_result)
-        @version << update_result.version
-        del_result = @client.destroy(FHIR::Patient, @id)
-        assert_response_code(del_result,204)
-        
-        @entry_count = @version.length
-        # add one for deletion
-        @version_count = @entry_count + 1
+        begin
+          @resources = Crucible::Generator::Resources.new
+          response = @client.create(@resources.minimal_patient)
+          assert_response_ok(response)
+          @patient = response.resource
+          @patient_created = true
+          @create_date = Time.now.utc
+
+          @version = []
+          @version << @client.reply.version
+
+          @patient.telecom ||= []
+          @patient.telecom << FHIR::ContactPoint.new.from_hash(system: 'email', value: 'foo@example.com')
+
+          @patient.update
+          @version << @client.reply.version
+          @patient.destroy
+          assert_response_code(@client.reply,204)
+
+          @entry_count = @version.length
+          # add one for deletion
+          @version_count = @entry_count + 1
+          @patient_setup = true
+        rescue Exception => e
+          @patient_setup = false
+          @create_date = Time.now.utc
+        end
+      end
+
+      def teardown
+        ignore_client_exception { @patient.destroy if @patient_created }
       end
 
       test  'HI01','History for specific resource' do
@@ -47,12 +55,11 @@ module Crucible
           requires resource: "Patient", methods: ["create", "update", "delete"]
           validates resource: "Patient", methods: ["history"]
         }
+        skip unless @patient_setup
 
-        result = @client.resource_instance_history(FHIR::Patient,@id)
-        assert_response_ok result
-        bundle = result.resource
+        bundle = FHIR::Patient.resource_instance_history(@patient.id)
 
-        assert_equal "history", bundle.fhirType, "The bundle type is not correct"
+        assert_equal "history", bundle.type, "The bundle type is not correct"
         assert_equal @version_count, bundle.total, "the number of returned versions is not correct"
         check_sort_order(bundle.entry)
       end
@@ -63,14 +70,13 @@ module Crucible
           requires resource: "Patient", methods: ["create", "update", "delete"]
           validates resource: "Patient", methods: ["history"]
         }
-        result = @client.resource_instance_history(FHIR::Patient,@id)
-        assert_response_ok result
-        bundle = result.resource
+        skip unless @patient_setup
+        bundle = FHIR::Patient.resource_instance_history(@patient.id)
         entries = bundle.entry
 
-        assert_equal 1, entries.select{|entry| entry.request.try(:method) == 'DELETE' }.size, 'Wrong number of DELETE transactions in the history bundle'
-        assert_equal 1, entries.select{|entry| entry.request.try(:method) == 'PUT' }.size, 'Wrong number of PUT transactions in the history bundle'
-        assert_equal 1, entries.select{|entry| entry.request.try(:method) == 'POST' }.size, 'Wrong number of POST transactions in the history bundle'
+        assert_equal 1, entries.select{|entry| entry.request.try(:local_method) == 'DELETE' }.size, 'Wrong number of DELETE transactions in the history bundle'
+        assert_equal 1, entries.select{|entry| entry.request.try(:local_method) == 'PUT' }.size, 'Wrong number of PUT transactions in the history bundle'
+        assert_equal 1, entries.select{|entry| entry.request.try(:local_method) == 'POST' }.size, 'Wrong number of POST transactions in the history bundle'
 
       end
 
@@ -80,24 +86,22 @@ module Crucible
           requires resource: "Patient", methods: ["create", "update", "delete"]
           validates resource: "Patient", methods: ["history"]
         }
+        skip unless @patient_setup
 
         before = @create_date - 1.minute
         after = before + 1.hour
 
-        all_history = @client.resource_instance_history(FHIR::Patient,@id)
+        all_history = FHIR::Patient.resource_instance_history(@patient.id)
 
-        result = @client.resource_instance_history_as_of(FHIR::Patient,@id,before)
-        assert_response_ok result
-        bundle = result.resource
+        bundle = FHIR::Patient.resource_instance_history_as_of(@patient.id,before)
 
         assert_equal @version_count, bundle.total, "the number of returned versions since the creation date is not correct"
 
         entry_ids_are_present(bundle.entry)
         check_sort_order(bundle.entry)
 
-        result = @client.resource_instance_history_as_of(FHIR::Patient,@id,after)
-        assert_response_ok result
-        assert_equal 0, result.resource.total, "there should not be any history one hour after the creation date"
+        bundle = FHIR::Patient.resource_instance_history_as_of(@patient.id,after)
+        assert_equal 0, bundle.total, "there should not be any history one hour after the creation date"
       end
 
       test "HI03", "individual history versions" do
@@ -106,24 +110,22 @@ module Crucible
           requires resource: "Patient", methods: ["create", "update", "delete"]
           validates resource: "Patient", methods: ["vread", "history"]
         }
+        skip unless @patient_setup
 
-        result = @client.resource_instance_history(FHIR::Patient,@id)
-        assert_response_ok result
-
-        bundle = result.resource
+        bundle = FHIR::Patient.resource_instance_history(@patient.id)
 
         active_entries(bundle.entry).each do |entry|
-          pulled = @client.vread(FHIR::Patient, entry.resource.xmlId, entry.resource.meta.versionId)
-          assert_response_ok pulled
+          pulled = FHIR::Patient.vread(entry.resource.id, entry.resource.meta.versionId)
           assert !pulled.nil?, "Cannot find version that was present in history"
         end
 
         deleted_entries(bundle.entry).each do |entry|
           # FIXME: Should we parse the request URL or drop this assertion?
           if entry.resource
-            pulled = @client.vread(FHIR::Patient, entry.resource.xmlId, entry.resource.meta.versionId)
-            assert pulled.resource.nil?, "resource should not be found since it was deleted"
-            assert_response_gone pulled
+
+            ignore_client_exception { pulled = FHIR::Patient.vread(entry.resource.id, entry.resource.meta.versionId) }
+            assert_response_gone @client.reply
+
           end
         end
       end
@@ -135,9 +137,9 @@ module Crucible
           validates resource: "Patient", methods: ["history"]
         }
 
-        result = @client.resource_instance_history(FHIR::Patient,'3141592unlikely')
-        assert_response_not_found result
-        assert result.resource.nil?, 'bad history request should not return a resource'
+        ignore_client_exception { FHIR::Patient.resource_instance_history('3141592unlikely') }
+        assert_response_not_found @client.reply
+        assert @client.reply.resource.nil?, 'bad history request should not return a resource'
       end
 
       test "HI06", "all history for resource with since" do
@@ -150,17 +152,13 @@ module Crucible
         before = @create_date - 1.minute
         after = Time.now.utc + 1.hour
 
-        result = @client.resource_history_as_of(FHIR::Patient,before)
-        assert_response_ok result
-        bundle = result.resource
+        bundle = FHIR::Patient.resource_history_as_of(before)
 
         entry_ids_are_present(bundle.entry)
         check_sort_order(bundle.entry)
 
-
-        result = @client.resource_history_as_of(FHIR::Patient,after)
-        assert_response_ok result
-        assert_equal 0, result.resource.total, "Setting since to a future moment still returns history"
+        bundle = FHIR::Patient.resource_history_as_of(after)
+        assert_equal 0, bundle.total, "Setting since to a future moment still returns history"
 
       end
 
@@ -178,14 +176,20 @@ module Crucible
         assert_response_ok result
         bundle = result.resource
         entry_ids_are_present(bundle.entry)
-        check_sort_order(bundle.entry)
 
-        warning { assert_navigation_links(bundle) }
+        relevant_entries = bundle.entry.select{|x|x.request.try(:local_method)!='DELETE'}
+        relevant_entries.map!(&:resource).map!(&:meta).compact rescue assert(false, 'Unable to find meta for resources returned by the bundle')
+        relevant_entries.each_cons(2) do |left, right|
+          if !left.lastUpdated.nil? && !right.lastUpdated.nil?
+            assert (left.lastUpdated >= right.lastUpdated), 'Result contains entries in the wrong order.'
+          else
+            raise AssertionException.new 'Unable to determine if entries are in the correct order -- no meta.versionId or meta.lastUpdated'
+          end
+        end
 
         result = @client.resource_history_as_of(FHIR::Patient,after)
         assert_response_ok result
         assert_equal 0, result.resource.total, "Setting since to a future moment still returns history"
-
       end
 
 
@@ -209,7 +213,7 @@ module Crucible
           page = @client.next_page(page)
         end
 
-        assert forward_count > 2, "there should be at least 2 history entries"
+        assert(forward_count > 2, "there should be at least 2 history entries") if @patient_setup
       end
 
       test "HI10", "resource history page backwards" do
@@ -255,7 +259,7 @@ module Crucible
 
         history = @client.all_history
         assert !history.resource.nil?, "A bundle was not returned from the history request."
-        assert history.resource.entry.size >= 3, "there should be at least 3 history entries"
+        assert(history.resource.entry.size >= 3, "there should be at least 3 history entries") if @patient_setup
       end
 
       ###
@@ -270,7 +274,7 @@ module Crucible
       def deleted_entries(entries)
         entries.select do |entry|
           assert !entry.request.nil?, "history bundle entries do not have request elements, deleted entries cannot be distinguished"
-          entry.request.try(:method) == "DELETE"
+          entry.request.try(:local_method) == "DELETE"
         end
       end
 
@@ -280,8 +284,8 @@ module Crucible
 
 
       def entry_ids_are_present(entries)
-        relevant_entries = entries.select{|x|x.request.try(:method)!='DELETE'}
-        ids = relevant_entries.map(&:resource).map(&:xmlId).compact rescue assert(false, 'Unable to find IDs for resources returned by the bundle')
+        relevant_entries = entries.select{|x|x.request.try(:local_method)!='DELETE'}
+        ids = relevant_entries.map(&:resource).map(&:id).compact rescue assert(false, 'Unable to find IDs for resources returned by the bundle')
 
         # check that we have ids and self links
         assert_equal relevant_entries.length, ids.size, 'All PUT and POST entries must have an ID'
@@ -292,7 +296,7 @@ module Crucible
       end
 
       def check_sort_order(entries)
-        relevant_entries = entries.select{|x|x.request.try(:method)!='DELETE'}
+        relevant_entries = entries.select{|x|x.request.try(:local_method)!='DELETE'}
         relevant_entries.map!(&:resource).map!(&:meta).compact rescue assert(false, 'Unable to find meta for resources returned by the bundle')
 
         relevant_entries.each_cons(2) do |left, right|

data/lib/tests/suites/read_test.rb

@@ -16,18 +16,23 @@ module Crucible
       end
 
       def setup
-        @patient = ReadTest.createPatient('Emerald', 'Caro')
-        reply = @client.create(@patient)
-        @id = reply.id
-        @body = reply.body
+        # try to find a patient
+        begin
+          response = @client.read_feed(FHIR::Patient)
+          @patient = response.resource.entry.first.resource
+        rescue
+          # try to create a patient
+          begin
+            @patient = FHIR::Patient.create(name: { family: 'Emerald', given: 'Caro' })
+            @patient_created = true
+          rescue
+            @patient = nil
+          end
+        end
       end
 
       def teardown
-        @client.destroy(FHIR::Patient, @id)
-      end
-
-      def self.createPatient(family, given)
-        patient = FHIR::Patient.new(name: [FHIR::HumanName.new(family: [family], given: [given])])
+        ignore_client_exception { @patient.destroy if @patient_created }
       end
 
       # [SprinklerTest("R001", "Result headers on normal read")]
@@ -37,14 +42,14 @@ module Crucible
           requires resource: "Patient", methods: ["create", "read", "delete"]
           validates resource: "Patient", methods: ["read"]
         }
-
-        assert(@id, 'Setup was unable to create a patient.',@body)
-        reply = @client.read(FHIR::Patient, @id)
-        assert_response_ok(reply)
-        assert_equal @id, reply.id, 'Server returned wrong patient.'
-        warning { assert_valid_resource_content_type_present(reply) }
-        warning { assert_etag_present(reply) }
-        warning { assert_last_modified_present(reply) }
+        skip if @patient.nil?
+        
+        patient = FHIR::Patient.read(@patient.id)
+
+        assert_equal @patient.id, @client.reply.id, 'Server returned wrong patient.'
+        warning { assert_valid_resource_content_type_present(@client.reply) }
+        warning { assert_etag_present(@client.reply) }
+        warning { assert_last_modified_present(@client.reply) }
       end
 
       # [SprinklerTest("R002", "Read unknown resource type")]
@@ -54,8 +59,8 @@ module Crucible
           links "#{REST_SPEC_LINK}#update"
         }
 
-        reply = @client.read(Crucible::Tests::ReadTest, @id)
-        assert_response_not_found(reply)
+        ignore_client_exception { FHIR::Model.read('1') } #not a valid model
+        assert(([400,404].include?(@client.reply.code)), "An unknown resource type should be 404 or 400. The spec says 404 for an unknown resource, but does not define unknown type. Returned #{@client.reply.code}." )
       end
 
       # [SprinklerTest("R003", "Read non-existing resource id")]
@@ -66,8 +71,8 @@ module Crucible
           validates resource: "Patient", methods: ["read"]
         }
 
-        reply = @client.read(FHIR::Patient, 'Supercalifragilisticexpialidocious')
-        assert_response_not_found(reply)
+        ignore_client_exception { FHIR::Patient.read('Supercalifragilisticexpialidocious') }
+        assert_response_not_found(@client.reply)
       end
 
       # [SprinklerTest("R004", "Read bad formatted resource id")]
@@ -80,8 +85,8 @@ module Crucible
           validates resource: "Patient", methods: ["read"]
         }
 
-        reply = @client.read(FHIR::Patient, 'Invalid-ID-Because_Of_!@$Special_Characters_and_Length_Over_Sixty_Four_Characters')
-        assert_response_bad(reply)
+        ignore_client_exception { FHIR::Patient.read('Invalid-ID-Because_Of_!@$Special_Characters_and_Length_Over_Sixty_Four_Characters') }
+        assert_response_not_found(@client.reply)
       end
 
       test 'R005', 'Read _summary=text' do
@@ -92,11 +97,10 @@ module Crucible
           requires resource: "Patient", methods: ["create", "read", "delete"]
           validates resource: "Patient", methods: ["read"]
         }
+        skip if @patient.nil?
 
-        assert(@id, 'Setup was unable to create a patient.', @body)
-        reply = @client.read(FHIR::Patient, @id, @client.default_format, 'text')
-        assert_response_ok(reply)
-        assert(reply.try(:resource).try(:text), 'Requested summary narrative was not provided.', reply.body)
+        patient = FHIR::Patient.read_with_summary(@patient.id, "text")
+        assert(patient.text, 'Requested summary narrative was not provided.', @client.reply.body)
       end      
 
     end

data/lib/tests/suites/resource_test.rb

@@ -7,9 +7,14 @@ module Crucible
       attr_accessor :history_bundle
 
       attr_accessor :temp_resource
-      attr_accessor :temp_id
       attr_accessor :temp_version
 
+      attr_accessor :conditional_create_resource_a
+      attr_accessor :conditional_create_resource_b
+      attr_accessor :conditional_create_resource_c
+      attr_accessor :conditional_update_resource_a
+      attr_accessor :conditional_update_resource_c
+
       attr_accessor :preexisting_id
       attr_accessor :preexisting_version
       attr_accessor :preexisting
@@ -20,7 +25,7 @@ module Crucible
           {"ResourceTest_#{@resource_class.name.demodulize}" => execute_test_methods}
         else
           results = {}
-          fhir_resources.each do | klass |
+          Crucible::Tests::BaseSuite.fhir_resources.each do | klass |
             @resource_class = klass
             results.merge!({"ResourceTest_#{@resource_class.name.demodulize}" => execute_test_methods})
           end
@@ -56,6 +61,14 @@ module Crucible
         "#{resource_class.name.demodulize}: #{desc}"
       end
 
+      def teardown
+        ignore_client_exception { @temp_resource.destroy if @temp_resource }
+        ignore_client_exception { @conditional_create_resource_a.destroy if @conditional_create_resource_a }
+        ignore_client_exception { @conditional_create_resource_b.destroy if @conditional_create_resource_b }
+        ignore_client_exception { @conditional_create_resource_c.destroy if @conditional_create_resource_c }
+        ignore_client_exception { @conditional_create_resource_d.destroy if @conditional_create_resource_d }
+      end
+
       #
       # Get and read all the resources of this type. Result is an XML ATOM bundle.
       #
@@ -64,9 +77,8 @@ module Crucible
           define_metadata('read')
         }
 
-        reply = @client.read_feed(@resource_class)
-        @bundle = reply.resource
-        assert_bundle_response reply
+        @bundle = resource_class.search
+        assert_bundle_response @client.reply
         assert !@bundle.nil?, 'Service did not respond with bundle.'
       end
 
@@ -79,23 +91,92 @@ module Crucible
         }
 
         result = TestResult.new('X010',"Create new #{resource_class.name.demodulize}", nil, nil, nil)
-        @temp_resource = ResourceGenerator.generate(@resource_class,3)
-        reply = @client.create @temp_resource
-        @temp_id = reply.id
-        @temp_resource.xmlId = (reply.resource.try(:xmlId) || reply.id)
-        @temp_version = reply.version
-
-        if reply.code==201
-          result.update(STATUS[:pass], "New #{resource_class.name.demodulize} was created.", reply.body)
+        ignore_client_exception { @temp_resource = ResourceGenerator.generate(@resource_class,3).create }
+        @temp_version = @client.reply.version
+
+        if @client.reply.code==201
+          result.update(STATUS[:pass], "New #{resource_class.name.demodulize} was created.", @client.reply.body)
         else
-          outcome = (self.parse_operation_outcome(reply.body) rescue nil)
+          outcome = (self.parse_operation_outcome(@client.reply.body) rescue nil)
           if outcome.nil?
-            message = "Response code #{reply.code} with no OperationOutcome provided."
+            message = "Response code #{@client.reply.code} with no OperationOutcome provided."
           else
             message = self.build_messages(outcome)
           end
-          result.update(STATUS[:fail], message, reply.body)
-          @temp_resource = nil
+          result.update(STATUS[:fail], message, @client.reply.body)
+        end
+
+        result
+      end
+
+      test 'X012', 'Conditional Create (No Matches)' do
+        metadata {
+          define_metadata('conditional-create')
+        }
+
+        result = TestResult.new('X012',"Conditional Create #{resource_class.name.demodulize} (No Matches)", nil, nil, nil)
+        # chances are good that no resource has this ID
+        ifNoneExist = { '_id' => "#{(SecureRandom.uuid * 2)[0..63]}" }
+        ignore_client_exception { @conditional_create_resource_a = ResourceGenerator.generate(@resource_class,3).conditional_create(ifNoneExist) }
+
+        if @client.reply.code==201
+          result.update(STATUS[:pass], "New #{resource_class.name.demodulize} was created.", @client.reply.body)
+        else
+          outcome = (self.parse_operation_outcome(@client.reply.body) rescue nil)
+          if outcome.nil?
+            message = "Response code #{@client.reply.code} with no OperationOutcome provided."
+          else
+            message = self.build_messages(outcome)
+          end
+          result.update(STATUS[:fail], message, @client.reply.body)
+        end
+
+        result
+      end
+
+
+      test 'X013', 'Conditional Create (One Match)' do
+        metadata {
+          define_metadata('conditional-create')
+        }
+
+        result = TestResult.new('X013',"Conditional Create #{resource_class.name.demodulize} (One Match)", nil, nil, nil)
+        # this ID should already exist if temp resource was created
+        if !@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
+        elsif !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
+        else
+          raise AssertionException.new("Preexisting #{resource_class.name.demodulize} unknown.", nil)
+        end
+        ifNoneExist = { '_id' => @preexisting_id }
+        ignore_client_exception { @conditional_create_resource_b = ResourceGenerator.generate(@resource_class,3).conditional_create(ifNoneExist) }
+
+        if @client.reply.code==200
+          result.update(STATUS[:pass], "Request was correctly ignored.", @client.reply.body)
+          @conditional_create_resource_b = nil
+        else
+          result.update(STATUS[:fail], "Request should have been ignored with HTTP 200.", @client.reply.body)
+        end
+
+        result
+      end
+
+
+      test 'X014', 'Conditional Create (Multiple Matches)' do
+        metadata {
+          define_metadata('conditional-create')
+        }
+
+        result = TestResult.new('X014',"Conditional Create #{resource_class.name.demodulize}", nil, nil, nil)
+        # this should match all resources
+        ifNoneExist = { '_lastUpdated' => 'gt1900-01-01' }
+        ignore_client_exception { @conditional_create_resource_c = ResourceGenerator.generate(@resource_class,3).conditional_create(ifNoneExist) }
+
+        if @client.reply.code==412
+          result.update(STATUS[:pass], "Request correctly failed.", @client.reply.body)
+        else
+          result.update(STATUS[:fail], "Request should have failed with HTTP 412.", @client.reply.body)
         end
 
         result
@@ -110,31 +191,30 @@ module Crucible
         }
 
         result = TestResult.new('X020',"Read existing #{resource_class.name.demodulize} by ID", nil, nil, nil)
-        if !@bundle.nil? && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
-          @preexisting_id = @bundle.entry[0].resource.xmlId
-        elsif !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        if !@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
+        elsif !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
         else
           raise AssertionException.new("Preexisting #{resource_class.name.demodulize} unknown.", nil)
         end
 
-        reply = @client.read(@resource_class, @preexisting_id)
-        @preexisting = reply.resource
+        ignore_client_exception { @preexisting = @resource_class.read(@preexisting_id) }
 
         if @preexisting.nil?
-          raise AssertionException.new("Failed to read preexisting #{resource_class.name.demodulize}: #{@preexisting_id}", reply.body)
+          raise AssertionException.new("Failed to read preexisting #{resource_class.name.demodulize}: #{@preexisting_id}", @client.reply.body)
         else
           begin
             @preexisting.to_xml
           rescue Exception
             @preexisting = nil
-            raise AssertionException.new("Read preexisting #{resource_class.name.demodulize}, but it appears invalid.", reply.response)
+            raise AssertionException.new("Read preexisting #{resource_class.name.demodulize}, but it appears invalid.", @client.reply.response)
           end
         end
 
-        @preexisting_version = reply.version
+        @preexisting_version = @client.reply.version
 
-        result.update(STATUS[:pass], "Successfully read preexisting #{resource_class.name.demodulize}.", reply.response)
+        result.update(STATUS[:pass], "Successfully read preexisting #{resource_class.name.demodulize}.", @client.reply.response)
         result
       end
 
@@ -148,11 +228,11 @@ module Crucible
 
         result = TestResult.new('X030',"Update existing #{resource_class.name.demodulize} by ID", nil, nil, nil)
 
-        if !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        if !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
           @preexisting = @temp_resource
-        elsif !@bundle.nil? && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
-          @preexisting_id = @bundle.entry[0].resource.xmlId
+        elsif !@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
           @preexisting = @bundle.entry[0].resource
         end
 
@@ -170,38 +250,145 @@ module Crucible
           ResourceGenerator.set_fields!(@preexisting)
           ResourceGenerator.apply_invariants!(@preexisting)
 
-          reply = @client.update @preexisting, @preexisting_id
+          ignore_client_exception { @preexisting.update }
 
-          if reply.code==200
-            result.update(STATUS[:pass], "Updated existing #{resource_class.name.demodulize}.", reply.body)
-          elsif reply.code==201
+          if @client.reply.code==200
+            result.update(STATUS[:pass], "Updated existing #{resource_class.name.demodulize}.", @client.reply.body)
+          elsif @client.reply.code==201
             # check created id -- see if it matches the one we used, or is new
-            resulting_id = reply.id
+            resulting_id = @client.reply.id
 
             if(@preexisting_id != resulting_id)
-              result.update(STATUS[:fail], "Server created (201) new #{resource_class.name.demodulize} rather than update (200). A new ID (#{resulting_id}) was also created (was #{@preexisting_id}).", reply.body)
+              result.update(STATUS[:fail], "Server created (201) new #{resource_class.name.demodulize} rather than update (200). A new ID (#{resulting_id}) was also created (was #{@preexisting_id}).", @client.reply.body)
             else
-              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server responded with the wrong code (201, but should have been 200).", reply.body)
+              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server responded with the wrong code (201, but should have been 200).", @client.reply.body)
             end
 
-            resulting_version = reply.version
+            resulting_version = @client.reply.version
             if(@preexisting_version == resulting_version)
-              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server did not update the resource version number.", reply.body)
+              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server did not update the resource version number.", @client.reply.body)
             end
           else
-            outcome = self.parse_operation_outcome(reply.body) rescue nil
+            outcome = self.parse_operation_outcome(@client.reply.body) rescue nil
             if outcome.nil?
-              message = "Response code #{reply.code} with no OperationOutcome provided."
+              message = "Response code #{@client.reply.code} with no OperationOutcome provided."
             else
               message = self.build_messages(outcome)
             end
-            result.update(STATUS[:fail], message, reply.body)
+            result.update(STATUS[:fail], message, @client.reply.body)
           end
         end
 
         result
       end
 
+      test 'X032', 'Conditional Update (No Matches)' do
+        metadata {
+          define_metadata('conditional-update')
+        }
+
+        result = TestResult.new('X032',"Conditional Update #{resource_class.name.demodulize} (No Matches)", nil, nil, nil)
+
+        searchParams = { '_id' => "#{(SecureRandom.uuid * 2)[0..63]}" }
+        ignore_client_exception { @conditional_update_resource_a = ResourceGenerator.generate(@resource_class,3).conditional_update(searchParams) }
+        # chances are good that no resource has this ID
+
+        if @client.reply.code==201
+          result.update(STATUS[:pass], "New #{resource_class.name.demodulize} was created.", @client.reply.body)
+        else
+          outcome = (self.parse_operation_outcome(@client.reply.body) rescue nil)
+          if outcome.nil?
+            message = "Response code #{@client.reply.code} with no OperationOutcome provided."
+          else
+            message = self.build_messages(outcome)
+          end
+          result.update(STATUS[:fail], message, @client.reply.body)
+        end
+
+        result
+      end
+
+
+      test 'X033', 'Conditional Update (One Match)' do
+        metadata {
+          define_metadata('conditional-update')
+        }
+
+        result = TestResult.new('X033',"Conditional Update #{resource_class.name.demodulize} (One Match)", nil, nil, nil)
+        if !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
+          @preexisting = @temp_resource
+        elsif !@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
+          @preexisting = @bundle.entry[0].resource
+        end
+
+        if !@preexisting.nil?
+          begin
+            @preexisting.to_xml
+          rescue Exception
+            @preexisting = nil
+          end
+        end
+
+        if @preexisting.nil?
+          result.update(STATUS[:skip], "Unable to update -- existing #{resource_class.name.demodulize} is not available or was not valid.", nil)
+        else
+          ResourceGenerator.set_fields!(@preexisting)
+          ResourceGenerator.apply_invariants!(@preexisting)
+
+          searchParams = { '_id' => @preexisting_id }
+          ignore_client_exception { @preexisting.conditional_update(searchParams) }
+
+          if @client.reply.code==200
+            result.update(STATUS[:pass], "Updated existing #{resource_class.name.demodulize}.", @client.reply.body)
+          elsif @client.reply.code==201
+            # check created id -- see if it matches the one we used, or is new
+            resulting_id = @client.reply.id
+
+            if(@preexisting_id != resulting_id)
+              result.update(STATUS[:fail], "Server created (201) new #{resource_class.name.demodulize} rather than update (200). A new ID (#{resulting_id}) was also created (was #{@preexisting_id}).", @client.reply.body)
+            else
+              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server responded with the wrong code (201, but should have been 200).", @client.reply.body)
+            end
+
+            resulting_version = @client.reply.version
+            if(@preexisting_version == resulting_version)
+              result.update(STATUS[:fail], "The #{resource_class.name.demodulize} was successfully updated, but the server did not update the resource version number.", @client.reply.body)
+            end
+          else
+            outcome = self.parse_operation_outcome(@client.reply.body) rescue nil
+            if outcome.nil?
+              message = "Response code #{@client.reply.code} with no OperationOutcome provided."
+            else
+              message = self.build_messages(outcome)
+            end
+            result.update(STATUS[:fail], message, @client.reply.body)
+          end
+        end
+
+        result
+      end
+
+
+      test 'X034', 'Conditional Update (Multiple Matches)' do
+        metadata {
+          define_metadata('conditional-update')
+        }
+
+        result = TestResult.new('X034',"Conditional Update #{resource_class.name.demodulize}", nil, nil, nil)
+        searchParams = { '_lastUpdated' => 'gt1900-01-01' }
+        ignore_client_exception { @conditional_update_resource_c = ResourceGenerator.generate(@resource_class,3).conditional_update(searchParams) }
+
+        if @client.reply.code==412
+          result.update(STATUS[:pass], "Request correctly failed.", @client.reply.body)
+          @conditional_update_resource_c = nil
+        else
+          result.update(STATUS[:fail], "Request should have failed with HTTP 412.", @client.reply.body)
+        end
+        result
+      end
+
       #
       # Test if we can retrieve the history of a preexisting resource.
       #
@@ -215,12 +402,11 @@ module Crucible
         if @preexisting_id.nil?
           result.update(STATUS[:skip], "Preexisting #{resource_class.name.demodulize} unknown.", nil)
         else
-          reply = @client.resource_instance_history(@resource_class, @preexisting_id)
-          @history_bundle = reply.resource
+          @history_bundle = @resource_class.resource_instance_history(@preexisting_id)
           if @history_bundle.nil?
             raise AssertionException.new('Service did not respond with bundle.', nil)
           end
-          result.update(STATUS[:pass], 'Service responded with bundle.', reply.body)
+          result.update(STATUS[:pass], 'Service responded with bundle.', @client.reply.body)
         end
         result
       end
@@ -237,11 +423,11 @@ module Crucible
 
         if !@history_bundle.nil? && @history_bundle.total && @history_bundle.total>0 && @history_bundle.entry && !@history_bundle.entry[0].nil? && !@history_bundle.entry[0].resource.nil?
           @preexisting = @history_bundle.entry[0].resource
-          @preexisting_id = @preexisting.xmlId
+          @preexisting_id = @preexisting.id
           @preexisting_version = nil
           @preexisting_version = @preexisting.meta.versionId if !@preexisting.meta.nil?
-        elsif !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        elsif !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
           @preexisting_version = @temp_version
           @preexisting = @temp_resource
         end
@@ -249,15 +435,16 @@ module Crucible
         if @preexisting.nil?
           result.update(STATUS[:skip], "Preexisting #{resource_class.name.demodulize} unknown.", nil)
         else
-          reply = @client.vread(@resource_class, @preexisting_id, @preexisting_version)
-          if reply.resource.nil?
-            raise AssertionException.new("Server failed to return preexisting #{resource_class.name.demodulize}.", reply.body)
-          elsif reply.code != 200
-            raise AssertionException.new("Server returned preexisting #{resource_class.name.demodulize}, but responded with HTTP#{reply.code}.", nil)
-          elsif (reply.id != @preexisting_id) and (reply.version != @preexisting_version)
+          vread_resource = nil
+          ignore_client_exception { vread_resource = @preexisting.vread(@preexisting_version) }
+          if vread_resource.nil?
+            raise AssertionException.new("Server failed to return preexisting #{resource_class.name.demodulize}.", @client.reply.body)
+          elsif @client.reply.code != 200
+            raise AssertionException.new("Server returned preexisting #{resource_class.name.demodulize}, but responded with HTTP#{@client.reply.code}.", nil)
+          elsif (@client.reply.id != @preexisting_id) and (@client.reply.version != @preexisting_version)
             raise AssertionException.new("Server did not respond with correct information in the content-location header.", nil)
           end
-          result.update(STATUS[:pass], "Read current version of preexisting #{resource_class.name.demodulize}.", reply.body)
+          result.update(STATUS[:pass], "Read current version of preexisting #{resource_class.name.demodulize}.", @client.reply.body)
         end
         result
       end
@@ -274,7 +461,7 @@ module Crucible
 
         if !@history_bundle.nil? && @history_bundle.total && @history_bundle.total>0 && @history_bundle.entry && !@history_bundle.entry[0].nil? && !@history_bundle.entry[0].resource.nil?
           @preexisting = @history_bundle.entry[0].resource
-          @preexisting_id = @preexisting.xmlId
+          @preexisting_id = @preexisting.id
           @preexisting_version = nil
           @preexisting_version = @preexisting.meta.versionId if !@preexisting.meta.nil?
         end
@@ -282,15 +469,16 @@ module Crucible
         if @preexisting.nil?
           result.update(STATUS[:skip],"Previous version of #{resource_class.name.demodulize} unavailable.", nil)
         else
-          reply = @client.vread(@resource_class, @preexisting_id, @preexisting_version)
-          if reply.resource.nil?
-            raise AssertionException.new("Server failed to return preexisting #{resource_class.name.demodulize}.", reply.body)
-          elsif reply.code != 200
-            raise AssertionException.new("Server returned preexisting #{resource_class.name.demodulize}, but responded with HTTP#{reply.code}.", nil)
-          elsif (reply.id != @preexisting_id) and (reply.version != @preexisting_version)
+          vread_resource = nil
+          ignore_client_exception { vread_resource = @resource_class.vread(@preexisting_id, @preexisting_version) }
+          if vread_resource.nil?
+            raise AssertionException.new("Server failed to return preexisting #{resource_class.name.demodulize}.", @client.reply.body)
+          elsif @client.reply.code != 200
+            raise AssertionException.new("Server returned preexisting #{resource_class.name.demodulize}, but responded with HTTP#{@client.reply.code}.", nil)
+          elsif (@client.reply.id != @preexisting_id) and (@client.reply.version != @preexisting_version)
             raise AssertionException.new("Server did not respond with correct information in the content-location header.", nil)
           end
-          result.update(STATUS[:pass], "Read previous version of preexisting #{resource_class.name.demodulize}.", reply.body)
+          result.update(STATUS[:pass], "Read previous version of preexisting #{resource_class.name.demodulize}.", @client.reply.body)
         end
         result
       end
@@ -309,8 +497,8 @@ module Crucible
 
         result = TestResult.new('X060',"Validate #{resource_class.name.demodulize}", nil, nil, nil)
 
-        @temp_resource = ResourceGenerator.generate(@resource_class,3)
-        reply = @client.validate @temp_resource
+        tres = ResourceGenerator.generate(@resource_class,3)
+        reply = @client.validate tres
         if reply.code==200
           result.update(STATUS[:pass], "#{resource_class.name.demodulize} was validated.", reply.body)
         elsif reply.code==201
@@ -341,19 +529,26 @@ module Crucible
 
         result = TestResult.new('X065',"Validate existing #{resource_class.name.demodulize}", nil, nil, nil)
 
-        if !@bundle.nil? && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
-          @preexisting_id = @bundle.entry[0].resource.xmlId
+        if !@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
           @preexisting = @bundle.entry[0].resource
-        elsif !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        elsif !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
           @preexisting = @temp_resource
         end
 
+        is_preexisting_valid = false
         if !@preexisting.nil?
           begin
             @preexisting.to_xml
+            is_preexisting_valid = @preexisting.is_valid?
+            profile = FHIR::Definitions.get_resource_definition("#{resource_class.name.demodulize}")
+            if !profile.nil?
+              is_preexisting_valid &&= profile.validates_resource?(@preexisting)
+            end
           rescue Exception
             @preexisting = nil
+            is_preexisting_valid = false
           end
         end
 
@@ -369,7 +564,7 @@ module Crucible
             result.update(STATUS[:pass], "Existing #{resource_class.name.demodulize} was validated.", reply.body)
           elsif reply.code==201
             result.update(STATUS[:fail], "Server created a #{resource_class.name.demodulize} with the ID `_validate` rather than validate the resource.", reply.body)
-          elsif reply.code==400
+          elsif (400..499).include?(reply.code)
             outcome = self.parse_operation_outcome(reply.body) rescue nil
 
             if outcome.nil?
@@ -381,12 +576,16 @@ module Crucible
               security_codes = ['security','login','unknown','expired','forbidden','suppressed']
               processing_codes = ['processing','not-supported','duplicate','not-found','too-long','code-invalid','extension','too-costly','business-rule','conflict','incomplete']
               transient_codes = ['transient','lock-error','no-store','exception','timeout','throttled']
-            
+
               status = :pass
-              outcome.issue.each do |issue|
-                if ['fatal','error'].include?(issue.severity)
-                  status = :fail if security_codes.include?(issue.code) || transient_codes.include?(issue.code)
+              if is_preexisting_valid
+                outcome.issue.each do |issue|
+                  if ['fatal','error'].include?(issue.severity)
+                    status = :fail if security_codes.include?(issue.code) || transient_codes.include?(issue.code)
+                  end
                 end
+              else
+                message = "Server correctly rejected invalid preexisting resource."
               end
               result.update(STATUS[status], message, reply.body)
             end
@@ -429,8 +628,8 @@ module Crucible
 
         result = TestResult.new('X067',"Validate #{resource_class.name.demodulize} against a profile", nil, nil, nil)
 
-        @temp_resource = ResourceGenerator.generate(@resource_class,3)
-        reply = @client.validate(@temp_resource,{profile_uri: profile_uri})
+        tres = ResourceGenerator.generate(@resource_class,3)
+        reply = @client.validate(tres,{profile_uri: profile_uri})
         if reply.code==200
           result.update(STATUS[:pass], "#{resource_class.name.demodulize} was validated.", reply.body)
         elsif reply.code==201
@@ -464,12 +663,11 @@ module Crucible
         @x070_success = false
         result = TestResult.new('X070',"Delete existing #{resource_class.name.demodulize}", nil, nil, nil)
 
-        if !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        if !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
           @preexisting = @temp_resource
-        end
-        if @preexisting_id.nil? &&!@bundle.nil? && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
-          @preexisting_id = @bundle.entry[0].resource.xmlId
+        elsif @preexisting_id.nil? &&!@bundle.nil? && @bundle.is_a?(FHIR::Bundle) && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
+          @preexisting_id = @bundle.entry[0].resource.id
           @preexisting = @bundle.entry[0].resource
         end
 
@@ -513,12 +711,12 @@ module Crucible
 
         result = TestResult.new('X075',"Get Deleted #{resource_class.name.demodulize}", nil, nil, nil)
 
-        if !@temp_resource.nil?
-          @preexisting_id = @temp_id
+        if !@temp_resource.nil? && !@temp_resource.id.nil?
+          @preexisting_id = @temp_resource.id
           @preexisting = @temp_resource
         end
         if @preexisting_id.nil? &&!@bundle.nil? && @bundle.total && @bundle.total>0 && @bundle.entry && !@bundle.entry[0].nil? && !@bundle.entry[0].resource.nil?
-          @preexisting_id = @bundle.entry[0].resource.xmlId
+          @preexisting_id = @bundle.entry[0].resource.id
           @preexisting = @bundle.entry[0].resource
         end