diff --git a/tests/test_client.py b/tests/test_client.py index b76ac81..3c70f1a 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -52,8 +52,8 @@ def test_valid_resource_paths(self): base_path = "/base/path" c = Client(user="foo", password="foo", instance="instance") r = c.resource(api_path=api_path, base_path=base_path) - self.assertEquals(r._api_path, api_path) - self.assertEquals(r._base_path, base_path) + self.assertEqual(r._api_path, api_path) + self.assertEqual(r._base_path, base_path) def test_valid_resource_paths_unicode(self): """:meth:`resource` should return a :class:`pysnow.Response` object with paths set to the expected value""" @@ -61,8 +61,8 @@ def test_valid_resource_paths_unicode(self): base_path = u"/base/path" c = Client(user="foo", password="foo", instance="instance") r = c.resource(api_path=api_path, base_path=base_path) - self.assertEquals(r._api_path, api_path) - self.assertEquals(r._base_path, base_path) + self.assertEqual(r._api_path, api_path) + self.assertEqual(r._base_path, base_path) def test_client_with_session(self): """Should be able to create a client given a requests session object.""" diff --git a/tests/test_oauth_client.py b/tests/test_oauth_client.py index b33f2d7..235a41c 100644 --- a/tests/test_oauth_client.py +++ b/tests/test_oauth_client.py @@ -128,7 +128,7 @@ def test_resource_with_token(self): c.set_token(self.mock_token) r = c.resource(api_path="/valid/path") - self.assertEquals(r._api_path, api_path) + self.assertEqual(r._api_path, api_path) def test_reset_token(self): """OAuthClient should set token property to None and bypass validation if passed token is `False`""" diff --git a/tests/test_params_builder.py b/tests/test_params_builder.py index a8262f8..24840d0 100644 --- a/tests/test_params_builder.py +++ b/tests/test_params_builder.py @@ -13,7 +13,7 @@ def test_stringify_dict(self): query = {"dict_foo": "dict_bar"} expected_string = "dict_foo=dict_bar" - self.assertEquals(ParamsBuilder.stringify_query(query), expected_string) + self.assertEqual(ParamsBuilder.stringify_query(query), expected_string) def test_stringify_query_builder(self): """:meth:`_stringify` should be able to convert a query builder object to a string of the expected value""" @@ -21,7 +21,7 @@ def test_stringify_query_builder(self): query = QueryBuilder().field("qb_foo").equals("qb_bar") expected_string = "qb_foo=qb_bar" - self.assertEquals(ParamsBuilder.stringify_query(query), expected_string) + self.assertEqual(ParamsBuilder.stringify_query(query), expected_string) def test_query_setter_getter(self): """:prop:query setter should set _sysparms['sysparm_query'] and be accessible using :prop:query getter""" @@ -31,8 +31,8 @@ def test_query_setter_getter(self): sp = ParamsBuilder() sp.query = query - self.assertEquals(sp.query, query) - self.assertEquals(sp._sysparms["sysparm_query"], query) + self.assertEqual(sp.query, query) + self.assertEqual(sp._sysparms["sysparm_query"], query) def test_stringify_invalid_type(self): """:meth:`_stringify` should raise an InvalidUsage exception if the query is of invalid type""" @@ -49,8 +49,8 @@ def test_apply_valid_limit(self): sp = ParamsBuilder() sp.limit = limit - self.assertEquals(sp._sysparms["sysparm_limit"], limit) - self.assertEquals(sp.limit, limit) + self.assertEqual(sp._sysparms["sysparm_limit"], limit) + self.assertEqual(sp.limit, limit) def test_apply_valid_offset(self): """:meth:`set_offset` should set `sysparm_offset` in :prop:`_sysparms`""" @@ -59,8 +59,8 @@ def test_apply_valid_offset(self): sp = ParamsBuilder() sp.offset = offset - self.assertEquals(sp._sysparms["sysparm_offset"], offset) - self.assertEquals(sp.offset, offset) + self.assertEqual(sp._sysparms["sysparm_offset"], offset) + self.assertEqual(sp.offset, offset) def test_apply_valid_fields(self): """:meth:`set_fields` should set `sysparm_fields` in :prop:`_sysparms` to a comma-separated string""" @@ -69,8 +69,8 @@ def test_apply_valid_fields(self): sp = ParamsBuilder() sp.fields = fields - self.assertEquals(sp._sysparms["sysparm_fields"], ",".join(fields)) - self.assertEquals(sp.fields, ",".join(fields)) + self.assertEqual(sp._sysparms["sysparm_fields"], ",".join(fields)) + self.assertEqual(sp.fields, ",".join(fields)) def test_apply_invalid_fields(self): """:meth:`set_fields` should raise an InvalidUsage exception if fields is of an invalid type""" @@ -109,12 +109,12 @@ def test_set_suppress_pagination_header(self): sp = ParamsBuilder() sp.suppress_pagination_header = True - self.assertEquals(sp._sysparms["sysparm_suppress_pagination_header"], True) - self.assertEquals(sp.suppress_pagination_header, True) + self.assertEqual(sp._sysparms["sysparm_suppress_pagination_header"], True) + self.assertEqual(sp.suppress_pagination_header, True) sp.suppress_pagination_header = False - self.assertEquals(sp._sysparms["sysparm_suppress_pagination_header"], False) - self.assertEquals(sp.suppress_pagination_header, False) + self.assertEqual(sp._sysparms["sysparm_suppress_pagination_header"], False) + self.assertEqual(sp.suppress_pagination_header, False) def test_set_exclude_reference_link(self): """:prop:`exclude_reference_link` setter should set `sysparm_exclude_reference_link` in :prop:`_sysparms`""" @@ -122,12 +122,12 @@ def test_set_exclude_reference_link(self): sp = ParamsBuilder() sp.exclude_reference_link = True - self.assertEquals(sp._sysparms["sysparm_exclude_reference_link"], True) - self.assertEquals(sp.exclude_reference_link, True) + self.assertEqual(sp._sysparms["sysparm_exclude_reference_link"], True) + self.assertEqual(sp.exclude_reference_link, True) sp.exclude_reference_link = False - self.assertEquals(sp._sysparms["sysparm_exclude_reference_link"], False) - self.assertEquals(sp.exclude_reference_link, False) + self.assertEqual(sp._sysparms["sysparm_exclude_reference_link"], False) + self.assertEqual(sp.exclude_reference_link, False) def test_set_display_value(self): """:prop:`display_value` setter should set `sysparm_display_value` in :prop:`_sysparms`""" @@ -135,16 +135,16 @@ def test_set_display_value(self): sp = ParamsBuilder() sp.display_value = True - self.assertEquals(sp._sysparms["sysparm_display_value"], True) - self.assertEquals(sp.display_value, True) + self.assertEqual(sp._sysparms["sysparm_display_value"], True) + self.assertEqual(sp.display_value, True) sp.display_value = False - self.assertEquals(sp._sysparms["sysparm_display_value"], False) - self.assertEquals(sp.display_value, False) + self.assertEqual(sp._sysparms["sysparm_display_value"], False) + self.assertEqual(sp.display_value, False) sp.display_value = "all" - self.assertEquals(sp._sysparms["sysparm_display_value"], "all") - self.assertEquals(sp.display_value, "all") + self.assertEqual(sp._sysparms["sysparm_display_value"], "all") + self.assertEqual(sp.display_value, "all") def test_set_exclude_reference_link_invalid(self): """:prop:`exclude_reference_link` setter should raise an exception if type is not bool""" @@ -189,9 +189,9 @@ def test_add_custom_parameter(self): sp = ParamsBuilder() sp.add_custom(custom_param) - self.assertEquals(sp.custom_params, custom_param) - self.assertEquals(sp._custom_params, custom_param) - self.assertEquals(sp.as_dict()["foo"], custom_param["foo"]) + self.assertEqual(sp.custom_params, custom_param) + self.assertEqual(sp._custom_params, custom_param) + self.assertEqual(sp.as_dict()["foo"], custom_param["foo"]) def test_add_invalid_custom_parameter(self): """:meth:`add_custom` should only accept dicts""" diff --git a/tests/test_resource.py b/tests/test_resource.py index 6dad7ae..d2bb108 100644 --- a/tests/test_resource.py +++ b/tests/test_resource.py @@ -130,10 +130,10 @@ def test_create_resource(self): resource_repr = type(repr(r)) - self.assertEquals(resource_repr, str) - self.assertEquals(r._base_path, self.base_path) - self.assertEquals(r._api_path, self.api_path) - self.assertEquals(r.path, self.base_path + self.api_path) + self.assertEqual(resource_repr, str) + self.assertEqual(r._base_path, self.base_path) + self.assertEqual(r._api_path, self.api_path) + self.assertEqual(r.path, self.base_path + self.api_path) @httpretty.activate def test_resource_request_default_timeout(self): @@ -205,7 +205,7 @@ def test_response_error(self): try: response.first() except ResponseError as e: - self.assertEquals(str(e), expected_str) + self.assertEqual(str(e), expected_str) @httpretty.activate def test_get_request_fields(self): @@ -224,8 +224,8 @@ def test_get_request_fields(self): str_fields = ",".join(self.get_fields) # List of fields should end up as comma-separated string - self.assertEquals(type(response), Response) - self.assertEquals(qs["sysparm_fields"], str_fields) + self.assertEqual(type(response), Response) + self.assertEqual(qs["sysparm_fields"], str_fields) @httpretty.activate def test_get_offset(self): @@ -243,7 +243,7 @@ def test_get_offset(self): response = self.resource.get(self.dict_query, offset=offset) qs = qs_as_dict(response._response.request.url) - self.assertEquals(int(qs["sysparm_offset"]), offset) + self.assertEqual(int(qs["sysparm_offset"]), offset) @httpretty.activate def test_get_limit(self): @@ -262,7 +262,7 @@ def test_get_limit(self): response = self.resource.get(self.dict_query, limit=limit) qs = qs_as_dict(response._response.request.url) - self.assertEquals(int(qs["sysparm_limit"]), limit) + self.assertEqual(int(qs["sysparm_limit"]), limit) @httpretty.activate def test_get_limit(self): @@ -281,7 +281,7 @@ def test_get_limit(self): response = self.resource.get(self.dict_query, limit=limit) qs = qs_as_dict(response._response.request.url) - self.assertEquals(int(qs["sysparm_limit"]), limit) + self.assertEqual(int(qs["sysparm_limit"]), limit) @httpretty.activate def test_get_one(self): @@ -298,7 +298,7 @@ def test_get_one(self): response = self.resource.get(self.dict_query) result = response.one() - self.assertEquals(result["sys_id"], self.record_response_get_one[0]["sys_id"]) + self.assertEqual(result["sys_id"], self.record_response_get_one[0]["sys_id"]) @httpretty.activate def test_get_all_empty(self): @@ -315,7 +315,7 @@ def test_get_all_empty(self): response = self.resource.get(self.dict_query, stream=True) result = list(response.all()) - self.assertEquals(result, []) + self.assertEqual(result, []) @httpretty.activate def test_get_nocontent(self): @@ -348,7 +348,7 @@ def test_get_all_single(self): response = self.resource.get(self.dict_query, stream=True) result = list(response.all())[0] - self.assertEquals(result, self.record_response_get_dict) + self.assertEqual(result, self.record_response_get_dict) @httpretty.activate def test_get_buffer_missing_result_keys(self): @@ -444,7 +444,7 @@ def test_get_one_or_none_empty(self): response = self.resource.get(self.dict_query) result = response.one_or_none() - self.assertEquals(result, None) + self.assertEqual(result, None) @httpretty.activate def test_get_first_or_none_empty(self): @@ -461,7 +461,7 @@ def test_get_first_or_none_empty(self): response = self.resource.get(self.dict_query, stream=True) result = response.first_or_none() - self.assertEquals(result, None) + self.assertEqual(result, None) @httpretty.activate def test_get_first_or_none(self): @@ -478,7 +478,7 @@ def test_get_first_or_none(self): response = self.resource.get(self.dict_query, stream=True) result = response.first_or_none() - self.assertEquals(result, self.record_response_get_three[0]) + self.assertEqual(result, self.record_response_get_three[0]) @httpretty.activate def test_get_first(self): @@ -495,7 +495,7 @@ def test_get_first(self): response = self.resource.get(self.dict_query, stream=True) result = response.first() - self.assertEquals(result, self.record_response_get_three[0]) + self.assertEqual(result, self.record_response_get_three[0]) @httpretty.activate def test_get_first_empty(self): @@ -527,8 +527,8 @@ def test_create(self): response = self.resource.create(self.record_response_create) - self.assertEquals(type(response.one()), dict) - self.assertEquals(response.one(), self.record_response_create) + self.assertEqual(type(response.one()), dict) + self.assertEqual(response.one(), self.record_response_create) @httpretty.activate def test_update(self): @@ -553,8 +553,8 @@ def test_update(self): response = self.resource.update(self.dict_query, self.record_response_update) result = response.one() - self.assertEquals(type(result), dict) - self.assertEquals(self.record_response_update["attr1"], result["attr1"]) + self.assertEqual(type(result), dict) + self.assertEqual(self.record_response_update["attr1"], result["attr1"]) @httpretty.activate def test_update_invalid_payload(self): @@ -592,8 +592,8 @@ def test_delete(self): result = self.resource.delete(self.dict_query) - self.assertEquals(type(result), dict) - self.assertEquals(result["status"], "record deleted") + self.assertEqual(type(result), dict) + self.assertEqual(result["status"], "record deleted") @httpretty.activate def test_delete_chained(self): @@ -617,8 +617,8 @@ def test_delete_chained(self): result = self.resource.get(query={}).delete() - self.assertEquals(type(result), dict) - self.assertEquals(result["status"], "record deleted") + self.assertEqual(type(result), dict) + self.assertEqual(result["status"], "record deleted") @httpretty.activate def test_custom(self): @@ -636,8 +636,8 @@ def test_custom(self): response = self.resource.request(method) - self.assertEquals(response._response.request.method, method) - self.assertEquals(type(response), Response) + self.assertEqual(response._response.request.method, method) + self.assertEqual(type(response), Response) @httpretty.activate def test_custom_with_headers(self): @@ -655,7 +655,7 @@ def test_custom_with_headers(self): response = self.resource.request("GET", headers=headers) - self.assertEquals(response._response.request.headers["foo"], headers["foo"]) + self.assertEqual(response._response.request.headers["foo"], headers["foo"]) @httpretty.activate def test_custom_with_path(self): @@ -673,7 +673,7 @@ def test_custom_with_path(self): response = self.resource.request("GET", path_append="/foo") - self.assertEquals(response._response.status_code, 200) + self.assertEqual(response._response.status_code, 200) @httpretty.activate def test_custom_with_path_invalid(self): @@ -702,7 +702,7 @@ def test_response_repr(self): response = self.resource.get(query={}) response_repr = repr(response) - self.assertEquals(response_repr, "") + self.assertEqual(response_repr, "") def test_attachment_non_table(self): """Accessing `Resource.attachments` from a non-table API should fail""" @@ -739,7 +739,7 @@ def test_get_response_item(self): response = self.resource.get(query={}) - self.assertEquals( + self.assertEqual( response["sys_id"], self.record_response_get_one[0].get("sys_id") )