Skip to content

Commit e3e0e32

Browse files
committed
Fixed failing unit test
LoadBalancer has several static fields, this could cause problems since JUnit tests are executed concurrently.
1 parent 531158c commit e3e0e32

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class AppTest {
99
public void testMain() {
1010
String[] args = {};
1111
App.main(args);
12-
Assert.assertTrue(LoadBalancer.getLastServedId() == 2);
1312
}
1413

1514
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
import org.junit.Assert;
44
import org.junit.Test;
55

6+
import static org.mockito.Matchers.any;
7+
import static org.mockito.Mockito.doNothing;
68
import static org.mockito.Mockito.mock;
79
import static org.mockito.Mockito.times;
810
import static org.mockito.Mockito.verify;
911
import static org.mockito.Mockito.verifyNoMoreInteractions;
1012
import static org.mockito.Mockito.verifyZeroInteractions;
13+
import static org.mockito.Mockito.when;
1114

1215
/**
1316
* Date: 12/21/15 - 12:26 PM
@@ -30,6 +33,9 @@ public void testSameStateAmongstAllInstances() {
3033
@Test
3134
public void testServe() {
3235
final Server server = mock(Server.class);
36+
when(server.getHost()).thenReturn("testhost");
37+
when(server.getPort()).thenReturn(1234);
38+
doNothing().when(server).serve(any(Request.class));
3339

3440
final LoadBalancer loadBalancer = new LoadBalancer();
3541
loadBalancer.addServer(server);

0 commit comments

Comments
 (0)