Skip to content
Snippets Groups Projects
Commit 8f10a269 authored by Martin Weise's avatar Martin Weise
Browse files

resolved the tests

Former-commit-id: 5150d8ce
parent 736aa65f
No related branches found
No related tags found
1 merge request!23Sprint results
...@@ -14,9 +14,11 @@ import static java.time.temporal.ChronoUnit.HOURS; ...@@ -14,9 +14,11 @@ import static java.time.temporal.ChronoUnit.HOURS;
@TestPropertySource(locations = "classpath:application.properties") @TestPropertySource(locations = "classpath:application.properties")
public abstract class BaseIntegrationTest { public abstract class BaseIntegrationTest {
public final Long IMAGE_1_ID = 1L;
public final String IMAGE_1_REPOSITORY = "postgres"; public final String IMAGE_1_REPOSITORY = "postgres";
public final String IMAGE_1_TAG = "13-alpine"; public final String IMAGE_1_TAG = "13-alpine";
public final String IMAGE_1_HASH = "83b40f2726e5"; public final String IMAGE_1_HASH = "83b40f2726e5";
public final Long IMAGE_1_SIZE = 100000L;
public final Integer IMAGE_1_PORT = 5432; public final Integer IMAGE_1_PORT = 5432;
public final Instant IMAGE_1_BUILT = Instant.now().minus(40, HOURS); public final Instant IMAGE_1_BUILT = Instant.now().minus(40, HOURS);
public final List<ContainerImageEnvironmentItem> IMAGE_1_ENV = List.of(ContainerImageEnvironmentItem.builder() public final List<ContainerImageEnvironmentItem> IMAGE_1_ENV = List.of(ContainerImageEnvironmentItem.builder()
...@@ -28,9 +30,11 @@ public abstract class BaseIntegrationTest { ...@@ -28,9 +30,11 @@ public abstract class BaseIntegrationTest {
.value("postgres") .value("postgres")
.build()); .build());
public final Long IMAGE_2_ID = 2L;
public final String IMAGE_2_REPOSITORY = "redis"; public final String IMAGE_2_REPOSITORY = "redis";
public final String IMAGE_2_TAG = "latest"; public final String IMAGE_2_TAG = "latest";
public final String IMAGE_2_HASH = "f877e80bb9ef"; public final String IMAGE_2_HASH = "f877e80bb9ef";
public final Long IMAGE_2_SIZE = 200000L;
public final Integer IMAGE_2_PORT = 6379; public final Integer IMAGE_2_PORT = 6379;
public final Instant IMAGE_2_BUILT = Instant.now().minus(9, DAYS); public final Instant IMAGE_2_BUILT = Instant.now().minus(9, DAYS);
public final List<ContainerImageEnvironmentItem> IMAGE_2_ENV = List.of(ContainerImageEnvironmentItem.builder() public final List<ContainerImageEnvironmentItem> IMAGE_2_ENV = List.of(ContainerImageEnvironmentItem.builder()
...@@ -43,18 +47,22 @@ public abstract class BaseIntegrationTest { ...@@ -43,18 +47,22 @@ public abstract class BaseIntegrationTest {
.build()); .build());
public final ContainerImage IMAGE_1 = ContainerImage.builder() public final ContainerImage IMAGE_1 = ContainerImage.builder()
.id(IMAGE_1_ID)
.repository(IMAGE_1_REPOSITORY) .repository(IMAGE_1_REPOSITORY)
.tag(IMAGE_1_TAG) .tag(IMAGE_1_TAG)
.hash(IMAGE_1_HASH) .hash(IMAGE_1_HASH)
.size(IMAGE_1_SIZE)
.compiled(IMAGE_1_BUILT) .compiled(IMAGE_1_BUILT)
.environment(IMAGE_1_ENV) .environment(IMAGE_1_ENV)
.defaultPort(IMAGE_1_PORT) .defaultPort(IMAGE_1_PORT)
.build(); .build();
public final ContainerImage IMAGE_2 = ContainerImage.builder() public final ContainerImage IMAGE_2 = ContainerImage.builder()
.id(IMAGE_2_ID)
.repository(IMAGE_2_REPOSITORY) .repository(IMAGE_2_REPOSITORY)
.tag(IMAGE_2_TAG) .tag(IMAGE_2_TAG)
.hash(IMAGE_2_HASH) .hash(IMAGE_2_HASH)
.size(IMAGE_2_SIZE)
.compiled(IMAGE_2_BUILT) .compiled(IMAGE_2_BUILT)
.environment(IMAGE_2_ENV) .environment(IMAGE_2_ENV)
.defaultPort(IMAGE_2_PORT) .defaultPort(IMAGE_2_PORT)
...@@ -64,21 +72,24 @@ public abstract class BaseIntegrationTest { ...@@ -64,21 +72,24 @@ public abstract class BaseIntegrationTest {
public final String CONTAINER_1_HASH = "deadbeef"; public final String CONTAINER_1_HASH = "deadbeef";
public final ContainerImage CONTAINER_1_IMAGE = IMAGE_1; public final ContainerImage CONTAINER_1_IMAGE = IMAGE_1;
public final String CONTAINER_1_NAME = "u01"; public final String CONTAINER_1_NAME = "u01";
public final String CONTAINER_1_INTERNAL_NAME = "u01";
public final String CONTAINER_1_DATABASE = "univie"; public final String CONTAINER_1_DATABASE = "univie";
public final String CONTAINER_1_IP = "231.145.98.83"; public final String CONTAINER_1_IP = "172.28.0.3";
public final Instant CONTAINER_1_CREATED = Instant.now().minus(1, HOURS); public final Instant CONTAINER_1_CREATED = Instant.now().minus(1, HOURS);
public final Long CONTAINER_2_ID = 2L; public final Long CONTAINER_2_ID = 2L;
public final String CONTAINER_2_HASH = "0ff1ce"; public final String CONTAINER_2_HASH = "0ff1ce";
public final ContainerImage CONTAINER_2_IMAGE = IMAGE_2; public final ContainerImage CONTAINER_2_IMAGE = IMAGE_2;
public final String CONTAINER_2_NAME = "t01"; public final String CONTAINER_2_NAME = "t01";
public final String CONTAINER_2_INTERNAL_NAME = "u01";
public final String CONTAINER_2_DATABASE = "tuw"; public final String CONTAINER_2_DATABASE = "tuw";
public final String CONTAINER_2_IP = "233.145.99.83"; public final String CONTAINER_2_IP = "172.28.0.4";
public final Instant CONTAINER_2_CREATED = Instant.now().minus(1, HOURS); public final Instant CONTAINER_2_CREATED = Instant.now().minus(1, HOURS);
public final Container CONTAINER_1 = Container.builder() public final Container CONTAINER_1 = Container.builder()
.id(CONTAINER_1_ID) .id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME) .name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNAL_NAME)
.image(CONTAINER_1_IMAGE) .image(CONTAINER_1_IMAGE)
.hash(CONTAINER_1_HASH) .hash(CONTAINER_1_HASH)
.containerCreated(CONTAINER_1_CREATED) .containerCreated(CONTAINER_1_CREATED)
...@@ -87,6 +98,7 @@ public abstract class BaseIntegrationTest { ...@@ -87,6 +98,7 @@ public abstract class BaseIntegrationTest {
public final Container CONTAINER_2 = Container.builder() public final Container CONTAINER_2 = Container.builder()
.id(CONTAINER_2_ID) .id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME) .name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNAL_NAME)
.image(CONTAINER_2_IMAGE) .image(CONTAINER_2_IMAGE)
.hash(CONTAINER_2_HASH) .hash(CONTAINER_2_HASH)
.containerCreated(CONTAINER_2_CREATED) .containerCreated(CONTAINER_2_CREATED)
......
package at.tuwien.service; package at.tuwien.service;
import at.tuwien.BaseUnitTest; import at.tuwien.BaseIntegrationTest;
import at.tuwien.api.container.ContainerCreateRequestDto; import at.tuwien.api.container.ContainerCreateRequestDto;
import at.tuwien.api.container.ContainerStateDto; import at.tuwien.api.container.ContainerStateDto;
import at.tuwien.entities.container.Container; import at.tuwien.entities.container.Container;
...@@ -24,12 +24,13 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -24,12 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import static at.tuwien.BaseUnitTest.IMAGE_1_ENVIRONMENT;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@SpringBootTest @SpringBootTest
public class ContainerServiceIntegrationTest extends BaseUnitTest { public class ContainerServiceIntegrationTest extends BaseIntegrationTest {
@Autowired @Autowired
private ContainerService containerService; private ContainerService containerService;
...@@ -52,7 +53,6 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest { ...@@ -52,7 +53,6 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
@Transactional @Transactional
@BeforeEach @BeforeEach
public void beforeEach() { public void beforeEach() {
afterEach();
/* create network */ /* create network */
dockerClient.createNetworkCmd() dockerClient.createNetworkCmd()
.withName("fda-userdb") .withName("fda-userdb")
...@@ -71,7 +71,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest { ...@@ -71,7 +71,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
.withPortBindings(PortBinding.parse("5433:" + IMAGE_1_PORT))) .withPortBindings(PortBinding.parse("5433:" + IMAGE_1_PORT)))
.withName(CONTAINER_1_NAME) .withName(CONTAINER_1_NAME)
.withIpv4Address(CONTAINER_1_IP) .withIpv4Address(CONTAINER_1_IP)
.withHostName(CONTAINER_1_INTERNALNAME) .withHostName(CONTAINER_1_INTERNAL_NAME)
.exec(); .exec();
/* start container */ /* start container */
dockerClient.startContainerCmd(request.getId()).exec(); dockerClient.startContainerCmd(request.getId()).exec();
...@@ -106,7 +106,6 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest { ...@@ -106,7 +106,6 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
System.out.println("DELETE NETWORK " + network.getName()); System.out.println("DELETE NETWORK " + network.getName());
dockerClient.removeNetworkCmd(network.getId()).exec(); dockerClient.removeNetworkCmd(network.getId()).exec();
}); });
/* entities are deleted automatically by dirties context */
} }
@Test @Test
......
package at.tuwien.service; package at.tuwien.service;
import at.tuwien.BaseIntegrationTest;
import at.tuwien.BaseUnitTest; import at.tuwien.BaseUnitTest;
import at.tuwien.api.container.ContainerCreateRequestDto; import at.tuwien.api.container.ContainerCreateRequestDto;
import at.tuwien.api.container.ContainerStateDto; import at.tuwien.api.container.ContainerStateDto;
...@@ -27,11 +28,13 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -27,11 +28,13 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import static at.tuwien.BaseUnitTest.IMAGE_1_ENV_DTO;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@SpringBootTest @SpringBootTest
public class ImageServiceIntegrationTest extends BaseUnitTest { public class ImageServiceIntegrationTest extends BaseIntegrationTest {
@Autowired @Autowired
private ImageService imageService; private ImageService imageService;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment