#502 Adjusted tests for logger introduction

visitor/src/test/java/com/iluwatar/visitor/StdOutTest.java

@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.iluwatar.visitor;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
-  /**
-   * The mocked standard out {@link PrintStream}, required since some actions don't have any
-   * influence on accessible objects, except for writing to std-out using {@link System#out}
-   */
-  private final PrintStream stdOutMock = mock(PrintStream.class);
-
-  /**
-   * Keep the original std-out so it can be restored after the test
-   */
-  private final PrintStream stdOutOrig = System.out;
-
-  /**
-   * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
-   */
-  @Before
-  public void setUp() {
-    System.setOut(this.stdOutMock);
-  }
-
-  /**
-   * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
-   */
-  @After
-  public void tearDown() {
-    System.setOut(this.stdOutOrig);
-  }
-
-  /**
-   * Get the mocked stdOut {@link PrintStream}
-   *
-   * @return The stdOut print stream mock, renewed before each test
-   */
-  final PrintStream getStdOutMock() {
-    return this.stdOutMock;
-  }
-
-}

visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java

@@ -22,19 +22,38 @@
  */
 package com.iluwatar.visitor;
 
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Date: 12/30/15 - 18:59 PM
  *
  * @author Jeroen Meulemeester
  */
-public abstract class VisitorTest<V extends UnitVisitor> extends StdOutTest {
+public abstract class VisitorTest<V extends UnitVisitor> {
+
+  private InMemoryAppender appender;
+
+  @Before
+  public void setUp() {
+    appender = new InMemoryAppender();
+  }
+
+  @After
+  public void tearDown() {
+    appender.stop();
+  }
 
   /**
    * The tested visitor instance
@@ -76,27 +95,48 @@ public abstract class VisitorTest<V extends UnitVisitor> extends StdOutTest {
   public void testVisitCommander() {
     this.visitor.visitCommander(new Commander());
     if (this.commanderResponse.isPresent()) {
-      verify(getStdOutMock()).println(this.commanderResponse.get());
+      assertEquals(this.commanderResponse.get(), appender.getLastMessage());
+      assertEquals(1, appender.getLogSize());
     }
-    verifyNoMoreInteractions(getStdOutMock());
   }
 
   @Test
   public void testVisitSergeant() {
     this.visitor.visitSergeant(new Sergeant());
     if (this.sergeantResponse.isPresent()) {
-      verify(getStdOutMock()).println(this.sergeantResponse.get());
+      assertEquals(this.sergeantResponse.get(), appender.getLastMessage());
+      assertEquals(1, appender.getLogSize());
     }
-    verifyNoMoreInteractions(getStdOutMock());
   }
 
   @Test
   public void testVisitSoldier() {
     this.visitor.visitSoldier(new Soldier());
     if (this.soldierResponse.isPresent()) {
-      verify(getStdOutMock()).println(this.soldierResponse.get());
+      assertEquals(this.soldierResponse.get(), appender.getLastMessage());
+      assertEquals(1, appender.getLogSize());
     }
-    verifyNoMoreInteractions(getStdOutMock());
   }
 
+  private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+    private List<ILoggingEvent> log = new LinkedList<>();
+
+    public InMemoryAppender() {
+      ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+      start();
+    }
+
+    @Override
+    protected void append(ILoggingEvent eventObject) {
+      log.add(eventObject);
+    }
+
+    public int getLogSize() {
+      return log.size();
+    }
+
+    public String getLastMessage() {
+      return log.get(log.size() - 1).getFormattedMessage();
+    }
+  }
 }