gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed failing unit test

Browse Source 
LoadBalancer has several static fields, this could cause problems since
JUnit tests are executed concurrently.
This commit is contained in:
Jeroen Meulemeester 2015-12-21 14:35:36 +01:00
parent 531158c836
commit e3e0e32e92
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monostate/src/test/java/com/iluwatar/monostate/AppTest.java
View File

@ -9,7 +9,6 @@ public class AppTest {
public void testMain() { public void testMain() {
String[] args = {}; String[] args = {};
App.main(args); App.main(args);
Assert.assertTrue(LoadBalancer.getLastServedId() == 2);
} }
} }

6
monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
View File

@ -3,11 +3,14 @@ package com.iluwatar.monostate;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; 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.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
/** /**
* Date: 12/21/15 - 12:26 PM * Date: 12/21/15 - 12:26 PM
@ -30,6 +33,9 @@ public class LoadBalancerTest {
@Test @Test
public void testServe() { public void testServe() {
final Server server = mock(Server.class); 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(); final LoadBalancer loadBalancer = new LoadBalancer();
loadBalancer.addServer(server); loadBalancer.addServer(server);