Skip to content

Commit e8a0142

Browse files
committed
fixing tests for new pypi release 1.1.0
1 parent 2046850 commit e8a0142

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed
-1 Bytes
Binary file not shown.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="onepyece",
8-
version="1.0.1",
8+
version="1.1.0",
99
author="Rémi JARA",
1010
author_email="remi.jara4@gmail.com",
1111
description="A package to use the One-Piece API : https://api-onepiece.com/",
22 Bytes
Binary file not shown.
-12 Bytes
Binary file not shown.

tests/test_common.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def test_url_no_search(self, endpoint="characters"):
88
url = common.build_url(endpoint)
99
self.assertEqual(url, "https://api.api-onepiece.com/characters")
1010

11-
def test_url_with_search(self, endpoint="characters", search="id", resource="1"):
11+
def test_url_with_search(self, endpoint="characters", search="id", resource=1):
1212
url = common.build_url(endpoint, search, resource)
1313
self.assertEqual(url, "https://api.api-onepiece.com/characters/1")
1414

@@ -32,7 +32,7 @@ def test_url_by_title(self, endpoint="episodes", search="title", resource="Je su
3232
url = common.build_url(endpoint, search, resource)
3333
self.assertEqual(url, "https://api.api-onepiece.com/episodes/search/Je%20suis%20Luffy%20!")
3434

35-
def test_url_search_other_id(self, endpoint="boats", search="crew_id", resource="1"):
35+
def test_url_search_other_id(self, endpoint="boats", search="crew_id", resource=1):
3636
url = common.build_url(endpoint, search, resource)
3737
self.assertEqual(url, "https://api.api-onepiece.com/boats/search/crew/1")
3838

@@ -51,19 +51,19 @@ def test_endpoint_with_wrong_value(self, endpoint="wrong"):
5151
def test_search_no_resource(self, endpoint="characters", search="id"):
5252
self.assertRaises(ValueError, common.check_params, endpoint, search)
5353

54-
def test_search_with_resource(self, endpoint="characters", search="id", resource="1"):
54+
def test_search_with_resource(self, endpoint="characters", search="id", resource=1):
5555
self.assertEqual(common.check_params(endpoint, search, resource), None)
5656

57-
def test_search_with_wrong_value(self, endpoint="characters", search="wrong", resource="1"):
57+
def test_search_with_wrong_value(self, endpoint="characters", search="wrong", resource=1):
5858
self.assertRaises(ValueError, common.check_params, endpoint, search, resource)
5959

6060

6161
class TestConvertName(unittest.TestCase):
62-
def test_convert_name(self, name="Baggy / Le Clown"):
63-
self.assertEqual(common.convert_name(name), "Baggy")
62+
def test_convert_resource(self, name="Baggy / Le Clown"):
63+
self.assertEqual(common.convert_resource(name), "Baggy")
6464

65-
def test_convert_name_with_space(self, name="Baggy / Le Clown "):
66-
self.assertEqual(common.convert_name(name), "Baggy")
65+
def test_convert_resource_with_space(self, name="Baggy / Le Clown "):
66+
self.assertEqual(common.convert_resource(name), "Baggy")
6767

6868

6969
class TestEndpointsSearches(unittest.TestCase):

tests/test_interface.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55

66
class TestAPI(unittest.TestCase):
77
def test_unique_character(self):
8-
api_object = interface.API("characters", "id", "1")
8+
api_object = interface.API("characters", "id", 1)
99
self.assertIsInstance(api_object, interface.API)
10-
self.assertEqual(api_object.resource, "1")
10+
self.assertEqual(api_object.resource, 1)
1111
self.assertEqual(api_object.id, 1)
1212
self.assertEqual(api_object.french_name, "Monkey D Luffy")
1313

1414
def test_unique_character_with_wrong_resource_id(self):
1515
self.assertRaises(ValueError, interface.API, "characters", "id", "wrong")
1616

1717
def test_unique_character_with_wrong_search(self):
18-
self.assertRaises(ValueError, interface.API, "characters", "wrong", "1")
18+
self.assertRaises(ValueError, interface.API, "characters", "wrong", 1)
1919

2020
def test_unique_character_with_wrong_endpoint(self):
21-
self.assertRaises(ValueError, interface.API, "wrong", "id", "1")
21+
self.assertRaises(ValueError, interface.API, "wrong", "id", 1)
2222

2323
def test_multiple_result(self):
2424
api_object = interface.API("hakis", "name", "Haki")
2525
self.assertIsInstance(api_object, interface.API)
2626
self.assertIsInstance(api_object.results, list)
2727
self.assertEqual(api_object.resource, "Haki")
2828
self.assertRaises(AttributeError, getattr, api_object, "id")
29-
self.assertIsInstance(api_object.results[0], dict)
30-
self.assertEqual(api_object.results[0]["french_name"], "Haki de l'Observation")
29+
self.assertIsInstance(api_object.results[0], interface.API)
30+
self.assertEqual(api_object.results[0].french_name, "Haki de l'Observation")
3131

3232
def test_count_implicit(self):
3333
api_object = interface.API("hakis")
@@ -49,8 +49,8 @@ def test_iterate_object(self):
4949
api_object = interface.API("crews")
5050
self.assertIsInstance(api_object, interface.API)
5151
for result in api_object:
52-
self.assertIsInstance(result, dict)
52+
self.assertIsInstance(result, interface.API)
5353
# Unique result -> do not iterate
54-
api_object = interface.API("crews", "id", "1")
54+
api_object = interface.API("crews", "id", 1)
5555
self.assertIsInstance(api_object, interface.API)
5656
self.assertRaises(TypeError, iter, api_object)

0 commit comments

Comments
 (0)