Skip to content

Commit f445a4d

Browse files
SgitarioKevinGilmore
Sgitario
authored and
KevinGilmore
committed
BAEL-373: Improve/Upgrade existing Mockito articles to Mockito 2 (eugenp#2311)
* BAEL-373: Improve/Upgrade existing Mockito articles to Mockito 2 * Fix formatting issue with LoginControllerIntegrationTest
1 parent 9f45d70 commit f445a4d

10 files changed

Lines changed: 57 additions & 32 deletions

File tree

‎core-java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
</profile>
383383
</profiles>
384384

385-
<properties>
385+
<properties>
386386
<!-- marshalling -->
387387
<jackson.version>2.8.5</jackson.version>
388388

@@ -408,7 +408,7 @@
408408
<!-- testing -->
409409
<org.hamcrest.version>1.3</org.hamcrest.version>
410410
<junit.version>4.12</junit.version>
411-
<mockito.version>1.10.19</mockito.version>
411+
<mockito.version>2.8.9</mockito.version>
412412
<assertj.version>3.6.1</assertj.version>
413413
<avaitility.version>1.7.0</avaitility.version>
414414

‎core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ public void givenPath_whenWriteToItUsingMappedByteBuffer_thenShouldSuccessfullyW
6363

6464
private Path getFileURIFromResources(String fileName) throws Exception {
6565
ClassLoader classLoader = getClass().getClassLoader();
66-
return Paths.get(classLoader.getResource(fileName).getPath());
66+
return Paths.get(classLoader.getResource(fileName).toURI());
6767
}
6868
}

‎core-java/src/test/java/com/baeldung/money/JavaMoneyUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void givenAmount_whenCustomFormat_thanEquals() {
179179
MonetaryAmountFormat customFormat = MonetaryFormats.getAmountFormat(AmountFormatQueryBuilder
180180
.of(Locale.US)
181181
.set(CurrencyStyle.NAME)
182-
.set("pattern", "00000.00 ¤")
182+
.set("pattern", "00000.00 ¤")
183183
.build());
184184
String customFormatted = customFormat.format(oneDollar);
185185

‎core-java/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileReader;
1212
import java.io.IOException;
1313
import java.io.InputStream;
14+
import java.util.Locale;
1415
import java.util.Scanner;
1516

1617
import org.junit.Test;
@@ -105,6 +106,7 @@ public void whenValidateInputUsingScanner_thenValidated() throws IOException {
105106
public void whenScanString_thenCorrect() throws IOException {
106107
final String input = "Hello 1 F 3.5";
107108
final Scanner scanner = new Scanner(input);
109+
scanner.useLocale(Locale.US);
108110

109111
assertEquals("Hello", scanner.next());
110112
assertEquals(1, scanner.nextInt());

‎mockito/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</dependency>
4242
<dependency>
4343
<groupId>org.powermock</groupId>
44-
<artifactId>powermock-api-mockito</artifactId>
44+
<artifactId>powermock-api-mockito2</artifactId>
4545
<version>${powermock.version}</version>
4646
<scope>test</scope>
4747
</dependency>
@@ -65,7 +65,7 @@
6565
<commons-lang3.version>3.5</commons-lang3.version>
6666

6767
<!-- testing -->
68-
<powermock.version>1.6.6</powermock.version>
68+
<powermock.version>1.7.0</powermock.version>
6969

7070
</properties>
7171

‎mockito2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5454

5555
<!-- testing -->
56-
<mockito.version>2.7.5</mockito.version>
56+
<mockito.version>2.8.9</mockito.version>
5757
</properties>
5858
</project>

‎mocks/mock-comparisons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>mock-comparisons</name>
1414

1515
<properties>
16-
<mockito.version>1.10.19</mockito.version>
16+
<mockito.version>2.8.9</mockito.version>
1717
<easymock.version>3.4</easymock.version>
1818
<jmockit.version>1.29</jmockit.version>
1919

‎mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
import org.junit.Assert;
88
import org.junit.Before;
99
import org.junit.Test;
10-
import org.mockito.*;
10+
import org.mockito.ArgumentMatcher;
11+
import org.mockito.InjectMocks;
12+
import org.mockito.Mock;
13+
import org.mockito.Mockito;
14+
import org.mockito.MockitoAnnotations;
15+
import org.mockito.Spy;
1116

1217
public class LoginControllerIntegrationTest {
1318

@@ -41,70 +46,86 @@ public void assertThatNoMethodHasBeenCalled() {
4146
public void assertTwoMethodsHaveBeenCalled() {
4247
UserForm userForm = new UserForm();
4348
userForm.username = "foo";
44-
Mockito.when(loginService.login(userForm)).thenReturn(true);
49+
Mockito.when(loginService.login(userForm))
50+
.thenReturn(true);
4551

4652
String login = loginController.login(userForm);
4753

4854
Assert.assertEquals("OK", login);
49-
Mockito.verify(loginService).login(userForm);
50-
Mockito.verify(loginService).setCurrentUser("foo");
55+
Mockito.verify(loginService)
56+
.login(userForm);
57+
Mockito.verify(loginService)
58+
.setCurrentUser("foo");
5159
}
5260

5361
@Test
5462
public void assertOnlyOneMethodHasBeenCalled() {
5563
UserForm userForm = new UserForm();
5664
userForm.username = "foo";
57-
Mockito.when(loginService.login(userForm)).thenReturn(false);
65+
Mockito.when(loginService.login(userForm))
66+
.thenReturn(false);
5867

5968
String login = loginController.login(userForm);
6069

6170
Assert.assertEquals("KO", login);
62-
Mockito.verify(loginService).login(userForm);
71+
Mockito.verify(loginService)
72+
.login(userForm);
6373
Mockito.verifyNoMoreInteractions(loginService);
6474
}
6575

6676
@Test
6777
public void mockExceptionThrowing() {
6878
UserForm userForm = new UserForm();
69-
Mockito.when(loginService.login(userForm)).thenThrow(IllegalArgumentException.class);
79+
Mockito.when(loginService.login(userForm))
80+
.thenThrow(IllegalArgumentException.class);
7081

7182
String login = loginController.login(userForm);
7283

7384
Assert.assertEquals("ERROR", login);
74-
Mockito.verify(loginService).login(userForm);
85+
Mockito.verify(loginService)
86+
.login(userForm);
7587
Mockito.verifyZeroInteractions(loginService);
7688
}
7789

7890
@Test
7991
public void mockAnObjectToPassAround() {
80-
UserForm userForm = Mockito.when(Mockito.mock(UserForm.class).getUsername()).thenReturn("foo").getMock();
81-
Mockito.when(loginService.login(userForm)).thenReturn(true);
92+
UserForm userForm = Mockito.when(Mockito.mock(UserForm.class)
93+
.getUsername())
94+
.thenReturn("foo")
95+
.getMock();
96+
Mockito.when(loginService.login(userForm))
97+
.thenReturn(true);
8298

8399
String login = loginController.login(userForm);
84100

85101
Assert.assertEquals("OK", login);
86-
Mockito.verify(loginService).login(userForm);
87-
Mockito.verify(loginService).setCurrentUser("foo");
102+
Mockito.verify(loginService)
103+
.login(userForm);
104+
Mockito.verify(loginService)
105+
.setCurrentUser("foo");
88106
}
89107

90108
@Test
91109
public void argumentMatching() {
92110
UserForm userForm = new UserForm();
93111
userForm.username = "foo";
94112
// default matcher
95-
Mockito.when(loginService.login(Mockito.any(UserForm.class))).thenReturn(true);
113+
Mockito.when(loginService.login(Mockito.any(UserForm.class)))
114+
.thenReturn(true);
96115

97116
String login = loginController.login(userForm);
98117

99118
Assert.assertEquals("OK", login);
100-
Mockito.verify(loginService).login(userForm);
119+
Mockito.verify(loginService)
120+
.login(userForm);
101121
// complex matcher
102-
Mockito.verify(loginService).setCurrentUser(Mockito.argThat(new ArgumentMatcher<String>() {
103-
@Override
104-
public boolean matches(Object argument) {
105-
return argument instanceof String && ((String) argument).startsWith("foo");
106-
}
107-
}));
122+
Mockito.verify(loginService)
123+
.setCurrentUser(Mockito.argThat(new ArgumentMatcher<String>() {
124+
@Override
125+
public boolean matches(String argument) {
126+
return argument.startsWith("foo");
127+
}
128+
}));
108129
}
109130

110131
@Test
@@ -114,12 +135,14 @@ public void partialMocking() {
114135
UserForm userForm = new UserForm();
115136
userForm.username = "foo";
116137
// let service's login use implementation so let's mock DAO call
117-
Mockito.when(loginDao.login(userForm)).thenReturn(1);
138+
Mockito.when(loginDao.login(userForm))
139+
.thenReturn(1);
118140

119141
String login = loginController.login(userForm);
120142

121143
Assert.assertEquals("OK", login);
122144
// verify mocked call
123-
Mockito.verify(spiedLoginService).setCurrentUser("foo");
145+
Mockito.verify(spiedLoginService)
146+
.setCurrentUser("foo");
124147
}
125148
}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- <gib.enabled>false</gib.enabled>-->
1919
<junit.version>4.12</junit.version>
2020
<org.hamcrest.version>1.3</org.hamcrest.version>
21-
<mockito.version>1.10.19</mockito.version>
21+
<mockito.version>2.8.9</mockito.version>
2222
<!-- logging -->
2323
<org.slf4j.version>1.7.21</org.slf4j.version>
2424
<logback.version>1.1.7</logback.version>

‎video-tutorials/jackson-annotations/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<commons-io.version>2.5</commons-io.version>
165165

166166
<!-- testing -->
167-
<mockito.version>2.2.26</mockito.version>
167+
<mockito.version>2.8.9</mockito.version>
168168

169169
<httpcore.version>4.4.1</httpcore.version>
170170
<httpclient.version>4.5</httpclient.version>

0 commit comments

Comments
 (0)