Remove SHOW_ON_COUNTER during the cut action

jetbrains-academy · Oct 17, 2024 · 23d3192 · 23d3192
1 parent 1da359a
commit 23d3192
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 27 deletions.
diff --git a/...Spices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Spices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/culinaryServer/culinaryServerAddSpices/test/Tests.kt b/culinaryServer/culinaryServerAddSpices/test/Tests.kt
@@ -86,10 +86,7 @@ class Test {
         val expectedActions = buildList {
             addAll(List(NUMBER_OF_TOMATOES) { Action(ActionType.SHOW_ON_COUNTER, ItemType.FRESH_TOMATO) })
             repeat(NUMBER_OF_TOMATOES) {
-                addAll(listOf(
-                    Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO),
-                    Action(ActionType.SHOW_ON_COUNTER, ItemType.CUT_TOMATO)
-                ))
+                add(Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO))
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(

diff --git a/...kSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...kSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/culinaryServer/culinaryServerCookSalad/test/Tests.kt b/culinaryServer/culinaryServerCookSalad/test/Tests.kt
@@ -74,7 +74,7 @@ class Test {
         val expectedActions = buildList {
             addAll(List(vegetables.size) { ActionType.SHOW_ON_COUNTER })
             repeat(vegetables.size) {
-                addAll(listOf(ActionType.CUT_ON_COUNTER, ActionType.SHOW_ON_COUNTER))
+                add(ActionType.CUT_ON_COUNTER)
             }
         }
         assert(expectedActions == actions.map{ it.type }) { "The ${cutMethod.name} method should take vegetables and cut them: take each of them from the fridge, and then cut" }
@@ -174,7 +174,6 @@ class Test {
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(
                     Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO),
-                    Action(ActionType.SHOW_ON_COUNTER, ItemType.CUT_TOMATO)
                 ))
             }
             repeat(NUMBER_OF_TOMATOES) {

diff --git a/...oothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...oothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt b/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt
@@ -3,8 +3,6 @@ import org.jetbrains.academy.test.system.core.invokeWithoutArgs
 import org.jetbrains.kotlin.course.culinary.converters.buildAction
 import org.jetbrains.kotlin.course.culinary.game.actions
 import org.jetbrains.kotlin.course.culinary.game.clearActions
-import org.jetbrains.kotlin.course.culinary.game.fridge
-import org.jetbrains.kotlin.course.culinary.game.kitchen
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
@@ -115,7 +113,7 @@ class Test {
         val expectedActions = buildList {
             addAll(List(vegetables.size) { ActionType.SHOW_ON_COUNTER })
             repeat(vegetables.size) {
-                addAll(listOf(ActionType.CUT_ON_COUNTER, ActionType.SHOW_ON_COUNTER))
+                add(ActionType.CUT_ON_COUNTER)
             }
         }
         assert(expectedActions == actions.map{ it.type }) { "The ${cutMethod.name} method should take vegetables and cut them: take each of them from the fridge, and then cut" }
@@ -213,10 +211,7 @@ class Test {
         val expectedActions = buildList {
             addAll(List(NUMBER_OF_TOMATOES) { Action(ActionType.SHOW_ON_COUNTER, ItemType.FRESH_TOMATO) })
             repeat(NUMBER_OF_TOMATOES) {
-                addAll(listOf(
-                    Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO),
-                    Action(ActionType.SHOW_ON_COUNTER, ItemType.CUT_TOMATO)
-                ))
+                add(Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO))
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(

diff --git a/...Refill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Refill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...wToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...wToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...uction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...uction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...Models/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Models/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...Theory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Theory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...zation/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...zation/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/...toSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...toSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -26,7 +26,6 @@ data object KitchenImpl : Kitchen {
         actions += buildAction(ActionType.CUT_ON_COUNTER, vegetable)
         val cut = CutVegetable(vegetable.type)
         filling += cut
-        actions += buildAction(ActionType.SHOW_ON_COUNTER, cut)
         return cut
     }
 

diff --git a/culinaryServer/culinaryServerTomatoSoup/test/Tests.kt b/culinaryServer/culinaryServerTomatoSoup/test/Tests.kt
@@ -49,10 +49,7 @@ class Test {
         val expectedActions = buildList {
             addAll(List(NUMBER_OF_TOMATOES) { Action(ActionType.SHOW_ON_COUNTER, ItemType.FRESH_TOMATO) })
             repeat(NUMBER_OF_TOMATOES) {
-                addAll(listOf(
-                    Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO),
-                    Action(ActionType.SHOW_ON_COUNTER, ItemType.CUT_TOMATO)
-                ))
+                add(Action(ActionType.CUT_ON_COUNTER, ItemType.FRESH_TOMATO))
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(