diff options
Diffstat (limited to 'vespaclient-java/src/test/java')
-rw-r--r-- | vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java | 13 | ||||
-rw-r--r-- | vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java | 9 |
2 files changed, 12 insertions, 10 deletions
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 874a2a382ea..aaeada5be25 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java @@ -22,13 +22,14 @@ public class BucketStatsPrinterTest { private BucketStatsRetriever retriever; private final ByteArrayOutputStream out = new ByteArrayOutputStream(); + private final String bucketSpace = "default"; @Before public void mockBucketStatsRetriever() throws BucketStatsException { retriever = mock(BucketStatsRetriever.class); when(retriever.getBucketIdForType(any(), any())).thenReturn(new BucketId(0x42)); - when(retriever.retrieveBucketList(any())).thenReturn(Collections.emptyList()); - when(retriever.retrieveBucketStats(any(), any(), any())).thenReturn(""); + when(retriever.retrieveBucketList(any(), any())).thenReturn(Collections.emptyList()); + when(retriever.retrieveBucketStats(any(), any(), any(), any())).thenReturn(""); } @After @@ -44,7 +45,7 @@ public class BucketStatsPrinterTest { private String retreiveAndPrintBucketStats(ClientParameters.SelectionType type, String id, boolean dumpData) throws BucketStatsException { BucketStatsPrinter printer = new BucketStatsPrinter(retriever, new PrintStream(out)); - printer.retrieveAndPrintBucketStats(type, id, dumpData); + printer.retrieveAndPrintBucketStats(type, id, dumpData, bucketSpace); return getOutputString(); } @@ -68,7 +69,7 @@ public class BucketStatsPrinterTest { List<GetBucketListReply.BucketInfo> bucketList = new ArrayList<>(); String dummyInfoString = "dummyinformation"; bucketList.add(new GetBucketListReply.BucketInfo(new BucketId(0), dummyInfoString)); - when(retriever.retrieveBucketList(any())).thenReturn(bucketList); + when(retriever.retrieveBucketList(any(), any())).thenReturn(bucketList); String output = retreiveAndPrintBucketStats(ClientParameters.SelectionType.USER, "1234", false); assertTrue(output.contains(dummyInfoString)); @@ -78,8 +79,8 @@ public class BucketStatsPrinterTest { public void testShouldPrintBucketStats() throws BucketStatsException { String dummyBucketStats = "dummystats"; GetBucketListReply.BucketInfo bucketInfo = new GetBucketListReply.BucketInfo(new BucketId(0), "dummy"); - when(retriever.retrieveBucketList(any())).thenReturn(Collections.singletonList(bucketInfo)); - when(retriever.retrieveBucketStats(any(), any(), any())).thenReturn(dummyBucketStats); + when(retriever.retrieveBucketList(any(), any())).thenReturn(Collections.singletonList(bucketInfo)); + when(retriever.retrieveBucketStats(any(), any(), any(), any())).thenReturn(dummyBucketStats); String output = retreiveAndPrintBucketStats(ClientParameters.SelectionType.USER, "1234", true); assertTrue(output.contains(dummyBucketStats)); 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 557cefd8504..a34e3a73205 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsRetrieverTest.java @@ -31,6 +31,7 @@ public class BucketStatsRetrieverTest { private DocumentAccessFactory mockedFactory; private MessageBusDocumentAccess mockedDocumentAccess; private MessageBusSyncSession mockedSession; + private final String bucketSpace = "default"; @Before @@ -67,7 +68,7 @@ public class BucketStatsRetrieverTest { reply.getBuckets().add(new GetBucketListReply.BucketInfo(bucketId, bucketInfo)); when(mockedSession.syncSend(any())).thenReturn(reply); - List<GetBucketListReply.BucketInfo> bucketList = createRetriever().retrieveBucketList(bucketId); + List<GetBucketListReply.BucketInfo> bucketList = createRetriever().retrieveBucketList(bucketId, bucketSpace); verify(mockedSession, times(1)).syncSend(any()); assertEquals(1, bucketList.size()); @@ -83,7 +84,7 @@ public class BucketStatsRetrieverTest { StatBucketReply reply = new StatBucketReply(); reply.setResults(bucketInfo); when(mockedSession.syncSend(any())).thenReturn(reply); - String result = createRetriever().retrieveBucketStats(ClientParameters.SelectionType.DOCUMENT, docId, bucketId); + String result = createRetriever().retrieveBucketStats(ClientParameters.SelectionType.DOCUMENT, docId, bucketId, bucketSpace); verify(mockedSession, times(1)).syncSend(any()); assertEquals(bucketInfo, result); @@ -112,7 +113,7 @@ public class BucketStatsRetrieverTest { reply.addError(new Error(0, "errormsg")); when(mockedSession.syncSend(any())).thenReturn(reply); - createRetriever().retrieveBucketList(new BucketId(1)); + createRetriever().retrieveBucketList(new BucketId(1), bucketSpace); } @Test @@ -124,7 +125,7 @@ public class BucketStatsRetrieverTest { when(mockedSession.syncSend(any())).thenReturn(reply); BucketStatsRetriever retriever = new BucketStatsRetriever(mockedFactory, route, t -> {}); - retriever.retrieveBucketList(new BucketId(0)); + retriever.retrieveBucketList(new BucketId(0), bucketSpace); verify(mockedSession).syncSend(argThat(new ArgumentMatcher<Message>() { @Override |