From c8a3341318518ee39440bacb02755c09f6f87635 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Wed, 20 Sep 2023 12:35:06 +0200 Subject: [PATCH] Fixed some tests --- .../at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java | 2 +- .../at/tuwien/repository/ViewRepositoryIntegrationTest.java | 3 +-- .../java/at/tuwien/service/QueryServiceIntegrationTest.java | 3 +-- .../at/tuwien/service/StoreServiceIntegrationModifyTest.java | 3 +-- .../java/at/tuwien/service/ViewServiceIntegrationTest.java | 2 +- .../tuwien/service/ViewServicePersistenceIntegrationTest.java | 2 +- dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue | 3 ++- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java index 26a9add0bb..9b96beefef 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java @@ -93,7 +93,7 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest { TABLE_2.setColumns(TABLE_2_COLUMNS); /* metadata database */ imageRepository.save(IMAGE_1); - userRepository.save(USER_1); + userRepository.saveAll(List.of(USER_1, USER_2)); containerRepository.save(CONTAINER_1); databaseRepository.save(DATABASE_1_SIMPLE); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE)); diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java index 844d798d67..bcb12ab0b3 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java @@ -55,8 +55,7 @@ public class ViewRepositoryIntegrationTest extends BaseUnitTest { @BeforeEach public void beforeEach() { imageRepository.save(IMAGE_1); - userRepository.save(USER_1); - userRepository.save(USER_2); + userRepository.saveAll(List.of(USER_1, USER_2, USER_3)); containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE)); databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE)); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE)); diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java index 5469cb5107..32f6119398 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java @@ -87,8 +87,7 @@ public class QueryServiceIntegrationTest extends BaseUnitTest { MariaDbConfig.createInitDatabase(CONTAINER_1, DATABASE_1); /* metadata database */ imageRepository.save(IMAGE_1); - userRepository.save(USER_1); - userRepository.save(USER_2); + userRepository.saveAll(List.of(USER_1, USER_2, USER_3)); containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE)); databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE)); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE)); diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java index e7d733a529..13012ab5bb 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java @@ -79,8 +79,7 @@ public class StoreServiceIntegrationModifyTest extends BaseUnitTest { /* metadata database */ imageRepository.save(IMAGE_1); containerRepository.save(CONTAINER_1); - userRepository.save(USER_1); - userRepository.save(USER_5); + userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5)); databaseRepository.save(DATABASE_1_SIMPLE); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE)); tableColumnRepository.saveAll(TABLE_1_COLUMNS); diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java index a7568af28b..8cccc05515 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java @@ -98,7 +98,7 @@ public class ViewServiceIntegrationTest extends BaseUnitTest { public void beforeEach() { /* metadata database */ imageRepository.save(IMAGE_1); - userRepository.saveAll(List.of(USER_1, USER_2)); + userRepository.saveAll(List.of(USER_1, USER_2, USER_3)); containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE)); databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE)); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE)); diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java index a1e884e337..d29f53845a 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java @@ -77,7 +77,7 @@ public class ViewServicePersistenceIntegrationTest extends BaseUnitTest { public void beforeEach() { /* metadata database */ imageRepository.save(IMAGE_1); - userRepository.saveAll(List.of(USER_1, USER_2)); + userRepository.saveAll(List.of(USER_1, USER_2, USER_3)); containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE)); databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE)); tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE)); diff --git a/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue b/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue index a4b3d284fb..8a3df803ef 100644 --- a/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue +++ b/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue @@ -293,7 +293,8 @@ export default { return row }) }) - .catch(() => { + .catch((error) => { + console.error('load data resulted in error', error) this.error = true }) .finally(() => { -- GitLab