Skip to content

Commit 3058603

Browse files
committed
Fixed test for magnet pattern
1 parent 748ed5f commit 3058603

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,9 @@ lazy val scala_strings = (project in file("scala-strings"))
472472
lazy val scala_design_patterns = (project in file("scala-design-patterns"))
473473
.settings(
474474
name := "scala-design-patterns",
475+
scalaVersion := scala3Version,
475476
libraryDependencies ++= scalaTestDeps,
476-
libraryDependencies += scalaMock,
477+
libraryDependencies += "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % Test,
477478
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
478479
)
479480

scala-design-patterns/src/main/scala-2/com/baeldung/scala/magnetpattern/MagnetPattern.scala renamed to scala-design-patterns/src/main/scala/com/baeldung/scala/magnetpattern/MagnetPattern.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.baeldung.scala.magnetpattern
22

3+
import scala.language.implicitConversions
4+
35
object MagnetPattern extends App {
46

57
/*
@@ -20,11 +22,11 @@ object MagnetPattern extends App {
2022

2123
def combineElements(magnet: CombineMagnet): magnet.Result = magnet()
2224

23-
implicit def intCombineMagnet(intList: List[Int]) = new CombineMagnet {
25+
implicit def intCombineMagnet(intList: List[Int]): CombineMagnet {type Result = Int} = new CombineMagnet {
2426
override type Result = Int
2527
override def apply(): Result = intList.reduce((i, c) => i + c)
2628
}
27-
implicit def strCombineMagnet(stringList: List[String]) = new CombineMagnet {
29+
implicit def strCombineMagnet(stringList: List[String]): CombineMagnet {type Result = String} = new CombineMagnet {
2830
override type Result = String
2931
override def apply(): Result = stringList.reduce((s, c) => s.concat(c))
3032
}

scala-design-patterns/src/test/scala-2/com/baeldung/scala/cakepattern/CakePatternUnitTest.scala renamed to scala-design-patterns/src/test/scala/com/baeldung/scala/cakepattern/CakePatternUnitTest.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
package com.baeldung.scala.cakepattern
22

33
import com.baeldung.scala.cakepattern.CakePattern.Test
4-
import org.scalamock.scalatest.MockFactory
4+
import org.mockito.Mockito.when
55
import org.scalatest.flatspec.AnyFlatSpec
6+
import org.scalatestplus.mockito.MockitoSugar
67

78
trait TestRegistry
89
extends CakePattern.TestExecutorComponent
910
with CakePattern.TestEnvironmentComponent
10-
with MockFactory {
11+
with MockitoSugar {
1112
override val env: TestEnvironment = mock[TestEnvironment]
1213
override val testExecutor: TestExecutor = new TestExecutor
1314
}
1415

1516
class CakePatternUnitTest extends AnyFlatSpec with TestRegistry {
1617

1718
"A TestExecutor" should "execute tests using a given environment" in {
18-
(env.readEnvironmentProperties _).expects().returning(Map("ENV" -> "true"))
19+
when(env.readEnvironmentProperties).thenReturn(Map("ENV" -> "true"))
1920
val test = Test(
2021
"test-1",
2122
{ environment =>

0 commit comments

Comments
 (0)