Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18557 from dreis2211

Browse Source 
* pr/18557:
  Polish
  Remove usage of @InjectMocks

Closes gh-18557
This commit is contained in:
Stephane Nicoll
2019-10-12 16:56:47 +01:00
parent 498ae649a8 d8de6fff53
commit 53b0569dae
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointTests.java
View File

@@ -16,11 +16,7 @@
package org.springframework.boot.actuate.integration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.integration.graph.Graph;
import org.springframework.integration.graph.IntegrationGraphServer;
@@ -37,30 +33,23 @@ import static org.mockito.Mockito.verify;
*/
class IntegrationGraphEndpointTests {
@Mock
private IntegrationGraphServer integrationGraphServer;
private final IntegrationGraphServer server = mock(IntegrationGraphServer.class);
@InjectMocks
private IntegrationGraphEndpoint integrationGraphEndpoint;
@BeforeEach
void setUp() {
MockitoAnnotations.initMocks(this);
}
private final IntegrationGraphEndpoint endpoint = new IntegrationGraphEndpoint(this.server);
@Test
void readOperationShouldReturnGraph() {
Graph mockedGraph = mock(Graph.class);
given(this.integrationGraphServer.getGraph()).willReturn(mockedGraph);
Graph graph = this.integrationGraphEndpoint.graph();
verify(this.integrationGraphServer).getGraph();
given(this.server.getGraph()).willReturn(mockedGraph);
Graph graph = this.endpoint.graph();
verify(this.server).getGraph();
assertThat(graph).isEqualTo(mockedGraph);
}
@Test
void writeOperationShouldRebuildGraph() {
this.integrationGraphEndpoint.rebuild();
verify(this.integrationGraphServer).rebuild();
this.endpoint.rebuild();
verify(this.server).rebuild();
}
}

2
src/checkstyle/checkstyle.xml
View File

@@ -15,7 +15,7 @@
<property name="illegalPkgs"
value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*" />
<property name="illegalClasses"
value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert" />
value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert" />
</module>
<module
name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">