tp7 step 2

Author: ctruchi

tp7/src/main/kotlin/fmt/kotlin/fundamentals/Barrel.kt

@@ -0,0 +1,5 @@
+package fmt.kotlin.fundamentals
+
+data class Barrel(
+    val capacity: Int
+)

tp7/src/main/kotlin/fmt/kotlin/fundamentals/Cellar.kt

@@ -3,7 +3,8 @@ package fmt.kotlin.fundamentals
 import jdk.internal.org.jline.utils.Colors.s
 
 data class Cellar(
-    val bottles: List<Bottle>
+    val bottles: List<Bottle>,
+    val barrels: List<Barrel> = emptyList()
 ) {
     fun describeAll() = callOnEveryBottle(Bottle::describe)
 

tp7/src/test/kotlin/fmt/kotlin/fundamentals/CellarTest.kt

@@ -1,13 +1,48 @@
 package fmt.kotlin.fundamentals
 
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import strikt.api.expectThat
+import strikt.assertions.all
+import strikt.assertions.hasSize
 import strikt.assertions.isEqualTo
+import strikt.assertions.withFirst
 
 class CellarTest {
 
+    @Nested
+    inner class Dsl {
+
+        @Test
+        fun `should build a Cellar`() {
+            val cellar = cellar {
+                barrel {
+                    capacity = 225
+                }
+                barrel {
+                    capacity = 225
+                }
+                bottle {
+                    name = "Coucheroy"
+                    year = 2005
+                }
+            }
+
+            expectThat(cellar) {
+                get { barrels }.hasSize(2)
+                    .all {
+                        get { capacity }.isEqualTo(225)
+                    }
+                get { bottles }.hasSize(1)
+                    .withFirst {
+                        get { name }.isEqualTo("Coucheroy")
+                        get { year }.isEqualTo(2005)
+                    }
+
+            }
+        }
+    }
+
     @Nested
     inner class OnEveryBottle {