diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/ContainerEndpointUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/ContainerEndpointUnitTest.java index 42b44f281479b01cd9d1c8496e1c69c2e0c1fe94..a974602d2b734617180c176fd4b6546abc251289 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/ContainerEndpointUnitTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/ContainerEndpointUnitTest.java @@ -118,7 +118,6 @@ public class ContainerEndpointUnitTest extends BaseUnitTest { /* test */ final ResponseEntity<ContainerDto> response = containerEndpoint.findById(CONTAINER_1_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(CONTAINER_1_ID, Objects.requireNonNull(response.getBody()).getId()); } @Test diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java new file mode 100644 index 0000000000000000000000000000000000000000..878905e7afdcf0b4e08ad7b3471474977b5da8b6 --- /dev/null +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java @@ -0,0 +1,54 @@ +package at.tuwien.service; + +import at.tuwien.BaseUnitTest; +import at.tuwien.api.container.ContainerCreateRequestDto; +import at.tuwien.api.container.ContainerStateDto; +import at.tuwien.api.container.image.ImageCreateDto; +import at.tuwien.entities.container.Container; +import at.tuwien.exception.*; +import at.tuwien.repository.ContainerRepository; +import at.tuwien.repository.ImageRepository; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.exception.NotModifiedException; +import com.github.dockerjava.api.model.HostConfig; +import com.github.dockerjava.api.model.Network; +import com.github.dockerjava.api.model.PortBinding; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(SpringExtension.class) +@SpringBootTest +public class ImageServiceIntegrationTest extends BaseUnitTest { + + @Autowired + private ImageService imageService; + + @Test + public void test_notFound_fails() { + final ImageCreateDto request = ImageCreateDto.builder() + .repository("s0m3th1ng_n0t3x1st1ng") + .tag("d3v_h3ll") + .defaultPort(IMAGE_1_PORT) + .environment(IMAGE_1_ENV_DTO) + .build(); + + /* test */ + assertThrows(ImageNotFoundException.class, () -> { + imageService.create(request); + }); + } + +} diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java index a3f1513cb933b01e5145119d9a03385a2f4db3d8..464dea92e91695129022eda60adb495f52652fbe 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java @@ -76,23 +76,6 @@ public class ImageServiceUnitTest extends BaseUnitTest { }); } - @Test - public void create_notFound_fails() throws ImageNotFoundException { - final ImageCreateDto request = ImageCreateDto.builder() - .repository(IMAGE_1_REPOSITORY) - .tag(IMAGE_1_TAG) - .defaultPort(IMAGE_1_PORT) - .environment(IMAGE_1_ENV_DTO) - .build(); - when(imageService.create(request)) - .thenThrow(ImageNotFoundException.class); - - /* test */ - assertThrows(ImageNotFoundException.class, () -> { - imageService.create(request); - }); - } - @Test public void create_duplicate_fails() throws ImageNotFoundException { final ImageCreateDto request = ImageCreateDto.builder() diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java index 60948dcd4c90da0342462fe76e70cbb0ef2e2861..fbe0039e8374bf2f2d3cac6350c1677b9a77fd64 100644 --- a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java +++ b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java @@ -55,6 +55,8 @@ public class TableServiceUnitTest extends BaseUnitTest { public void findAll_succeeds() throws TableNotFoundException, DatabaseNotFoundException { when(databaseRepository.findById(DATABASE_1_ID)) .thenReturn(Optional.of(DATABASE_1)); + when(tableRepository.findByDatabase(DATABASE_1)) + .thenReturn(List.of(TABLE_1)); /* test */ final List<Table> response = tableService.findAll(DATABASE_1_ID);