[SPARK-26536] Upgrade Mockito to 2.23.4

• Type: Sub-task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 3.0.0
• Fix Version/s: 3.0.0
• Component/s: Build, Tests
• Assignee: Dongjoon Hyun
• Reporter: Dongjoon Hyun
• Created: 04/Jan/19 16:48
• Updated: 13/Jul/19 19:41
• Resolved: 05/Jan/19 03:25

Description

This issue upgrades Mockito from 1.10.19 to 2.23.4. The following changes are required.

• Replace `org.mockito.Matchers` with `org.mockito.ArgumentMatchers`
• Replace `anyObject` with `any`
• Replace `getArgumentAt` with `getArgument` and add type annotation.
• Use `isNull` matcher in case of `null` is invoked.

       saslHandler.channelInactive(null);
  -    verify(handler).channelInactive(any(TransportClient.class));
  +    verify(handler).channelInactive(isNull());
  

• Make and use `doReturn` wrapper to avoid SI-4775

  private def doReturn(value: Any) = org.mockito.Mockito.doReturn(value, Seq.empty: _*)
  

Issue Links

• is related to: SPARK-28370 Upgrade Mockito to 2.28.2
• links to: GitHub Pull Request #23452
• links to: GitHub Pull Request #23463