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

Fixed some test base, apperently still some hibernate setter issues

parent 08ca20ff
No related branches found
No related tags found
4 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!113Resolve "Bugs related with Query Service",!109Resolve "Use MariaDB for metadata database"
...@@ -4,6 +4,7 @@ import at.tuwien.BaseUnitTest; ...@@ -4,6 +4,7 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.SecretInvalidException; import at.tuwien.exception.SecretInvalidException;
import at.tuwien.repositories.TimeSecretRepository; import at.tuwien.repositories.TimeSecretRepository;
import at.tuwien.repositories.UserRepository;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -31,16 +32,18 @@ public class TokenServiceIntegrationTest extends BaseUnitTest { ...@@ -31,16 +32,18 @@ public class TokenServiceIntegrationTest extends BaseUnitTest {
@Autowired @Autowired
private TimeSecretRepository tokenRepository; private TimeSecretRepository tokenRepository;
@Autowired
private UserRepository userRepository;
@BeforeEach @BeforeEach
public void beforeEach() { public void beforeEach() {
userRepository.save(USER_1);
tokenRepository.save(TOKEN_1); tokenRepository.save(TOKEN_1);
} }
@Test @Test
public void updateVerification_succeeds() throws SecretInvalidException { public void updateVerification_succeeds() throws SecretInvalidException {
/* mock */
/* test */ /* test */
tokenService.invalidate(TOKEN_1_TOKEN); tokenService.invalidate(TOKEN_1_TOKEN);
assertThrows(SecretInvalidException.class, () -> { assertThrows(SecretInvalidException.class, () -> {
......
...@@ -155,6 +155,7 @@ public abstract class BaseUnitTest { ...@@ -155,6 +155,7 @@ public abstract class BaseUnitTest {
.id(CONTAINER_1_ID) .id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME) .name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME) .internalName(CONTAINER_1_INTERNALNAME)
.imageId(IMAGE_1_ID)
.image(CONTAINER_1_IMAGE) .image(CONTAINER_1_IMAGE)
.hash(CONTAINER_1_HASH) .hash(CONTAINER_1_HASH)
.build(); .build();
...@@ -163,6 +164,7 @@ public abstract class BaseUnitTest { ...@@ -163,6 +164,7 @@ public abstract class BaseUnitTest {
.id(CONTAINER_2_ID) .id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME) .name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME) .internalName(CONTAINER_2_INTERNALNAME)
.imageId(IMAGE_1_ID)
.image(CONTAINER_2_IMAGE) .image(CONTAINER_2_IMAGE)
.hash(CONTAINER_2_HASH) .hash(CONTAINER_2_HASH)
.build(); .build();
......
...@@ -57,10 +57,14 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest { ...@@ -57,10 +57,14 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
@Autowired @Autowired
private UserRepository userRepository; private UserRepository userRepository;
@Autowired
private ImageRepository imageRepository;
@BeforeEach @BeforeEach
@Transactional @Transactional
public void beforeEach() { public void beforeEach() {
userRepository.save(USER_1); userRepository.save(USER_1);
imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1); containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1); databaseRepository.save(DATABASE_1);
identifierRepository.save(IDENTIFIER_1); identifierRepository.save(IDENTIFIER_1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment