Fix mockito MockedStatic invocation

danepitkin · Aug 11, 2023 · e2fb2dc · e2fb2dc
1 parent b45dc55
commit e2fb2dc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...rc/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java b/...rc/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java
@@ -158,7 +158,7 @@ private MockedStatic<KeyStore> createKeyStoreStaticMock() {
  if (method.getName().equals("getInstance")) {
  return invocationOnMock.callRealMethod();
  }
- return invocationOnMock.getMock();
+ return method.invoke(invocationOnMock.getMock(), invocationOnMock.getArguments());
  }
  );
  }
@@ -169,13 +169,15 @@ private MockedStatic<ClientAuthenticationUtils> createClientAuthenticationUtilsS
  if (method.getName().equals("getCertificateInputStreamFromSystem")) {
  return invocationOnMock.callRealMethod();
  }
- return invocationOnMock.getMock();
+ return method.invoke(invocationOnMock.getMock(), invocationOnMock.getArguments());
  });
  }
 
  private void setOperatingSystemMock(MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic,
  boolean isWindows, boolean isMac) {
  clientAuthenticationUtilsMockedStatic.when(ClientAuthenticationUtils::isMac).thenReturn(isMac);
+ Assert.assertEquals(ClientAuthenticationUtils.isMac(), isMac);
  clientAuthenticationUtilsMockedStatic.when(ClientAuthenticationUtils::isWindows).thenReturn(isWindows);
+ Assert.assertEquals(ClientAuthenticationUtils.isWindows(), isWindows);
  }
 }