Skip to content

Commit 94bb77f

Browse files
committed
delete redis tests
1 parent 7fb20f0 commit 94bb77f

File tree

1 file changed

+8
-110
lines changed

1 file changed

+8
-110
lines changed

services/payments/src/test/java/com/workup/payments/PaymentsApplicationTests.java

Lines changed: 8 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static org.junit.jupiter.api.Assertions.*;
44

5-
import com.redis.testcontainers.RedisContainer;
65
import com.workup.payments.models.PaymentRequest;
76
import com.workup.payments.models.PaymentTransaction;
87
import com.workup.payments.models.Wallet;
@@ -12,8 +11,14 @@
1211
import com.workup.payments.repositories.WalletRepository;
1312
import com.workup.payments.repositories.WalletTransactionRepository;
1413
import com.workup.shared.commands.payments.dto.PaymentRequestDTO;
15-
import com.workup.shared.commands.payments.paymentrequest.requests.*;
16-
import com.workup.shared.commands.payments.paymentrequest.responses.*;
14+
import com.workup.shared.commands.payments.paymentrequest.requests.CreatePaymentRequestRequest;
15+
import com.workup.shared.commands.payments.paymentrequest.requests.GetClientPaymentRequestsRequest;
16+
import com.workup.shared.commands.payments.paymentrequest.requests.GetFreelancerPaymentRequestsRequest;
17+
import com.workup.shared.commands.payments.paymentrequest.requests.PayPaymentRequestRequest;
18+
import com.workup.shared.commands.payments.paymentrequest.responses.CreatePaymentRequestResponse;
19+
import com.workup.shared.commands.payments.paymentrequest.responses.GetClientPaymentRequestsResponse;
20+
import com.workup.shared.commands.payments.paymentrequest.responses.GetFreelancerPaymentRequestsResponse;
21+
import com.workup.shared.commands.payments.paymentrequest.responses.PayPaymentRequestResponse;
1722
import com.workup.shared.commands.payments.wallet.requests.CreateWalletRequest;
1823
import com.workup.shared.commands.payments.wallet.requests.GetWalletRequest;
1924
import com.workup.shared.commands.payments.wallet.responses.CreateWalletResponse;
@@ -31,7 +36,6 @@
3136
import com.workup.shared.enums.payments.PaymentRequestStatus;
3237
import com.workup.shared.enums.payments.PaymentTransactionStatus;
3338
import com.workup.shared.enums.payments.WalletTransactionType;
34-
import com.workup.shared.redis.RedisService;
3539
import java.util.Optional;
3640
import java.util.UUID;
3741
import org.junit.jupiter.api.AfterAll;
@@ -47,7 +51,6 @@
4751
import org.testcontainers.containers.RabbitMQContainer;
4852
import org.testcontainers.junit.jupiter.Container;
4953
import org.testcontainers.junit.jupiter.Testcontainers;
50-
import org.testcontainers.utility.DockerImageName;
5154

5255
@SpringBootTest
5356
@Testcontainers
@@ -62,32 +65,24 @@ class PaymentsApplicationTests {
6265
static final RabbitMQContainer rabbitMQContainer =
6366
new RabbitMQContainer("rabbitmq:3.13-management");
6467

65-
@Container
66-
static final RedisContainer redisContainer =
67-
new RedisContainer(DockerImageName.parse("redis:latest"));
68-
6968
@Autowired private AmqpTemplate template;
7069
@Autowired private PaymentRequestRepository paymentRequestRepository;
7170
@Autowired private PaymentTransactionRepository paymentTransactionRepository;
7271
@Autowired private WalletRepository walletRepository;
7372
@Autowired private WalletTransactionRepository walletTransactionRepository;
74-
@Autowired private RedisService redisService;
7573

7674
@BeforeEach
7775
void clearAll() {
7876
paymentRequestRepository.deleteAll();
7977
paymentTransactionRepository.deleteAll();
8078
walletRepository.deleteAll();
8179
walletTransactionRepository.deleteAll();
82-
83-
redisService.clearCache();
8480
}
8581

8682
@AfterAll
8783
static void stopContainers() {
8884
postgreSQLContainer.stop();
8985
rabbitMQContainer.stop();
90-
redisContainer.stop();
9186
}
9287

9388
@DynamicPropertySource
@@ -101,9 +96,6 @@ static void setDatasourceProperties(DynamicPropertyRegistry registry) {
10196
registry.add("spring.rabbitmq.port", rabbitMQContainer::getFirstMappedPort);
10297
registry.add("spring.rabbitmq.username", rabbitMQContainer::getAdminUsername);
10398
registry.add("spring.rabbitmq.password", rabbitMQContainer::getAdminPassword);
104-
105-
registry.add("spring.redis.host", redisContainer::getHost);
106-
registry.add("spring.redis.port", () -> redisContainer.getMappedPort(6379));
10799
}
108100

109101
@Test
@@ -523,53 +515,6 @@ void testGetFreelancerPaymentRequests() {
523515
() -> assertEquals(paymentRequest2.getFreelancerId(), requestDTO2.getFreelancerId()));
524516
}
525517

526-
@Test
527-
void testGetPaymentRequest() {
528-
PaymentRequest paymentRequest =
529-
PaymentRequest.builder()
530-
.withAmount(1200)
531-
.withDescription("Payment for services rendered")
532-
.withClientId("3")
533-
.withFreelancerId("4")
534-
.build();
535-
paymentRequestRepository.save(paymentRequest);
536-
537-
GetPaymentRequestRequest getPaymentRequest =
538-
GetPaymentRequestRequest.builder().withPaymentRequestId(paymentRequest.getId()).build();
539-
540-
GetPaymentRequestResponse response =
541-
(GetPaymentRequestResponse)
542-
template.convertSendAndReceive(ServiceQueueNames.PAYMENTS, getPaymentRequest);
543-
544-
assertNotNull(response);
545-
assertEquals(HttpStatusCode.OK, response.getStatusCode());
546-
547-
PaymentRequestDTO requestDTO = response.getRequest();
548-
549-
assertNotNull(requestDTO);
550-
551-
assertAll(
552-
() -> assertEquals(paymentRequest.getId(), requestDTO.getId()),
553-
() -> assertEquals(paymentRequest.getAmount(), requestDTO.getAmount()),
554-
() -> assertEquals(paymentRequest.getDescription(), requestDTO.getDescription()),
555-
() -> assertEquals(paymentRequest.getClientId(), requestDTO.getClientId()),
556-
() -> assertEquals(paymentRequest.getFreelancerId(), requestDTO.getFreelancerId()));
557-
}
558-
559-
@Test
560-
void testGetPaymentRequestNotFound() {
561-
GetPaymentRequestRequest getPaymentRequest =
562-
GetPaymentRequestRequest.builder().withPaymentRequestId("123").build();
563-
564-
GetPaymentRequestResponse response =
565-
(GetPaymentRequestResponse)
566-
template.convertSendAndReceive(ServiceQueueNames.PAYMENTS, getPaymentRequest);
567-
568-
assertNotNull(response);
569-
assertEquals(HttpStatusCode.NOT_FOUND, response.getStatusCode());
570-
assertNull(response.getRequest());
571-
}
572-
573518
@Test
574519
void testPayPaymentRequest() {
575520
PaymentRequest paymentRequest =
@@ -744,51 +689,4 @@ void testGetInvalidWallet() {
744689
assertNotNull(getWalletResponse);
745690
assertEquals(HttpStatusCode.NOT_FOUND, getWalletResponse.getStatusCode());
746691
}
747-
748-
@Test
749-
void testGetPaymentRequestResponseFromCache() {
750-
PaymentRequest paymentRequest =
751-
PaymentRequest.builder()
752-
.withAmount(1200)
753-
.withDescription("Payment for services rendered")
754-
.withClientId("3")
755-
.withFreelancerId("4")
756-
.build();
757-
paymentRequestRepository.save(paymentRequest);
758-
759-
GetPaymentRequestRequest getPaymentRequest =
760-
GetPaymentRequestRequest.builder().withPaymentRequestId(paymentRequest.getId()).build();
761-
762-
GetPaymentRequestResponse response =
763-
(GetPaymentRequestResponse)
764-
template.convertSendAndReceive(ServiceQueueNames.PAYMENTS, getPaymentRequest);
765-
766-
assertNotNull(response);
767-
assertEquals(HttpStatusCode.OK, response.getStatusCode());
768-
769-
GetPaymentRequestResponse cachedResponse =
770-
(GetPaymentRequestResponse)
771-
redisService.getValue(
772-
getPaymentRequest.getPaymentRequestId(), GetPaymentRequestResponse.class);
773-
774-
assertNotNull(cachedResponse);
775-
assertEquals(HttpStatusCode.OK, cachedResponse.getStatusCode());
776-
777-
assertAll(
778-
() -> assertEquals(response.getRequest().getId(), cachedResponse.getRequest().getId()),
779-
() ->
780-
assertEquals(
781-
response.getRequest().getAmount(), cachedResponse.getRequest().getAmount()),
782-
() ->
783-
assertEquals(
784-
response.getRequest().getDescription(),
785-
cachedResponse.getRequest().getDescription()),
786-
() ->
787-
assertEquals(
788-
response.getRequest().getClientId(), cachedResponse.getRequest().getClientId()),
789-
() ->
790-
assertEquals(
791-
response.getRequest().getFreelancerId(),
792-
cachedResponse.getRequest().getFreelancerId()));
793-
}
794692
}

0 commit comments

Comments
 (0)