Fix the course structure and add more tests

nbirillo · nbirillo · commit b7acf6b907c6 · 2024-09-28T20:41:40.000+02:00
diff --git a/course-info.yaml b/course-info.yaml
@@ -17,7 +17,7 @@ content:
   - duckShopServer
   - oldSchoolServer
   - backToTheFutureServer
-  - FeedbackSurvey
   - culinaryServer
+  - FeedbackSurvey
 environment_settings:
   jvm_language_level: JDK_17
diff --git a/culinaryServer/culinaryServerAddSpices/test/Tests.kt b/culinaryServer/culinaryServerAddSpices/test/Tests.kt
@@ -11,13 +11,48 @@ import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl.RA
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.action.Action
 import org.jetbrains.kotlin.course.culinary.models.action.ActionType
+import org.jetbrains.kotlin.course.culinary.models.food.SpiceType
 import org.jetbrains.kotlin.course.culinary.models.food.Vegetable
 import org.jetbrains.kotlin.course.culinary.models.food.VegetableType
 import org.junit.jupiter.api.Test
 import java.lang.reflect.InvocationTargetException
 
 class Test {
-    // TODO: add tests for the current task
+    @Test
+    fun generateSpicesMethodTest() {
+        val spices = generateSpices().take(5).toList()
+        if (spices.isEmpty()) {
+           assert(false) { "The method ${generateSpicesMethod.name} should generate random spices! Now you always generate an empty sequence!" }
+        }
+        assert(spices.toSet().size > 1) { "The method ${generateSpicesMethod.name} should generate random spices! Now you always generate ${spices.first()}" }
+    }
+
+    private fun generateSpices(): Sequence<SpiceType> {
+        val clazz = tomatoSoupKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(generateSpicesMethod)
+
+        return try {
+            method.invokeWithoutArgs(clazz = clazz) as Sequence<SpiceType>
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+            emptySequence()
+        }
+    }
+
+    @Test
+    fun addSpicesMethodTest() {
+        clearActions()
+        val clazz = tomatoSoupKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(addSpicesMethod)
+
+        try {
+            method.invoke(clazz, generateSpices())
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+        }
+
+        assert(actions.isNotEmpty() && actions.all{ it.type == ActionType.PUT_IN_POT }) { "The ${method.name} should generate spices and add them into the pot." }
+    }
 
     @Test
     fun getTomatoesForSoupMethodTest() {
diff --git a/culinaryServer/culinaryServerAddSpices/test/TomatoSoupFunctions.kt b/culinaryServer/culinaryServerAddSpices/test/TomatoSoupFunctions.kt
@@ -21,11 +21,31 @@ internal val prepareTomatoesMethod = TestMethod(
     )
 )
 
+internal val generateSpicesMethod = TestMethod(
+    "generateSpices",
+    TestKotlinType("Sequence", params = listOf("org.jetbrains.kotlin.course.culinary.models.food.SpiceType")),
+)
+
+internal val addSpicesMethod = TestMethod(
+    "addSpices",
+    TestKotlinType("Unit"),
+    returnTypeJava = "void",
+    arguments = listOf(
+        TestVariable(
+            name = "spices",
+            javaType = "Sequence",
+            kotlinType = TestKotlinType("Sequence", params = listOf("org.jetbrains.kotlin.course.culinary.models.food.SpiceType")),
+        ),
+    )
+)
+
 internal val tomatoSoupKtTestClass = TestClass(
     "TomatoSoupKt",
     "org.jetbrains.kotlin.course.culinary.game.recipes",
     customMethods = listOf(
         getTomatoesForSoupMethod,
-        prepareTomatoesMethod
+        prepareTomatoesMethod,
+        generateSpicesMethod,
+        addSpicesMethod
     ),
 )
diff --git a/culinaryServer/culinaryServerCookSalad/task-info.yaml b/culinaryServer/culinaryServerCookSalad/task-info.yaml
@@ -62,9 +62,12 @@ files:
   - name: test/FridgeImplTestClass.kt
     visible: false
     propagatable: false
+  - name: test/Tests.kt
+    visible: false
+    propagatable: false
   - name: test/TomatoSoupFunctions.kt
     visible: false
     propagatable: false
-  - name: test/Tests.kt
+  - name: test/SaladFunctions.kt
     visible: false
     propagatable: false
diff --git a/culinaryServer/culinaryServerCookSalad/test/SaladFunctions.kt b/culinaryServer/culinaryServerCookSalad/test/SaladFunctions.kt
@@ -0,0 +1,30 @@
+import org.jetbrains.academy.test.system.core.models.TestKotlinType
+import org.jetbrains.academy.test.system.core.models.classes.TestClass
+import org.jetbrains.academy.test.system.core.models.method.TestMethod
+import org.jetbrains.academy.test.system.core.models.variable.TestVariable
+
+internal val getFreshVegetablesMethod = TestMethod(
+    "getFreshVegetables",
+    TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.Vegetable")),
+)
+
+internal val cutMethod = TestMethod(
+    "cut",
+    TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.CutVegetable")),
+    arguments = listOf(
+        TestVariable(
+            name = "vegetables",
+            javaType = "List",
+            kotlinType = TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.Vegetable")),
+        ),
+    )
+)
+
+internal val saladKtTestClass = TestClass(
+    "SaladKt",
+    "org.jetbrains.kotlin.course.culinary.game.recipes",
+    customMethods = listOf(
+        getFreshVegetablesMethod,
+        cutMethod
+    ),
+)
diff --git a/culinaryServer/culinaryServerCookSalad/test/Tests.kt b/culinaryServer/culinaryServerCookSalad/test/Tests.kt
@@ -5,19 +5,114 @@ import org.jetbrains.academy.test.system.core.models.classes.ConstructorGetter
 import org.jetbrains.kotlin.course.culinary.game.actions
 import org.jetbrains.kotlin.course.culinary.game.clearActions
 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
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl.RANDOM_FRESH_VEGETABLES_NUMBER
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl.RANDOM_VEGETABLES_NUMBER
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.action.Action
 import org.jetbrains.kotlin.course.culinary.models.action.ActionType
+import org.jetbrains.kotlin.course.culinary.models.food.CutVegetable
+import org.jetbrains.kotlin.course.culinary.models.food.SpiceType
 import org.jetbrains.kotlin.course.culinary.models.food.Vegetable
 import org.jetbrains.kotlin.course.culinary.models.food.VegetableType
 import org.junit.jupiter.api.Test
 import java.lang.reflect.InvocationTargetException
 
 class Test {
-    // TODO: add tests for the current task
+    // TODO: add tests for mixVegetablesForSalad
+    @Test
+    fun getFreshVegetablesMethodTest() {
+        val randomVegetables = fillFridge()
+        val vegetables = getFreshVegetables()
+        assert(randomVegetables.filter{ it.isFresh }.sortedBy { it.type } == vegetables.sortedBy { it.type }) { "The ${getFreshVegetablesMethod.name} should return all fresh vegetables from the fridge." }
+        assert(FridgeImpl.vegetables.none { it.isFresh }) { "The ${getFreshVegetablesMethod.name} should return all fresh vegetables from the fridge." }
+    }
+
+    private fun fillFridge(): List<Vegetable> {
+        val randomVegetables = generateRandomVegetables()
+        FridgeImpl.vegetables.clear()
+        FridgeImpl.vegetables.addAll(randomVegetables)
+        return randomVegetables
+    }
+
+    private fun getFreshVegetables(): List<Vegetable> {
+        val clazz = saladKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(getFreshVegetablesMethod)
+
+        return try {
+            method.invokeWithoutArgs(clazz = clazz) as List<Vegetable>
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+            emptyList()
+        }
+    }
+
+    @Test
+    fun cutMethodTest() {
+        clearActions()
+        fillFridge()
+
+        val clazz = saladKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(cutMethod)
+        val vegetables = getFreshVegetables()
+        val expectedVegetables = vegetables.take(NUM_VEGETABLES_FOR_SALAD).map{ CutVegetable(it.type) }
+
+        val cutVegetables = try {
+            method(clazz, vegetables) as List<CutVegetable>
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+            emptyList()
+        }
+
+        assert(expectedVegetables.size == cutVegetables.size) { "The ${method.name} method should take all vegetables from the list of vegetables and cut them!" }
+        assert(expectedVegetables.sortedBy { it.type } == cutVegetables.sortedBy { it.type }) { "The ${method.name} method should take vegetables and cut them!" }
+
+        val expectedActions = buildList {
+            addAll(List(vegetables.size) { ActionType.SHOW_ON_COUNTER })
+            repeat(vegetables.size) {
+                addAll(listOf(ActionType.CUT_ON_COUNTER, ActionType.SHOW_ON_COUNTER))
+            }
+            addAll(List(NUM_VEGETABLES_FOR_SALAD) { ActionType.REMOVE_FROM_COUNTER })
+        }
+        assert(expectedActions == actions.map{ it.type }) { "The ${method.name} method should take vegetables and cut them: take each of them from the fridge, and then cut" }
+    }
+
+    @Test
+    fun generateSpicesMethodTest() {
+        val spices = generateSpices().take(5).toList()
+        if (spices.isEmpty()) {
+           assert(false) { "The method ${generateSpicesMethod.name} should generate random spices! Now you always generate an empty sequence!" }
+        }
+        assert(spices.toSet().size > 1) { "The method ${generateSpicesMethod.name} should generate random spices! Now you always generate ${spices.first()}" }
+    }
+
+    private fun generateSpices(): Sequence<SpiceType> {
+        val clazz = tomatoSoupKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(generateSpicesMethod)
+
+        return try {
+            method.invokeWithoutArgs(clazz = clazz) as Sequence<SpiceType>
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+            emptySequence()
+        }
+    }
+
+    @Test
+    fun addSpicesMethodTest() {
+        clearActions()
+        val clazz = tomatoSoupKtTestClass.checkBaseDefinition()
+        val method = clazz.declaredMethods.findMethod(addSpicesMethod)
+
+        try {
+            method.invoke(clazz, generateSpices())
+        } catch(e: InvocationTargetException) {
+            assert(false) { "Can not invoke method ${method.name}. Please, add an implementation!" }
+        }
+
+        assert(actions.isNotEmpty() && actions.all{ it.type == ActionType.PUT_IN_POT }) { "The ${method.name} should generate spices and add them into the pot." }
+    }
 
     @Test
     fun getTomatoesForSoupMethodTest() {
diff --git a/culinaryServer/culinaryServerCookSalad/test/TomatoSoupFunctions.kt b/culinaryServer/culinaryServerCookSalad/test/TomatoSoupFunctions.kt
@@ -21,11 +21,31 @@ internal val prepareTomatoesMethod = TestMethod(
     )
 )
 
+internal val generateSpicesMethod = TestMethod(
+    "generateSpices",
+    TestKotlinType("Sequence", params = listOf("org.jetbrains.kotlin.course.culinary.models.food.SpiceType")),
+)
+
+internal val addSpicesMethod = TestMethod(
+    "addSpices",
+    TestKotlinType("Unit"),
+    returnTypeJava = "void",
+    arguments = listOf(
+        TestVariable(
+            name = "spices",
+            javaType = "Sequence",
+            kotlinType = TestKotlinType("Sequence", params = listOf("org.jetbrains.kotlin.course.culinary.models.food.SpiceType")),
+        ),
+    )
+)
+
 internal val tomatoSoupKtTestClass = TestClass(
     "TomatoSoupKt",
     "org.jetbrains.kotlin.course.culinary.game.recipes",
     customMethods = listOf(
         getTomatoesForSoupMethod,
-        prepareTomatoesMethod
+        prepareTomatoesMethod,
+        generateSpicesMethod,
+        addSpicesMethod
     ),
 )
diff --git a/culinaryServer/culinaryServerCookSmoothie/task-info.yaml b/culinaryServer/culinaryServerCookSmoothie/task-info.yaml
@@ -59,12 +59,15 @@ files:
     visible: true
   - name: src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/recipes/Smoothie.kt
     visible: true
-  - name: test/FridgeImplTestClass.kt
+  - name: test/SaladFunctions.kt
     visible: false
     propagatable: false
-  - name: test/TomatoSoupFunctions.kt
+  - name: test/FridgeImplTestClass.kt
     visible: false
     propagatable: false
   - name: test/Tests.kt
     visible: false
     propagatable: false
+  - name: test/TomatoSoupFunctions.kt
+    visible: false
+    propagatable: false
diff --git a/culinaryServer/culinaryServerCookSmoothie/test/SaladFunctions.kt b/culinaryServer/culinaryServerCookSmoothie/test/SaladFunctions.kt
@@ -0,0 +1,30 @@
+import org.jetbrains.academy.test.system.core.models.TestKotlinType
+import org.jetbrains.academy.test.system.core.models.classes.TestClass
+import org.jetbrains.academy.test.system.core.models.method.TestMethod
+import org.jetbrains.academy.test.system.core.models.variable.TestVariable
+
+internal val getFreshVegetablesMethod = TestMethod(
+    "getFreshVegetables",
+    TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.Vegetable")),
+)
+
+internal val cutMethod = TestMethod(
+    "cut",
+    TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.CutVegetable")),
+    arguments = listOf(
+        TestVariable(
+            name = "vegetables",
+            javaType = "List",
+            kotlinType = TestKotlinType("List", params = listOf("org.jetbrains.kotlin.course.culinary.ingredient.Vegetable")),
+        ),
+    )
+)
+
+internal val saladKtTestClass = TestClass(
+    "SaladKt",
+    "org.jetbrains.kotlin.course.culinary.game.recipes",
+    customMethods = listOf(
+        getFreshVegetablesMethod,
+        cutMethod
+    ),
+)
diff --git a/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt b/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt
diff --git a/culinaryServer/culinaryServerCookSmoothie/test/TomatoSoupFunctions.kt b/culinaryServer/culinaryServerCookSmoothie/test/TomatoSoupFunctions.kt
diff --git a/culinaryServer/lesson-info.yaml b/culinaryServer/lesson-info.yaml
