Added condiment decorator pattern

src/StarbuzzCoffee/StarbuzzCoffee/Beverage.cs

@@ -1,43 +1,13 @@
 
-using System;
 namespace StarbuzzCoffee
 {
     abstract class Beverage
     {
         public abstract string Description { get; }
         public abstract decimal Cost { get; }
-        protected decimal CondimentCost
+        public override string ToString()
         {
-            get
-            {
-                Decimal condimentCost = 0;
-
-                if(milk)
-                    condimentCost += milkCost;
-                if(soy)
-                    condimentCost += soyCost;
-                if(mocha)
-                    condimentCost += mochaCost;
-                if(whip)
-                    condimentCost += whipCost;
-
-                return condimentCost;
-            }
+            return Description + " $" + Cost;
         }
-
-        private bool milk = false;
-        private bool soy = false;
-        private bool mocha = false;
-        private bool whip = false;
-
-        private decimal milkCost = 0.49M;
-        private decimal soyCost = 0.25M;
-        private decimal mochaCost = 1.00M;
-        private decimal whipCost = 0.89M;
-
-        public bool Milk { get { return milk; } set { milk = value; } }
-        public bool Soy { get { return soy; } set { soy = value; } }
-        public bool Mocha { get { return mocha; } set { mocha = value; } }
-        public bool Whip { get { return whip; } set { whip = value; } }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/Condiments/CondimentDecorator.cs

@@ -0,0 +1,13 @@
+
+namespace StarbuzzCoffee.Condiments
+{
+    abstract class CondimentDecorator : Beverage
+    {
+        protected readonly Beverage decoratedBeverage;
+
+        protected CondimentDecorator(Beverage beverage)
+        {
+            this.decoratedBeverage = beverage;
+        }
+    }
+}

src/StarbuzzCoffee/StarbuzzCoffee/Condiments/Milk.cs

@@ -0,0 +1,20 @@
+
+namespace StarbuzzCoffee.Condiments
+{
+    class Milk : CondimentDecorator
+    {
+        private readonly decimal cost = 0.49M;
+
+        public Milk(Beverage beverage) : base(beverage) { }
+
+        public override string Description
+        {
+            get { return base.decoratedBeverage.Description + ", milk"; }
+        }
+
+        public override decimal Cost
+        {
+            get { return base.decoratedBeverage.Cost + cost; }
+        }
+    }
+}

src/StarbuzzCoffee/StarbuzzCoffee/Condiments/Mocha.cs

@@ -0,0 +1,20 @@
+
+namespace StarbuzzCoffee.Condiments
+{
+    class Mocha : CondimentDecorator
+    {
+        private readonly decimal cost = 1.00M;
+
+        public Mocha(Beverage beverage) : base(beverage) { }
+
+        public override string Description
+        {
+            get { return base.decoratedBeverage.Description + ", mocha"; }
+        }
+
+        public override decimal Cost
+        {
+            get { return base.decoratedBeverage.Cost + cost; }
+        }
+    }
+}

src/StarbuzzCoffee/StarbuzzCoffee/Condiments/Soy.cs

@@ -0,0 +1,20 @@
+
+namespace StarbuzzCoffee.Condiments
+{
+    class Soy : CondimentDecorator
+    {
+        private readonly decimal cost = 0.25M;
+
+        public Soy(Beverage beverage) : base(beverage) { }
+
+        public override string Description
+        {
+            get { return base.decoratedBeverage.Description + ", soy"; }
+        }
+
+        public override decimal Cost
+        {
+            get { return base.decoratedBeverage.Cost + cost; }
+        }
+    }
+}

src/StarbuzzCoffee/StarbuzzCoffee/Condiments/Whip.cs

@@ -0,0 +1,20 @@
+
+namespace StarbuzzCoffee.Condiments
+{
+    class Whip : CondimentDecorator
+    {
+        private readonly decimal cost = 0.89M;
+
+        public Whip(Beverage beverage) : base(beverage) { }
+
+        public override string Description
+        {
+            get { return base.decoratedBeverage.Description + ", whip"; }
+        }
+
+        public override decimal Cost
+        {
+            get { return base.decoratedBeverage.Cost + cost; }
+        }
+    }
+}

src/StarbuzzCoffee/StarbuzzCoffee/DarkRoast.cs

@@ -10,7 +10,7 @@ public override string Description
 
         public override decimal Cost
         {
-            get { return 3.99M + CondimentCost; }
+            get { return 3.99M; }
         }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/Decaf.cs

@@ -10,7 +10,7 @@ public override string Description
 
         public override decimal Cost
         {
-            get { return 2.49M + CondimentCost; }
+            get { return 2.49M; }
         }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/Espresso.cs

@@ -10,7 +10,7 @@ public override string Description
 
         public override decimal Cost
         {
-            get { return 2.79M + CondimentCost; }
+            get { return 2.79M; }
         }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/HouseBlend.cs

@@ -10,7 +10,7 @@ public override string Description
 
         public override decimal Cost
         {
-            get { return 2.99M + CondimentCost; }
+            get { return 2.99M; }
         }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/Program.cs

@@ -1,14 +1,39 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using StarbuzzCoffee.Condiments;
 
 namespace StarbuzzCoffee
 {
     class Program
     {
         static void Main(string[] args)
         {
+            PrintEspresso();
+            PrintDarkRoastDoubleMochaWhip();
+            PrintHouseBlendSoyMochaWhip();
+        }
+
+        private static void PrintHouseBlendSoyMochaWhip()
+        {
+            Beverage beverage = new HouseBlend();
+            beverage = new Soy(beverage);
+            beverage = new Mocha(beverage);
+            beverage = new Whip(beverage);
+            Console.Out.WriteLine(beverage);
+        }
+
+        private static void PrintDarkRoastDoubleMochaWhip()
+        {
+            Beverage beverage = new DarkRoast();
+            beverage = new Mocha(beverage);
+            beverage = new Mocha(beverage);
+            beverage = new Whip(beverage);
+            Console.Out.WriteLine(beverage);
+        }
+
+        private static void PrintEspresso()
+        {
+            Beverage beverage = new Espresso();
+            Console.Out.WriteLine(beverage);
         }
     }
 }

src/StarbuzzCoffee/StarbuzzCoffee/StarbuzzCoffee.csproj

@@ -44,13 +44,19 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Beverage.cs" />
+    <Compile Include="Condiments\CondimentDecorator.cs" />
+    <Compile Include="Condiments\Milk.cs" />
+    <Compile Include="Condiments\Mocha.cs" />
+    <Compile Include="Condiments\Soy.cs" />
+    <Compile Include="Condiments\Whip.cs" />
     <Compile Include="Espresso.cs" />
     <Compile Include="Decaf.cs" />
     <Compile Include="DarkRoast.cs" />
     <Compile Include="HouseBlend.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.