Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master

Conflicts:
	monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java

monostate/src/main/java/com/iluwatar/monostate/App.java

@@ -28,8 +28,8 @@ public class App {
   public static void main(String[] args) {
     LoadBalancer loadBalancer1 = new LoadBalancer();
     LoadBalancer loadBalancer2 = new LoadBalancer();
-    loadBalancer1.serverequest(new Request("Hello"));
-    loadBalancer2.serverequest(new Request("Hello World"));
+    loadBalancer1.serverRequest(new Request("Hello"));
+    loadBalancer2.serverRequest(new Request("Hello World"));
   }
 
 }

monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java

@@ -45,7 +45,7 @@ public class LoadBalancer {
   /**
    * Handle request
    */
-  public void serverequest(Request request) {
+  public void serverRequest(Request request) {
     if (lastServedId >= servers.size()) {
       lastServedId = 0;
     }

monostate/src/main/java/com/iluwatar/monostate/Server.java

@@ -28,7 +28,7 @@ public class Server {
     return port;
   }
 
-  public final void serve(Request request) {
+  public void serve(Request request) {
     System.out.println("Server ID " + id + " associated to host : " + getHost() + " and Port "
         + getPort() + " Processed request with value  " + request.value);
   }

monostate/src/test/java/com/iluwatar/monostate/AppTest.java

@@ -5,22 +5,10 @@ import org.junit.Test;
 
 public class AppTest {
 
-  @Test
-  public void testSameStateAmonstAllInstances() {
-    LoadBalancer balancer = new LoadBalancer();
-    LoadBalancer balancer2 = new LoadBalancer();
-    balancer.addServer(new Server("localhost", 8085, 6));
-    // Both should have the same number of servers.
-    Assert.assertTrue(balancer.getNoOfServers() == balancer2.getNoOfServers());
-    // Both Should have the same LastServedId
-    Assert.assertTrue(balancer.getLastServedId() == balancer2.getLastServedId());
-  }
-
   @Test
   public void testMain() {
     String[] args = {};
     App.main(args);
-    Assert.assertTrue(LoadBalancer.getLastServedId() == 2);
   }
 
 }

monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java

@@ -0,0 +1,55 @@
+package com.iluwatar.monostate;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * Date: 12/21/15 - 12:26 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class LoadBalancerTest {
+
+  @Test
+  public void testSameStateAmongstAllInstances() {
+    final LoadBalancer firstBalancer = new LoadBalancer();
+    final LoadBalancer secondBalancer = new LoadBalancer();
+    firstBalancer.addServer(new Server("localhost", 8085, 6));
+    // Both should have the same number of servers.
+    Assert.assertTrue(firstBalancer.getNoOfServers() == secondBalancer.getNoOfServers());
+    // Both Should have the same LastServedId
+    Assert.assertTrue(firstBalancer.getLastServedId() == secondBalancer.getLastServedId());
+  }
+
+  @Test
+  public void testServe() {
+    final Server server = mock(Server.class);
+    when(server.getHost()).thenReturn("testhost");
+    when(server.getPort()).thenReturn(1234);
+    doNothing().when(server).serve(any(Request.class));
+
+    final LoadBalancer loadBalancer = new LoadBalancer();
+    loadBalancer.addServer(server);
+
+    verifyZeroInteractions(server);
+
+    final Request request = new Request("test");
+    for (int i = 0; i < loadBalancer.getNoOfServers() * 2; i++) {
+      loadBalancer.serverRequest(request);
+    }
+
+    verify(server, times(2)).serve(request);
+    verifyNoMoreInteractions(server);
+
+  }
+
+}