#502 Adjusted tests for logger introduction

producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java

@@ -23,18 +23,15 @@
 package com.iluwatar.producer.consumer;
 
 import org.junit.Test;
-import org.mockito.InOrder;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.*;
 
 /**
  * Date: 12/27/15 - 11:01 PM
  *
  * @author Jeroen Meulemeester
  */
-public class ConsumerTest extends StdOutTest {
+public class ConsumerTest {
 
   private static final int ITEM_COUNT = 5;
 
@@ -48,14 +45,11 @@ public class ConsumerTest extends StdOutTest {
     reset(queue); // Don't count the preparation above as interactions with the queue
     final Consumer consumer = new Consumer("consumer", queue);
 
-    final InOrder inOrder = inOrder(getStdOutMock());
     for (int id = 0; id < ITEM_COUNT; id++) {
       consumer.consume();
-      inOrder.verify(getStdOutMock())
-          .println("Consumer [consumer] consume item [" + id + "] produced by [producer]");
     }
 
-    inOrder.verifyNoMoreInteractions();
+    verify(queue, times(ITEM_COUNT)).take();
   }
 
 }

producer-consumer/src/test/java/com/iluwatar/producer/consumer/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.producer.consumer;
-
-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;
-  }
-
-}