port nose tools (#878)

reduce usage of nose tools (assert_equals / true / false) unless its really needed

Author: dpep

tests/test_accept.py

@@ -2,7 +2,6 @@
 from flask import Flask
 import flask_restful
 from werkzeug import exceptions
-from nose.tools import assert_equals
 
 
 
@@ -21,8 +20,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'application/json')
 
 
     def test_accept_no_default_match_acceptable(self):
@@ -38,8 +37,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'application/json')
 
 
     def test_accept_default_override_accept(self):
@@ -55,8 +54,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'text/plain')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'application/json')
 
 
     def test_accept_default_any_pick_first(self):
@@ -77,8 +76,8 @@ def text_rep(data, status_code, headers=None):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', '*/*')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'application/json')
 
 
     def test_accept_no_default_no_match_not_acceptable(self):
@@ -94,8 +93,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'text/plain')])
-            assert_equals(res.status_code, 406)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 406)
+            self.assertEqual(res.content_type, 'application/json')
 
 
     def test_accept_no_default_custom_repr_match(self):
@@ -117,8 +116,8 @@ def text_rep(data, status_code, headers=None):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'text/plain')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'text/plain')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'text/plain')
 
 
     def test_accept_no_default_custom_repr_not_acceptable(self):
@@ -140,8 +139,8 @@ def text_rep(data, status_code, headers=None):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json')])
-            assert_equals(res.status_code, 406)
-            assert_equals(res.content_type, 'text/plain')
+            self.assertEqual(res.status_code, 406)
+            self.assertEqual(res.content_type, 'text/plain')
 
 
     def test_accept_no_default_match_q0_not_acceptable(self):
@@ -161,8 +160,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json; q=0')])
-            assert_equals(res.status_code, 406)
-            assert_equals(res.content_type, 'application/json')
+            self.assertEqual(res.status_code, 406)
+            self.assertEqual(res.content_type, 'application/json')
 
     def test_accept_no_default_accept_highest_quality_of_two(self):
         class Foo(flask_restful.Resource):
@@ -181,8 +180,8 @@ def text_rep(data, status_code, headers=None):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json; q=0.1, text/plain; q=1.0')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'text/plain')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'text/plain')
 
 
     def test_accept_no_default_accept_highest_quality_of_three(self):
@@ -203,8 +202,8 @@ def text_rep(data, status_code, headers=None):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'application/json; q=0.1, text/plain; q=0.3, text/html; q=0.2')])
-            assert_equals(res.status_code, 200)
-            assert_equals(res.content_type, 'text/plain')
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.content_type, 'text/plain')
 
 
     def test_accept_no_default_no_representations(self):
@@ -221,8 +220,8 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'text/plain')])
-            assert_equals(res.status_code, 406)
-            assert_equals(res.content_type, 'text/plain')
+            self.assertEqual(res.status_code, 406)
+            self.assertEqual(res.content_type, 'text/plain')
 
     def test_accept_invalid_default_no_representations(self):
 
@@ -238,4 +237,4 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/', headers=[('Accept', 'text/plain')])
-            assert_equals(res.status_code, 500)
+            self.assertEqual(res.status_code, 500)

tests/test_api.py

@@ -16,13 +16,12 @@
 import flask_restful.fields
 from flask_restful import OrderedDict
 from json import dumps, loads, JSONEncoder
-#noinspection PyUnresolvedReferences
-from nose.tools import assert_equals, assert_true, assert_false  # you need it for tests in form of continuations
+from nose.tools import assert_equal  # you need it for tests in form of continuations
 import six
 
 
 def check_unpack(expected, value):
-    assert_equals(expected, value)
+    assert_equal(expected, value)
 
 
 def test_unpack():
@@ -62,7 +61,7 @@ def test_unauthorized_no_challenge_by_default(self):
         response.headers = {}
         with app.test_request_context('/foo'):
             response = api.unauthorized(response)
-        assert_false('WWW-Authenticate' in response.headers)
+        self.assertFalse('WWW-Authenticate' in response.headers)
 
     def test_unauthorized(self):
         app = Flask(__name__)
@@ -433,10 +432,10 @@ def get(self):
         app = app.test_client()
 
         resp = app.get("/api")
-        assert_equals(resp.status_code, 404)
-        assert_equals('application/json', resp.headers['Content-Type'])
+        self.assertEqual(resp.status_code, 404)
+        self.assertEqual('application/json', resp.headers['Content-Type'])
         data = loads(resp.data.decode())
-        assert_true('message' in data)
+        self.assertTrue('message' in data)
 
     def test_handle_non_api_error(self):
         app = Flask(__name__)
@@ -742,7 +741,7 @@ def test_abort_custom_message(self):
             flask_restful.abort(404, message="no user")
             assert False  # We should never get here
         except Exception as e:
-            assert_equals(e.data['message'], "no user")
+            self.assertEqual(e.data['message'], "no user")
 
     def test_abort_type(self):
         self.assertRaises(HTTPException, lambda: flask_restful.abort(404))

tests/test_cors.py

@@ -2,7 +2,6 @@
 from flask import Flask
 import flask_restful
 from flask_restful.utils import cors
-from nose.tools import assert_equals, assert_true
 
 
 class CORSTestCase(unittest.TestCase):
@@ -20,12 +19,12 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/')
-            assert_equals(res.status_code, 200)
-            assert_equals(res.headers['Access-Control-Allow-Origin'], '*')
-            assert_equals(res.headers['Access-Control-Max-Age'], '21600')
-            assert_true('HEAD' in res.headers['Access-Control-Allow-Methods'])
-            assert_true('OPTIONS' in res.headers['Access-Control-Allow-Methods'])
-            assert_true('GET' in res.headers['Access-Control-Allow-Methods'])
+            self.assertEqual(res.status_code, 200)
+            self.assertEqual(res.headers['Access-Control-Allow-Origin'], '*')
+            self.assertEqual(res.headers['Access-Control-Max-Age'], '21600')
+            self.assertTrue('HEAD' in res.headers['Access-Control-Allow-Methods'])
+            self.assertTrue('OPTIONS' in res.headers['Access-Control-Allow-Methods'])
+            self.assertTrue('GET' in res.headers['Access-Control-Allow-Methods'])
 
     def test_access_control_expose_headers(self):
 
@@ -41,9 +40,9 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/')
-            assert_equals(res.status_code, 200)
-            assert_true('X-MY-HEADER' in res.headers['Access-Control-Expose-Headers'])
-            assert_true('X-ANOTHER-HEADER' in res.headers['Access-Control-Expose-Headers'])
+            self.assertEqual(res.status_code, 200)
+            self.assertTrue('X-MY-HEADER' in res.headers['Access-Control-Expose-Headers'])
+            self.assertTrue('X-ANOTHER-HEADER' in res.headers['Access-Control-Expose-Headers'])
 
     def test_access_control_allow_methods(self):
 
@@ -62,11 +61,11 @@ def post(self):
 
         with app.test_client() as client:
             res = client.get('/')
-            assert_equals(res.status_code, 200)
-            assert_true('HEAD' in res.headers['Access-Control-Allow-Methods'])
-            assert_true('OPTIONS' in res.headers['Access-Control-Allow-Methods'])
-            assert_true('GET' in res.headers['Access-Control-Allow-Methods'])
-            assert_true('POST' not in res.headers['Access-Control-Allow-Methods'])
+            self.assertEqual(res.status_code, 200)
+            self.assertTrue('HEAD' in res.headers['Access-Control-Allow-Methods'])
+            self.assertTrue('OPTIONS' in res.headers['Access-Control-Allow-Methods'])
+            self.assertTrue('GET' in res.headers['Access-Control-Allow-Methods'])
+            self.assertTrue('POST' not in res.headers['Access-Control-Allow-Methods'])
 
     def test_no_crossdomain(self):
 
@@ -80,7 +79,7 @@ def get(self):
 
         with app.test_client() as client:
             res = client.get('/')
-            assert_equals(res.status_code, 200)
-            assert_true('Access-Control-Allow-Origin' not in res.headers)
-            assert_true('Access-Control-Allow-Methods' not in res.headers)
-            assert_true('Access-Control-Max-Age' not in res.headers)
+            self.assertEqual(res.status_code, 200)
+            self.assertTrue('Access-Control-Allow-Origin' not in res.headers)
+            self.assertTrue('Access-Control-Allow-Methods' not in res.headers)
+            self.assertTrue('Access-Control-Max-Age' not in res.headers)