Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

테스트 코드를 도커를 활용한 컨테이너에서 수행한다. #81

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
runtimeOnly 'com.h2database:h2'
// test containers
testImplementation 'org.testcontainers:testcontainers:1.20.0'
testImplementation 'org.testcontainers:junit-jupiter:1.20.0'
testImplementation "org.testcontainers:mysql:1.20.1"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testCompileOnly 'org.projectlombok:lombok'
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/flab/nutridiary/TestContainerControllerSupport.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package flab.nutridiary;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.web.servlet.MockMvc;

@SpringBootTest
@AutoConfigureMockMvc
public abstract class TestContainerControllerSupport extends TestContainerSupport {

@Autowired
protected MockMvc mockMvc;
}

33 changes: 33 additions & 0 deletions src/test/java/flab/nutridiary/TestContainerSupport.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package flab.nutridiary;

import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.junit.jupiter.Testcontainers;

@ActiveProfiles("test")
@Testcontainers
@Transactional
@SpringBootTest
public abstract class TestContainerSupport {
protected static final MySQLContainer<?> mysqlContainer;

static {
mysqlContainer = new MySQLContainer<>("mysql:8.0")
.withDatabaseName("nutridiary");

mysqlContainer.start();
}

@DynamicPropertySource
public static void init(DynamicPropertyRegistry registry) {
registry.add("spring.datasource.driver-class-name", mysqlContainer::getDriverClassName);
registry.add("spring.datasource.url", mysqlContainer::getJdbcUrl);
registry.add("spring.datasource.username", mysqlContainer::getUsername);
registry.add("spring.datasource.password", mysqlContainer::getPassword);
}
}

26 changes: 0 additions & 26 deletions src/test/java/flab/nutridiary/config/TestJdbcConfig.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package flab.nutridiary.diary.controller;

import com.fasterxml.jackson.databind.ObjectMapper;
import flab.nutridiary.TestContainerControllerSupport;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.diary.domain.*;
import flab.nutridiary.diary.dto.request.AddDiaryRecordRequest;
Expand Down Expand Up @@ -35,7 +36,7 @@
@Transactional
@SpringBootTest
@AutoConfigureMockMvc
class DiaryControllerTest {
class DiaryControllerTest extends TestContainerControllerSupport {
@Autowired
private MockMvc mockMvc;
@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package flab.nutridiary.diary.domain;

import flab.nutridiary.TestContainerSupport;
import flab.nutridiary.commom.exception.BusinessException;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.diary.repository.DiaryRepository;
Expand All @@ -11,9 +12,6 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand All @@ -24,10 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

@ActiveProfiles("test")
@Transactional
@SpringBootTest
class DiaryValidatorTest {
class DiaryValidatorTest extends TestContainerSupport {
@Autowired
private DiaryValidator diaryValidator;
@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
package flab.nutridiary.diary.domain.calculator;

import flab.nutridiary.TestContainerSupport;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.product.domain.ServingUnit;
import flab.nutridiary.diary.domain.NutritionCalculator;
import flab.nutridiary.diary.domain.ProductIntakeInfo;
import flab.nutridiary.product.domain.NutritionFacts;
import flab.nutridiary.product.domain.Product;
import flab.nutridiary.product.domain.ServingUnit;
import flab.nutridiary.product.repository.ProductRepository;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import static java.math.BigDecimal.valueOf;

@ActiveProfiles("test")
@Transactional
@SpringBootTest
class NutritionCalculatorTest {
class NutritionCalculatorTest extends TestContainerSupport {
@Autowired
private NutritionCalculator nutritionCalculator;
@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package flab.nutridiary.diary.repository;

import flab.nutridiary.TestContainerSupport;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.diary.domain.Diary;
import flab.nutridiary.diary.domain.DiaryRecord;
Expand All @@ -12,9 +13,6 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand All @@ -26,10 +24,7 @@
import static java.math.BigDecimal.valueOf;
import static org.assertj.core.api.Assertions.assertThat;

@ActiveProfiles("test")
@Transactional
@SpringBootTest
class DiaryRepositoryTest {
class DiaryRepositoryTest extends TestContainerSupport {
@Autowired
private DiaryRepository diaryRepository;
@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package flab.nutridiary.diary.repository;

import flab.nutridiary.TestContainerSupport;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.diary.domain.*;
import flab.nutridiary.diary.dto.response.query.DiaryRecordWithProduct;
Expand All @@ -12,9 +13,6 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand All @@ -23,10 +21,7 @@

import static java.math.BigDecimal.valueOf;

@ActiveProfiles("test")
@Transactional
@SpringBootTest
class DiarySearchRepositoryTest {
class DiarySearchRepositoryTest extends TestContainerSupport {
@Autowired
private NutritionCalculator nutritionCalculator;
@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flab.nutridiary.diary.service;

import flab.nutridiary.TestContainerSupport;
import flab.nutridiary.commom.exception.BusinessException;
import flab.nutridiary.commom.generic.Nutrition;
import flab.nutridiary.product.domain.ServingUnit;
import flab.nutridiary.diary.domain.Diary;
import flab.nutridiary.diary.domain.DiaryRecord;
import flab.nutridiary.diary.domain.MealType;
Expand All @@ -12,15 +12,13 @@
import flab.nutridiary.diary.repository.DiaryRepository;
import flab.nutridiary.product.domain.NutritionFacts;
import flab.nutridiary.product.domain.Product;
import flab.nutridiary.product.domain.ServingUnit;
import flab.nutridiary.product.repository.ProductRepository;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand All @@ -31,10 +29,7 @@
import static java.math.BigDecimal.valueOf;
import static org.assertj.core.api.Assertions.assertThat;

@ActiveProfiles("test")
@Transactional
@SpringBootTest
class DiaryRegisterServiceTest {
class DiaryRegisterServiceTest extends TestContainerSupport {

@Autowired
private DiaryRegisterService diaryRegisterService;
Expand Down
Loading
Loading