diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
commit | 579754fa5b5f4768a75fc3aed08f70ffb29db0e3 (patch) | |
tree | 825e5366b8253535bb9366722006ef49c6e83c53 /vespaclient-java/src | |
parent | 19ab63311c9354db919a9a9ac38d34342e1ca204 (diff) |
Use mockito-core 3.1.0
Diffstat (limited to 'vespaclient-java/src')
3 files changed, 10 insertions, 28 deletions
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java index 9873bea3953..c662e2fed62 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java @@ -1,15 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaget; -import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.document.DataType; import com.yahoo.document.Document; import com.yahoo.document.DocumentId; import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; -import com.yahoo.documentapi.messagebus.MessageBusParams; import com.yahoo.documentapi.messagebus.MessageBusSyncSession; import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; @@ -20,7 +17,6 @@ import com.yahoo.messagebus.Error; import com.yahoo.messagebus.Reply; import com.yahoo.vespaclient.ClusterDef; import com.yahoo.vespaclient.ClusterList; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -39,8 +35,8 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -156,15 +152,10 @@ public class DocumentRetrieverTest { params); documentRetriever.retrieveDocuments(); - verify(mockedSession, times(1)).syncSend(argThat(new ArgumentMatcher<GetDocumentMessage>() { - @Override - public boolean matches(Object o) { - GetDocumentMessage msg = (GetDocumentMessage) o; - return msg.getPriority().equals(DocumentProtocol.Priority.HIGH_1) && - !msg.getRetryEnabled() && - msg.getLoadType().equals(new LoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1)); - } - })); + verify(mockedSession, times(1)).syncSend(argThat((ArgumentMatcher<GetDocumentMessage>) o -> + o.getPriority().equals(DocumentProtocol.Priority.HIGH_1) && + !o.getRetryEnabled() && + o.getLoadType().equals(new LoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1)))); assertContainsDocument(DOC_ID_1); } @@ -255,12 +246,7 @@ public class DocumentRetrieverTest { DocumentRetriever documentRetriever = createDocumentRetriever(params, clusterList); documentRetriever.retrieveDocuments(); - verify(mockedFactory).createDocumentAccess(argThat(new ArgumentMatcher<MessageBusParams>() { - @Override - public boolean matches(Object o) { - return ((MessageBusParams) o).getRoute().equals(expectedRoute); - } - })); + verify(mockedFactory).createDocumentAccess(argThat(o -> o.getRoute().equals(expectedRoute))); } @Test diff --git a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java index aaeada5be25..fb5fb3accc9 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java @@ -14,7 +14,7 @@ import java.util.Collections; import java.util.List; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java index 475547546d3..7035c54c906 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java @@ -9,18 +9,14 @@ import com.yahoo.documentapi.messagebus.MessageBusSyncSession; import com.yahoo.documentapi.messagebus.protocol.GetBucketListReply; import com.yahoo.documentapi.messagebus.protocol.StatBucketReply; import com.yahoo.messagebus.Error; -import com.yahoo.messagebus.Message; -import com.yahoo.messagebus.routing.Route; import org.junit.Before; import org.junit.Test; -import org.mockito.ArgumentMatcher; import java.util.List; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; -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.times; import static org.mockito.Mockito.verify; |