Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OMID-260 Align mockito version with Hadoop and HBase #174

Merged
merged 1 commit into from
Nov 8, 2024
Merged

OMID-260 Align mockito version with Hadoop and HBase #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
Expand Down
2 changes: 1 addition & 1 deletion hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import static org.apache.omid.transaction.CellUtils.hasCell;
import static org.apache.omid.transaction.CellUtils.hasShadowCell;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertTrue;
Expand Down
2 changes: 1 addition & 1 deletion hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertEquals;
Expand Down
2 changes: 1 addition & 1 deletion hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;
Expand Down
8 changes: 4 additions & 4 deletions hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
Expand Down Expand Up @@ -84,7 +84,7 @@ public void testReadOnlyTransactionsDoNotContactTSOServer(ITestContext context)
txTable.put(tx1, put);
tm.commit(tx1);

verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet());

// Create a read-only tx and verify that commit has not been invoked again in the TSOClient
AbstractTransaction readOnlyTx = (AbstractTransaction) tm.begin();
Expand All @@ -94,7 +94,7 @@ public void testReadOnlyTransactionsDoNotContactTSOServer(ITestContext context)
assertTrue(readOnlyTx.getWriteSet().isEmpty());
tm.commit(readOnlyTx);

verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet());
assertEquals(readOnlyTx.getStatus(), Transaction.Status.COMMITTED_RO);
}

Expand Down
12 changes: 6 additions & 6 deletions hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import static org.apache.omid.transaction.CellUtils.hasCell;
import static org.apache.omid.transaction.CellUtils.hasShadowCell;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
Expand Down Expand Up @@ -53,7 +53,7 @@
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.metrics.NullMetricsProvider;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
Expand Down Expand Up @@ -378,8 +378,8 @@ public List<KeyValue> answer(InvocationOnMock invocation) throws Throwable {
postCommitEnd.await();
return (List<KeyValue>) invocation.callRealMethod();
}
}).when(snapshotFilter).filterCellsForSnapshot(Matchers.<List<Cell>>any(),
any(HBaseTransaction.class), anyInt(), Matchers.<Map<String, Long>>any(), Matchers.<Map<String,byte[]>>any());
}).when(snapshotFilter).filterCellsForSnapshot(ArgumentMatchers.<List<Cell>>any(),
any(HBaseTransaction.class), anyInt(), ArgumentMatchers.<Map<String, Long>>any(), ArgumentMatchers.<Map<String,byte[]>>any());

TransactionManager tm = newTransactionManager(context);
if (hasShadowCell(row,
Expand Down
6 changes: 3 additions & 3 deletions hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertEquals;
Expand Down Expand Up @@ -78,7 +78,7 @@ public void testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) th
.when(mockedTSOClient).getNewStartTimestamp();

doReturn(abortingFF)
.when(mockedTSOClient).commit(eq(START_TS), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
.when(mockedTSOClient).commit(eq(START_TS), anySet(), anySet());

try (TransactionManager tm = newTransactionManager(context, mockedTSOClient);
TTable txTable = new TTable(connection, TEST_TABLE)) {
Expand Down
6 changes: 0 additions & 6 deletions hbase-coprocessor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
Expand Down
2 changes: 1 addition & 1 deletion hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;

import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
Expand Down
15 changes: 4 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,10 @@
<protoc.version>2.5.0</protoc.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<junit.version>4.13.2</junit.version>
<mockito.version>2.28.2</mockito.version>
<mockito.version>4.11.0</mockito.version>
<disruptor.version>3.2.0</disruptor.version>
<metrics.version>3.0.1</metrics.version>
<jcommander.version>1.82</jcommander.version>
<hamcrest.version>1.3</hamcrest.version>
<guava.version>32.1.3-jre</guava.version>
<!-- 2.12+ shades guava -->
<curator.version>5.6.0</curator.version>
Expand Down Expand Up @@ -1266,16 +1265,10 @@

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package org.apache.omid.tso;

import static org.apache.omid.tso.client.TSOClient.DEFAULT_ZK_CLUSTER;
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.reset;
import static org.mockito.Mockito.spy;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@

import java.io.IOException;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

import java.io.IOException;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

import java.io.IOException;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
Expand Down
4 changes: 2 additions & 2 deletions tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

import com.lmax.disruptor.BlockingWaitStrategy;

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.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
import java.util.Collections;
import java.util.List;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
Expand Down
2 changes: 1 addition & 1 deletion tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
Expand Down
14 changes: 7 additions & 7 deletions tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyCollectionOf;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -283,7 +283,7 @@ private void testWritingTimestampRequest(Channel channel) throws InterruptedExce
channel.writeAndFlush(tsBuilder.build()).await();
verify(requestProcessor, timeout(100).times(1)).timestampRequest(any(), any(MonitoringContext.class));
verify(requestProcessor, timeout(100).times(0))
.commitRequest(anyLong(), anyCollectionOf(Long.class), anyCollectionOf(Long.class), anyBoolean(), any(), any(MonitoringContext.class));
.commitRequest(anyLong(), anyCollection(), anyCollection(), anyBoolean(), any(), any(MonitoringContext.class));
}

private void testWritingCommitRequest(Channel channel) throws InterruptedException {
Expand All @@ -300,7 +300,7 @@ private void testWritingCommitRequest(Channel channel) throws InterruptedExcepti
channel.writeAndFlush(commitBuilder.build()).await();
verify(requestProcessor, timeout(100).times(0)).timestampRequest(any(), any(MonitoringContext.class));
verify(requestProcessor, timeout(100).times(1))
.commitRequest(eq(666L), anyCollectionOf(Long.class), anyCollectionOf(Long.class), eq(false), any(), any(MonitoringContext.class));
.commitRequest(eq(666L), anyCollection(), anyCollection(), eq(false), any(), any(MonitoringContext.class));
}

private void testWritingFenceRequest(Channel channel) throws InterruptedException {
Expand Down
2 changes: 1 addition & 1 deletion tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import java.io.IOException;

import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

import java.util.concurrent.CountDownLatch;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
Expand Down
6 changes: 3 additions & 3 deletions tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

import java.util.concurrent.CountDownLatch;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import java.util.Set;
import java.util.concurrent.ExecutionException;

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.assertFalse;
Expand Down