From 53bda6ff02e08bc2b81aec66a47ba59df28515e9 Mon Sep 17 00:00:00 2001 From: haerong22 Date: Mon, 1 Mar 2021 15:25:10 +0900 Subject: [PATCH] application test : jmeter --- .../apptest/study/StudyController.java | 24 +++++++++++++++++++ ...gBootTest.java => TestContainersTest.java} | 16 ++----------- 2 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 application-test/app-test/src/main/java/com/example/apptest/study/StudyController.java rename application-test/app-test/src/test/java/com/example/apptest/study/{StudyServiceSpringBootTest.java => TestContainersTest.java} (83%) diff --git a/application-test/app-test/src/main/java/com/example/apptest/study/StudyController.java b/application-test/app-test/src/main/java/com/example/apptest/study/StudyController.java new file mode 100644 index 00000000..4a2954a3 --- /dev/null +++ b/application-test/app-test/src/main/java/com/example/apptest/study/StudyController.java @@ -0,0 +1,24 @@ +package com.example.apptest.study; + +import com.example.apptest.domain.Study; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +public class StudyController { + + private final StudyRepository studyRepository; + + @GetMapping("/study/{id}") + public Study getStudy(@PathVariable Long id) { + return studyRepository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("Study not found for '" + id + "'")); + } + + @PostMapping("/study") + public Study createStudy(@RequestBody Study study) { + return studyRepository.save(study); + } + +} diff --git a/application-test/app-test/src/test/java/com/example/apptest/study/StudyServiceSpringBootTest.java b/application-test/app-test/src/test/java/com/example/apptest/study/TestContainersTest.java similarity index 83% rename from application-test/app-test/src/test/java/com/example/apptest/study/StudyServiceSpringBootTest.java rename to application-test/app-test/src/test/java/com/example/apptest/study/TestContainersTest.java index ef1dbecc..56c64702 100644 --- a/application-test/app-test/src/test/java/com/example/apptest/study/StudyServiceSpringBootTest.java +++ b/application-test/app-test/src/test/java/com/example/apptest/study/TestContainersTest.java @@ -1,9 +1,6 @@ package com.example.apptest.study; -import com.example.apptest.domain.Member; -import com.example.apptest.domain.Study; import com.example.apptest.member.MemberService; -import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -14,33 +11,24 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.Environment; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.testcontainers.containers.DockerComposeContainer; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import java.io.File; -import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.then; -import static org.mockito.Mockito.times; @SpringBootTest @ExtendWith(MockitoExtension.class) @ActiveProfiles("test") @Testcontainers //@Slf4j -@ContextConfiguration(initializers = StudyServiceSpringBootTest.ContainerPropertyInitializer.class) -public class StudyServiceSpringBootTest { +@ContextConfiguration(initializers = TestContainersTest.ContainerPropertyInitializer.class) +public class TestContainersTest { @Mock MemberService memberService; @Autowired StudyRepository studyRepository;