Skip to content
Snippets Groups Projects
Verified Commit 3fbeb529 authored by Martin Weise's avatar Martin Weise
Browse files

Fixed tests

parent 1bc43865
No related branches found
No related tags found
2 merge requests!387Wrong model,!384Wrong model
...@@ -6,6 +6,7 @@ import at.tuwien.api.database.query.QueryPersistDto; ...@@ -6,6 +6,7 @@ import at.tuwien.api.database.query.QueryPersistDto;
import at.tuwien.api.database.query.SubsetDto; import at.tuwien.api.database.query.SubsetDto;
import at.tuwien.endpoints.SubsetEndpoint; import at.tuwien.endpoints.SubsetEndpoint;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.CacheService; import at.tuwien.service.CacheService;
import at.tuwien.service.DatabaseService; import at.tuwien.service.DatabaseService;
import at.tuwien.service.StorageService; import at.tuwien.service.StorageService;
...@@ -65,6 +66,9 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -65,6 +66,9 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@MockBean @MockBean
private CacheService credentialService; private CacheService credentialService;
@MockBean
private MetadataServiceGateway metadataServiceGateway;
@BeforeEach @BeforeEach
public void beforeEach() { public void beforeEach() {
genesis(); genesis();
...@@ -328,6 +332,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -328,6 +332,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(QUERY_5_ID); .thenReturn(QUERY_5_ID);
when(databaseService.inspectView(any(DatabaseDto.class), anyString())) when(databaseService.inspectView(any(DatabaseDto.class), anyString()))
.thenReturn(QUERY_5_VIEW_DTO); .thenReturn(QUERY_5_VIEW_DTO);
when(metadataServiceGateway.getIdentifiers(DATABASE_3_ID, QUERY_5_ID))
.thenReturn(List.of());
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("POST"); .thenReturn("POST");
...@@ -358,6 +364,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -358,6 +364,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(QUERY_5_VIEW_DTO); .thenReturn(QUERY_5_VIEW_DTO);
when(databaseService.inspectView(any(DatabaseDto.class), anyString())) when(databaseService.inspectView(any(DatabaseDto.class), anyString()))
.thenReturn(QUERY_5_VIEW_DTO); .thenReturn(QUERY_5_VIEW_DTO);
when(metadataServiceGateway.getIdentifiers(DATABASE_3_ID, QUERY_5_ID))
.thenReturn(List.of());
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("POST"); .thenReturn("POST");
...@@ -432,6 +440,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -432,6 +440,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(mock); .thenReturn(mock);
when(databaseService.inspectView(any(DatabaseDto.class), anyString())) when(databaseService.inspectView(any(DatabaseDto.class), anyString()))
.thenReturn(QUERY_1_VIEW_DTO); .thenReturn(QUERY_1_VIEW_DTO);
when(metadataServiceGateway.getIdentifiers(DATABASE_1_ID, QUERY_1_ID))
.thenReturn(List.of(IDENTIFIER_1_BRIEF_DTO, IDENTIFIER_2_BRIEF_DTO));
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("POST"); .thenReturn("POST");
...@@ -453,6 +463,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -453,6 +463,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(QUERY_8_DTO); .thenReturn(QUERY_8_DTO);
when(subsetService.getData(any(DatabaseDto.class), anyString())) when(subsetService.getData(any(DatabaseDto.class), anyString()))
.thenReturn(mock); .thenReturn(mock);
when(metadataServiceGateway.getIdentifiers(DATABASE_2_ID, QUERY_8_ID))
.thenReturn(List.of());
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("POST"); .thenReturn("POST");
...@@ -480,6 +492,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -480,6 +492,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(mock); .thenReturn(mock);
when(databaseService.inspectView(any(DatabaseDto.class), anyString())) when(databaseService.inspectView(any(DatabaseDto.class), anyString()))
.thenReturn(QUERY_5_VIEW_DTO); .thenReturn(QUERY_5_VIEW_DTO);
when(metadataServiceGateway.getIdentifiers(DATABASE_3_ID, QUERY_5_ID))
.thenReturn(List.of());
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("GET"); .thenReturn("GET");
...@@ -532,6 +546,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest { ...@@ -532,6 +546,8 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
.thenReturn(mock); .thenReturn(mock);
when(databaseService.inspectView(any(DatabaseDto.class), anyString())) when(databaseService.inspectView(any(DatabaseDto.class), anyString()))
.thenReturn(QUERY_1_VIEW_DTO); .thenReturn(QUERY_1_VIEW_DTO);
when(metadataServiceGateway.getIdentifiers(DATABASE_1_ID, QUERY_1_ID))
.thenReturn(List.of(IDENTIFIER_1_BRIEF_DTO, IDENTIFIER_2_BRIEF_DTO));
when(httpServletRequest.getMethod()) when(httpServletRequest.getMethod())
.thenReturn("GET"); .thenReturn("GET");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment