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

Simplify function names

Browse source
This commit is contained in:
Sven van Heugten 2026-01-14 22:04:34 +01:00
parent d509829304
commit c342f06e82
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,13 +17,13 @@ let private genRemoteInteraction =
let private genInteraction biasTowardsLight = let private genInteraction biasTowardsLight =
Gen.oneof [ genTimeChanged; genHumanInteraction biasTowardsLight; genRemoteInteraction ] Gen.oneof [ genTimeChanged; genHumanInteraction biasTowardsLight; genRemoteInteraction ]
let genRandomInteractionsExcept biasTowardsLight disqualifier = let genInteractionsExcept biasTowardsLight disqualifier =
genInteraction biasTowardsLight genInteraction biasTowardsLight
|> Gen.filter (not << disqualifier) |> Gen.filter (not << disqualifier)
|> Gen.listOf |> Gen.listOf
let genRandomInteractions biasTowardsLight = let genInteractions biasTowardsLight =
genRandomInteractionsExcept biasTowardsLight (fun _ -> false) genInteractionsExcept biasTowardsLight (fun _ -> false)
let ensureStartsWithTimeChanged (genInteractions: Gen<Interaction list>) = let ensureStartsWithTimeChanged (genInteractions: Gen<Interaction list>) =
genInteractions genInteractions

24
NightLight.Core.Tests/NightLightTests.fs
View file

@ -27,7 +27,7 @@ type NightLightTests() =
[<Property(Arbitrary = [| typeof<ArbitraryLight> |])>] [<Property(Arbitrary = [| typeof<ArbitraryLight> |])>]
let ``All lights should be either off, white or yellow during the day`` (light: Light) = let ``All lights should be either off, white or yellow during the day`` (light: Light) =
genRandomInteractions light genInteractions light
|> ensurePartOfDayIs Day |> ensurePartOfDayIs Day
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen
@ -41,7 +41,7 @@ type NightLightTests() =
[<Property(Arbitrary = [| typeof<ArbitraryLight> |])>] [<Property(Arbitrary = [| typeof<ArbitraryLight> |])>]
let ``All lights should be either off or red during the night`` (light: Light) = let ``All lights should be either off or red during the night`` (light: Light) =
genRandomInteractions light genInteractions light
|> ensurePartOfDayIs Night |> ensurePartOfDayIs Night
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen
@ -55,7 +55,7 @@ type NightLightTests() =
[<Property(Arbitrary = [| typeof<ArbitraryNonRemotelyControlledLight> |])>] [<Property(Arbitrary = [| typeof<ArbitraryNonRemotelyControlledLight> |])>]
let ``All non-remotely controlled lights with power should be on`` (light: Light) = let ``All non-remotely controlled lights with power should be on`` (light: Light) =
genRandomInteractions light genInteractions light
|> ensureLightHasPower light |> ensureLightHasPower light
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen
@ -66,7 +66,7 @@ type NightLightTests() =
[<Property(Arbitrary = [| typeof<ArbitraryRemotelyControlledLight> |])>] [<Property(Arbitrary = [| typeof<ArbitraryRemotelyControlledLight> |])>]
let ``All remote controlled lights with power should be on if the remote was never used`` (light: Light) = let ``All remote controlled lights with power should be on if the remote was never used`` (light: Light) =
genRandomInteractionsExcept light _.IsRemoteInteraction genInteractionsExcept light _.IsRemoteInteraction
|> ensureLightHasPower light |> ensureLightHasPower light
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen
@ -79,7 +79,7 @@ type NightLightTests() =
let ``After pressing 'On' on the remote, if the remote isn't used again, all remotely controlled lights with power should be on`` let ``After pressing 'On' on the remote, if the remote isn't used again, all remotely controlled lights with power should be on``
(light: Light) (light: Light)
= =
genRandomInteractions light genInteractions light
|> ensureLastRemoteInteractionIs RemotePressedOnButton |> ensureLastRemoteInteractionIs RemotePressedOnButton
|> ensureLightHasPower light |> ensureLightHasPower light
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
@ -94,9 +94,9 @@ type NightLightTests() =
(light: Light) (light: Light)
= =
concatGens concatGens
[ genRandomInteractions light |> ensurePartOfDayIs Night [ genInteractions light |> ensurePartOfDayIs Night
genTimeChangedToPartOfDay Day |> Gen.map List.singleton genTimeChangedToPartOfDay Day |> Gen.map List.singleton
genRandomInteractionsExcept light _.IsRemoteInteraction ] genInteractionsExcept light _.IsRemoteInteraction ]
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> ensureLightHasPower light |> ensureLightHasPower light
|> Arb.fromGen |> Arb.fromGen
@ -110,9 +110,9 @@ type NightLightTests() =
(light: Light) (light: Light)
= =
concatGens concatGens
[ genRandomInteractions light [ genInteractions light
RemoteInteraction RemotePressedOffButton |> List.singleton |> Gen.constant RemoteInteraction RemotePressedOffButton |> List.singleton |> Gen.constant
genRandomInteractionsExcept light (fun interaction -> genInteractionsExcept light (fun interaction ->
interaction.IsRemoteInteraction || interaction |> isTimeChangedToPartOfDay Day) ] interaction.IsRemoteInteraction || interaction |> isTimeChangedToPartOfDay Day) ]
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen
@ -125,7 +125,7 @@ type NightLightTests() =
let ``After pressing 'Left' on the remote, if the remote isn't used again, all left-side remotely controlled lights with power should be on`` let ``After pressing 'Left' on the remote, if the remote isn't used again, all left-side remotely controlled lights with power should be on``
(light: Light) (light: Light)
= =
genRandomInteractions light genInteractions light
|> ensureLastRemoteInteractionIs RemotePressedLeftButton |> ensureLastRemoteInteractionIs RemotePressedLeftButton
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> ensureLightHasPower light |> ensureLightHasPower light
@ -140,9 +140,9 @@ type NightLightTests() =
(light: Light) (light: Light)
= =
concatGens concatGens
[ genRandomInteractions light [ genInteractions light
RemoteInteraction RemotePressedLeftButton |> List.singleton |> Gen.constant RemoteInteraction RemotePressedLeftButton |> List.singleton |> Gen.constant
genRandomInteractionsExcept light (fun interaction -> genInteractionsExcept light (fun interaction ->
interaction.IsRemoteInteraction || interaction |> isTimeChangedToPartOfDay Day) ] interaction.IsRemoteInteraction || interaction |> isTimeChangedToPartOfDay Day) ]
|> ensureStartsWithTimeChanged |> ensureStartsWithTimeChanged
|> Arb.fromGen |> Arb.fromGen