diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt index 5acf2cb..b73cadf 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt @@ -30,7 +30,7 @@ data class MixMaterial( // ==== DSL ==== fun mixMaterial( id: Long? = null, - mix: Mix = TODO(), + mix: Mix = mix(), material: Material = material(), quantity: Float = 0f, op: MixMaterial.() -> Unit = {} diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt index 47634b6..40cd5cf 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt @@ -30,7 +30,7 @@ data class RecipeStep( // ==== DSL ==== fun recipeStep( id: Long? = null, - recipe: Recipe? = TODO(), // TODO change default when recipe DSL is done + recipe: Recipe? = recipe(), message: String = "message", op: RecipeStep.() -> Unit = {} ) = RecipeStep(id, recipe, message).apply(op) diff --git a/src/test/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeStepServiceTest.kt b/src/test/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeStepServiceTest.kt index f44d938..beb6bed 100644 --- a/src/test/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeStepServiceTest.kt +++ b/src/test/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeStepServiceTest.kt @@ -12,8 +12,8 @@ class RecipeStepServiceTest : override val repository: RecipeStepRepository = mock() override val service: RecipeStepService = spy(RecipeStepServiceImpl(repository)) - override val entity: RecipeStep = recipeStep(id = 0L, recipe = TODO(), message = "message") - override val anotherEntity: RecipeStep = recipeStep(id = 1L, recipe = TODO(), message = "another message") + override val entity: RecipeStep = recipeStep(id = 0L, recipe = recipe(id = 0L), message = "message") + override val anotherEntity: RecipeStep = recipeStep(id = 1L, recipe = recipe(id = 1L), message = "another message") @Nested inner class CreateForRecipe {