svenvanheugten/night-light
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some ambiguity

Browse source
This commit is contained in:
Sven van Heugten 2026-01-05 21:54:34 +01:00
parent 838bbb79a3
commit cef2a20f7a
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
NightLight.Core.Tests/FakeHome.fs
View file

@ -7,8 +7,8 @@ open FsToolkit.ErrorHandling
open FSharp.Data open FSharp.Data
type HumanInteraction = type HumanInteraction =
| LightTurnedOn of Light | LightPoweredOn of Light
| LightTurnedOff of Light | LightPoweredOff of Light
type Interaction = type Interaction =
| HumanInteraction of HumanInteraction | HumanInteraction of HumanInteraction
@ -30,9 +30,9 @@ type FakeLight(light: Light) =
member _.LightWithState = light, if hasPower then On(brightness, color) else Off member _.LightWithState = light, if hasPower then On(brightness, color) else Off
member _.TurnOn() = hasPower <- true member _.PowerOn() = hasPower <- true
member _.TurnOff() = hasPower <- false member _.PowerOff() = hasPower <- false
member _.SetBrightness(newBrightness: byte) = member _.SetBrightness(newBrightness: byte) =
if hasPower then if hasPower then
@ -91,8 +91,8 @@ type FakeHome() =
member _.Interact(interaction: Interaction) = member _.Interact(interaction: Interaction) =
match interaction with match interaction with
| HumanInteraction(LightTurnedOn light) -> | HumanInteraction(LightPoweredOn light) ->
friendlyNameToFakeLight[light.FriendlyName].TurnOn() friendlyNameToFakeLight[light.FriendlyName].PowerOn()
{ Topic = "zigbee2mqtt/bridge/event" { Topic = "zigbee2mqtt/bridge/event"
Payload = Payload =
@ -102,7 +102,7 @@ type FakeHome() =
}}" } }}" }
|> ReceivedZigbeeEvent |> ReceivedZigbeeEvent
|> onEventPublished.Trigger |> onEventPublished.Trigger
| HumanInteraction(LightTurnedOff light) -> friendlyNameToFakeLight[light.FriendlyName].TurnOff() | HumanInteraction(LightPoweredOff light) -> friendlyNameToFakeLight[light.FriendlyName].PowerOff()
| TimeChanged newTime -> newTime |> Event.TimeChanged |> onEventPublished.Trigger | TimeChanged newTime -> newTime |> Event.TimeChanged |> onEventPublished.Trigger
type FakeHome with type FakeHome with

2
NightLight.Core.Tests/InteractionListGenerators.fs
View file

@ -10,7 +10,7 @@ let private genTimeChangedInteraction =
let private genHumanInteraction = let private genHumanInteraction =
Gen.elements lights Gen.elements lights
|> Gen.bind (fun light -> |> Gen.bind (fun light ->
[ LightTurnedOn light; LightTurnedOff light ] [ LightPoweredOn light; LightPoweredOff light ]
|> Gen.elements |> Gen.elements
|> Gen.map Interaction.HumanInteraction) |> Gen.map Interaction.HumanInteraction)