Skip to content

Commit 80a1b71

Browse files
committed
Remove deprecated @io.quarkus.test.junit.mockito.InjectMock
This was deprecated back in 3.2, so it's time to get rid of it
1 parent 95a309e commit 80a1b71

File tree

27 files changed

+58
-98
lines changed

27 files changed

+58
-98
lines changed

extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* <br />
1111
* This can have more than one level of hierarchy, for example:
1212
* <ul>
13-
* <li>When using @{@link io.quarkus.test.junit.mockito.InjectMock} or @{@link io.quarkus.test.junit.mockito.InjectSpy}</li>
13+
* <li>When using {@code io.quarkus.test.InjectMock} or {@code io.quarkus.test.junit.mockito.InjectSpy}</li>
1414
* </ul>
1515
*/
1616
public class ArcProxyBeanMetaDataClassNormalizer implements BeanMetaDataClassNormalizer {

integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/GrpcMockTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import examples.HelloReply;
1212
import examples.HelloRequest;
1313
import io.quarkus.grpc.GrpcClient;
14+
import io.quarkus.test.InjectMock;
1415
import io.quarkus.test.junit.QuarkusTest;
15-
import io.quarkus.test.junit.mockito.InjectMock;
1616
import io.smallrye.mutiny.Uni;
1717

1818
@QuarkusTest

integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheMockingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
1919
import io.quarkus.panache.mock.PanacheMock;
20+
import io.quarkus.test.InjectMock;
2021
import io.quarkus.test.junit.QuarkusTest;
21-
import io.quarkus.test.junit.mockito.InjectMock;
2222

2323
@QuarkusTest
2424
public class PanacheMockingTest {

integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.quarkus.hibernate.reactive.panache.Panache;
1818
import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
1919
import io.quarkus.panache.mock.PanacheMock;
20+
import io.quarkus.test.InjectMock;
2021
import io.quarkus.test.junit.QuarkusTest;
21-
import io.quarkus.test.junit.mockito.InjectMock;
2222
import io.quarkus.test.vertx.RunOnVertxContext;
2323
import io.quarkus.test.vertx.UniAsserter;
2424
import io.smallrye.mutiny.Uni;

integration-tests/hibernate-validator/src/test/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ private static class FirstSubclass extends Original implements Subclass {
4848
}
4949

5050
/**
51-
* Simulates an object injected through @{@link io.quarkus.test.junit.mockito.InjectMock}
52-
* or @{@link io.quarkus.test.junit.mockito.InjectSpy}.
51+
* Simulates an object injected through {@link io.quarkus.test.InjectMock}
52+
* or {@code io.quarkus.test.junit.mockito.InjectSpy}.
5353
*/
5454
private static class SecondSubclass extends FirstSubclass {
5555
}

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/DummyResourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.junit.jupiter.api.BeforeEach;
1010
import org.junit.jupiter.api.Test;
1111

12+
import io.quarkus.test.InjectMock;
1213
import io.quarkus.test.junit.QuarkusTest;
13-
import io.quarkus.test.junit.mockito.InjectMock;
1414

1515
@QuarkusTest
1616
class DummyResourceTest {

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/FooResourceTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
import org.junit.jupiter.api.Test;
1010
import org.mockito.Mockito;
1111

12+
import io.quarkus.test.InjectMock;
1213
import io.quarkus.test.junit.QuarkusTest;
13-
import io.quarkus.test.junit.mockito.InjectMock;
14+
import io.quarkus.test.junit.mockito.MockitoConfig;
1415

1516
@QuarkusTest
1617
class FooResourceTest {
1718

18-
@InjectMock(returnsDeepMocks = true)
19+
@InjectMock
20+
@MockitoConfig(returnsDeepMocks = true)
1921
FooService fooService;
2022

2123
@Test

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GenericFieldsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.junit.jupiter.api.Test;
77
import org.mockito.Mockito;
88

9+
import io.quarkus.test.InjectMock;
910
import io.quarkus.test.junit.QuarkusTest;
10-
import io.quarkus.test.junit.mockito.InjectMock;
1111

1212
@QuarkusTest
1313
public class GenericFieldsTest {

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GreetingResourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.junit.jupiter.api.Test;
88
import org.mockito.Mockito;
99

10+
import io.quarkus.test.InjectMock;
1011
import io.quarkus.test.junit.QuarkusTest;
11-
import io.quarkus.test.junit.mockito.InjectMock;
1212

1313
@QuarkusTest
1414
class GreetingResourceTest {

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GreetingSingletonResourceMockTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
import org.junit.jupiter.api.Test;
66
import org.mockito.Mockito;
77

8+
import io.quarkus.test.InjectMock;
89
import io.quarkus.test.junit.QuarkusTest;
9-
import io.quarkus.test.junit.mockito.InjectMock;
10+
import io.quarkus.test.junit.mockito.MockitoConfig;
1011

1112
@QuarkusTest
1213
class GreetingSingletonResourceMockTest {
1314

1415
// resteasy-reactive adds @Singleton automatically
15-
@InjectMock(convertScopes = true)
16+
@InjectMock
17+
@MockitoConfig(convertScopes = true)
1618
GreetingResourceSingleton greetingResourceSingleton;
1719

1820
@Test

0 commit comments

Comments
 (0)