From fcd1eb79fc721cc36fdb9b98221b425579663f49 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Feb 2017 20:48:58 +0000 Subject: [PATCH] Fix forward merge of new SpyBean test to use correct Mockito 2 API --- ...yBeanWithNameOnTestFieldForMultipleExistingBeansTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java index b5437036ca..90178f7042 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java @@ -42,8 +42,8 @@ public class SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests { @Test public void testSpying() throws Exception { - assertThat(new MockUtil().isSpy(this.spy)).isTrue(); - assertThat(new MockUtil().getMockName(this.spy).toString()).isEqualTo("two"); + assertThat(MockUtil.isSpy(this.spy)).isTrue(); + assertThat(MockUtil.getMockName(this.spy).toString()).isEqualTo("two"); } @Configuration