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

Using other image

parent b8403228
No related branches found
No related tags found
1 merge request!106Dev
......@@ -28,12 +28,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@Log4j2
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
......
......@@ -3,11 +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.Container;
import at.tuwien.exception.ContainerAlreadyExistsException;
import at.tuwien.exception.DockerClientException;
import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.UserRepository;
......
......@@ -3,8 +3,8 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.*;
import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.UserRepository;
......@@ -19,7 +19,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import java.security.Principal;
......@@ -43,19 +42,14 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
@Autowired
private UserRepository userRepository;
@Autowired
private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
@Autowired
private ContainerRepository containerRepository;
@BeforeEach
public void beforeEach() {
userRepository.save(USER_1);
imageRepository.save(IMAGE_2);
imageRepository.save(IMAGE_1);
containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
IMAGE_1.setEnvironment(IMAGE_1_ENV);
containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
}
@Test
......
......@@ -6,7 +6,6 @@ import at.tuwien.config.DockerUtil;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container;
import at.tuwien.exception.*;
import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.UserRepository;
......@@ -17,7 +16,6 @@ import lombok.extern.log4j.Log4j2;
import org.apache.http.auth.BasicUserPrincipal;
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;
......@@ -49,9 +47,6 @@ public class Old extends BaseUnitTest {
@Autowired
private ImageRepository imageRepository;
@Autowired
private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
@Autowired
private DockerClient dockerClient;
......@@ -86,9 +81,6 @@ public class Old extends BaseUnitTest {
/* mock data */
userRepository.save(USER_1);
imageRepository.save(IMAGE_1);
containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
IMAGE_1.setEnvironment(IMAGE_1_ENV);
containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
}
@AfterEach
......
package at.tuwien.repository.jpa;
import at.tuwien.entities.container.image.ContainerImageEnvironmentItem;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ContainerImageEnvironmentItemRepository extends JpaRepository<ContainerImageEnvironmentItem, Long> {
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment