Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.apache.iceberg.types.Types;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
import software.amazon.awssdk.services.glue.model.AccessDeniedException;
import software.amazon.awssdk.services.glue.model.ConcurrentModificationException;
Expand Down Expand Up @@ -246,7 +245,7 @@ private void concurrentCommitAndThrowException(GlueTableOperations realOps, Glue
table.refresh();
table.updateSchema().addColumn("newCol", Types.IntegerType.get()).commit();
throw new RuntimeException("Datacenter on fire");
}).when(spyOperations).persistGlueTable(Matchers.any(), Matchers.anyMap(), Matchers.any());
}).when(spyOperations).persistGlueTable(Mockito.any(), Mockito.anyMap(), Mockito.any());
}

@Test
Expand Down Expand Up @@ -344,7 +343,7 @@ private void commitAndThrowException(GlueTableOperations realOps, GlueTableOpera
i.getArgument(1, Map.class),
i.getArgument(2, TableMetadata.class));
throw new RuntimeException("Datacenter on fire");
}).when(spyOps).persistGlueTable(Matchers.any(), Matchers.anyMap(), Matchers.any());
}).when(spyOps).persistGlueTable(Mockito.any(), Mockito.anyMap(), Mockito.any());
}

private void failCommitAndThrowException(GlueTableOperations spyOps) {
Expand All @@ -353,7 +352,7 @@ private void failCommitAndThrowException(GlueTableOperations spyOps) {

private void failCommitAndThrowException(GlueTableOperations spyOps, Exception exceptionToThrow) {
Mockito.doThrow(exceptionToThrow)
.when(spyOps).persistGlueTable(Matchers.any(), Matchers.anyMap(), Matchers.any());
.when(spyOps).persistGlueTable(Mockito.any(), Mockito.anyMap(), Mockito.any());
}

private void breakFallbackCatalogCommitCheck(GlueTableOperations spyOperations) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
import org.junit.BeforeClass;
import org.junit.Test;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
import org.junit.Test;
import org.mockito.ArgumentCaptor;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;
Expand Down
12 changes: 6 additions & 6 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ org.scala-lang.modules:scala-collection-compat_2.13 = 2.6.0
com.emc.ecs:object-client-bundle = 3.3.2

# test deps
org.junit.vintage:junit-vintage-engine = 5.7.2
org.junit.jupiter:* = 5.7.2
org.mockito:* = 3.7.7
org.junit.vintage:junit-vintage-engine = 5.8.2
org.junit.jupiter:* = 5.8.2
org.mockito:* = 4.6.1
org.apache.tez:* = 0.8.4
com.adobe.testing:s3mock-junit4 = 2.1.28
org.assertj:assertj-core = 3.19.0
org.assertj:assertj-core = 3.23.1
org.xerial:sqlite-jdbc = 3.34.0
com.fasterxml.jackson.dataformat:jackson-dataformat-xml = 2.9.9
org.springframework:* = 5.3.9
org.springframework.boot:* = 2.5.4
org.mock-server:mockserver-netty = 5.11.1
org.mock-server:mockserver-client-java = 5.11.1
org.mock-server:mockserver-netty = 5.13.2
org.mock-server:mockserver-client-java = 5.13.2