Skip to content

Commit 56cc1db

Browse files
authored
Use a fake execution context to avoid timing issues on CI (#343)
1 parent b751841 commit 56cc1db

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

.bsp/sbt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"name":"sbt","version":"1.4.5","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home/bin/java","-Xms100m","-Xmx100m","-classpath","/Users/brunobonanno/Library/Application Support/JetBrains/IntelliJIdea2020.3/plugins/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp"]}
1+
{"name":"sbt","version":"1.4.6","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home/bin/java","-Xms100m","-Xmx100m","-classpath","/Users/bbonanno/Library/Application Support/JetBrains/IntelliJIdea2020.3/plugins/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp"]}

scalatest/src/test/scala-2.12/user/org/mockito/IdiomaticMockitoTest_212.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.scalatest.matchers.should.Matchers
66
import org.scalatest.wordspec.AnyWordSpec
77
import user.org.mockito.matchers.{ ValueCaseClassInt, ValueClass }
88

9-
import scala.concurrent.ExecutionContext.Implicits.global
9+
import user.org.mockito.SameThreadExecutionContext.Instance
1010
import scala.concurrent.Future
1111

1212
class IdiomaticMockitoTest_212 extends AnyWordSpec with Matchers with IdiomaticMockito with ArgumentMatchersSugar with ScalaFutures {

scalatest/src/test/scala-2.12/user/org/mockito/MockitoSugarTest_212.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.scalatest.prop.TableDrivenPropertyChecks
66
import org.scalatest.matchers.should.Matchers
77
import org.scalatest.wordspec.AnyWordSpec
88

9-
import scala.concurrent.ExecutionContext.Implicits.global
9+
import user.org.mockito.SameThreadExecutionContext.Instance
1010
import scala.concurrent.Future
1111

1212
//noinspection RedundantDefaultArgument

scalatest/src/test/scala-2.12/user/org/mockito/scalatest/AsyncIdiomaticMockitoTest_212.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AsyncIdiomaticMockitoTest_212 extends AsyncWordSpec with Matchers with Asy
1212
val mockFunction = mock[() => Int]
1313
mockFunction() returns 42
1414

15-
Future(mockFunction.apply())
15+
Future(mockFunction.apply())(user.org.mockito.SameThreadExecutionContext.Instance)
1616
.map { v =>
1717
v shouldBe 42
1818
mockFunction() was called

scalatest/src/test/scala-2.13/user/org/mockito/IdiomaticMockitoTest_213.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package user.org.mockito
22

33
import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito }
44
import org.scalatest.concurrent.ScalaFutures
5+
import org.scalatest.matchers.should.Matchers
6+
import org.scalatest.wordspec.AnyWordSpec
7+
import user.org.mockito.SameThreadExecutionContext.Instance
58
import user.org.mockito.matchers.{ ValueCaseClassInt, ValueClass }
69

7-
import scala.concurrent.ExecutionContext.Implicits.global
810
import scala.concurrent.Future
9-
import org.scalatest.matchers.should.Matchers
10-
import org.scalatest.wordspec.AnyWordSpec
1111

1212
class IdiomaticMockitoTest_213 extends AnyWordSpec with Matchers with IdiomaticMockito with ArgumentMatchersSugar with ScalaFutures {
1313
class Foo {

scalatest/src/test/scala-2.13/user/org/mockito/MockitoSugarTest_213.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.mockito.{ ArgumentMatchersSugar, MockitoSugar }
44
import org.scalatest.concurrent.ScalaFutures
55
import org.scalatest.prop.TableDrivenPropertyChecks
66

7-
import scala.concurrent.ExecutionContext.Implicits.global
7+
import user.org.mockito.SameThreadExecutionContext.Instance
88
import scala.concurrent.Future
99
import org.scalatest.matchers.should.Matchers
1010
import org.scalatest.wordspec.AnyWordSpec
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package user.org.mockito
2+
3+
import scala.concurrent.ExecutionContext
4+
5+
class SameThreadExecutionContext extends ExecutionContext {
6+
override def execute(runnable: Runnable): Unit = runnable.run()
7+
8+
override def reportFailure(cause: Throwable): Unit = throw cause
9+
}
10+
11+
object SameThreadExecutionContext {
12+
implicit val Instance: ExecutionContext = new SameThreadExecutionContext
13+
}

0 commit comments

Comments
 (0)