🧪 Update: TestCode

#27
Nexters · Nov 18, 2024 · 4dc9292 · 4dc9292
1 parent 96b4af3
commit 4dc9292
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/src/test/kotlin/nexters/weski/ski_resort/SkiResortControllerTest.kt b/src/test/kotlin/nexters/weski/ski_resort/SkiResortControllerTest.kt
@@ -43,8 +43,8 @@ class SkiResortControllerTest @Autowired constructor(
         )
         // Given
         val skiResorts = listOf(
-            SkiResortResponseDto(1, "스키장 A", ResortStatus.운영중.name, 3, currentWeather, weeklyWeather),
-            SkiResortResponseDto(2, "스키장 B", ResortStatus.운영중.name, 4, currentWeather, weeklyWeather),
+            SkiResortResponseDto(1, "스키장 A", ResortStatus.운영중.name, "미정", "미정", 3, currentWeather, weeklyWeather),
+            SkiResortResponseDto(2, "스키장 B", ResortStatus.운영중.name, "미정", "미정", 4, currentWeather, weeklyWeather),
         )
         every { skiResortService.getAllSkiResortsAndWeather() } returns skiResorts
 

diff --git a/src/test/kotlin/nexters/weski/ski_resort/SkiResortServiceTest.kt b/src/test/kotlin/nexters/weski/ski_resort/SkiResortServiceTest.kt
@@ -22,10 +22,34 @@ class SkiResortServiceTest {
     fun `getAllSkiResorts should return list of SkiResortDto`() {
         // Given
         val skiResorts = listOf(
-            SkiResort(1, "스키장 A", ResortStatus.운영중, null, null, 5, 10),
-            SkiResort(2, "스키장 B", ResortStatus.예정, null, null, 0, 8)
+            SkiResort(
+                resortId = 1,
+                name = "스키장 A",
+                status = ResortStatus.운영중,
+                openingDate = null,
+                closingDate = null,
+                openSlopes = 3,
+                totalSlopes = 8,
+                xCoordinate = "12.0",
+                yCoordinate = "34.0",
+                detailedAreaCode = "11D20201",
+                broadAreaCode = "11D20000"
+            ),
+            SkiResort(
+                resortId = 2,
+                name = "스키장 B",
+                status = ResortStatus.운영중,
+                openingDate = null,
+                closingDate = null,
+                openSlopes = 3,
+                totalSlopes = 8,
+                xCoordinate = "12.0",
+                yCoordinate = "34.0",
+                detailedAreaCode = "11D20201",
+                broadAreaCode = "11D20000"
+            )
         )
-        every { skiResortRepository.findAll() } returns skiResorts
+        every { skiResortRepository.findAllByOrderByOpeningDateAsc() } returns skiResorts
         every { currentWeatherRepository.findBySkiResortResortId(any()) } returns null
         every { dailyWeatherRepository.findAllBySkiResortResortId(any()) } returns emptyList()
 

diff --git a/src/test/kotlin/nexters/weski/snow_maker/SnowMakerServiceTest.kt b/src/test/kotlin/nexters/weski/snow_maker/SnowMakerServiceTest.kt
@@ -36,7 +36,19 @@ class SnowMakerServiceTest {
         // Given
         val resortId = 1L
         val isPositive = true
-        val skiResort = SkiResort(resortId, "스키장 A", ResortStatus.운영중, null, null, 5, 10)
+        val skiResort = SkiResort(
+            resortId = 1,
+            name = "스키장 A",
+            status = ResortStatus.운영중,
+            openingDate = null,
+            closingDate = null,
+            openSlopes = 3,
+            totalSlopes = 8,
+            xCoordinate = "12.0",
+            yCoordinate = "34.0",
+            detailedAreaCode = "11D20201",
+            broadAreaCode = "11D20000"
+        )
         val snowMakerVote = SnowMakerVote(
             isPositive = isPositive,
             skiResort = skiResort

diff --git a/src/test/kotlin/nexters/weski/weather/WeatherServiceTest.kt b/src/test/kotlin/nexters/weski/weather/WeatherServiceTest.kt
@@ -29,7 +29,7 @@ class WeatherServiceTest {
             resortId, -5, -2, -8, -10, "눈이 내리고 있습니다.", "눈", skiResort
         )
         every { currentWeatherRepository.findBySkiResortResortId(resortId) } returns currentWeather
-        every { hourlyWeatherRepository.findAll() } returns listOf()
+        every { hourlyWeatherRepository.findBySkiResortResortId(resortId) } returns listOf()
         every { dailyWeatherRepository.findAllBySkiResortResortId(resortId) } returns listOf()
 
         // When