Skip to content

Commit 5c0331c

Browse files
author
Chris Park
committed
Unit test fixes
1 parent 07a9eba commit 5c0331c

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

rosette/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ def validate(self):
344344
if self[option] is None:
345345
raise RosetteException(
346346
"missingParameter",
347-
"Required Transliteration parameter," + option + ", not supplied",
347+
"Required Transliteration parameter, " + option + ", not supplied",
348348
repr(option))
349349

350350

tests/test_rosette_api.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,6 @@ def test_name_deduplicatation_parameters(api, json_response):
472472

473473
params["threshold"] = 0.75
474474

475-
with pytest.raises(RosetteException) as e_rosette:
476-
result = api.name_deduplication(params)
477-
478475
result = api.name_deduplication(params)
479476
assert result["name"] == "Rosette API"
480477

@@ -599,7 +596,7 @@ def test_for_name_similarity_required_parameters(api, json_response):
599596
result = api.name_similarity(params)
600597

601598
assert e_rosette.value.status == 'missingParameter'
602-
assert e_rosette.value.message == 'Required Name Similarity parameter not supplied'
599+
assert e_rosette.value.message == 'Required Name Similarity parameter, name1, not supplied'
603600

604601
params["name1"] = {
605602
"text": matched_name_data1,
@@ -609,7 +606,7 @@ def test_for_name_similarity_required_parameters(api, json_response):
609606
result = api.name_similarity(params)
610607

611608
assert e_rosette.value.status == 'missingParameter'
612-
assert e_rosette.value.message == 'Required Name Similarity parameter not supplied'
609+
assert e_rosette.value.message == 'Required Name Similarity parameter, name2, not supplied'
613610

614611
params["name2"] = {"text": matched_name_data2, "entityType": "PERSON"}
615612

@@ -637,15 +634,16 @@ def test_for_name_translation_required_parameters(api, json_response):
637634
result = api.name_translation(params)
638635

639636
assert e_rosette.value.status == 'missingParameter'
640-
assert e_rosette.value.message == 'Required Name Translation parameter not supplied'
637+
assert e_rosette.value.message == 'Required Name Translation parameter, name, not supplied'
641638

642639
params["name"] = "some data to translate"
643640

644641
with pytest.raises(RosetteException) as e_rosette:
645642
result = api.name_translation(params)
646643

647644
assert e_rosette.value.status == 'missingParameter'
648-
assert e_rosette.value.message == 'Required Name Translation parameter not supplied'
645+
assert e_rosette.value.message == ('Required Name Translation parameter, '
646+
'targetLanguage, not supplied')
649647

650648
params["targetLanguage"] = "eng"
651649

0 commit comments

Comments
 (0)