Skip to content

Redesign of decorator pattern #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srgtrujillo wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Redesign of decorator pattern #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b956fa
Redesign of decorator pattern
srgtrujillo Mar 15, 2017
45f69a1
Remove unnecessary asserts
srgtrujillo Mar 15, 2017
5be0c75
Using `by` keyword with IngredientDecorator
Cotel Mar 15, 2017
b31714e
Improve Decorator Pattern design
srgtrujillo Mar 15, 2017
12ba9ba
Extract the variable COST from the constructor to an immutable constant
srgtrujillo Mar 21, 2017
9177395
Remove unnecessary override of function calculateTotalCost() in Ingre…
srgtrujillo Mar 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/kotlin/Decorator/littlekai/base/IngredientDecorator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package Decorator.littlekai.base

abstract class IngredientDecorator (private val noodles: Noodles) : Noodles by noodles {
protected abstract val COST : Double

override fun calculateCost(): Double = noodles.calculateCost() + this.COST
abstract fun calculateTotalCost(): Double
}
6 changes: 5 additions & 1 deletion src/main/kotlin/Decorator/littlekai/ingredients/Chicken.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@ import Decorator.littlekai.base.Noodles


class Chicken(noodles: Noodles) : IngredientDecorator(noodles) {
override val COST: Double = 3.50
private val COST: Double = 3.50

override fun calculateTotalCost(): Double {
return calculateCost() + COST
}
}
6 changes: 5 additions & 1 deletion src/main/kotlin/Decorator/littlekai/ingredients/Peanuts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@ import Decorator.littlekai.base.Noodles


class Peanuts(noodles: Noodles) : IngredientDecorator(noodles) {
override val COST: Double = 2.50
private val COST: Double = 2.50

override fun calculateTotalCost(): Double {
return calculateCost() + COST
}
}
6 changes: 5 additions & 1 deletion src/main/kotlin/Decorator/littlekai/ingredients/Pork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@ import Decorator.littlekai.base.Noodles


class Pork(noodles: Noodles) : IngredientDecorator(noodles) {
override val COST: Double = 4.00
private val COST: Double = 4.00

override fun calculateTotalCost(): Double {
return calculateCost() + COST
}
}
6 changes: 5 additions & 1 deletion src/main/kotlin/Decorator/littlekai/ingredients/Tuna.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@ import Decorator.littlekai.base.Noodles


class Tuna(noodles: Noodles) : IngredientDecorator(noodles) {
override val COST: Double = 2.75
private val COST: Double = 2.75

override fun calculateTotalCost(): Double {
return calculateCost() + COST
}
}
77 changes: 77 additions & 0 deletions src/test/kotlin/Decorator/littlekai/base/IngredientDecoratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package Decorator.littlekai.base

import Decorator.littlekai.ingredients.Chicken
import Decorator.littlekai.ingredients.Peanuts
import Decorator.littlekai.ingredients.Pork
import Decorator.littlekai.ingredients.Tuna
import Decorator.littlekai.noodles.EggNoodles
import Decorator.littlekai.noodles.UdonNoodles
import Decorator.littlekai.noodles.WheatNoodles
import Decorator.littlekai.sauces.BittersweetSauce
import Decorator.littlekai.sauces.RedPepperSauce
import Decorator.littlekai.sauces.SateSauce
import Decorator.littlekai.sauces.TeriyakiSauce
import org.hamcrest.CoreMatchers.`is`
import org.junit.Assert.assertThat
import org.junit.Assert.assertTrue
Expand All @@ -28,4 +34,75 @@ class IngredientDecoratorTest {
fun `price of ingredient is calculated correctly`() =
assertThat(Tuna(Pork(UdonNoodles())).calculateCost(), `is`(10.75))

@Test
fun `has the same interface`() {
Copy link
Member

@tonilopezmr tonilopezmr Mar 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my good lots asserts

assertTrue(BittersweetSauce(Chicken(EggNoodles())) is Noodles)
assertTrue(BittersweetSauce(Chicken(UdonNoodles())) is Noodles)
assertTrue(BittersweetSauce(Chicken(WheatNoodles())) is Noodles)
assertTrue(BittersweetSauce(Peanuts(EggNoodles())) is Noodles)
assertTrue(BittersweetSauce(Peanuts(UdonNoodles())) is Noodles)
assertTrue(BittersweetSauce(Peanuts(WheatNoodles())) is Noodles)
assertTrue(BittersweetSauce(Pork(EggNoodles())) is Noodles)
assertTrue(BittersweetSauce(Pork(UdonNoodles())) is Noodles)
assertTrue(BittersweetSauce(Pork(WheatNoodles())) is Noodles)
assertTrue(BittersweetSauce(Tuna(EggNoodles())) is Noodles)
assertTrue(BittersweetSauce(Tuna(UdonNoodles())) is Noodles)
assertTrue(BittersweetSauce(Tuna(WheatNoodles())) is Noodles)
assertTrue(RedPepperSauce(Chicken(EggNoodles())) is Noodles)
assertTrue(RedPepperSauce(Chicken(UdonNoodles())) is Noodles)
assertTrue(RedPepperSauce(Chicken(WheatNoodles())) is Noodles)
assertTrue(RedPepperSauce(Peanuts(EggNoodles())) is Noodles)
assertTrue(RedPepperSauce(Peanuts(UdonNoodles())) is Noodles)
assertTrue(RedPepperSauce(Peanuts(WheatNoodles())) is Noodles)
assertTrue(RedPepperSauce(Pork(EggNoodles())) is Noodles)
assertTrue(RedPepperSauce(Pork(UdonNoodles())) is Noodles)
assertTrue(RedPepperSauce(Pork(WheatNoodles())) is Noodles)
assertTrue(RedPepperSauce(Tuna(EggNoodles())) is Noodles)
assertTrue(RedPepperSauce(Tuna(UdonNoodles())) is Noodles)
assertTrue(RedPepperSauce(Tuna(WheatNoodles())) is Noodles)
assertTrue(SateSauce(Chicken(EggNoodles())) is Noodles)
assertTrue(SateSauce(Chicken(UdonNoodles())) is Noodles)
assertTrue(SateSauce(Chicken(WheatNoodles())) is Noodles)
assertTrue(SateSauce(Peanuts(EggNoodles())) is Noodles)
assertTrue(SateSauce(Peanuts(UdonNoodles())) is Noodles)
assertTrue(SateSauce(Peanuts(WheatNoodles())) is Noodles)
assertTrue(SateSauce(Pork(EggNoodles())) is Noodles)
assertTrue(SateSauce(Pork(UdonNoodles())) is Noodles)
assertTrue(SateSauce(Pork(WheatNoodles())) is Noodles)
assertTrue(SateSauce(Tuna(EggNoodles())) is Noodles)
assertTrue(SateSauce(Tuna(UdonNoodles())) is Noodles)
assertTrue(SateSauce(Tuna(WheatNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Chicken(EggNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Chicken(UdonNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Chicken(WheatNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Peanuts(EggNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Peanuts(UdonNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Peanuts(WheatNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Pork(EggNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Pork(UdonNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Pork(WheatNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Tuna(EggNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Tuna(UdonNoodles())) is Noodles)
assertTrue(TeriyakiSauce(Tuna(WheatNoodles())) is Noodles)
}

@Test
fun `does not modify behavior`() {
val eggNoodles = EggNoodles()
val chickenEggNoodles = Chicken(eggNoodles)
val bittersweetEggNoodles = BittersweetSauce(eggNoodles)
assertTrue(eggNoodles.calculateCost() == chickenEggNoodles.calculateCost())
assertTrue(eggNoodles.calculateCost() == bittersweetEggNoodles.calculateCost())
}

@Test
fun `adds behavior`() {


}

@Test
fun `is stackable`() {

}
}