raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

use receiveOne instead of receiveMessageType, #25914

Browse source 
* use receiveOne instead of receiveMessageType, #25914

* when the type is the same as the probe's type

* formatting

* rename receiveOne to receiveMessage

* rename receiveN to receiveMessages

* have to use different name in javadsl so that became receiveSeveralMessages
This commit is contained in:
Patrik Nordwall 2019-01-15 09:23:30 +01:00 • committed by GitHub
parent ab82924a84
commit f4defb139b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 166 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala
View file

@ -18,7 +18,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val deviceActor = spawn(Device("group", "device"))
deviceActor ! Device.ReadTemperature(requestId = 42, probe.ref)
val response = probe.expectMessageType[Device.RespondTemperature]
val response = probe.receiveMessage()
response.requestId should ===(42)
response.value should ===(None)
}
@ -34,7 +34,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 1))
deviceActor ! Device.ReadTemperature(requestId = 2, readProbe.ref)
val response1 = readProbe.expectMessageType[RespondTemperature]
val response1 = readProbe.receiveMessage()
response1.requestId should ===(2)
response1.value should ===(Some(24.0))
@ -42,7 +42,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 3))
deviceActor ! Device.ReadTemperature(requestId = 4, readProbe.ref)
val response2 = readProbe.expectMessageType[RespondTemperature]
val response2 = readProbe.receiveMessage()
response2.requestId should ===(4)
response2.value should ===(Some(55.0))
}

16
akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala
View file

@ -21,12 +21,12 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
val deviceActor1 = registered1.device
// another deviceId
groupActor ! RequestTrackDevice("group", "device2", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
val deviceActor2 = registered2.device
deviceActor1 should !==(deviceActor2)
@ -53,11 +53,11 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
// registering same again should be idempotent
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
registered1.device should ===(registered2.device)
}
@ -69,10 +69,10 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
groupActor ! RequestTrackDevice("group", "device2", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
val deviceListProbe = createTestProbe[ReplyDeviceList]()
groupActor ! RequestDeviceList(requestId = 0, groupId = "group", deviceListProbe.ref)
@ -84,11 +84,11 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", registeredProbe.ref)
val registered1 = registeredProbe.expectMessageType[DeviceRegistered]
val registered1 = registeredProbe.receiveMessage()
val toShutDown = registered1.device
groupActor ! RequestTrackDevice("group", "device2", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
val deviceListProbe = createTestProbe[ReplyDeviceList]()
groupActor ! RequestDeviceList(requestId = 0, groupId = "group", deviceListProbe.ref)

4
akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala
View file

@ -17,11 +17,11 @@ class DeviceManagerSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val managerActor = spawn(DeviceManager())
managerActor ! RequestTrackDevice("group1", "device", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
// another group
managerActor ! RequestTrackDevice("group2", "device", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
registered1.device should !==(registered2.device)
}

6
akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala
View file

@ -18,7 +18,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val deviceActor = spawn(Device("group", "device"))
deviceActor ! Device.ReadTemperature(requestId = 42, probe.ref)
val response = probe.expectMessageType[Device.RespondTemperature]
val response = probe.receiveMessage()
response.requestId should ===(42)
response.value should ===(None)
}
@ -34,7 +34,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 1))
deviceActor ! Device.ReadTemperature(requestId = 2, readProbe.ref)
val response1 = readProbe.expectMessageType[RespondTemperature]
val response1 = readProbe.receiveMessage()
response1.requestId should ===(2)
response1.value should ===(Some(24.0))
@ -42,7 +42,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 3))
deviceActor ! Device.ReadTemperature(requestId = 4, readProbe.ref)
val response2 = readProbe.expectMessageType[RespondTemperature]
val response2 = readProbe.receiveMessage()
response2.requestId should ===(4)
response2.value should ===(Some(55.0))
}

22
akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala
View file

@ -21,12 +21,12 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
val deviceActor1 = registered1.device
// another deviceId
groupActor ! RequestTrackDevice("group", "device2", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
val deviceActor2 = registered2.device
deviceActor1 should !==(deviceActor2)
@ -53,11 +53,11 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
// registering same again should be idempotent
groupActor ! RequestTrackDevice("group", "device1", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
registered1.device should ===(registered2.device)
}
@ -69,10 +69,10 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
groupActor ! RequestTrackDevice("group", "device2", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
val deviceListProbe = createTestProbe[ReplyDeviceList]()
groupActor ! RequestDeviceList(requestId = 0, groupId = "group", deviceListProbe.ref)
@ -84,11 +84,11 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", registeredProbe.ref)
val registered1 = registeredProbe.expectMessageType[DeviceRegistered]
val registered1 = registeredProbe.receiveMessage()
val toShutDown = registered1.device
groupActor ! RequestTrackDevice("group", "device2", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
val deviceListProbe = createTestProbe[ReplyDeviceList]()
groupActor ! RequestDeviceList(requestId = 0, groupId = "group", deviceListProbe.ref)
@ -112,13 +112,13 @@ class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val groupActor = spawn(DeviceGroup("group"))
groupActor ! RequestTrackDevice("group", "device1", registeredProbe.ref)
val deviceActor1 = registeredProbe.expectMessageType[DeviceRegistered].device
val deviceActor1 = registeredProbe.receiveMessage().device
groupActor ! RequestTrackDevice("group", "device2", registeredProbe.ref)
val deviceActor2 = registeredProbe.expectMessageType[DeviceRegistered].device
val deviceActor2 = registeredProbe.receiveMessage().device
groupActor ! RequestTrackDevice("group", "device3", registeredProbe.ref)
registeredProbe.expectMessageType[DeviceRegistered]
registeredProbe.receiveMessage()
// Check that the device actors are working
val recordProbe = createTestProbe[TemperatureRecorded]()

4
akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala
View file

@ -17,11 +17,11 @@ class DeviceManagerSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val managerActor = spawn(DeviceManager())
managerActor ! RequestTrackDevice("group1", "device", probe.ref)
val registered1 = probe.expectMessageType[DeviceRegistered]
val registered1 = probe.receiveMessage()
// another group
managerActor ! RequestTrackDevice("group2", "device", probe.ref)
val registered2 = probe.expectMessageType[DeviceRegistered]
val registered2 = probe.receiveMessage()
registered1.device should !==(registered2.device)
}

6
akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala
View file

@ -18,7 +18,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
val deviceActor = spawn(Device("group", "device"))
deviceActor ! Device.ReadTemperature(requestId = 42, probe.ref)
val response = probe.expectMessageType[Device.RespondTemperature]
val response = probe.receiveMessage()
response.requestId should ===(42)
response.value should ===(None)
}
@ -34,7 +34,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 1))
deviceActor ! Device.ReadTemperature(requestId = 2, readProbe.ref)
val response1 = readProbe.expectMessageType[RespondTemperature]
val response1 = readProbe.receiveMessage()
response1.requestId should ===(2)
response1.value should ===(Some(24.0))
@ -42,7 +42,7 @@ class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
recordProbe.expectMessage(Device.TemperatureRecorded(requestId = 3))
deviceActor ! Device.ReadTemperature(requestId = 4, readProbe.ref)
val response2 = readProbe.expectMessageType[RespondTemperature]
val response2 = readProbe.receiveMessage()
response2.requestId should ===(4)
response2.value should ===(Some(55.0))
}