From d76df82d5ae86c7cb8d16befaab5ec1930c38854 Mon Sep 17 00:00:00 2001 From: Moritz Staudinger <moritz.staudinger@tuwien.ac.at> Date: Thu, 3 Mar 2022 16:40:59 +0100 Subject: [PATCH] removed tests for saving Former-commit-id: c8f94dbce8c237b154b9a436068ca2f7808d66e2 --- .../QueryEndpointIntegrationTest.java | 24 ------------- .../endpoint/QueryEndpointUnitTest.java | 34 ------------------- 2 files changed, 58 deletions(-) diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointIntegrationTest.java index 760222876c..1188d4e14a 100644 --- a/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointIntegrationTest.java +++ b/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointIntegrationTest.java @@ -156,29 +156,5 @@ public class QueryEndpointIntegrationTest extends BaseUnitTest { assertEquals(QUERY_1_ID, response.getBody().getId()); } - @Test - public void save_succeeds() throws QueryStoreException, DatabaseNotFoundException, ImageNotSupportedException, - InterruptedException, SQLException, ContainerNotFoundException { - final SaveStatementDto statement = SaveStatementDto.builder() - .statement(QUERY_1_STATEMENT) - .build(); - - /* mock */ - DockerConfig.startContainer(CONTAINER_1); - MariaDbConfig.clearQueryStore(TABLE_1); - - /* test */ - final ResponseEntity<QueryDto> response = queryEndpoint.save(CONTAINER_1_ID, DATABASE_1_ID, statement); - assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals(QUERY_1_ID, response.getBody().getId()); - assertEquals(CONTAINER_1_ID, response.getBody().getCid()); - assertEquals(DATABASE_1_ID, response.getBody().getDbid()); - assertEquals(QUERY_1_STATEMENT, response.getBody().getQuery()); - assertEquals(QUERY_1_STATEMENT, response.getBody().getQueryNormalized()); - assertNull(response.getBody().getResultNumber()); - assertNull(response.getBody().getResultHash()); - } - } diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java index da894a812e..3ac55d0953 100644 --- a/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java +++ b/fda-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java @@ -116,38 +116,4 @@ public class QueryEndpointUnitTest extends BaseUnitTest { }); } - @Test - public void save_succeeds() throws QueryStoreException, DatabaseNotFoundException, ImageNotSupportedException, - ContainerNotFoundException { - final SaveStatementDto request = SaveStatementDto.builder() - .statement(QUERY_1_STATEMENT) - .build(); - - /* mock */ - when(storeService.insert(CONTAINER_1_ID, DATABASE_1_ID, null, request)) - .thenReturn(QUERY_1); - - /* test */ - final ResponseEntity<QueryDto> response = queryEndpoint.save(CONTAINER_1_ID, DATABASE_1_ID, request); - assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); - assertEquals(QUERY_1_DTO, response.getBody()); - } - - @Test - public void save_dbNotFound_fails() throws QueryStoreException, DatabaseNotFoundException, - ImageNotSupportedException, ContainerNotFoundException { - final SaveStatementDto request = SaveStatementDto.builder() - .statement(QUERY_1_STATEMENT) - .build(); - - /* mock */ - when(storeService.insert(CONTAINER_1_ID, DATABASE_1_ID, null, request)) - .thenThrow(DatabaseNotFoundException.class); - - /* test */ - assertThrows(DatabaseNotFoundException.class, () -> { - queryEndpoint.save(CONTAINER_1_ID, DATABASE_1_ID, request); - }); - } - } -- GitLab