Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/build&ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Just Build with JDK 21

on:
pull_request:
branches:
- 'develop'
push:
branches:
- 'develop'

workflow_dispatch:

jobs:
build_and_ci:
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission to gradlew
run: chmod +x ./gradlew

- name: Test And Build with Gradle
run: ./gradlew clean build
25 changes: 21 additions & 4 deletions src/test/java/life/mosu/mosuserver/FaqServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,23 @@

import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

import life.mosu.mosuserver.applicaiton.faq.FaqService;
import life.mosu.mosuserver.domain.faq.FaqAttachmentRepository;
import life.mosu.mosuserver.domain.faq.FaqJpaEntity;
import life.mosu.mosuserver.domain.faq.FaqRepository;
import life.mosu.mosuserver.infra.storage.application.S3Service;
import life.mosu.mosuserver.infra.storage.domain.Folder;
import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;

import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import org.springframework.web.multipart.MultipartFile;

@ExtendWith(MockitoExtension.class)
Expand All @@ -29,8 +34,21 @@ public class FaqServiceTest {
@Mock private FaqRepository faqRepository;
@Mock private FaqAttachmentRepository faqAttachmentRepository;
@Mock private S3Service s3Service;
@Mock private ExecutorService executorService;
@InjectMocks private FaqService faqService;

private ExecutorService realExecutorService;
private FaqService faqService;

@BeforeEach
void setUp() {
realExecutorService = Executors.newSingleThreadExecutor();

faqService = new FaqService(
faqRepository,
faqAttachmentRepository,
s3Service,
realExecutorService
);
}

@Test
void FAQ_생성_요청시_FAQ_저장_그리고_파일_업로드_해야함() {
Expand All @@ -45,7 +63,6 @@ public class FaqServiceTest {
// when
faqService.createFaq(request);

// then
verify(faqRepository).save(any());
verify(s3Service, atLeastOnce()).uploadFile(any(), eq(Folder.FAQ));
verify(faqAttachmentRepository, atLeastOnce()).save(any());
Expand Down