Skip to content

Commit ac8742c

Browse files
committed
fix MockitoJUnitRunner deprecated import
1 parent a295224 commit ac8742c

File tree

6 files changed

+39
-32
lines changed

6 files changed

+39
-32
lines changed

core-java/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.baeldung.nth.root.calculator;
22

3+
import static org.junit.Assert.assertEquals;
4+
35
import org.junit.Test;
46
import org.junit.runner.RunWith;
57
import org.mockito.InjectMocks;
6-
import org.mockito.runners.MockitoJUnitRunner;
7-
8-
import static org.junit.Assert.assertEquals;
8+
import org.mockito.junit.MockitoJUnitRunner;
99

1010
@RunWith(MockitoJUnitRunner.class)
1111
public class NthRootCalculatorUnitTest {

spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package com.baeldung.app.rest;
22

3-
import com.baeldung.app.api.Flower;
4-
import com.baeldung.domain.service.FlowerService;
3+
import static org.mockito.ArgumentMatchers.anyInt;
4+
import static org.mockito.ArgumentMatchers.eq;
5+
import static org.mockito.Mockito.when;
6+
57
import org.junit.Assert;
68
import org.junit.Test;
79
import org.junit.runner.RunWith;
810
import org.mockito.InjectMocks;
911
import org.mockito.Mock;
10-
import org.mockito.runners.MockitoJUnitRunner;
12+
import org.mockito.junit.MockitoJUnitRunner;
1113

12-
import static org.mockito.Matchers.anyInt;
13-
import static org.mockito.Matchers.eq;
14-
import static org.mockito.Mockito.when;
14+
import com.baeldung.app.api.Flower;
15+
import com.baeldung.domain.service.FlowerService;
1516

1617
@RunWith(MockitoJUnitRunner.class)
1718
public class FlowerControllerUnitTest {

spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.baeldung.app.rest;
22

3-
import com.baeldung.app.api.MessageApi;
4-
import com.baeldung.domain.model.Message;
5-
import com.baeldung.domain.service.MessageService;
6-
import com.baeldung.domain.util.MessageMatcher;
3+
import static org.mockito.Mockito.times;
4+
75
import org.junit.Test;
86
import org.junit.runner.RunWith;
7+
import org.mockito.ArgumentMatchers;
98
import org.mockito.InjectMocks;
10-
import org.mockito.Matchers;
119
import org.mockito.Mock;
1210
import org.mockito.Mockito;
13-
import org.mockito.runners.MockitoJUnitRunner;
11+
import org.mockito.junit.MockitoJUnitRunner;
1412

15-
import static org.mockito.Mockito.times;
13+
import com.baeldung.app.api.MessageApi;
14+
import com.baeldung.domain.model.Message;
15+
import com.baeldung.domain.service.MessageService;
16+
import com.baeldung.domain.util.MessageMatcher;
1617

1718
@RunWith(MockitoJUnitRunner.class)
1819
public class MessageControllerUnitTest {
@@ -37,6 +38,6 @@ public void createMessage_NewMessage_OK() {
3738
message.setTo("you");
3839
message.setText("Hello, you!");
3940

40-
Mockito.verify(messageService, times(1)).deliverMessage(Matchers.argThat(new MessageMatcher(message)));
41+
Mockito.verify(messageService, times(1)).deliverMessage(ArgumentMatchers.argThat(new MessageMatcher(message)));
4142
}
4243
}

spring-rest/src/test/java/com/baeldung/propertyeditor/creditcard/CreditCardEditorUnitTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import org.junit.Before;
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
7-
import org.mockito.runners.MockitoJUnitRunner;
8-
9-
import com.baeldung.propertyeditor.creditcard.CreditCard;
10-
import com.baeldung.propertyeditor.creditcard.CreditCardEditor;
7+
import org.mockito.junit.MockitoJUnitRunner;
118

129
@RunWith(MockitoJUnitRunner.class)
1310
public class CreditCardEditorUnitTest {

testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.baeldung.mockito;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
5-
import org.mockito.Mockito;
6-
import org.mockito.Spy;
7-
import org.mockito.runners.MockitoJUnitRunner;
3+
import static org.junit.Assert.assertEquals;
84

95
import java.util.ArrayList;
106
import java.util.List;
117

12-
import static org.junit.Assert.assertEquals;
8+
import org.junit.Test;
9+
import org.junit.runner.RunWith;
10+
import org.mockito.Mockito;
11+
import org.mockito.Spy;
12+
import org.mockito.junit.MockitoJUnitRunner;
1313

1414
@RunWith(MockitoJUnitRunner.class)
1515
public class MockitoSpyIntegrationTest {

testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsUnitTest.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
package org.baeldung.mockito;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
53
import static org.junit.Assert.assertEquals;
4+
import static org.mockito.ArgumentMatchers.any;
5+
import static org.mockito.ArgumentMatchers.isA;
6+
import static org.mockito.ArgumentMatchers.isNull;
7+
import static org.mockito.Mockito.doAnswer;
8+
import static org.mockito.Mockito.doCallRealMethod;
9+
import static org.mockito.Mockito.doNothing;
10+
import static org.mockito.Mockito.doThrow;
11+
import static org.mockito.Mockito.mock;
12+
import static org.mockito.Mockito.times;
13+
import static org.mockito.Mockito.verify;
614

7-
import static org.mockito.Mockito.*;
15+
import org.junit.Test;
16+
import org.junit.runner.RunWith;
817
import org.mockito.ArgumentCaptor;
9-
import static org.mockito.Matchers.any;
18+
import org.mockito.junit.MockitoJUnitRunner;
1019
import org.mockito.stubbing.Answer;
11-
import org.mockito.runners.MockitoJUnitRunner;
1220

1321
@RunWith(MockitoJUnitRunner.class)
1422
public class MockitoVoidMethodsUnitTest {

0 commit comments

Comments
 (0)