Skip to content

Commit b508e99

Browse files
committed
test: 비밀코드 중복 문제 해결
1 parent 404c8d9 commit b508e99

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.oronaminc.join.emoji.service;
22

3+
import org.springframework.orm.ObjectOptimisticLockingFailureException;
4+
import org.springframework.stereotype.Service;
5+
36
import com.oronaminc.join.emoji.dto.EmojiRequest;
47
import com.oronaminc.join.emoji.dto.EmojiResponse;
58
import com.oronaminc.join.global.exception.ErrorCode;
69
import com.oronaminc.join.global.exception.ErrorException;
10+
711
import lombok.RequiredArgsConstructor;
8-
import org.springframework.orm.ObjectOptimisticLockingFailureException;
9-
import org.springframework.stereotype.Service;
1012

1113
@Service
1214
@RequiredArgsConstructor

src/main/java/com/oronaminc/join/global/config/CacheConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.context.annotation.Configuration;
1313

1414
import com.github.benmanes.caffeine.cache.Caffeine;
15+
import com.github.benmanes.caffeine.cache.Scheduler;
1516

1617
@EnableCaching
1718
@Configuration
@@ -25,6 +26,7 @@ public CacheManager cacheManager() {
2526
Caffeine.newBuilder()
2627
.expireAfterWrite(cache.expireAfterWrite, TimeUnit.SECONDS)
2728
.maximumSize(cache.maximumSize)
29+
.scheduler(Scheduler.systemScheduler())
2830
.build()
2931
)
3032
)

src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
package com.oronaminc.join.emoji.service;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
3+
import static org.assertj.core.api.Assertions.*;
44

5-
import com.oronaminc.join.answer.service.AnswerReader;
6-
import com.oronaminc.join.config.TestQueryDslConfig;
7-
import com.oronaminc.join.emoji.dao.EmojiRepository;
8-
import com.oronaminc.join.emoji.domain.Emoji;
9-
import com.oronaminc.join.emoji.domain.TargetType;
10-
import com.oronaminc.join.emoji.dto.EmojiRequest;
11-
import com.oronaminc.join.member.dao.MemberRepository;
12-
import com.oronaminc.join.member.domain.Member;
13-
import com.oronaminc.join.member.service.MemberReader;
14-
import com.oronaminc.join.question.service.QuestionReader;
15-
import com.oronaminc.join.room.dao.RoomRepository;
16-
import com.oronaminc.join.room.domain.Room;
17-
import com.oronaminc.join.room.domain.RoomStatus;
18-
import com.oronaminc.join.room.service.RoomReader;
195
import java.time.LocalDateTime;
206
import java.util.ArrayList;
217
import java.util.List;
228
import java.util.concurrent.CountDownLatch;
239
import java.util.concurrent.ExecutorService;
2410
import java.util.concurrent.Executors;
11+
2512
import org.junit.jupiter.api.DisplayName;
2613
import org.junit.jupiter.api.Test;
2714
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +18,21 @@
3118
import org.springframework.transaction.annotation.Propagation;
3219
import org.springframework.transaction.annotation.Transactional;
3320

21+
import com.oronaminc.join.answer.service.AnswerReader;
22+
import com.oronaminc.join.config.TestQueryDslConfig;
23+
import com.oronaminc.join.emoji.dao.EmojiRepository;
24+
import com.oronaminc.join.emoji.domain.Emoji;
25+
import com.oronaminc.join.emoji.domain.TargetType;
26+
import com.oronaminc.join.emoji.dto.EmojiRequest;
27+
import com.oronaminc.join.member.dao.MemberRepository;
28+
import com.oronaminc.join.member.domain.Member;
29+
import com.oronaminc.join.member.service.MemberReader;
30+
import com.oronaminc.join.question.service.QuestionReader;
31+
import com.oronaminc.join.room.dao.RoomRepository;
32+
import com.oronaminc.join.room.domain.Room;
33+
import com.oronaminc.join.room.domain.RoomStatus;
34+
import com.oronaminc.join.room.service.RoomReader;
35+
3436
@DataJpaTest
3537
@Import({EmojiFacade.class, EmojiService.class, MemberReader.class, EmojiReader.class,
3638
RoomReader.class, QuestionReader.class, AnswerReader.class, TestQueryDslConfig.class})
@@ -118,7 +120,7 @@ void deleteEmoji_success_test() throws InterruptedException {
118120
Room.builder()
119121
.title("제목")
120122
.description("내용")
121-
.secretCode("123456")
123+
.secretCode("654321")
122124
.emojiCount(emojiCount)
123125
.participantLimit(0)
124126
.endedAt(LocalDateTime.now())

src/test/resources/application.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ spring:
99
database-platform: org.hibernate.dialect.H2Dialect
1010
hibernate:
1111
ddl-auto: create
12-
properties:
13-
hibernate:
14-
format_sql: true
15-
show_sql: true
1612

1713
cloud:
1814
aws:

0 commit comments

Comments
 (0)