Skip to content

Commit

Permalink
Fix tests. Ref #55
Browse files Browse the repository at this point in the history
  • Loading branch information
mkizesov committed Mar 16, 2020
1 parent 5d1f23c commit 496c04c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions tests/test_lib_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async def test_create_patient(self):
)

patient = await self.client.resources('Patient') \
.search(id='patient').get()
.search(_id='patient').get()
assert patient['name'] == [{'text': 'My patient'}]

@pytest.mark.asyncio
Expand All @@ -69,7 +69,7 @@ async def test_update_patient(self):
await patient.save()

check_patient = await self.client.resources('Patient') \
.search(id='patient').get()
.search(_id='patient').get()
assert check_patient.active is True
assert check_patient['birthDate'] == '1945-01-12'
assert check_patient.get_by_path(['name', 0, 'text']) == 'SomeName'
Expand Down Expand Up @@ -100,13 +100,13 @@ async def test_delete(self):
await patient.delete()

with pytest.raises(ResourceNotFound):
await self.get_search_set('Patient').search(id='patient').get()
await self.get_search_set('Patient').search(_id='patient').get()

@pytest.mark.asyncio
async def test_get_not_existing_id(self):
with pytest.raises(ResourceNotFound):
await self.client.resources('Patient') \
.search(id='FHIRPypy_not_existing_id').get()
.search(_id='FHIRPypy_not_existing_id').get()

@pytest.mark.asyncio
async def test_get_more_than_one_resources(self):
Expand All @@ -130,11 +130,11 @@ async def test_get_resource_by_id_is_deprecated(self):
async def test_get_resource_by_search_with_id(self):
await self.create_resource('Patient', id='patient', gender='male')
patient = await self.client.resources('Patient') \
.search(gender='male', id='patient').get()
.search(gender='male', _id='patient').get()
assert patient.id == 'patient'
with pytest.raises(ResourceNotFound):
await self.client.resources('Patient') \
.search(gender='female', id='patient').get()
.search(gender='female', _id='patient').get()

@pytest.mark.asyncio
async def test_get_resource_by_search(self):
Expand Down Expand Up @@ -256,10 +256,10 @@ async def test_create_bundle(self):
}
await self.create_resource('Bundle', **bundle)
await self.client.resources('Patient').search(
id='bundle_patient_1'
_id='bundle_patient_1'
).get()
await self.client.resources('Patient').search(
id='bundle_patient_2'
_id='bundle_patient_2'
).get()

@pytest.mark.asyncio
Expand Down
16 changes: 8 additions & 8 deletions tests/test_lib_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_create_patient(self):
}]
)

patient = self.client.resources('Patient').search(id='patient').get()
patient = self.client.resources('Patient').search(_id='patient').get()
assert patient['name'] == [{'text': 'My patient'}]

def test_update_patient(self):
Expand All @@ -66,7 +66,7 @@ def test_update_patient(self):
patient.save()

check_patient = self.client.resources('Patient') \
.search(id='patient').get()
.search(_id='patient').get()
assert check_patient.active is True
assert check_patient['birthDate'] == '1945-01-12'
assert check_patient.get_by_path(['name', 0, 'text']) == 'SomeName'
Expand Down Expand Up @@ -94,12 +94,12 @@ def test_delete(self):
patient.delete()

with pytest.raises(ResourceNotFound):
self.get_search_set('Patient').search(id='patient').get()
self.get_search_set('Patient').search(_id='patient').get()

def test_get_not_existing_id(self):
with pytest.raises(ResourceNotFound):
self.client.resources('Patient') \
.search(id='FHIRPypy_not_existing_id').get()
.search(_id='FHIRPypy_not_existing_id').get()

def test_get_more_than_one_resources(self):
self.create_resource('Patient', birthDate='1901-05-25')
Expand All @@ -120,11 +120,11 @@ def test_get_resource_by_id_is_deprecated(self):
def test_get_resource_by_search_with_id(self):
self.create_resource('Patient', id='patient', gender='male')
patient = self.client.resources('Patient') \
.search(gender='male', id='patient').get()
.search(gender='male', _id='patient').get()
assert patient.id == 'patient'
with pytest.raises(ResourceNotFound):
self.client.resources('Patient') \
.search(gender='female', id='patient').get()
.search(gender='female', _id='patient').get()

def test_get_resource_by_search(self):
self.create_resource(
Expand Down Expand Up @@ -238,10 +238,10 @@ def test_create_bundle(self):
}
self.create_resource('Bundle', **bundle)
self.client.resources('Patient').search(
id='bundle_patient_1'
_id='bundle_patient_1'
).get()
self.client.resources('Patient').search(
id='bundle_patient_2'
_id='bundle_patient_2'
).get()

def test_is_valid(self):
Expand Down

0 comments on commit 496c04c

Please sign in to comment.