From 52b0e1f6bab304ceb2a3ac89db443ef2ca84c8a6 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 4 Jun 2024 10:05:55 +0200
Subject: [PATCH] Fixed tests
---
lib/python/tests/test_unit_table.py | 26 ++++++++++++++++++++++----
lib/python/tests/test_unit_view.py | 8 +++++++-
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/lib/python/tests/test_unit_table.py b/lib/python/tests/test_unit_table.py
index 1a8e424ffc..03f5aca1af 100644
--- a/lib/python/tests/test_unit_table.py
+++ b/lib/python/tests/test_unit_table.py
@@ -8,7 +8,7 @@ from dbrepo.RestClient import RestClient
from pandas import DataFrame
from dbrepo.api.dto import Table, CreateTableConstraints, UserAttributes, User, Column, Constraints, ColumnType, Result, \
- Concept, Unit, TableStatistics, ColumnStatistic
+ Concept, Unit, TableStatistics, ColumnStatistic, PrimaryKey, TableMinimal, ColumnMinimal
from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, NameExistsError, QueryStoreError, \
AuthenticationError
@@ -31,7 +31,13 @@ class TableUnitTest(unittest.TestCase):
queue_name='test',
routing_key='dbrepo.test_database_1234.test',
is_public=True,
- constraints=Constraints(primary_key=["ID"], uniques=[], foreign_keys=[], checks=[]),
+ constraints=Constraints(uniques=[],
+ foreign_keys=[],
+ checks=[],
+ primary_key=[PrimaryKey(id=1,
+ table=TableMinimal(id=2, database_id=1),
+ column=ColumnMinimal(id=1, table_id=2,
+ database_id=1))]),
columns=[Column(id=1,
name="ID",
database_id=1,
@@ -135,7 +141,13 @@ class TableUnitTest(unittest.TestCase):
queue_name='test',
routing_key='dbrepo.test_database_1234.test',
is_public=True,
- constraints=Constraints(primary_key=["ID"], uniques=[], foreign_keys=[], checks=[]),
+ constraints=Constraints(uniques=[],
+ foreign_keys=[],
+ checks=[],
+ primary_key=[PrimaryKey(id=1,
+ table=TableMinimal(id=2, database_id=1),
+ column=ColumnMinimal(id=1, table_id=2,
+ database_id=1))]),
columns=[Column(id=1,
name="ID",
database_id=1,
@@ -169,7 +181,13 @@ class TableUnitTest(unittest.TestCase):
queue_name='test',
routing_key='dbrepo.test_database_1234.test',
is_public=True,
- constraints=Constraints(primary_key=["ID"], uniques=[], foreign_keys=[], checks=[]),
+ constraints=Constraints(uniques=[],
+ foreign_keys=[],
+ checks=[],
+ primary_key=[PrimaryKey(id=1,
+ table=TableMinimal(id=2, database_id=1),
+ column=ColumnMinimal(id=1, table_id=2,
+ database_id=1))]),
columns=[Column(id=1,
name="ID",
database_id=1,
diff --git a/lib/python/tests/test_unit_view.py b/lib/python/tests/test_unit_view.py
index e7ef8751e7..476f047370 100644
--- a/lib/python/tests/test_unit_view.py
+++ b/lib/python/tests/test_unit_view.py
@@ -7,7 +7,7 @@ import datetime
from dbrepo.RestClient import RestClient
from pandas import DataFrame
-from dbrepo.api.dto import UserAttributes, User, View, Result
+from dbrepo.api.dto import UserAttributes, User, View, Result, ViewColumn, ColumnType
from dbrepo.api.exceptions import ForbiddenError, NotExistsError, MalformedError, AuthenticationError
@@ -33,6 +33,8 @@ class ViewUnitTest(unittest.TestCase):
creator=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
attributes=UserAttributes(theme='light')),
is_public=True,
+ columns=[ViewColumn(id=1, name="id", internal_name="id", database_id=1, auto_generated=False,
+ column_type=ColumnType.BIGINT, is_public=True, is_null_allowed=False)],
created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
last_modified=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
identifiers=[])]
@@ -74,6 +76,8 @@ class ViewUnitTest(unittest.TestCase):
creator=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
attributes=UserAttributes(theme='light')),
is_public=True,
+ columns=[ViewColumn(id=1, name="id", internal_name="id", database_id=1, auto_generated=False,
+ column_type=ColumnType.BIGINT, is_public=True, is_null_allowed=False)],
created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
last_modified=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
identifiers=[])
@@ -115,6 +119,8 @@ class ViewUnitTest(unittest.TestCase):
creator=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
attributes=UserAttributes(theme='light')),
is_public=True,
+ columns=[ViewColumn(id=1, name="id", internal_name="id", database_id=1, auto_generated=False,
+ column_type=ColumnType.BIGINT, is_public=True, is_null_allowed=False)],
created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
last_modified=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
identifiers=[])
--
GitLab