fix assert equals and types for basic tests

Author: blankdots

tests/test_basic.py

@@ -147,8 +147,11 @@ def test_access_resolution_base(self):
         request = PARAMS
         token = mock_token(False, [], False)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1, 2], [3, 4], [5, 6])
-        assert result == (['PUBLIC'], [1, 2])
+        result = access_resolution(request, token, host, ["1", "2"], ["3", "4"], ["5", "6"])
+        self.assertListEqual(result[0], ['PUBLIC'])
+        intermediate_list = result[1]
+        intermediate_list.sort()
+        self.assertListEqual(["1", "2"], intermediate_list)
 
     def test_access_resolution_no_controlled(self):
         """Test assumptions for access resolution for token but no controlled datasets.
@@ -158,8 +161,11 @@ def test_access_resolution_no_controlled(self):
         request = PARAMS
         token = mock_token(False, [], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1, 2], [3, 4], [5, 6])
-        assert result == (['PUBLIC'], [1, 2])
+        result = access_resolution(request, token, host, ["1", "2"], ["3", "4"], ["5", "6"])
+        self.assertListEqual(result[0], ['PUBLIC'])
+        intermediate_list = result[1]
+        intermediate_list.sort()
+        self.assertListEqual(["1", "2"], intermediate_list)
 
     def test_access_resolution_registered(self):
         """Test assumptions for access resolution for token with just bona_fide.
@@ -169,30 +175,39 @@ def test_access_resolution_registered(self):
         request = PARAMS
         token = mock_token(True, [], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1, 2], [3, 4], [5, 6])
-        assert result == (['PUBLIC', 'REGISTERED'], [1, 2, 3, 4])
+        result = access_resolution(request, token, host, ["1", "2"], ["3", "4"], ["5", "6"])
+        self.assertListEqual(result[0], ['PUBLIC', 'REGISTERED'])
+        intermediate_list = result[1]
+        intermediate_list.sort()
+        self.assertListEqual(["1", "2", "3", "4"], intermediate_list)
 
     def test_access_resolution_controlled_no_registered(self):
         """Test assumptions for access resolution for token and no bona_fide.
 
         It is based on the result of fetch_datasets_access function.
         """
         request = PARAMS
-        token = mock_token(False, [5, 6], True)
+        token = mock_token(False, ["5", "6"], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1, 2], [3, 4], [5, 6])
-        assert result == (['PUBLIC', 'CONTROLLED'], [1, 2, 5, 6])
+        result = access_resolution(request, token, host, ["1", "2"], ["3", "4"], ["5", "6"])
+        self.assertListEqual(result[0], ['PUBLIC', 'CONTROLLED'])
+        intermediate_list = result[1]
+        intermediate_list.sort()
+        self.assertListEqual(["1", "2", "5", "6"], intermediate_list)
 
     def test_access_resolution_controlled_registered(self):
         """Test assumptions for access resolution for token and bona_fide.
 
         It is based on the result of fetch_datasets_access function.
         """
         request = PARAMS
-        token = mock_token(True, [5, 6], True)
+        token = mock_token(True, ["5", "6"], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1, 2], [3, 4], [5, 6])
-        assert result == (['PUBLIC', 'REGISTERED', 'CONTROLLED'], [1, 2, 3, 4, 5, 6])
+        result = access_resolution(request, token, host, ["1", "2"], ["3", "4"], ["5", "6"])
+        self.assertListEqual(result[0], ['PUBLIC', 'REGISTERED' ,'CONTROLLED'])
+        intermediate_list = result[1]
+        intermediate_list.sort()
+        self.assertListEqual(["1", "2", "3", "4", "5", "6"], intermediate_list)
 
     def test_access_resolution_bad_registered(self):
         """Test assumptions for access resolution for requested registered Unauthorized.
@@ -203,7 +218,7 @@ def test_access_resolution_bad_registered(self):
         token = mock_token(False, [], False)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPUnauthorized):
-            access_resolution(request, token, host, [], [3], [])
+            access_resolution(request, token, host, [], ["3"], [])
 
     def test_access_resolution_no_registered2(self):
         """Test assumptions for access resolution for requested registered Forbidden.
@@ -214,7 +229,7 @@ def test_access_resolution_no_registered2(self):
         token = mock_token(False, [], True)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPForbidden):
-            access_resolution(request, token, host, [], [4], [])
+            access_resolution(request, token, host, [], ["4"], [])
 
     def test_access_resolution_controlled_forbidden(self):
         """Test assumptions for access resolution for requested controlled Forbidden.
@@ -225,7 +240,7 @@ def test_access_resolution_controlled_forbidden(self):
         token = mock_token(False, [7], True)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPForbidden):
-            access_resolution(request, token, host, [], [6], [])
+            access_resolution(request, token, host, [], ["6"], [])
 
     def test_access_resolution_controlled_unauthorized(self):
         """Test assumptions for access resolution for requested controlled Unauthorized.
@@ -236,29 +251,29 @@ def test_access_resolution_controlled_unauthorized(self):
         token = mock_token(False, [], False)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPUnauthorized):
-            access_resolution(request, token, host, [], [5], [])
+            access_resolution(request, token, host, [], ["5"], [])
 
     def test_access_resolution_controlled_no_perms(self):
         """Test assumptions for access resolution for requested controlled Forbidden.
 
         It is based on the result of fetch_datasets_access function.
         """
         request = PARAMS
-        token = mock_token(False, [7], True)
+        token = mock_token(False, ["7"], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [2], [6], [])
-        assert result == (['PUBLIC'], [2])
+        result = access_resolution(request, token, host, ["2"], ["6"], [])
+        self.assertEqual(result, (['PUBLIC'], ["2"]))
 
     def test_access_resolution_controlled_some(self):
         """Test assumptions for access resolution for requested controlled some datasets.
 
         It is based on the result of fetch_datasets_access function.
         """
         request = PARAMS
-        token = mock_token(False, [5], True)
+        token = mock_token(False, ["5"], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [], [], [5, 6])
-        assert result == (['CONTROLLED'], [5])
+        result = access_resolution(request, token, host, [], [], ["5", "6"])
+        self.assertEqual(result, (['CONTROLLED'], ["5"]))
 
     def test_access_resolution_controlled_no_perms_public(self):
         """Test assumptions for access resolution for requested controlled and public, returning public only.
@@ -268,8 +283,8 @@ def test_access_resolution_controlled_no_perms_public(self):
         request = PARAMS
         token = mock_token(False, [], False)
         host = 'localhost'
-        result = access_resolution(request, token, host, [1], [], [5])
-        assert result == (['PUBLIC'], [1])
+        result = access_resolution(request, token, host, ["1"], [], ["5"])
+        self.assertEqual(result, (['PUBLIC'], ["1"]))
 
     def test_access_resolution_controlled_no_perms_bonafide(self):
         """Test assumptions for access resolution for requested controlled and registered, returning registered only.
@@ -279,8 +294,8 @@ def test_access_resolution_controlled_no_perms_bonafide(self):
         request = PARAMS
         token = mock_token(True, [], True)
         host = 'localhost'
-        result = access_resolution(request, token, host, [], [4], [7])
-        assert result == (['REGISTERED'], [4])
+        result = access_resolution(request, token, host, [], ["4"], ["7"])
+        self.assertEqual(result, (['REGISTERED'], ["4"]))
 
     def test_access_resolution_controlled_never_reached(self):
         """Test assumptions for access resolution for requested controlled unauthorized.
@@ -292,7 +307,7 @@ def test_access_resolution_controlled_never_reached(self):
         token = mock_token(False, None, False)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPUnauthorized):
-            access_resolution(request, token, host, [], [], [8])
+            access_resolution(request, token, host, [], [], ["8"])
 
     def test_access_resolution_controlled_never_reached2(self):
         """Test assumptions for access resolution for requested controlled forbidden.
@@ -304,7 +319,7 @@ def test_access_resolution_controlled_never_reached2(self):
         token = mock_token(False, None, True)
         host = 'localhost'
         with self.assertRaises(aiohttp.web_exceptions.HTTPForbidden):
-            access_resolution(request, token, host, [], [], [8])
+            access_resolution(request, token, host, [], [], ["8"])
 
     @asynctest.mock.patch('beacon_api.permissions.ga4gh.validate_passport')
     async def test_ga4gh_controlled(self, m_validation):

tests/test_db_load.py

@@ -225,7 +225,7 @@ async def test_check_tables(self, db_mock):
         db_mock.assert_called()
         result = await self._db.check_tables(['DATATSET1', 'DATATSET2'])
         # No Missing tables
-        assert result == []
+        self.assertEqual(result, [])
 
     @asynctest.mock.patch('beacon_api.utils.db_load.LOG')
     @asynctest.mock.patch('beacon_api.utils.db_load.asyncpg.connect')