Test done

SrdjanPaunovic · SrdjanPaunovic · commit 678524704c5a · 2017-05-03T13:21:13.000+02:00
diff --git a/extension-objects/pom.xml b/extension-objects/pom.xml
@@ -10,6 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>extension-objects</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
 
 
-</project>
+</project>
diff --git a/extension-objects/src/main/java/App.java b/extension-objects/src/main/java/App.java
@@ -38,6 +38,7 @@ private static void checkExtensionsForUnit(Unit unit) {
     SergeantExtension sergeantExtension = (SergeantExtension) unit.getUnitExtension("SergeantExtension");
     CommanderExtension commanderExtension = (CommanderExtension) unit.getUnitExtension("CommanderExtension");
 
+    //if unit have extension call the method
     if (soldierExtension != null) {
       soldierExtension.soldierReady();
     } else {
@@ -51,7 +52,7 @@ private static void checkExtensionsForUnit(Unit unit) {
     }
 
     if (commanderExtension != null) {
-      // commanderExtension.sergeantReady();
+      commanderExtension.commanderReady();
     } else {
       System.out.println(unit.getName() + " without CommanderExtension");
     }
diff --git a/extension-objects/src/main/java/abstractextensions/CommanderExtension.java b/extension-objects/src/main/java/abstractextensions/CommanderExtension.java
@@ -4,4 +4,6 @@
  * Created by Srdjan on 27-Apr-17.
  */
 public interface CommanderExtension extends UnitExtension {
+
+  void commanderReady();
 }
diff --git a/extension-objects/src/main/java/concreteextensions/Commander.java b/extension-objects/src/main/java/concreteextensions/Commander.java
@@ -13,4 +13,9 @@ public class Commander implements CommanderExtension {
   public Commander(CommanderUnit commanderUnit) {
     this.unit = commanderUnit;
   }
+
+  @Override
+  public void commanderReady() {
+    System.out.println("[Commander] " + unit.getName() + " is ready!");
+  }
 }
diff --git a/extension-objects/src/main/java/concreteextensions/Sergeant.java b/extension-objects/src/main/java/concreteextensions/Sergeant.java
@@ -16,6 +16,6 @@ public Sergeant(SergeantUnit sergeantUnit) {
 
   @Override
   public void sergeantReady() {
-    System.out.println("[Sergeant] " + unit.getName() + " do command! ");
+    System.out.println("[Sergeant] " + unit.getName() + " is ready! ");
   }
 }
diff --git a/extension-objects/src/main/java/concreteextensions/Soldier.java b/extension-objects/src/main/java/concreteextensions/Soldier.java
@@ -16,6 +16,6 @@ public Soldier(SoldierUnit soldierUnit) {
 
   @Override
   public void soldierReady() {
-    System.out.println("[Solider] " + unit.getName() + "  do command");
+    System.out.println("[Solider] " + unit.getName() + "  is ready!");
   }
 }
diff --git a/extension-objects/src/test/java/AppTest.java b/extension-objects/src/test/java/AppTest.java
@@ -0,0 +1,16 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class AppTest {
+  @Test
+  public void main() throws Exception {
+
+    String[] args = {};
+    App.main(args);
+  }
+
+}
diff --git a/extension-objects/src/test/java/concreteextensions/CommanderTest.java b/extension-objects/src/test/java/concreteextensions/CommanderTest.java
@@ -0,0 +1,19 @@
+package concreteextensions;
+
+import org.junit.Test;
+import units.CommanderUnit;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class CommanderTest {
+  @Test
+  public void commanderReady() throws Exception {
+    final Commander commander = new Commander(new CommanderUnit("CommanderUnitTest"));
+
+    commander.commanderReady();
+  }
+
+}
diff --git a/extension-objects/src/test/java/concreteextensions/SergeantTest.java b/extension-objects/src/test/java/concreteextensions/SergeantTest.java
@@ -0,0 +1,19 @@
+package concreteextensions;
+
+import org.junit.Test;
+import units.SergeantUnit;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class SergeantTest {
+  @Test
+  public void sergeantReady() throws Exception {
+    final Sergeant sergeant = new Sergeant(new SergeantUnit("SergeantUnitTest"));
+
+    sergeant.sergeantReady();
+  }
+
+}
diff --git a/extension-objects/src/test/java/concreteextensions/SoldierTest.java b/extension-objects/src/test/java/concreteextensions/SoldierTest.java
@@ -0,0 +1,19 @@
+package concreteextensions;
+
+import org.junit.Test;
+import units.SoldierUnit;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class SoldierTest {
+  @Test
+  public void soldierReady() throws Exception {
+    final Soldier soldier = new Soldier(new SoldierUnit("SoldierUnitTest"));
+
+    soldier.soldierReady();
+  }
+
+}
diff --git a/extension-objects/src/test/java/units/CommanderUnitTest.java b/extension-objects/src/test/java/units/CommanderUnitTest.java
@@ -0,0 +1,22 @@
+package units;
+
+import abstractextensions.CommanderExtension;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class CommanderUnitTest {
+  @Test
+  public void getUnitExtension() throws Exception {
+
+    final Unit unit = new CommanderUnit("CommanderUnitName");
+
+    assertNull(unit.getUnitExtension("SoldierExtension"));
+    assertNull(unit.getUnitExtension("SergeantExtension"));
+    assertNotNull((CommanderExtension)unit.getUnitExtension("CommanderExtension"));
+  }
+
+}
diff --git a/extension-objects/src/test/java/units/SergeantUnitTest.java b/extension-objects/src/test/java/units/SergeantUnitTest.java
@@ -0,0 +1,22 @@
+package units;
+
+import abstractextensions.SergeantExtension;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class SergeantUnitTest {
+  @Test
+  public void getUnitExtension() throws Exception {
+
+    final Unit unit = new SergeantUnit("SergeantUnitName");
+
+    assertNull(unit.getUnitExtension("SoldierExtension"));
+    assertNotNull((SergeantExtension)unit.getUnitExtension("SergeantExtension"));
+    assertNull(unit.getUnitExtension("CommanderExtension"));
+  }
+
+}
diff --git a/extension-objects/src/test/java/units/SoldierUnitTest.java b/extension-objects/src/test/java/units/SoldierUnitTest.java
@@ -0,0 +1,24 @@
+package units;
+
+import abstractextensions.SoldierExtension;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class SoldierUnitTest {
+  @Test
+  public void getUnitExtension() throws Exception {
+
+    final Unit unit = new SoldierUnit("SoldierUnitName");
+
+    assertNotNull((SoldierExtension)unit.getUnitExtension("SoldierExtension"));
+    assertNull(unit.getUnitExtension("SergeantExtension"));
+    assertNull(unit.getUnitExtension("CommanderExtension"));
+
+
+  }
+
+}
diff --git a/extension-objects/src/test/java/units/UnitTest.java b/extension-objects/src/test/java/units/UnitTest.java
@@ -0,0 +1,33 @@
+package units;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Srdjan on 03-May-17.
+ */
+public class UnitTest {
+
+  private Unit unit;
+
+  @Test
+  public void testConstGetSet() throws Exception {
+    final String name = "testName";
+    final Unit unit = new Unit(name);
+    assertEquals(name,unit.getName());
+
+    final String newName = "newName";
+    unit.setName(newName);
+    assertEquals(newName,unit.getName());
+
+
+    assertNull(unit.getUnitExtension(""));
+    assertNull(unit.getUnitExtension("SoldierExtension"));
+    assertNull(unit.getUnitExtension("SergeantExtension"));
+    assertNull(unit.getUnitExtension("CommanderExtension"));
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ private static void checkExtensionsForUnit(Unit unit) {`
`38`	`38`	`SergeantExtension sergeantExtension = (SergeantExtension) unit.getUnitExtension("SergeantExtension");`
`39`	`39`	`CommanderExtension commanderExtension = (CommanderExtension) unit.getUnitExtension("CommanderExtension");`
`40`	`40`
	`41`	`+ //if unit have extension call the method`
`41`	`42`	`if (soldierExtension != null) {`
`42`	`43`	`soldierExtension.soldierReady();`
`43`	`44`	`} else {`
`@@ -51,7 +52,7 @@ private static void checkExtensionsForUnit(Unit unit) {`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`if (commanderExtension != null) {`
`54`		`- // commanderExtension.sergeantReady();`
	`55`	`+ commanderExtension.commanderReady();`
`55`	`56`	`} else {`
`56`	`57`	`System.out.println(unit.getName() + " without CommanderExtension");`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,6 @@`
`4`	`4`	`* Created by Srdjan on 27-Apr-17.`
`5`	`5`	`*/`
`6`	`6`	`public interface CommanderExtension extends UnitExtension {`
	`7`	`+`
	`8`	`+ void commanderReady();`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,9 @@ public class Commander implements CommanderExtension {`
`13`	`13`	`public Commander(CommanderUnit commanderUnit) {`
`14`	`14`	`this.unit = commanderUnit;`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ @Override`
	`18`	`+ public void commanderReady() {`
	`19`	`+ System.out.println("[Commander] " + unit.getName() + " is ready!");`
	`20`	`+ }`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public Sergeant(SergeantUnit sergeantUnit) {`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`public void sergeantReady() {`
`19`		`- System.out.println("[Sergeant] " + unit.getName() + " do command! ");`
	`19`	`+ System.out.println("[Sergeant] " + unit.getName() + " is ready! ");`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public Soldier(SoldierUnit soldierUnit) {`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`public void soldierReady() {`
`19`		`- System.out.println("[Solider] " + unit.getName() + " do command");`
	`19`	`+ System.out.println("[Solider] " + unit.getName() + " is ready!");`
`20`	`20`	`}`
`21`	`21`	`}`