-
Notifications
You must be signed in to change notification settings - Fork 225
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[TOREE-545] Upgrade Scalatest 3.2 and Mockito 4 #211
Conversation
@@ -108,7 +110,7 @@ class IOPubClientSpec extends TestKit(ActorSystem( | |||
.build | |||
|
|||
// Mark as target being provided | |||
doReturn(Some(mockCommCallbacks)).when(spyCommStorage) | |||
doReturn(Some(mockCommCallbacks), Nil: _*).when(spyCommStorage) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a Scala bug, fixed in 2.13.0. A workaround is required to make it happy with Scala 2.12.
scala/scala#7680
@lresende would you mind taking a look at this PR? it is based on your previous in-progress work. |
b9fdb90
to
b56f594
Compare
@lresende this PR is ready to go(review and merge) on my side.
In short words, I intend to make each PR focus on one goal, especially, the large goal should be broken down into small/middle ones, which are easy to implement and review. For #199, technically, I think it is still far from the goal, because
As @requaos said, I think he also agrees to break it down.
@lresende That's my opinion, my goal is to accomplish the upgrading quickly, keep code quality, and make the code change history clear. Please let me know if you have any other thoughts :) |
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8" // Apache v2 | ||
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.16" // Apache v2 | ||
val scalaTestMockito = "org.scalatestplus" %% "mockito-4-11" % "3.2.16.0" // Apache v2 | ||
val mockitoInline = "org.mockito" % "mockito-inline" % "4.11.0" // MIT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all are test only, so no need to update LICENSE/NOTICE
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW, mockito-inline
is introduced to support mock final class
/ enum
The test failure is irrelevant, it's another known flaky test, will investigate independently.
|
e340c29
to
ff8aa97
Compare
@lresende do you have further concerns about shipping this patch? |
This PR only touches the test code, since all tests passed and no further objections, I'm going to merge it to unblock Scala 2.13 upgrading tasks. |
This is part of #199
Co-authored-by: Luciano Resende [email protected]
Co-authored-by: Cheng Pan [email protected]
This PR aims to upgrade scalatest to 3.2 and the corresponding mockito to 4.11 to prepare support for Scala 2.13
The change is verified by
examples/magic-tutorial.ipynb