root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Stephane Nicoll 2016-09-12 16:30:25 +02:00
parent d87d60f746 6eb0449aa9
commit c662986628
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
View File

@ -22,10 +22,10 @@ import javax.jms.ConnectionMetaData;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
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;
@ -86,8 +86,8 @@ public class JmsHealthIndicatorTests {
given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider"); given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider");
Connection connection = mock(Connection.class); Connection connection = mock(Connection.class);
given(connection.getMetaData()).willReturn(connectionMetaData); given(connection.getMetaData()).willReturn(connectionMetaData);
Mockito.doThrow(new JMSException("Could not start", "123")) willThrow(new JMSException("Could not start", "123"))
.when(connection).start(); .given(connection).start();
given(connectionFactory.createConnection()) given(connectionFactory.createConnection())
.willReturn(connection); .willReturn(connection);
JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory); JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory);