Added test and support for test

Author: Pedro David Rodríguez Sánchez

src/main/kotlin/oop/Flyweight/Admiral.kt

@@ -7,7 +7,7 @@ class Admiral : Soldier {
     val TYPE = 1
   }
   init {
-      Flyweitght.objectInstances++
+      Flyweight.objectInstances++
   }
 
   val attack = 6

src/main/kotlin/oop/Flyweight/Captain.kt

@@ -7,7 +7,7 @@ class Captain : Soldier {
     val TYPE = 2
   }
   init {
-      Flyweitght.objectInstances++
+      Flyweight.objectInstances++
   }
 
   val attack = 10

…/main/kotlin/oop/Flyweight/Flyweitght.kt …c/main/kotlin/oop/Flyweight/Flyweight.ktsrc/main/kotlin/oop/Flyweight/Flyweitght.kt renamed to src/main/kotlin/oop/Flyweight/Flyweight.kt src/main/kotlin/oop/Flyweight/Flyweitght.kt renamed to src/main/kotlin/oop/Flyweight/Flyweight.kt

@@ -1,7 +1,7 @@
 package oop.Flyweight
 
 import java.awt.Point
-class Flyweitght{
+class Flyweight{
   companion object{
     var objectInstances = 0
   }
@@ -21,6 +21,6 @@ fun main(args: Array<String>) {
   soldiers[3].attack(Point(11,7))
   soldiers[4].attack(Point(21,3))
 
-  System.out.println(Flyweitght.objectInstances)
+  System.out.println(Flyweight.objectInstances)
 
 }

src/main/kotlin/oop/Flyweight/SoldierClient.kt

@@ -1,5 +1,6 @@
 package oop.Flyweight
 
+import org.jetbrains.annotations.TestOnly
 import java.awt.Point
 
 class SoldierClient(private val type: Int) {
@@ -10,4 +11,7 @@ class SoldierClient(private val type: Int) {
     soldier.attack(currentPosition,attackPoint)
   }
 
+  @TestOnly
+  fun getSoldier() = soldier
+
 }

src/main/kotlin/oop/Flyweight/SoldierFactory.kt

@@ -1,5 +1,7 @@
 package oop.Flyweight
 
+import org.jetbrains.annotations.TestOnly
+
 class SoldierFactory {
   companion object {
     var admiral: Admiral? = null
@@ -22,6 +24,12 @@ class SoldierFactory {
       }
       throw IllegalArgumentException()
     }
+
+    @TestOnly
+    fun clearInstances(){
+      admiral = null
+      captain = null
+    }
   }
 
 

src/test/kotlin/oop/Flyweigth/FlyweightPatternShould.kt

@@ -0,0 +1,43 @@
+package oop.Flyweigth
+
+import oop.Flyweight.*
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Before
+import org.junit.Test
+import java.util.*
+
+class FlyweightPatternShould {
+
+  @Before
+  fun initTests(){
+    Flyweight.objectInstances = 0
+    SoldierFactory.clearInstances()
+  }
+
+  @Test
+  fun `Have one instance when only one type of soldier is created`() {
+    SoldierClient(Admiral.TYPE)
+    SoldierClient(Admiral.TYPE)
+    SoldierClient(Admiral.TYPE)
+
+    assertThat(Flyweight.objectInstances, `is`(1))
+  }
+  @Test
+  fun `Have two instances when both types are created, no matter the number of soldiers`(){
+    (1..Random().nextInt(30)).forEach {
+      SoldierClient(Admiral.TYPE)
+      SoldierClient(Captain.TYPE)
+    }
+
+    assertThat(Flyweight.objectInstances, `is`(2))
+  }
+
+  @Test
+  fun `Have the same main object in two instances of the same type`(){
+    val soldierOne: SoldierClient = SoldierClient(Admiral.TYPE)
+    val soldierTwo: SoldierClient = SoldierClient(Admiral.TYPE)
+
+    assertThat(soldierOne.getSoldier(), `is`(soldierTwo.getSoldier()))
+  }
+}