Added example for expecting an Exception and added some more expactations to the static mocks

AktienTraum · AktienTraum · commit a574ce45ffdc · 2016-02-19T08:26:31.000+01:00
diff --git a/src/main/java/com/codecentric/sample/store/service/external/ExternalSystemProxy.java b/src/main/java/com/codecentric/sample/store/service/external/ExternalSystemProxy.java
@@ -3,6 +3,8 @@
 import com.codecentric.sample.store.model.Customer;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+
 @Service
 public class ExternalSystemProxy {
 
@@ -15,4 +17,9 @@ public void update(Customer customer) {
     }
 
 
+    public boolean connectionAvailable(String ipAddress) throws IOException {
+        return true;
+    }
+
+
 }
diff --git a/src/main/java/com/codecentric/sample/store/service/external/HostService.java b/src/main/java/com/codecentric/sample/store/service/external/HostService.java
@@ -4,13 +4,26 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+
 @Service
 public class HostService {
 
+    @Autowired
+    private ExternalSystemProxy externalSystemProxy;
+
     public void expand(Customer customer) {
 
         // Host magic happening here to retrieve the value
         customer.setHostValue("host value");
     }
 
+
+    public void connect(String ipAddress) throws IOException {
+
+        if (externalSystemProxy.connectionAvailable(ipAddress)) {
+            // Do something here
+        }
+    }
+
 }
diff --git a/src/test/java/com/codecentric/sample/store/service/CustomerServiceTest.java b/src/test/java/com/codecentric/sample/store/service/CustomerServiceTest.java
@@ -54,12 +54,12 @@ public void setUp() throws Exception {
     @Test
     public void testPLZAddressCombination() {
 
-        Customer customer = new Customer("204", "John Do", "224B Bakerstreet");
+        Customer customer = new Customer("204", "John Do", "221B Bakerstreet");
 
         when(addressService.getPLZForCustomer(customer)).thenReturn(47891);
         String address = customerService.getPLZAddressCombination(customer);
 
-        assertThat(address, is("47891_224B Bakerstreet"));
+        assertThat(address, is("47891_221B Bakerstreet"));
     }
 
 
diff --git a/src/test/java/com/codecentric/sample/store/service/ItemServiceTest.java b/src/test/java/com/codecentric/sample/store/service/ItemServiceTest.java
@@ -29,7 +29,6 @@
 @PrepareForTest({StaticService.class})
 public class ItemServiceTest {
 
-
     @Mock
     private ItemRepository itemRepository;
 
@@ -42,7 +41,6 @@ public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
     }
 
-
     @Test
     public void calculationOfAveragePriceForAllItems() {
 
@@ -55,7 +53,8 @@ public void calculationOfAveragePriceForAllItems() {
         int averagePriceForAllItems = itemService.getAveragePriceForAllItems();
 
         Mockito.verify(itemRepository, times(1)).readAllItems();
-        verifyStatic();
+        verifyStatic(times(1));
+        StaticService.getMultiplicator();
 
         assertThat(averagePriceForAllItems, is(2000*5));
     }
@@ -70,7 +69,8 @@ public void readItemDescriptionWithoutIOException() throws IOException {
 
         String value = itemService.readItemDescription(fileName);
 
-        verifyStatic();
+        verifyStatic(times(1));
+        StaticService.readFile(fileName);
 
         assertThat(value, equalTo("Dummy"));
     }
@@ -85,7 +85,8 @@ public void readItemDescriptionWithIOException() throws IOException {
 
         String value = itemService.readItemDescription(fileName);
 
-        verifyStatic();
+        verifyStatic(times(1));
+        StaticService.readFile(fileName);
 
         assertThat(value, equalTo(""));
     }
diff --git a/src/test/java/com/codecentric/sample/store/service/external/HostServiceTest.java b/src/test/java/com/codecentric/sample/store/service/external/HostServiceTest.java
@@ -0,0 +1,38 @@
+package com.codecentric.sample.store.service.external;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.IOException;
+
+import static org.mockito.Mockito.when;
+
+public class HostServiceTest {
+
+    @Mock
+    private ExternalSystemProxy externalSystemProxy;
+
+    @InjectMocks
+    private HostService hostService;
+
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+    }
+
+
+    @Test(expected = IOException.class)
+    public void testConnectionNotAvailable() throws IOException {
+
+        String ipAddress = "10.20.30.40";
+
+        when(externalSystemProxy.connectionAvailable(ipAddress)).thenThrow(new IOException());
+        hostService.connect(ipAddress);
+    }
+
+
+}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`import com.codecentric.sample.store.model.Customer;`
`4`	`4`	`import org.springframework.stereotype.Service;`
`5`	`5`
	`6`	`+import java.io.IOException;`
	`7`	`+`
`6`	`8`	`@Service`
`7`	`9`	`public class ExternalSystemProxy {`
`8`	`10`
`@@ -15,4 +17,9 @@ public void update(Customer customer) {`
`15`	`17`	`}`
`16`	`18`
`17`	`19`
	`20`	`+ public boolean connectionAvailable(String ipAddress) throws IOException {`
	`21`	`+ return true;`
	`22`	`+ }`
	`23`	`+`
	`24`	`+`
`18`	`25`	`}`