diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java index 87dd212a356b82172184b9a00bfbbe0387b00819..b3fffa115d80b6bf95561eac60d25da6b478a61c 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java @@ -86,94 +86,43 @@ public abstract class BaseUnitTest { .roles(List.of()) .build(); - public final static Long IMAGE_1_ID = 1L; - public final static String IMAGE_1_REPOSITORY = "mysql"; - public final static String IMAGE_1_TAG = "8.0"; + public final static Long IMAGE_1_ID = 2L; + public final static String IMAGE_1_REPOSITORY = "mariadb"; + public final static String IMAGE_1_TAG = "10.5"; public final static String IMAGE_1_HASH = "83b40f2726e5"; public final static Integer IMAGE_1_PORT = 3306; - public final static String IMAGE_1_DIALECT = "org.hibernate.dialect.MySQLDialect"; - public final static String IMAGE_1_DRIVER = "com.mysql.jdbc.Driver"; - public final static String IMAGE_1_JDBC = "mysql"; + public final static String IMAGE_1_DIALECT = "org.hibernate.dialect.MariaDBDialect"; + public final static String IMAGE_1_DRIVER = "org.mariadb.jdbc.Driver"; + public final static String IMAGE_1_JDBC = "mariadb"; public final static Long IMAGE_1_SIZE = 12000L; public final static Instant IMAGE_1_BUILT = Instant.now().minus(38, HOURS); public final static List<ContainerImageEnvironmentItem> IMAGE_1_ENV = List.of(ContainerImageEnvironmentItem.builder() .iid(IMAGE_1_ID) - .key("MYSQL_USER") - .value("mariadb") - .type(ContainerImageEnvironmentItemType.USERNAME) - .build(), - ContainerImageEnvironmentItem.builder() - .iid(IMAGE_1_ID) - .key("MYSQL_PASSWORD") - .value("mariadb") - .type(ContainerImageEnvironmentItemType.PASSWORD) - .build()); - - public final static List<ImageEnvItemDto> IMAGE_1_ENV_DTO = List.of(ImageEnvItemDto.builder() - .iid(IMAGE_1_ID) - .key("MYSQL_USER") - .value("mariadb") - .type(ImageEnvItemTypeDto.USERNAME) - .build(), - ImageEnvItemDto.builder() - .iid(IMAGE_1_ID) - .key("MYSQL_PASSWORD") - .value("mariadb") - .type(ImageEnvItemTypeDto.PASSWORD) - .build()); - - public final static ContainerImage IMAGE_1 = ContainerImage.builder() - .id(IMAGE_1_ID) - .repository(IMAGE_1_REPOSITORY) - .tag(IMAGE_1_TAG) - .hash(IMAGE_1_HASH) - .jdbcMethod(IMAGE_1_JDBC) - .dialect(IMAGE_1_DIALECT) - .driverClass(IMAGE_1_DRIVER) - .compiled(IMAGE_1_BUILT) - .size(IMAGE_1_SIZE) - .environment(IMAGE_1_ENV) - .defaultPort(IMAGE_1_PORT) - .build(); - - public final static Long IMAGE_2_ID = 2L; - public final static String IMAGE_2_REPOSITORY = "mariadb"; - public final static String IMAGE_2_TAG = "10.5"; - public final static String IMAGE_2_HASH = "83b40f2726e5"; - public final static Integer IMAGE_2_PORT = 3306; - public final static String IMAGE_2_DIALECT = "org.hibernate.dialect.MariaDBDialect"; - public final static String IMAGE_2_DRIVER = "org.mariadb.jdbc.Driver"; - public final static String IMAGE_2_JDBC = "mariadb"; - public final static Long IMAGE_2_SIZE = 12000L; - public final static Instant IMAGE_2_BUILT = Instant.now().minus(38, HOURS); - - public final static List<ContainerImageEnvironmentItem> IMAGE_2_ENV = List.of(ContainerImageEnvironmentItem.builder() - .iid(IMAGE_2_ID) .key("MARIADB_USER") .value("mariadb") .type(ContainerImageEnvironmentItemType.USERNAME) .build(), ContainerImageEnvironmentItem.builder() - .iid(IMAGE_2_ID) + .iid(IMAGE_1_ID) .key("MARIADB_PASSWORD") .value("mariadb") .type(ContainerImageEnvironmentItemType.PASSWORD) .build(), ContainerImageEnvironmentItem.builder() - .iid(IMAGE_2_ID) + .iid(IMAGE_1_ID) .key("MARIADB_ROOT_PASSWORD") .value("mariadb") .type(ContainerImageEnvironmentItemType.PRIVILEGED_PASSWORD) .build(), ContainerImageEnvironmentItem.builder() - .iid(IMAGE_2_ID) + .iid(IMAGE_1_ID) .key("UZERNAME") .value("root") .type(ContainerImageEnvironmentItemType.PRIVILEGED_USERNAME) .build()); - public final static List<ImageEnvItemDto> IMAGE_2_ENV_DTO = List.of(ImageEnvItemDto.builder() + public final static List<ImageEnvItemDto> IMAGE_1_ENV_DTO = List.of(ImageEnvItemDto.builder() .iid(IMAGE_1_ID) .key("MARIADB_USER") .value("mariadb") @@ -186,18 +135,18 @@ public abstract class BaseUnitTest { .type(ImageEnvItemTypeDto.PASSWORD) .build()); - public final static ContainerImage IMAGE_2 = ContainerImage.builder() - .id(IMAGE_2_ID) - .repository(IMAGE_2_REPOSITORY) - .tag(IMAGE_2_TAG) - .hash(IMAGE_2_HASH) - .jdbcMethod(IMAGE_2_JDBC) - .dialect(IMAGE_2_DIALECT) - .driverClass(IMAGE_2_DRIVER) - .compiled(IMAGE_2_BUILT) - .size(IMAGE_2_SIZE) - .environment(IMAGE_2_ENV) - .defaultPort(IMAGE_2_PORT) + public final static ContainerImage IMAGE_1 = ContainerImage.builder() + .id(IMAGE_1_ID) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) + .hash(IMAGE_1_HASH) + .jdbcMethod(IMAGE_1_JDBC) + .dialect(IMAGE_1_DIALECT) + .driverClass(IMAGE_1_DRIVER) + .compiled(IMAGE_1_BUILT) + .size(IMAGE_1_SIZE) + .environment(IMAGE_1_ENV) + .defaultPort(IMAGE_1_PORT) .build(); public final static Long CONTAINER_1_ID = 1L; diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java index 1c1f89acbf0ad64f7a2fa12f5a36fd1f8c7c079d..f8ca6a0891f6135831e2a913a814ad541fef6515 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java @@ -5,6 +5,7 @@ import at.tuwien.api.container.ContainerCreateRequestDto; import at.tuwien.config.DockerUtil; import at.tuwien.config.ReadyConfig; import at.tuwien.entities.container.Container; +import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.exception.ContainerAlreadyExistsException; import at.tuwien.exception.DockerClientException; import at.tuwien.exception.ImageNotFoundException; @@ -79,7 +80,20 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest { /* mock data */ userRepository.save(USER_1); - imageRepository.save(IMAGE_1); + final ContainerImage tmp = ContainerImage.builder() + .id(IMAGE_1_ID) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) + .hash(IMAGE_1_HASH) + .jdbcMethod(IMAGE_1_JDBC) + .dialect(IMAGE_1_DIALECT) + .driverClass(IMAGE_1_DRIVER) + .compiled(IMAGE_1_BUILT) + .size(IMAGE_1_SIZE) + .environment(IMAGE_1_ENV) + .defaultPort(IMAGE_1_PORT) + .build(); + imageRepository.save(tmp); } @AfterEach diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java index 7494a4f2e08866b1b696512febc36a9f7fe1a018..abf2d22b286fb409fc0052ac66680789b553931d 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java @@ -3,6 +3,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.api.container.ContainerCreateRequestDto; import at.tuwien.config.ReadyConfig; +import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.exception.ContainerAlreadyExistsException; import at.tuwien.repository.jpa.ContainerRepository; import at.tuwien.repository.jpa.ImageRepository; @@ -47,8 +48,20 @@ public class ContainerServiceUnitTest extends BaseUnitTest { public void beforeEach() { /* mock data */ userRepository.save(USER_1); - imageRepository.save(IMAGE_1); - imageRepository.save(IMAGE_2); + final ContainerImage tmp = ContainerImage.builder() + .id(IMAGE_1_ID) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) + .hash(IMAGE_1_HASH) + .jdbcMethod(IMAGE_1_JDBC) + .dialect(IMAGE_1_DIALECT) + .driverClass(IMAGE_1_DRIVER) + .compiled(IMAGE_1_BUILT) + .size(IMAGE_1_SIZE) + .environment(IMAGE_1_ENV) + .defaultPort(IMAGE_1_PORT) + .build(); + imageRepository.save(tmp); containerRepository.save(CONTAINER_1); } 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 index 2f98337c1feccba36706c41b89b2a3e062d1a1b9..af59e75dfd4fd7f34d27e438e1a1a4bfd061ce20 100644 --- 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 @@ -48,20 +48,32 @@ public class ImageServiceIntegrationTest extends BaseUnitTest { @BeforeEach public void beforeEach() { userRepository.save(USER_1); - imageRepository.save(IMAGE_1); - imageRepository.save(IMAGE_2); + final ContainerImage tmp = ContainerImage.builder() + .id(IMAGE_1_ID) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) + .hash(IMAGE_1_HASH) + .jdbcMethod(IMAGE_1_JDBC) + .dialect(IMAGE_1_DIALECT) + .driverClass(IMAGE_1_DRIVER) + .compiled(IMAGE_1_BUILT) + .size(IMAGE_1_SIZE) + .environment(IMAGE_1_ENV) + .defaultPort(IMAGE_1_PORT) + .build(); + imageRepository.save(tmp); } @Test public void create_succeeds() throws ImageAlreadyExistsException, DockerClientException, ImageNotFoundException, UserNotFoundException { final ImageCreateDto request = ImageCreateDto.builder() - .repository(IMAGE_2_REPOSITORY) - .tag(IMAGE_2_TAG) - .dialect(IMAGE_2_DIALECT) - .driverClass(IMAGE_2_DRIVER) - .jdbcMethod(IMAGE_2_JDBC) - .defaultPort(IMAGE_2_PORT) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) + .dialect(IMAGE_1_DIALECT) + .driverClass(IMAGE_1_DRIVER) + .jdbcMethod(IMAGE_1_JDBC) + .defaultPort(IMAGE_1_PORT) .environment(IMAGE_1_ENV_DTO) .build(); final Principal principal = new BasicUserPrincipal(USER_1_USERNAME); diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java index 3a54d15686933aa2746930f4fbab6b7c176d802a..660a44e4def42a0bd418279de0790cdf8a826997 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java @@ -168,8 +168,8 @@ public class Old extends BaseUnitTest { public void create_notFound_fails() { final ContainerCreateRequestDto request = ContainerCreateRequestDto.builder() - .repository(IMAGE_2_REPOSITORY) - .tag(IMAGE_2_TAG) + .repository(IMAGE_1_REPOSITORY) + .tag(IMAGE_1_TAG) .name(CONTAINER_3_NAME) .build(); final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);