diff --git a/core/pom.xml b/core/pom.xml index 19bc3fc61..2cae5868f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -120,10 +120,11 @@ 3.2.3.RELEASE provided + org.mockito - mockito-all - 1.9.0 + mockito-core + 5.4.0 test diff --git a/core/src/main/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspector.java b/core/src/main/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspector.java index 5d954674c..e1bfce6dc 100644 --- a/core/src/main/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspector.java +++ b/core/src/main/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspector.java @@ -90,7 +90,7 @@ protected void processResultSet(InspectionContext inspectionContext, ResultSet c DatabaseMetaData databaseMetaData = inspectionContext.getConnection().getMetaData(); Map fieldsType = new HashMap(); try (ResultSet columnsFromDatabaseMetaData = databaseMetaData.getColumns(null, schema, tableName, null)) { - if (columnsFromDatabaseMetaData.next()) { + if (columnsFromDatabaseMetaData != null && columnsFromDatabaseMetaData.next()) { do { JdbcTypeDesc typeDescAlias = dialect.getJdbcTypeAlias( columnsFromDatabaseMetaData.getInt("DATA_TYPE"), diff --git a/core/src/test/java/com/nuodb/migrator/backup/BackupOpsValidateTableFilterTest.java b/core/src/test/java/com/nuodb/migrator/backup/BackupOpsValidateTableFilterTest.java index 3b19e42fd..338327a6a 100644 --- a/core/src/test/java/com/nuodb/migrator/backup/BackupOpsValidateTableFilterTest.java +++ b/core/src/test/java/com/nuodb/migrator/backup/BackupOpsValidateTableFilterTest.java @@ -47,9 +47,12 @@ import static com.nuodb.migrator.jdbc.metadata.filter.MetaDataFilters.newAllOfFilters; import static com.nuodb.migrator.jdbc.metadata.filter.MetaDataFilters.newEitherOfFilters; import static com.nuodb.migrator.jdbc.metadata.Identifier.valueOf; +import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; +import org.mockito.ArgumentCaptor; + /** * @author Mukund @@ -76,7 +79,9 @@ public void testValidateTableNameFilter(ArrayList databaseTable, String XmlBackupOps backupOps1 = spy(new XmlBackupOps()); backupOps1.verifyFilter(databaseTable, all); - verify(backupOps1, times(1)).logWarnMessage(valueOf(anyString())); + ArgumentCaptor identifierCaptor = ArgumentCaptor.forClass(Identifier.class); + verify(backupOps1, times(1)).logWarnMessage(identifierCaptor.capture()); + assertNotNull(identifierCaptor.getValue().value()); } @DataProvider(name = "getData1") @@ -97,6 +102,9 @@ public void testValidateTableRegexFilter1(ArrayList databaseTable, Strin XmlBackupOps backupOps1 = spy(new XmlBackupOps()); backupOps1.verifyFilter(databaseTable, all); - verify(backupOps1, times(1)).logWarnMessage(valueOf(anyString())); + + ArgumentCaptor identifierCaptor = ArgumentCaptor.forClass(Identifier.class); + verify(backupOps1, times(1)).logWarnMessage(identifierCaptor.capture()); + assertNotNull(identifierCaptor.getValue().value()); } } diff --git a/core/src/test/java/com/nuodb/migrator/cli/CliHandlerTest.java b/core/src/test/java/com/nuodb/migrator/cli/CliHandlerTest.java index 9b8e1a2da..7a2a41279 100644 --- a/core/src/test/java/com/nuodb/migrator/cli/CliHandlerTest.java +++ b/core/src/test/java/com/nuodb/migrator/cli/CliHandlerTest.java @@ -35,7 +35,7 @@ import static java.io.File.createTempFile; import static org.apache.commons.io.IOUtils.write; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/com/nuodb/migrator/cli/parse/option/OptionFactory.java b/core/src/test/java/com/nuodb/migrator/cli/parse/option/OptionFactory.java index c29f72939..681a3c24a 100644 --- a/core/src/test/java/com/nuodb/migrator/cli/parse/option/OptionFactory.java +++ b/core/src/test/java/com/nuodb/migrator/cli/parse/option/OptionFactory.java @@ -35,7 +35,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.apache.commons.lang3.StringUtils.startsWith; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; /** diff --git a/core/src/test/java/com/nuodb/migrator/cli/run/CliRunSupportTest.java b/core/src/test/java/com/nuodb/migrator/cli/run/CliRunSupportTest.java index 76f12723a..6aedc874a 100644 --- a/core/src/test/java/com/nuodb/migrator/cli/run/CliRunSupportTest.java +++ b/core/src/test/java/com/nuodb/migrator/cli/run/CliRunSupportTest.java @@ -54,7 +54,7 @@ import static com.google.common.collect.Maps.newHashMap; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static java.util.TimeZone.getTimeZone; -import static org.mockito.Matchers.notNull; +import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.testng.Assert.*; diff --git a/core/src/test/java/com/nuodb/migrator/dump/DumpJobTest.java b/core/src/test/java/com/nuodb/migrator/dump/DumpJobTest.java index ebb8c379d..126191bfc 100644 --- a/core/src/test/java/com/nuodb/migrator/dump/DumpJobTest.java +++ b/core/src/test/java/com/nuodb/migrator/dump/DumpJobTest.java @@ -43,9 +43,7 @@ import com.nuodb.migrator.job.JobExecution; import com.nuodb.migrator.job.JobExecutor; import com.nuodb.migrator.spec.DumpJobSpec; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; +import org.mockito.*; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -58,7 +56,7 @@ import static com.nuodb.migrator.jdbc.metadata.Identifier.EMPTY; import static com.nuodb.migrator.job.JobExecutors.createJobExecutor; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; @@ -89,16 +87,14 @@ public class DumpJobTest { @Spy @InjectMocks private DumpJob dumpJob = new DumpJob(new DumpJobSpec()); - @Spy - @InjectMocks - private BackupWriter backupWriter = new BackupWriter(); + private JobExecutor jobExecutor; private Map jobContext; @BeforeMethod public void setUp() throws Exception { - initMocks(this); + MockitoAnnotations.initMocks(this); DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); given(databaseMetaData.getDatabaseProductName()).willReturn("NuoDB"); given(connection.getMetaData()).willReturn(databaseMetaData); @@ -155,6 +151,7 @@ public void testExecuteInSession() throws Throwable { Column column2 = table.addColumn("column2"); column2.setTypeCode(Types.LONGVARCHAR); + BackupWriter backupWriter = Mockito.mock(BackupWriter.class); willReturn(backupWriter).given(dumpJob).getBackupWriter(); jobExecutor.execute(jobContext); diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierNormalizerTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierNormalizerTest.java index a1a21ca6c..ba6d531ad 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierNormalizerTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierNormalizerTest.java @@ -33,7 +33,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierQuotingTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierQuotingTest.java index a3671a9f1..5a6791d8c 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierQuotingTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/dialect/IdentifierQuotingTest.java @@ -33,8 +33,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectionManagerTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectionManagerTest.java index d8ddc7371..0dd4249fa 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectionManagerTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectionManagerTest.java @@ -11,8 +11,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyVararg; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertNotNull; @@ -30,14 +29,15 @@ public void setUp() throws Exception { inspectionManager = spy(new InspectionManager()); given(inspectionManager.createInspectionContext(any(Connection.class), any(InspectionResults.class), - (MetaDataType[]) anyVararg())).will(new Answer() { - @Override - public InspectionContext answer(InvocationOnMock invocation) throws Throwable { - InspectionContext inspectionContext = (InspectionContext) spy(invocation.callRealMethod()); - willDoNothing().given(inspectionContext).close(); - return inspectionContext; - } - }); + any(MetaDataType[].class))).will(new Answer() { + @Override + public InspectionContext answer(InvocationOnMock invocation) throws Throwable { + InspectionContext inspectionContext = (InspectionContext) spy(invocation.callRealMethod()); + willDoNothing().given(inspectionContext).close(); + return inspectionContext; + } + }); + } @DataProvider(name = "inspect") diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorTestBase.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorTestBase.java index 0f0462afd..d782ffdfd 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorTestBase.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorTestBase.java @@ -40,8 +40,8 @@ import java.sql.DatabaseMetaData; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorUtils.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorUtils.java index d63651257..51d96158c 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorUtils.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/InspectorUtils.java @@ -36,7 +36,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; /** diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerCheckInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerCheckInspectorTest.java index 6762f050e..48f48f252 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerCheckInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerCheckInspectorTest.java @@ -39,8 +39,8 @@ import static com.google.common.collect.Iterables.get; import static com.nuodb.migrator.jdbc.metadata.MetaDataType.CHECK; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerSequenceInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerSequenceInspectorTest.java index 59ced5e7a..51e08aa53 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerSequenceInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MSSQLServerSequenceInspectorTest.java @@ -38,8 +38,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.SEQUENCE; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createSequence; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLIndexInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLIndexInspectorTest.java index 296ac00dc..89f6957e8 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLIndexInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLIndexInspectorTest.java @@ -32,8 +32,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.INDEX; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLSequenceInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLSequenceInspectorTest.java index 51c76c6c4..8c335112a 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLSequenceInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/MySQLSequenceInspectorTest.java @@ -39,8 +39,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.SEQUENCE; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createSequence; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBCheckInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBCheckInspectorTest.java index 198e084f6..ebf255059 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBCheckInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBCheckInspectorTest.java @@ -41,8 +41,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createColumn; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspectorTest.java index 4b5ec1aab..198204172 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnInspectorTest.java @@ -42,9 +42,8 @@ import static com.nuodb.migrator.jdbc.metadata.DefaultValue.valueOf; import static com.nuodb.migrator.jdbc.metadata.MetaDataType.COLUMN; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createColumn; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -99,7 +98,7 @@ public void testInspect() throws Exception { DatabaseMetaData metaData = mock(DatabaseMetaData.class); given(getConnection().getMetaData()).willReturn(metaData); ResultSet columnsResultSet = mock(ResultSet.class); - given(metaData.getColumns(anyString(), anyString(), anyString(), anyString())).willReturn(columnsResultSet); + given(metaData.getColumns(isNull(), anyString(), anyString(), isNull())).willReturn(columnsResultSet); given(columnsResultSet.next()).willReturn(true, false); given(columnsResultSet.getInt("DATA_TYPE")).willReturn(typeCode); given(columnsResultSet.getString("TYPE_NAME")).willReturn(typeName); diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnTriggerInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnTriggerInspectorTest.java index 5f16123a2..31628e51a 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnTriggerInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBColumnTriggerInspectorTest.java @@ -43,8 +43,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.COLUMN_TRIGGER; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBForeignKeyInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBForeignKeyInspectorTest.java index 105520fcc..8c6e94ad9 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBForeignKeyInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBForeignKeyInspectorTest.java @@ -44,8 +44,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static java.sql.DatabaseMetaData.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBIndexInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBIndexInspectorTest.java index 228ca0b7a..e1978179c 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBIndexInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBIndexInspectorTest.java @@ -40,8 +40,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.INDEX; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBPrimaryKeyInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBPrimaryKeyInspectorTest.java index cc5cd9f87..8b8991fe0 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBPrimaryKeyInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBPrimaryKeyInspectorTest.java @@ -40,8 +40,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.PRIMARY_KEY; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBSchemaInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBSchemaInspectorTest.java index ea9d51cd9..7df77afcd 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBSchemaInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBSchemaInspectorTest.java @@ -38,8 +38,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.SCHEMA; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createSchema; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBTableInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBTableInspectorTest.java index b63f2a174..2b0dfed48 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBTableInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/NuoDBTableInspectorTest.java @@ -38,8 +38,8 @@ import static com.nuodb.migrator.jdbc.metadata.MetaDataType.TABLE; import static com.nuodb.migrator.jdbc.metadata.MetaDataUtils.createTable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/OracleUserDefineTypeInspectorTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/OracleUserDefineTypeInspectorTest.java index 2be90932e..a15c669b9 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/OracleUserDefineTypeInspectorTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/inspector/OracleUserDefineTypeInspectorTest.java @@ -38,8 +38,8 @@ import static com.google.common.collect.Iterables.get; import static com.nuodb.migrator.jdbc.metadata.MetaDataType.USER_DEFINED_TYPE; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/resolver/ServiceResolverTest.java b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/resolver/ServiceResolverTest.java index c199faa60..d53e26dc2 100644 --- a/core/src/test/java/com/nuodb/migrator/jdbc/metadata/resolver/ServiceResolverTest.java +++ b/core/src/test/java/com/nuodb/migrator/jdbc/metadata/resolver/ServiceResolverTest.java @@ -38,7 +38,7 @@ import java.sql.Statement; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/com/nuodb/migrator/job/JobExecutorTest.java b/core/src/test/java/com/nuodb/migrator/job/JobExecutorTest.java index 06f6acf4f..a39ce7431 100644 --- a/core/src/test/java/com/nuodb/migrator/job/JobExecutorTest.java +++ b/core/src/test/java/com/nuodb/migrator/job/JobExecutorTest.java @@ -38,7 +38,6 @@ import static junit.framework.Assert.*; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify;