Repository: storm Updated Branches: refs/heads/master 1a857637e -> 352cd4665
http://git-wip-us.apache.org/repos/asf/storm/blob/3503dcea/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java index 10e422d..32d9435 100644 --- a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java +++ b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java @@ -20,10 +20,11 @@ package org.apache.storm.daemon.logviewer.handler; import static java.util.stream.Collectors.joining; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -676,7 +677,7 @@ public class LogviewerLogSearchHandlerTest { verify(handler, times(4)).findNMatches(files.capture(), numMatches.capture(), fileOffset.capture(), offset.capture(), search.capture()); - verify(handler, times(4)).logsForPort(anyString(), any(File.class)); + verify(handler, times(4)).logsForPort(isNull(), any(File.class)); // File offset and byte offset should always be zero when searching multiple workers (multiple ports). assertEquals(logFiles, files.getAllValues().get(0)); @@ -718,7 +719,7 @@ public class LogviewerLogSearchHandlerTest { verify(handler, times(4)).findNMatches(files.capture(), numMatches.capture(), fileOffset.capture(), offset.capture(), search.capture()); - verify(handler, times(4)).logsForPort(anyString(), any(File.class)); + verify(handler, times(4)).logsForPort(isNull(), any(File.class)); // File offset and byte offset should always be zero when searching multiple workers (multiple ports). assertEquals(Collections.singletonList(logFiles.get(0)), files.getAllValues().get(0)); @@ -760,7 +761,7 @@ public class LogviewerLogSearchHandlerTest { verify(handler, times(1)).findNMatches(files.capture(), numMatches.capture(), fileOffset.capture(), offset.capture(), search.capture()); - verify(handler, times(2)).logsForPort(anyString(), any(File.class)); + verify(handler, times(2)).logsForPort(isNull(), any(File.class)); assertEquals(logFiles, files.getAllValues().get(0)); assertEquals(Integer.valueOf(20), numMatches.getAllValues().get(0)); @@ -783,7 +784,7 @@ public class LogviewerLogSearchHandlerTest { verify(handler, times(1)).findNMatches(files.capture(), numMatches.capture(), fileOffset.capture(), offset.capture(), search.capture()); - verify(handler, times(2)).logsForPort(anyString(), any(File.class)); + verify(handler, times(2)).logsForPort(isNull(), any(File.class)); assertEquals(logFiles, files.getAllValues().get(0)); assertEquals(Integer.valueOf(20), numMatches.getAllValues().get(0)); @@ -806,7 +807,7 @@ public class LogviewerLogSearchHandlerTest { verify(handler, times(1)).findNMatches(files.capture(), numMatches.capture(), fileOffset.capture(), offset.capture(), search.capture()); - verify(handler, times(2)).logsForPort(anyString(), any(File.class)); + verify(handler, times(2)).logsForPort(isNull(), any(File.class)); // File offset should be zero, since search-archived is false. assertEquals(Collections.singletonList(logFiles.get(0)), files.getAllValues().get(0)); @@ -822,8 +823,8 @@ public class LogviewerLogSearchHandlerTest { handler.deepSearchLogsForTopology("", null, "search", "20", "6700", "1", "100", true, null, null); - verify(handler, times(1)).findNMatches(anyListOf(File.class), anyInt(), anyInt(), anyInt(), anyString()); - verify(handler, times(2)).logsForPort(anyString(), any(File.class)); + verify(handler, times(1)).findNMatches(anyList(), anyInt(), anyInt(), anyInt(), anyString()); + verify(handler, times(2)).logsForPort(isNull(), any(File.class)); } @Test @@ -850,14 +851,14 @@ public class LogviewerLogSearchHandlerTest { new ResourceAuthorizer(stormConf)); handler = spy(handler); - doReturn(logFiles).when(handler).logsForPort(anyString(), any(File.class)); + doReturn(logFiles).when(handler).logsForPort(any(), any()); doAnswer(invocationOnMock -> { Object[] arguments = invocationOnMock.getArguments(); int fileOffset = (Integer) arguments[2]; String search = (String) arguments[4]; return new LogviewerLogSearchHandler.Matched(fileOffset, search, Collections.emptyList()); - }).when(handler).findNMatches(anyListOf(File.class), anyInt(), anyInt(), anyInt(), anyString()); + }).when(handler).findNMatches(any(), anyInt(), anyInt(), anyInt(), any()); return handler; } http://git-wip-us.apache.org/repos/asf/storm/blob/3503dcea/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/utils/LogCleanerTest.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/utils/LogCleanerTest.java b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/utils/LogCleanerTest.java index 1031c04..847edb1 100644 --- a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/utils/LogCleanerTest.java +++ b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/utils/LogCleanerTest.java @@ -24,13 +24,15 @@ import static org.apache.storm.DaemonConfig.LOGVIEWER_CLEANUP_AGE_MINS; import static org.apache.storm.DaemonConfig.LOGVIEWER_CLEANUP_INTERVAL_SECS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.anySetOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyListOf; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyMapOf; +import static org.mockito.ArgumentMatchers.anySet; +import static org.mockito.ArgumentMatchers.anySetOf; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -118,12 +120,12 @@ public class LogCleanerTest { prevUtils = Utils.setInstance(mockUtils); DirectoryCleaner mockDirectoryCleaner = mock(DirectoryCleaner.class); - when(mockDirectoryCleaner.getStreamForDirectory(any(File.class))).thenAnswer(invocationOnMock -> { + when(mockDirectoryCleaner.getStreamForDirectory(any())).thenAnswer(invocationOnMock -> { File file = (File) invocationOnMock.getArguments()[0]; List<Path> paths = Arrays.stream(file.listFiles()).map(f -> mkMockPath(f)).collect(toList()); return mkDirectoryStream(paths); }); - when(mockDirectoryCleaner.deleteOldestWhileTooLarge(anyListOf(File.class), anyLong(), anyBoolean(), anySetOf(String.class))) + when(mockDirectoryCleaner.deleteOldestWhileTooLarge(any(), anyLong(), anyBoolean(), any())) .thenCallRealMethod(); long nowMillis = Time.currentTimeMillis();
