From 20c79e7aad91bf280e58b3e2690cc40d09cf8172 Mon Sep 17 00:00:00 2001 From: Andras Katona Date: Tue, 17 Sep 2024 12:26:41 +0200 Subject: [PATCH] Fixing Unexpected method calls: HttpSession.invalidate Signed-off-by: Andras Katona --- .../servlet/UserTaskManagerTest.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/cruise-control/src/test/java/com/linkedin/kafka/cruisecontrol/servlet/UserTaskManagerTest.java b/cruise-control/src/test/java/com/linkedin/kafka/cruisecontrol/servlet/UserTaskManagerTest.java index b27978a86..25fff3579 100644 --- a/cruise-control/src/test/java/com/linkedin/kafka/cruisecontrol/servlet/UserTaskManagerTest.java +++ b/cruise-control/src/test/java/com/linkedin/kafka/cruisecontrol/servlet/UserTaskManagerTest.java @@ -25,6 +25,14 @@ public class UserTaskManagerTest { + private static HttpSession getMockHttpSession(long lastAccessedTimeReturn) { + HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); + EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(lastAccessedTimeReturn).anyTimes(); + mockHttpSession.invalidate(); + EasyMock.expectLastCall().andVoid().anyTimes(); + return mockHttpSession; + } + @Test public void testCreateUserTask() throws Exception { UUID testUserTaskId = UUID.randomUUID(); @@ -32,8 +40,7 @@ public void testCreateUserTask() throws Exception { UserTaskManager.UuidGenerator mockUuidGenerator = EasyMock.mock(UserTaskManager.UuidGenerator.class); EasyMock.expect(mockUuidGenerator.randomUUID()).andReturn(testUserTaskId).anyTimes(); - HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(100L).anyTimes(); + HttpSession mockHttpSession = getMockHttpSession(100L); HttpServletRequest mockHttpServletRequest1 = prepareServletRequest(mockHttpSession, null); @@ -109,8 +116,7 @@ public void testSessionsShareUserTask() throws Exception { UserTaskManager.UuidGenerator mockUuidGenerator = EasyMock.mock(UserTaskManager.UuidGenerator.class); EasyMock.expect(mockUuidGenerator.randomUUID()).andReturn(testUserTaskId).anyTimes(); - HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(100L).anyTimes(); + HttpSession mockHttpSession = getMockHttpSession(System.currentTimeMillis()); Map requestParams1 = new HashMap<>(); requestParams1.put("param", new String[]{"true"}); @@ -157,9 +163,7 @@ public void testAddStepsFutures() throws Exception { UserTaskManager.UuidGenerator mockUuidGenerator = EasyMock.mock(UserTaskManager.UuidGenerator.class); EasyMock.expect(mockUuidGenerator.randomUUID()).andReturn(testUserTaskId).anyTimes(); - HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); - // Change mock session's last access time to always return current time to avoid unintended recycling of session. - EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(System.currentTimeMillis()).anyTimes(); + HttpSession mockHttpSession = getMockHttpSession(System.currentTimeMillis()); HttpServletRequest mockHttpServletRequest = prepareServletRequest(mockHttpSession, null); @@ -192,9 +196,7 @@ public void testAddStepsFutures() throws Exception { @Test public void testCompletedTasks() throws Exception { - HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(100L).anyTimes(); - mockHttpSession.invalidate(); + HttpSession mockHttpSession = getMockHttpSession(100L); HttpServletRequest mockHttpServletRequest = prepareServletRequest(mockHttpSession, null); UserTaskManager.UuidGenerator mockUuidGenerator = EasyMock.mock(UserTaskManager.UuidGenerator.class); @@ -234,9 +236,7 @@ public void testExpireSession() throws Exception { EasyMock.expect(mockUuidGenerator.randomUUID()).andReturn(testUserTaskId).anyTimes(); Time mockTime = new MockTime(); - HttpSession mockHttpSession = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession.getLastAccessedTime()).andReturn(mockTime.milliseconds()).anyTimes(); - mockHttpSession.invalidate(); + HttpSession mockHttpSession = getMockHttpSession(100L); HttpServletRequest mockHttpServletRequest = prepareServletRequest(mockHttpSession, null); OperationFuture future = new OperationFuture("future"); @@ -265,8 +265,7 @@ public void testExpireSession() throws Exception { @Test public void testMaximumActiveTasks() throws Exception { - HttpSession mockHttpSession1 = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession1.getLastAccessedTime()).andReturn(100L).anyTimes(); + HttpSession mockHttpSession1 = getMockHttpSession(100L); HttpServletRequest mockHttpServletRequest1 = prepareServletRequest(mockHttpSession1, null); @@ -285,9 +284,7 @@ public void testMaximumActiveTasks() throws Exception { userTaskManager.getOrCreateUserTask(requestContext, uuid -> future, 0, true, null).get(0); Assert.assertEquals(future, future1); EasyMock.verify(mockHttpSession1, mockHttpServletRequest1, mockHttpServletResponse); - HttpSession mockHttpSession2 = EasyMock.mock(HttpSession.class); - EasyMock.expect(mockHttpSession2.getLastAccessedTime()).andReturn(100L).anyTimes(); - EasyMock.replay(mockHttpSession2); + HttpSession mockHttpSession2 = getMockHttpSession(100L); EasyMock.reset(mockHttpServletResponse); HttpServletRequest mockHttpServletRequest2 = prepareServletRequest(mockHttpSession2, null, "/test2", Collections.emptyMap());