From 1fcae19f32b4e239273596c75fa4238749ab1f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=EC=B0=BD=ED=98=84?= Date: Sat, 2 Jul 2022 03:00:50 +0900 Subject: [PATCH] refactor: removed unnecessary comments --- .../movie/service/MovieTimeServiceImpl.java | 2 -- .../service/MovieTimeServiceImplTest.java | 23 +++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java b/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java index cbaee99..ef5767c 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java @@ -31,9 +31,7 @@ public class MovieTimeServiceImpl implements MovieTimeService { Movie movie = movieRepository.findByTitle(title) .orElseThrow(MovieTimeServiceImpl::throwMovieNotFound); - // 영화 시작 시간이 06시 이전(전날 심야 영화)는 제외하고 가져오기 LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6); - // 영화 시작 시간이 익일 06시 이전(심야 영화)까지 모두 가져오기 LocalDateTime endOfDay = startOfDay.plusDays(1); List movieTimes = movieTimeRepository.findValidMovieTimes(movie.getId(), startOfDay, endOfDay); diff --git a/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java b/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java index 7f28c20..4820a20 100644 --- a/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java +++ b/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java @@ -3,21 +3,23 @@ package com.ticketing.server.movie.service; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; +import com.ticketing.server.movie.domain.Movie; import com.ticketing.server.movie.domain.repository.MovieRepository; import com.ticketing.server.movie.domain.repository.MovieTimeRepository; -import com.ticketing.server.movie.service.dto.MovieDto; import com.ticketing.server.movie.service.dto.MovieTimeDto; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collections; import java.util.List; -import org.apache.tomcat.jni.Local; +import java.util.Optional; +import javax.transaction.Transactional; import org.junit.jupiter.api.DisplayName; 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.test.annotation.Rollback; @ExtendWith(MockitoExtension.class) public class MovieTimeServiceImplTest { @@ -31,23 +33,30 @@ public class MovieTimeServiceImplTest { @Mock MovieTimeRepository movieTimeRepository; + @InjectMocks + MovieServiceImpl movieService; + @InjectMocks MovieTimeServiceImpl movieTimeService; @Test - @DisplayName("MovieTime Service Test - get movie times when there is no valid movie times") + @Transactional + @DisplayName("MovieTime Service Test - get empty list when there is no valid movie times") void shouldGetEmptyList() { // given - long movieId = 1L; + String title = "범죄도시2"; + Movie movie = new Movie(title, 106); + when(movieRepository.findByTitle(title)).thenReturn(Optional.of(movie)); - when(movieTimeRepository.findValidMovieTimes(movieId, startOfDay, endOfDay)) + when(movieTimeRepository.findValidMovieTimes(1L, startOfDay, endOfDay)) .thenReturn(Collections.emptyList()); // when - List movieTimes = movieTimeService.getMovieTimes(); + Optional result = movieRepository.findByTitle(title); + List movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.now()); // then - assertTrue(movieDtoList.isEmpty()); + assertTrue(movieTimeDtoList.isEmpty()); } }