scoobycoder
diff --git a/‎.classpath
Lines changed: 1 addition & 0 deletions b/‎.classpath
Lines changed: 1 addition & 0 deletions
diff --git a/‎bin/halterman/command/Client.class
-10 Bytes b/‎bin/halterman/command/Client.class
-10 Bytes
diff --git a/‎bin/halterman/command/CommandPatternTest.class
255 Bytes b/‎bin/halterman/command/CommandPatternTest.class
255 Bytes
diff --git a/‎bin/halterman/command/Light.class
200 Bytes b/‎bin/halterman/command/Light.class
200 Bytes
diff --git a/‎bin/halterman/command/Switch.class
594 Bytes b/‎bin/halterman/command/Switch.class
594 Bytes
diff --git a/‎src/halterman/command/Client.java
Lines changed: 9 additions & 5 deletions b/‎src/halterman/command/Client.java
Lines changed: 9 additions & 5 deletions
diff --git a/‎src/halterman/command/Light.java
Lines changed: 2 additions & 0 deletions b/‎src/halterman/command/Light.java
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/halterman/command/Switch.java
Lines changed: 15 additions & 0 deletions b/‎src/halterman/command/Switch.java
Lines changed: 15 additions & 0 deletions
diff --git a/‎test/halterman/command/CommandPatternTest.java
Lines changed: 26 additions & 5 deletions b/‎test/halterman/command/CommandPatternTest.java
Lines changed: 26 additions & 5 deletions
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="C:/svn/trunk/build/target/ivy/repo-cache/mockito/mockito-all/jars/mockito-all-1.9.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -3,20 +3,24 @@
 //Client
 public class Client {
 	public static void main(String[] args) {
-		RemoteControl control = new RemoteControl();
+		
+		//Invoker
+		Switch lightSwitch = new Switch();
 
+		//Receiver
 		Light light = new Light();
 
+		//Concrete Commands from Command Interface
 		Command lightsOn = new LightOnCommand(light);
 		Command lightsOff = new LightOffCommand(light);
 
 		// switch on
-		control.setCommand(lightsOn);
-		control.pressButton();
+		lightSwitch.setCommand(lightsOn);
+		lightSwitch.pressButton();
 
 		// switch off
-		control.setCommand(lightsOff);
-		control.pressButton();
+		lightSwitch.setCommand(lightsOff);
+		lightSwitch.pressButton();
 
 	}
 
 
@@ -6,10 +6,12 @@ public class Light {
 
 	public void switchOn() {
 		on = true;
+		System.out.println("Turned Light On.");
 	}
 
 	public void switchOff() {
 		on = false;
+		System.out.println("Turned Light Off.");
 	}
 
 }
@@ -0,0 +1,15 @@
+package halterman.command;
+
+//Invoker
+public class Switch {
+	private Command command;
+
+	public void setCommand(Command command) {
+		this.command = command;
+	}
+
+	public void pressButton() {
+		command.execute();
+	}
+
+}
@@ -2,17 +2,38 @@
 
 import static org.junit.Assert.*;
 
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import org.junit.Before;
 import org.junit.Test;
 
 public class CommandPatternTest {
 
+	@Mock
+	Light light;
+	
+	@Mock
+	Command lightsOn;
+	
+	private Switch control;
+	
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        control = new Switch();
+    }
+	
 	@Test
 	public void shouldTurnOnLight() {
-		Light l = new Light();
-		Command loc = new LightOnCommand(l);
-		
-		RemoteControl rc = new RemoteControl();
-		rc.setCommand(loc);
+		Command lightsOn = new LightOnCommand(light);
+
+		// switch on
+		control.setCommand(lightsOn);
+		control.pressButton();
+
+		//verify
 
 		// Need Mockito here, will work on this from home.
 	}
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,12 @@ public class Light {`
`6`	`6`
`7`	`7`	`public void switchOn() {`
`8`	`8`	`on = true;`
	`9`	`+ System.out.println("Turned Light On.");`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`public void switchOff() {`
`12`	`13`	`on = false;`
	`14`	`+ System.out.println("Turned Light Off.");`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`}`