diff --git a/dbrepo-auth-service/init/.coveragerc b/dbrepo-auth-service/init/.coveragerc index a387be84259ecf1c8b1387a407e3cfc528960a30..75f7db52f9e99d919ec9c797589ae1d56a4fdf9c 100644 --- a/dbrepo-auth-service/init/.coveragerc +++ b/dbrepo-auth-service/init/.coveragerc @@ -2,8 +2,6 @@ omit = # omit tests ./tests/* - # omit ext lib - ./omlib/* [html] directory = htmlcov diff --git a/dbrepo-auth-service/init/tests/test_unit_app.py b/dbrepo-auth-service/init/tests/test_unit_app.py index 4fb38ac2f45220d74f79ccbb12bc650f1cba4e3f..fc454cfa3ef1a358f1ce3a41c82e3f2c5d53a167 100644 --- a/dbrepo-auth-service/init/tests/test_unit_app.py +++ b/dbrepo-auth-service/init/tests/test_unit_app.py @@ -23,7 +23,7 @@ class AppUnitTest(unittest.TestCase): mock.post(f'{endpoint}/realms/master/protocol/openid-connect/token', json=self.token_res, status_code=400) # test try: - fetch() + fetch('admin') except IOError: pass @@ -33,7 +33,7 @@ class AppUnitTest(unittest.TestCase): mock.post(f'{endpoint}/realms/master/protocol/openid-connect/token', json=self.token_res, status_code=401) # test try: - fetch() + fetch('admin') except IOError: pass @@ -45,7 +45,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except FileNotFoundError: pass @@ -57,7 +57,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except FileNotFoundError: pass @@ -69,7 +69,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except FileNotFoundError: pass @@ -83,7 +83,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except ModuleNotFoundError: pass @@ -98,7 +98,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except ImportError: pass @@ -115,7 +115,7 @@ class AppUnitTest(unittest.TestCase): # test try: - fetch() + fetch('admin') except EnvironmentError: pass @@ -131,6 +131,6 @@ class AppUnitTest(unittest.TestCase): }], status_code=200) # test - ldap_user_id, user_id = fetch() + ldap_user_id, user_id = fetch('admin') self.assertEqual("7a0b4b7f-77cd-4f28-a665-2da443024621", ldap_user_id) self.assertEqual("5b516520-67cb-4aa0-86a6-d12f8b8f1a20", user_id) diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java index b25babb6e1122ba81d52002e624af6e575291402..0180368e4080137ffcf2ecad9f97b3705cee601b 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java @@ -991,16 +991,6 @@ public class TableEndpointUnitTest extends AbstractUnitTest { assertNotNull(body); } - @Test - @WithMockUser(username = USER_4_USERNAME) - public void findById_privateDatabasePrivateDataPrivateSchemaNoRole_fails() { - - /* test */ - assertThrows(NotAllowedException.class, () -> { - generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL, USER_4, DATABASE_1_USER_4_READ_ACCESS); - }); - } - @Test @WithMockUser(username = USER_4_USERNAME) public void delete_privateNoRole_fails() { diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py index 54a41cfbd79027fad93e5b2c570110ac17a4ea8f..ee4d0aeae40e6880f3ef3999c398023d76cbc4aa 100644 --- a/lib/python/tests/test_unit_database.py +++ b/lib/python/tests/test_unit_database.py @@ -76,6 +76,7 @@ class DatabaseUnitTest(unittest.TestCase): internal_name='test_abcd', is_public=True, is_schema_public=True, + is_dashboard_enabled=True, container=ContainerBrief( id="44d811a8-4019-46ba-bd57-ea10a2eb0c74", name='MariaDB Galera 11.1.3', @@ -134,6 +135,7 @@ class DatabaseUnitTest(unittest.TestCase): internal_name='test_abcd', is_public=True, is_schema_public=True, + is_dashboard_enabled=True, container=ContainerBrief( id="44d811a8-4019-46ba-bd57-ea10a2eb0c74", name='MariaDB Galera 11.1.3', @@ -261,6 +263,7 @@ class DatabaseUnitTest(unittest.TestCase): internal_name='test_abcd', is_public=True, is_schema_public=True, + is_dashboard_enabled=True, container=ContainerBrief( id="44d811a8-4019-46ba-bd57-ea10a2eb0c74", name='MariaDB Galera 11.1.3', @@ -379,6 +382,7 @@ class DatabaseUnitTest(unittest.TestCase): internal_name='test_abcd', is_public=True, is_schema_public=True, + is_dashboard_enabled=True, container=ContainerBrief( id="44d811a8-4019-46ba-bd57-ea10a2eb0c74", name='MariaDB Galera 11.1.3', diff --git a/lib/python/tests/test_unit_table.py b/lib/python/tests/test_unit_table.py index c67b54c6144016df23a85fc6bb8fe8c46b9a0565..8aa67d924e255836a76824614b21db7c19801ec7 100644 --- a/lib/python/tests/test_unit_table.py +++ b/lib/python/tests/test_unit_table.py @@ -1105,7 +1105,10 @@ class TableUnitTest(unittest.TestCase): def test_analyse_table_statistics_succeeds(self): with requests_mock.Mocker() as mock: exp = TableStatistics( - columns={"id": ColumnStatistic(val_min=1.0, val_max=9.0, mean=5.0, median=5.0, std_dev=2.73)}) + total_columns=1, + total_rows=1000, + columns={ + "id": ColumnStatistic(name="id", val_min=1.0, val_max=9.0, mean=5.0, median=5.0, std_dev=2.73)}) # mock mock.get( '/api/analyse/database/6bd39359-b154-456d-b9c2-caa516a45732/table/b3230b86-4743-498d-9015-3fad58049692/statistics',