You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by th...@apache.org on 2022/12/06 02:51:11 UTC
[commons-dbutils] 02/03: DBUTILS-148 Replace deprecated Mockito.initMocks with @RunWith(MockitoJUnitRunner.class)
This is an automated email from the ASF dual-hosted git repository.
thecarlhall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 339976ed05ca4b77c6e87042e288e0ae963ba58a
Author: Carl Hall <th...@apache.org>
AuthorDate: Mon Dec 5 21:14:51 2022 -0500
DBUTILS-148 Replace deprecated Mockito.initMocks with @RunWith(MockitoJUnitRunner.class)
---
src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java | 5 +++--
.../java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java | 6 +++---
src/test/java/org/apache/commons/dbutils/OutParameterTest.java | 6 +++---
src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java | 5 +++--
.../org/apache/commons/dbutils/handlers/BeanMapHandlerTest.java | 5 +++--
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java b/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
index 456e24f..782c72e 100644
--- a/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
@@ -40,10 +40,13 @@ import javax.sql.DataSource;
import org.apache.commons.dbutils.handlers.ArrayHandler;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
@SuppressWarnings("boxing") // test code
+@RunWith(MockitoJUnitRunner.class)
public class AsyncQueryRunnerTest {
AsyncQueryRunner runner;
ArrayHandler handler;
@@ -57,8 +60,6 @@ public class AsyncQueryRunnerTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
-
when(dataSource.getConnection()).thenReturn(conn);
when(conn.prepareStatement(any(String.class))).thenReturn(prepStmt);
diff --git a/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java b/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java
index bb68468..eb4e9a1 100644
--- a/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java
+++ b/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java
@@ -18,8 +18,9 @@ package org.apache.commons.dbutils;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.beans.PropertyDescriptor;
import java.sql.ResultSetMetaData;
@@ -28,6 +29,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public class GenerousBeanProcessorTest {
GenerousBeanProcessor processor = new GenerousBeanProcessor();
@@ -36,8 +38,6 @@ public class GenerousBeanProcessorTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
-
propDescriptors = new PropertyDescriptor[3];
propDescriptors[0] = new PropertyDescriptor("one", TestBean.class);
diff --git a/src/test/java/org/apache/commons/dbutils/OutParameterTest.java b/src/test/java/org/apache/commons/dbutils/OutParameterTest.java
index ce173d8..6282285 100644
--- a/src/test/java/org/apache/commons/dbutils/OutParameterTest.java
+++ b/src/test/java/org/apache/commons/dbutils/OutParameterTest.java
@@ -28,9 +28,11 @@ import java.sql.CallableStatement;
import java.sql.Types;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+@RunWith(MockitoJUnitRunner.class)
public class OutParameterTest {
private static final int INDEX = 2;
private static final int VALUE = 42;
@@ -41,8 +43,6 @@ public class OutParameterTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this); // init the mocks
-
parameter = new OutParameter<>(Types.INTEGER, Number.class);
}
diff --git a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
index eb01b23..7105559 100644
--- a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
@@ -45,12 +45,15 @@ import org.apache.commons.dbutils.handlers.ScalarHandler;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
@SuppressWarnings("boxing") // test code
+@RunWith(MockitoJUnitRunner.class)
public class QueryRunnerTest {
QueryRunner runner;
ArrayHandler handler;
@@ -66,8 +69,6 @@ public class QueryRunnerTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this); // init the mocks
-
when(dataSource.getConnection()).thenReturn(conn);
when(conn.prepareStatement(any(String.class))).thenReturn(prepStmt);
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/BeanMapHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/BeanMapHandlerTest.java
index 60d505a..3a2662a 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/BeanMapHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/BeanMapHandlerTest.java
@@ -27,9 +27,12 @@ import org.apache.commons.dbutils.RowProcessor;
import org.apache.commons.dbutils.TestBean;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+@RunWith(MockitoJUnitRunner.class)
public class BeanMapHandlerTest {
private BeanMapHandler<Long, TestBean> bmh;
@@ -40,8 +43,6 @@ public class BeanMapHandlerTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
-
when(Boolean.valueOf(rs.next())).thenReturn(Boolean.TRUE, Boolean.FALSE);
when(rs.getObject(1)).thenReturn(Long.valueOf(23L));
when(rs.getObject(2)).thenReturn(Long.valueOf(23L));