Skip to content

Commit d232085

Browse files
committed
Upgraded scala-libraries-2 also into 2.13 version
1 parent c1497c1 commit d232085

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

build.sbt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ val sparkVersion = "3.2.1"
238238

239239
lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
240240
.settings(
241-
scalaVersion := "2.12.15",
242241
name := "scala-libraries",
243242
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
244243
libraryDependencies ++= Seq(
@@ -252,16 +251,12 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
252251
"com.beachape" %% "enumeratum" % "1.7.0"
253252
),
254253
libraryDependencies ++= Seq(
255-
"com.typesafe.play" %% "play-slick" % "5.0.0",
254+
"com.typesafe.play" %% "play-slick" % "5.1.0",
256255
"org.postgresql" % "postgresql" % "42.2.12"
257256
),
258257
libraryDependencies ++= Seq(
259258
"io.monix" %% "monix" % monixVersion
260259
),
261-
libraryDependencies ++= Seq(
262-
"org.apache.spark" %% "spark-core" % sparkVersion,
263-
"org.apache.spark" %% "spark-sql" % sparkVersion
264-
),
265260
dependencyOverrides := Seq(
266261
"com.typesafe.akka" %% "akka-protobuf-v3" % "2.6.16",
267262
"com.typesafe.akka" %% "akka-stream" % "2.6.16",
@@ -331,10 +326,6 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
331326
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
332327
"org.tpolecat" %% "skunk-core" % "0.3.2"
333328
),
334-
libraryDependencies ++= Seq(
335-
"org.apache.spark" %% "spark-core" % sparkVersion,
336-
"org.apache.spark" %% "spark-sql" % sparkVersion
337-
),
338329
scalacOptions += "-Xasync"
339330
)
340331

@@ -413,6 +404,8 @@ lazy val scala212 = (project in file("scala212"))
413404
scalaVersion := "2.12.17",
414405
name := "scala212",
415406
libraryDependencies ++= Seq(
416-
scalaTest
407+
scalaTest,
408+
"org.apache.spark" %% "spark-core" % sparkVersion,
409+
"org.apache.spark" %% "spark-sql" % sparkVersion
417410
)
418411
)

scala-libraries-2/src/test/scala/com/baeldung/akka/Tests.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class GreeterTest extends TestService {
7272
sender ! Greeter.GreetingRequest(greeting, probe.ref)
7373
probe.expectMessage(Greeter.GreetingResponse(greeting))
7474
// no other message should be received by the greeter actor
75-
probe.expectNoMessage(50 millis)
75+
probe.expectNoMessage(50.millis)
7676
}
7777

7878
class TrafficLightTest extends TestService {
@@ -83,29 +83,29 @@ class TrafficLightTest extends TestService {
8383
// ensure that initial state is RED
8484
sender ! TrafficLight.SignalCommand.GetSignal(probe.ref)
8585
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
86-
probe.expectNoMessage(50 millis)
86+
probe.expectNoMessage(50.millis)
8787

8888

8989
// now try to change signal
9090
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
9191
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.YELLOW))
9292
// ensure no other message is received
93-
probe.expectNoMessage(50 millis)
93+
probe.expectNoMessage(50.millis)
9494

9595
// ensure that the state is preserved
9696
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
9797
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.GREEN))
98-
probe.expectNoMessage(50 millis)
98+
probe.expectNoMessage(50.millis)
9999
//ensure that the state is preserved
100100
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
101101
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
102-
probe.expectNoMessage(50 millis)
102+
probe.expectNoMessage(50.millis)
103103
}
104104

105105
class TrafficLightTestFut extends TestService {
106106
import scala.concurrent.duration._
107107
val sender = testKit.spawn(TrafficLight(), "traffic")
108-
val duration = 300 millis
108+
val duration = 300.millis
109109
implicit val timeout = Timeout(duration)
110110

111111
val signalFut = sender.ask(replyTo =>TrafficLight.SignalCommand.GetSignal(replyTo))

scala-test/src/test/scala/com/baeldung/scala/scalatest/mockito/InventoryServiceTest.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ class InventoryServiceTest extends AnyWordSpec with MockitoSugar with ScalaFutur
4343
val service = new InventoryService(dao, mockProducer, mockLogger)
4444
when(dao.saveAsync(any[InventoryTransaction])).thenReturn(Future.successful(txn))
4545
doNothing().when(mockProducer).publish(txn)
46-
service.saveAndPublish(txn)
47-
verify(mockProducer, times(1)).publish(any[InventoryTransaction])
46+
val result = service.saveAndPublish(txn)
47+
whenReady(result){ _ =>
48+
verify(mockProducer, times(1)).publish(any[InventoryTransaction])
49+
}
4850
}
4951

5052
"save and NOT publish to kafka for non chocolate inventory" in {

0 commit comments

Comments
 (0)