Revert "EFRS-1343: Mocked test dependencies that rely on a local database"

This reverts commit 0be5e37.

Author: VolodymyrBushko

java/api/src/test/java/com/exadel/frs/core/trainservice/component/migration/MigrationComponentTest.java

@@ -10,7 +10,6 @@
 import com.exadel.frs.commonservice.sdk.faces.feign.dto.FindFacesResult;
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +32,6 @@ class MigrationComponentTest extends EmbeddedPostgreSQLTest {
     @MockBean
     FacesFeignClient feignClient;
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Autowired
     MigrationComponent migrationComponent;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/ConsistenceControllerTest.java

@@ -5,7 +5,6 @@
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -32,9 +31,6 @@ class ConsistenceControllerTest extends EmbeddedPostgreSQLTest {
     @MockBean
     FacesApiClient client;
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Test
     void shouldReturnStatusWithoutAuth() throws Exception {
         var currentCalculator = "currentCalculator";

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/DetectionControllerTest.java

@@ -25,7 +25,6 @@
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
 import com.exadel.frs.core.trainservice.dto.Base64File;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import com.exadel.frs.core.trainservice.validation.ImageExtensionValidator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.val;
@@ -67,9 +66,6 @@ class DetectionControllerTest extends EmbeddedPostgreSQLTest {
     @MockBean
     private FacesApiClient client;
 
-    @MockBean
-    private NotificationReceiverService notificationReceiverService;
-
     @Autowired
     private ObjectMapper objectMapper;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/EmbeddingControllerTest.java

@@ -33,7 +33,6 @@
 import com.exadel.frs.core.trainservice.dto.Base64File;
 import com.exadel.frs.core.trainservice.dto.FaceVerification;
 import com.exadel.frs.core.trainservice.service.EmbeddingService;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import com.exadel.frs.core.trainservice.service.SubjectService;
 import com.exadel.frs.core.trainservice.validation.ImageExtensionValidator;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -100,9 +99,6 @@ class EmbeddingControllerTest extends EmbeddedPostgreSQLTest {
     @MockBean
     FacesApiClient client;
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     private static Pair<Subject, Embedding> pair() {
         Subject subject = new Subject();
         subject.setId(UUID.randomUUID());

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/MigrateControllerTest.java

@@ -23,7 +23,6 @@
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
 import com.exadel.frs.core.trainservice.dto.ModelValidationResult;
 import com.exadel.frs.core.trainservice.service.ModelService;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -53,9 +52,6 @@ class MigrateControllerTest extends EmbeddedPostgreSQLTest {
     @MockBean
     private ModelService modelService;
 
-    @MockBean
-    private NotificationReceiverService notificationReceiverService;
-
     @Test
     void migrate() throws Exception {
         var validationResult = new ModelValidationResult(1L, OK);

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/StaticControllerTest.java

@@ -4,11 +4,9 @@
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static com.exadel.frs.core.trainservice.system.global.Constants.API_V1;
@@ -29,9 +27,6 @@ class StaticControllerTest extends EmbeddedPostgreSQLTest {
     @Autowired
     MockMvc mockMvc;
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Test
     void getImg() throws Exception {
         var model = dbHelper.insertModel();

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/VerifyControllerTest.java

@@ -9,7 +9,6 @@
 import com.exadel.frs.core.trainservice.component.FaceClassifierPredictor;
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
 import com.exadel.frs.core.trainservice.dto.VerifySourceTargetRequest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import com.exadel.frs.core.trainservice.validation.ImageExtensionValidator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.val;
@@ -49,9 +48,6 @@ class VerifyControllerTest extends EmbeddedPostgreSQLTest {
     @MockBean
     private FacesApiClient client;
 
-    @MockBean
-    private NotificationReceiverService notificationReceiverService;
-
     @Autowired
     private ObjectMapper objectMapper;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/dao/SubjectDaoTest.java

@@ -10,15 +10,13 @@
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.dto.EmbeddingInfo;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Pageable;
 
 import java.util.Optional;
@@ -31,9 +29,6 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class SubjectDaoTest extends EmbeddedPostgreSQLTest {
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Autowired
     DbHelper dbHelper;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/repository/EmbeddingRepositoryTest.java

@@ -5,11 +5,9 @@
 import com.exadel.frs.commonservice.repository.EmbeddingRepository;
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import com.exadel.frs.core.trainservice.system.global.Constants;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Pageable;
 
 import javax.transaction.Transactional;
@@ -21,9 +19,6 @@
 
 class EmbeddingRepositoryTest extends EmbeddedPostgreSQLTest {
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Autowired
     DbHelper dbHelper;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/repository/SubjectRepositoryTest.java

@@ -4,23 +4,18 @@
 import com.exadel.frs.commonservice.repository.SubjectRepository;
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
-import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import org.springframework.boot.test.mock.mockito.MockBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 class SubjectRepositoryTest extends EmbeddedPostgreSQLTest {
 
-    @MockBean
-    NotificationReceiverService notificationReceiverService;
-
     @Autowired
     DbHelper dbHelper;