remove printer

Author: code4craft

pom.xml

@@ -31,18 +31,6 @@
             <artifactId>mockito-all</artifactId>
             <version>1.9.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.5.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.5.2</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 

src/main/java/helloworld/behavioral/Printer.java

@@ -1,15 +1,15 @@
 package helloworld.behavioral.command;
 
-import helloworld.behavioral.Printer;
+import java.io.PrintStream;
 
 /**
  * @author yihua.huang@dianping.com
  */
 public class HelloWorldPrintCommand implements Command {
 
-    private Printer printer = Printer.instance();
+    private PrintStream printer = System.out;
 
-    public void setPrinter(Printer printer) {
+    public void setPrinter(PrintStream printer) {
         this.printer = printer;
     }
 

src/main/java/helloworld/behavioral/command/HelloWorldPrintCommand.java

@@ -1,8 +1,8 @@
 package helloworld.behavioral.interpreter;
 
-import helloworld.behavioral.Printer;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,9 +41,9 @@ public void registerFunction(String name, Function function) {
 
     static class PrintlnFunction implements Function {
 
-        private Printer printer = Printer.instance();
+        private PrintStream printer = System.out;
 
-        void setPrinter(Printer printer) {
+        void setPrinter(PrintStream printer) {
             this.printer = printer;
         }
 

src/main/java/helloworld/behavioral/interpreter/HelloWorldInterpreter.java

@@ -1,7 +1,10 @@
 package helloworld.behavioral.command;
 
-import helloworld.behavioral.Printer;
+import com.sun.org.apache.xml.internal.serialize.Printer;
 import org.junit.Test;
+
+import java.io.PrintStream;
+
 import static org.mockito.Mockito.*;
 
 /**
@@ -12,7 +15,7 @@ public class HelloWorldPrintCommandTest {
     @Test
     public void testHelloWorldPrintCommand(){
         HelloWorldPrintCommand helloWorldPrintCommand = new HelloWorldPrintCommand();
-        Printer mockPrinter = mock(Printer.class);
+        PrintStream mockPrinter = mock(PrintStream.class);
         helloWorldPrintCommand.setPrinter(mockPrinter);
         helloWorldPrintCommand.execute();
         verify(mockPrinter,times(1)).println("Hello Command!");

src/test/java/helloworld/behavioral/PrinterTest.java

@@ -1,7 +1,9 @@
 package helloworld.behavioral.interpreter;
 
-import helloworld.behavioral.Printer;
 import org.junit.Test;
+
+import java.io.PrintStream;
+
 import static org.mockito.Mockito.*;
 
 /**
@@ -12,7 +14,7 @@ public class HelloWorldInterpreterTest {
     @Test
     public void testHelloWorldInterpreter(){
         HelloWorldInterpreter helloWorldInterpreter = new HelloWorldInterpreter();
-        Printer mockPrinter = mock(Printer.class);
+        PrintStream mockPrinter = mock(PrintStream.class);
         HelloWorldInterpreter.PrintlnFunction printlnFunction = new HelloWorldInterpreter.PrintlnFunction();
         printlnFunction.setPrinter(mockPrinter);
         helloWorldInterpreter.registerFunction("println",printlnFunction);