From b572d1c49682dd452879b84c485430f431fd2682 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 20 Nov 2022 15:02:47 +0100
Subject: [PATCH] Using other image
---
.../service/ContainerServiceIntegrationTest.java | 4 ----
.../at/tuwien/service/ContainerServiceUnitTest.java | 4 ----
.../at/tuwien/service/ImageServiceIntegrationTest.java | 10 ++--------
.../src/test/java/at/tuwien/service/Old.java | 8 --------
.../jpa/ContainerImageEnvironmentItemRepository.java | 10 ----------
5 files changed, 2 insertions(+), 34 deletions(-)
delete mode 100644 fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java
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 2ff41cab90..1c1f89acbf 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
@@ -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)
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 9a1ccac5d9..9eba0e20b8 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,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;
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 0b84a7246d..65259b9f21 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
@@ -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
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 557fda530f..3a54d15686 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
@@ -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
diff --git a/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java b/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java
deleted file mode 100644
index aa1504a292..0000000000
--- a/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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> {
-
-}
--
GitLab