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 26f526ffa4c9fa239de2909f0d12d954dab0ee33..87dd212a356b82172184b9a00bfbbe0387b00819 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 @@ -87,49 +87,38 @@ public abstract class BaseUnitTest { .build(); public final static Long IMAGE_1_ID = 1L; - public final static String IMAGE_1_REPOSITORY = "mariadb"; - public final static String IMAGE_1_TAG = "10.5"; + public final static String IMAGE_1_REPOSITORY = "mysql"; + public final static String IMAGE_1_TAG = "8.0"; public final static String IMAGE_1_HASH = "83b40f2726e5"; - public final static Integer IMAGE_1_PORT = 5432; - 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 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 Long IMAGE_1_SIZE = 12000L; - public final static Instant IMAGE_1_BUILT = Instant.now().minus(40, HOURS); + 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("MARIADB_USER") + .key("MYSQL_USER") .value("mariadb") .type(ContainerImageEnvironmentItemType.USERNAME) .build(), ContainerImageEnvironmentItem.builder() .iid(IMAGE_1_ID) - .key("MARIADB_PASSWORD") + .key("MYSQL_PASSWORD") .value("mariadb") .type(ContainerImageEnvironmentItemType.PASSWORD) - .build(), - ContainerImageEnvironmentItem.builder() - .iid(IMAGE_1_ID) - .key("MARIADB_ROOT_PASSWORD") - .value("mariadb") - .type(ContainerImageEnvironmentItemType.PRIVILEGED_PASSWORD) - .build(), - ContainerImageEnvironmentItem.builder() - .iid(IMAGE_1_ID) - .key("UZERNAME") - .value("root") - .type(ContainerImageEnvironmentItemType.PRIVILEGED_USERNAME) .build()); public final static List<ImageEnvItemDto> IMAGE_1_ENV_DTO = List.of(ImageEnvItemDto.builder() .iid(IMAGE_1_ID) - .key("MARIADB_USER") + .key("MYSQL_USER") .value("mariadb") .type(ImageEnvItemTypeDto.USERNAME) .build(), ImageEnvItemDto.builder() .iid(IMAGE_1_ID) - .key("MARIADB_PASSWORD") + .key("MYSQL_PASSWORD") .value("mariadb") .type(ImageEnvItemTypeDto.PASSWORD) .build());