From 2ca1f92612e9308f8add416c225892da07551940 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:43:31 +0200
Subject: [PATCH 01/20] 6: fixed test

---
 tdd_intro/homework/06_coffee/test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 33b9093e..a81d346b 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -111,9 +111,9 @@ TEST(CoffeeMachine, Americano)
     MockSourceOfIngredients si;
     CoffeeMachine cm(si);
 
-    EXPECT_CALL(si, AddCoffee(75)).Times(1);
+    EXPECT_CALL(si, AddCoffee(50)).Times(1);
     EXPECT_CALL(si, SetCupSize(100)).Times(1);
-    EXPECT_CALL(si, AddWater(25, 60)).Times(1);
+    EXPECT_CALL(si, AddWater(50, 60)).Times(1);
 
     cm.CreateCoffee(Cup::Normal, Coffee::Americano);
 }

From c67c0453bbe976959ec2c3d35829437c8962ae77 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:44:10 +0200
Subject: [PATCH 02/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index a81d346b..39f7dc2f 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -65,9 +65,9 @@ class CoffeeMachine
     }
     void CreateCoffee(const Cup cup, const Coffee coffee)
     {
-        m_source.AddCoffee(0);
-        m_source.SetCupSize(0);
-        m_source.AddWater(0, 0);
+        m_source.AddCoffee(50);
+        m_source.SetCupSize(100);
+        m_source.AddWater(50, 60);
     }
 private:
     ISourceOfIngredients& m_source;

From d4fba57f2ccb272a199ac81663b93dc1571f182b Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:44:23 +0200
Subject: [PATCH 03/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 39f7dc2f..7110aeaa 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -93,19 +93,6 @@ TEST(CoffeeMachine, CoffemachineIsHere)
     CoffeeMachine cm(si);
 }
 
-TEST(CoffeeMachine, CallsImportantThings)
-{
-    MockSourceOfIngredients si;
-    CoffeeMachine cm(si);
-
-    EXPECT_CALL(si, AddCoffee(::testing::_)).Times(1);
-    EXPECT_CALL(si, SetCupSize(::testing::_)).Times(1);
-    EXPECT_CALL(si, AddWater(::testing::_, ::testing::_)).Times(1);
-
-    cm.CreateCoffee(Cup::Normal, Coffee::Americano);
-}
-
-//- americano: water & coffee 1:3 Water temp 60C
 TEST(CoffeeMachine, Americano)
 {
     MockSourceOfIngredients si;

From b16dc47510a57109e907fdef24c555e9b117db8c Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:46:09 +0200
Subject: [PATCH 04/20] 6: red

---
 tdd_intro/homework/06_coffee/test.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 7110aeaa..22d3d08d 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -104,3 +104,15 @@ TEST(CoffeeMachine, Americano)
 
     cm.CreateCoffee(Cup::Normal, Coffee::Americano);
 }
+
+TEST(CoffeeMachine, LargeAmericano)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, AddCoffee(70)).Times(1);
+    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, AddWater(70, 60)).Times(1);
+
+    cm.CreateCoffee(Cup::Big, Coffee::Americano);
+}

From f27f0d541fb4d2c47cc3b9710821338cde2ff3c2 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:47:09 +0200
Subject: [PATCH 05/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 22d3d08d..9a55dcfd 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -65,9 +65,18 @@ class CoffeeMachine
     }
     void CreateCoffee(const Cup cup, const Coffee coffee)
     {
-        m_source.AddCoffee(50);
-        m_source.SetCupSize(100);
-        m_source.AddWater(50, 60);
+        if(cup == Cup::Normal)
+        {
+            m_source.AddCoffee(50);
+            m_source.SetCupSize(100);
+            m_source.AddWater(50, 60);
+        }
+        else
+        {
+            m_source.AddCoffee(70);
+            m_source.SetCupSize(140);
+            m_source.AddWater(70, 60);
+        }
     }
 private:
     ISourceOfIngredients& m_source;

From b33af1e20a86d2e321814c0802dd8716796d8f5d Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:49:23 +0200
Subject: [PATCH 06/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 9a55dcfd..962de485 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -34,8 +34,8 @@ class ISourceOfIngredients
 
 enum Cup
 {
-    Normal,
-    Big
+    Normal = 100,
+    Big = 140
 };
 
 enum Coffee
@@ -65,16 +65,17 @@ class CoffeeMachine
     }
     void CreateCoffee(const Cup cup, const Coffee coffee)
     {
+        int cupSize = static_cast<int>(cup);
         if(cup == Cup::Normal)
         {
             m_source.AddCoffee(50);
-            m_source.SetCupSize(100);
+            m_source.SetCupSize(cupSize);
             m_source.AddWater(50, 60);
         }
         else
         {
             m_source.AddCoffee(70);
-            m_source.SetCupSize(140);
+            m_source.SetCupSize(cupSize);
             m_source.AddWater(70, 60);
         }
     }

From edf0d4896e98f76ee8b7cf08269471581780b435 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:50:33 +0200
Subject: [PATCH 07/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 962de485..a6916e1d 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -66,18 +66,10 @@ class CoffeeMachine
     void CreateCoffee(const Cup cup, const Coffee coffee)
     {
         int cupSize = static_cast<int>(cup);
-        if(cup == Cup::Normal)
-        {
-            m_source.AddCoffee(50);
-            m_source.SetCupSize(cupSize);
-            m_source.AddWater(50, 60);
-        }
-        else
-        {
-            m_source.AddCoffee(70);
-            m_source.SetCupSize(cupSize);
-            m_source.AddWater(70, 60);
-        }
+
+        m_source.AddCoffee(cupSize / 2);
+        m_source.SetCupSize(cupSize);
+        m_source.AddWater(cupSize / 2, 60);
     }
 private:
     ISourceOfIngredients& m_source;

From ce09f017deb83b6328752bcff0b52f28bbfc8715 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:53:11 +0200
Subject: [PATCH 08/20] 6: red

---
 tdd_intro/homework/06_coffee/test.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index a6916e1d..373818ae 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -118,3 +118,16 @@ TEST(CoffeeMachine, LargeAmericano)
 
     cm.CreateCoffee(Cup::Big, Coffee::Americano);
 }
+
+TEST(CoffeeMachine, Cappuccino)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, AddMilk(33)).Times(1);
+    EXPECT_CALL(si, AddCoffee(33)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(34)).Times(1);
+
+    cm.CreateCoffee(Cup::Normal, Coffee::Cappuccino);
+}

From 905479e75583de57005fea019d350259f623bd3b Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:53:35 +0200
Subject: [PATCH 09/20] 6: fixed build

---
 tdd_intro/homework/06_coffee/test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 373818ae..c269374c 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -40,7 +40,8 @@ enum Cup
 
 enum Coffee
 {
-    Americano
+    Americano,
+    Cappuccino
 };
 
 class MockSourceOfIngredients : public ISourceOfIngredients

From 5f8cec9b04cb1b9b63cdf67e6bf07e897f1439e6 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:56:22 +0200
Subject: [PATCH 10/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index c269374c..3e532c57 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -68,9 +68,19 @@ class CoffeeMachine
     {
         int cupSize = static_cast<int>(cup);
 
-        m_source.AddCoffee(cupSize / 2);
-        m_source.SetCupSize(cupSize);
-        m_source.AddWater(cupSize / 2, 60);
+        if(coffee == Coffee::Americano)
+        {
+            m_source.AddCoffee(cupSize / 2);
+            m_source.SetCupSize(cupSize);
+            m_source.AddWater(cupSize / 2, 60);
+        }
+        else if(coffee == Coffee::Cappuccino)
+        {
+            m_source.SetCupSize(cupSize);
+            m_source.AddMilk(cupSize / 3);
+            m_source.AddCoffee(cupSize / 3);
+            m_source.AddMilkFoam(cupSize / 3 + 1);
+        }
     }
 private:
     ISourceOfIngredients& m_source;
@@ -125,7 +135,7 @@ TEST(CoffeeMachine, Cappuccino)
     MockSourceOfIngredients si;
     CoffeeMachine cm(si);
 
-    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, SetCupSize(100)).Times(1);
     EXPECT_CALL(si, AddMilk(33)).Times(1);
     EXPECT_CALL(si, AddCoffee(33)).Times(1);
     EXPECT_CALL(si, AddMilkFoam(34)).Times(1);

From 5598169b114e08116e35ea6b242b932c48fedbf2 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:58:03 +0200
Subject: [PATCH 11/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 3e532c57..f27fdd95 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -70,18 +70,30 @@ class CoffeeMachine
 
         if(coffee == Coffee::Americano)
         {
-            m_source.AddCoffee(cupSize / 2);
-            m_source.SetCupSize(cupSize);
-            m_source.AddWater(cupSize / 2, 60);
+           CreateAmericano(cupSize);
         }
         else if(coffee == Coffee::Cappuccino)
         {
-            m_source.SetCupSize(cupSize);
-            m_source.AddMilk(cupSize / 3);
-            m_source.AddCoffee(cupSize / 3);
-            m_source.AddMilkFoam(cupSize / 3 + 1);
+            CreateCappuccino(cupSize);
         }
     }
+
+private:
+    void CreateAmericano(int cupSize)
+    {
+        m_source.AddCoffee(cupSize / 2);
+        m_source.SetCupSize(cupSize);
+        m_source.AddWater(cupSize / 2, 60);
+    }
+
+    void CreateCappuccino(int cupSize)
+    {
+        m_source.SetCupSize(cupSize);
+        m_source.AddMilk(cupSize / 3);
+        m_source.AddCoffee(cupSize / 3);
+        m_source.AddMilkFoam(cupSize / 3 + 1);
+    }
+
 private:
     ISourceOfIngredients& m_source;
 };

From 2ef45e3c44e2fdc20af793580fc9398f39a21ecf Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 10:59:25 +0200
Subject: [PATCH 12/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index f27fdd95..23da20f6 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -88,10 +88,12 @@ class CoffeeMachine
 
     void CreateCappuccino(int cupSize)
     {
+        int onePart = cupSize / 3;
+
         m_source.SetCupSize(cupSize);
-        m_source.AddMilk(cupSize / 3);
-        m_source.AddCoffee(cupSize / 3);
-        m_source.AddMilkFoam(cupSize / 3 + 1);
+        m_source.AddMilk(onePart);
+        m_source.AddCoffee(onePart);
+        m_source.AddMilkFoam(cupSize - 2 * onePart);
     }
 
 private:

From 4fd26a0b1f7551ee00ed15f41b9bb0d47af2ff54 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:01:55 +0200
Subject: [PATCH 13/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 23da20f6..52d1ca69 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -156,3 +156,16 @@ TEST(CoffeeMachine, Cappuccino)
 
     cm.CreateCoffee(Cup::Normal, Coffee::Cappuccino);
 }
+
+TEST(CoffeeMachine, LargeCappuccino)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, AddMilk(46)).Times(1);
+    EXPECT_CALL(si, AddCoffee(46)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(48)).Times(1);
+
+    cm.CreateCoffee(Cup::Big, Coffee::Cappuccino);
+}

From dcec6d9139402e75b825786225b4225417d4fee7 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:05:03 +0200
Subject: [PATCH 14/20] 6: red

---
 tdd_intro/homework/06_coffee/test.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 52d1ca69..94e8c118 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -41,7 +41,8 @@ enum Cup
 enum Coffee
 {
     Americano,
-    Cappuccino
+    Cappuccino,
+    Latte
 };
 
 class MockSourceOfIngredients : public ISourceOfIngredients
@@ -169,3 +170,16 @@ TEST(CoffeeMachine, LargeCappuccino)
 
     cm.CreateCoffee(Cup::Big, Coffee::Cappuccino);
 }
+
+TEST(CoffeeMachine, Latte)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(100)).Times(1);
+    EXPECT_CALL(si, AddMilk(25)).Times(1);
+    EXPECT_CALL(si, AddCoffee(50)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(25)).Times(1);
+
+    cm.CreateCoffee(Cup::Normal, Coffee::Latte);
+}

From a5d201a032905b2a35834b2aa2381149d611364f Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:07:46 +0200
Subject: [PATCH 15/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 94e8c118..5c8dbbec 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -77,6 +77,10 @@ class CoffeeMachine
         {
             CreateCappuccino(cupSize);
         }
+        else
+        {
+            CreateLatte(cupSize);
+        }
     }
 
 private:
@@ -97,6 +101,16 @@ class CoffeeMachine
         m_source.AddMilkFoam(cupSize - 2 * onePart);
     }
 
+    void CreateLatte(int cupSize)
+    {
+        int onePart = cupSize / 4;
+
+        m_source.SetCupSize(cupSize);
+        m_source.AddMilk(onePart);
+        m_source.AddCoffee(2 * onePart);
+        m_source.AddMilkFoam(cupSize - 3 * onePart);
+    }
+
 private:
     ISourceOfIngredients& m_source;
 };

From 56ffecaf7a609c1896813a07be7484f249fe9e54 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:09:47 +0200
Subject: [PATCH 16/20] 6: refactored

---
 tdd_intro/homework/06_coffee/test.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 5c8dbbec..5639371a 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -69,17 +69,23 @@ class CoffeeMachine
     {
         int cupSize = static_cast<int>(cup);
 
-        if(coffee == Coffee::Americano)
+        switch(coffee)
         {
-           CreateAmericano(cupSize);
-        }
-        else if(coffee == Coffee::Cappuccino)
-        {
-            CreateCappuccino(cupSize);
-        }
-        else
-        {
-            CreateLatte(cupSize);
+            case Coffee::Americano:
+            {
+                CreateAmericano(cupSize);
+                break;
+            }
+            case Coffee::Cappuccino:
+            {
+                CreateCappuccino(cupSize);
+                break;
+            }
+        case Coffee::Latte:
+            {
+                CreateLatte(cupSize);
+                break;
+            }
         }
     }
 

From 6d2be8674b1738e54be3123df8d073f490839edb Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:10:47 +0200
Subject: [PATCH 17/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 5639371a..07cb0612 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -203,3 +203,16 @@ TEST(CoffeeMachine, Latte)
 
     cm.CreateCoffee(Cup::Normal, Coffee::Latte);
 }
+
+TEST(CoffeeMachine, LargeLatte)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, AddMilk(35)).Times(1);
+    EXPECT_CALL(si, AddCoffee(70)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(35)).Times(1);
+
+    cm.CreateCoffee(Cup::Big, Coffee::Latte);
+}

From baf38c42ce2ffcde9e4bcab34540cfea10335ca1 Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:12:23 +0200
Subject: [PATCH 18/20] 6: red

---
 tdd_intro/homework/06_coffee/test.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 07cb0612..26b0a0ee 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -42,7 +42,8 @@ enum Coffee
 {
     Americano,
     Cappuccino,
-    Latte
+    Latte,
+    Marochino
 };
 
 class MockSourceOfIngredients : public ISourceOfIngredients
@@ -216,3 +217,16 @@ TEST(CoffeeMachine, LargeLatte)
 
     cm.CreateCoffee(Cup::Big, Coffee::Latte);
 }
+
+TEST(CoffeeMachine, Marochino)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(100)).Times(1);
+    EXPECT_CALL(si, AddChocolate(25)).Times(1);
+    EXPECT_CALL(si, AddCoffee(25)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(25)).Times(1);
+
+    cm.CreateCoffee(Cup::Normal, Coffee::Marochino);
+}

From 7af9eedd5ade004f5dd367ee59134223ca9f343f Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:13:48 +0200
Subject: [PATCH 19/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index 26b0a0ee..a9b80d26 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -82,11 +82,16 @@ class CoffeeMachine
                 CreateCappuccino(cupSize);
                 break;
             }
-        case Coffee::Latte:
+            case Coffee::Latte:
             {
                 CreateLatte(cupSize);
                 break;
             }
+            case Coffee::Marochino:
+            {
+                CreateMarochino(cupSize);
+                break;
+            }
         }
     }
 
@@ -118,6 +123,16 @@ class CoffeeMachine
         m_source.AddMilkFoam(cupSize - 3 * onePart);
     }
 
+    void CreateMarochino(int cupSize)
+    {
+        int onePart = cupSize / 4;
+
+        m_source.SetCupSize(cupSize);
+        m_source.AddChocolate(onePart);
+        m_source.AddCoffee(onePart);
+        m_source.AddMilkFoam(onePart);
+    }
+
 private:
     ISourceOfIngredients& m_source;
 };

From b0f687834cb301d5075c56d3a61f70049c0de6fd Mon Sep 17 00:00:00 2001
From: Daria Tkachenko <daria.tkachenko19@gmail.com>
Date: Thu, 8 Nov 2018 11:14:29 +0200
Subject: [PATCH 20/20] 6: green

---
 tdd_intro/homework/06_coffee/test.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tdd_intro/homework/06_coffee/test.cpp b/tdd_intro/homework/06_coffee/test.cpp
index a9b80d26..f89f38e6 100644
--- a/tdd_intro/homework/06_coffee/test.cpp
+++ b/tdd_intro/homework/06_coffee/test.cpp
@@ -245,3 +245,16 @@ TEST(CoffeeMachine, Marochino)
 
     cm.CreateCoffee(Cup::Normal, Coffee::Marochino);
 }
+
+TEST(CoffeeMachine, LargeMarochino)
+{
+    MockSourceOfIngredients si;
+    CoffeeMachine cm(si);
+
+    EXPECT_CALL(si, SetCupSize(140)).Times(1);
+    EXPECT_CALL(si, AddChocolate(35)).Times(1);
+    EXPECT_CALL(si, AddCoffee(35)).Times(1);
+    EXPECT_CALL(si, AddMilkFoam(35)).Times(1);
+
+    cm.CreateCoffee(Cup::Big, Coffee::Marochino);
+}