Move module funcs to properties

This commit is contained in:
2025-01-30 20:36:00 -05:00
parent facc294d66
commit 42e3a58131
12 changed files with 384 additions and 410 deletions

View File

@@ -39,8 +39,8 @@ let asOfDateDisplayTests =
[<Tests>]
let churchTests =
testList "Church" [
test "empty is as expected" {
let mt = Church.empty
test "Empty is as expected" {
let mt = Church.Empty
Expect.equal mt.Id.Value Guid.Empty "The church ID should have been an empty GUID"
Expect.equal mt.Name "" "The name should have been blank"
Expect.equal mt.City "" "The city should have been blank"
@@ -111,16 +111,16 @@ let expirationTests =
let listPreferencesTests =
testList "ListPreferences" [
test "FontStack is correct for native fonts" {
Expect.equal ListPreferences.empty.FontStack
Expect.equal ListPreferences.Empty.FontStack
"""system-ui,-apple-system,"Segoe UI",Roboto,Ubuntu,"Liberation Sans",Cantarell,"Helvetica Neue",sans-serif"""
"The expected native font stack was incorrect"
}
test "FontStack is correct for specific fonts" {
Expect.equal { ListPreferences.empty with Fonts = "Arial,sans-serif" }.FontStack "Arial,sans-serif"
Expect.equal { ListPreferences.Empty with Fonts = "Arial,sans-serif" }.FontStack "Arial,sans-serif"
"The specified fonts were not returned correctly"
}
test "empty is as expected" {
let mt = ListPreferences.empty
test "Empty is as expected" {
let mt = ListPreferences.Empty
Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
Expect.equal mt.DaysToExpire 14 "The default days to expire should have been 14"
Expect.equal mt.DaysToKeepNew 7 "The default days to keep new should have been 7"
@@ -137,8 +137,7 @@ let listPreferencesTests =
Expect.equal mt.GroupPassword "" "The default group password should have been blank"
Expect.equal mt.DefaultEmailType HtmlFormat "The default e-mail type should have been HTML"
Expect.isFalse mt.IsPublic "The isPublic flag should not have been set"
Expect.equal (TimeZoneId.toString mt.TimeZoneId) "America/Denver"
"The default time zone should have been America/Denver"
Expect.equal (string mt.TimeZoneId) "America/Denver" "The default time zone should have been America/Denver"
Expect.equal mt.PageSize 100 "The default page size should have been 100"
Expect.equal mt.AsOfDateDisplay NoDisplay "The as-of date display should have been No Display"
}
@@ -147,8 +146,8 @@ let listPreferencesTests =
[<Tests>]
let memberTests =
testList "Member" [
test "empty is as expected" {
let mt = Member.empty
test "Empty is as expected" {
let mt = Member.Empty
Expect.equal mt.Id.Value Guid.Empty "The member ID should have been an empty GUID"
Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
Expect.equal mt.Name "" "The member name should have been blank"
@@ -162,8 +161,8 @@ let prayerRequestTests =
let instantNow = SystemClock.Instance.GetCurrentInstant
let localDateNow () = (instantNow ()).InUtc().Date
testList "PrayerRequest" [
test "empty is as expected" {
let mt = PrayerRequest.empty
test "Empty is as expected" {
let mt = PrayerRequest.Empty
Expect.equal mt.Id.Value Guid.Empty "The request ID should have been an empty GUID"
Expect.equal mt.RequestType CurrentRequest "The request type should have been Current"
Expect.equal mt.UserId.Value Guid.Empty "The user ID should have been an empty GUID"
@@ -175,59 +174,60 @@ let prayerRequestTests =
Expect.isFalse mt.NotifyChaplain "The notify chaplain flag should not have been set"
Expect.equal mt.Expiration Automatic "The expiration should have been Automatic"
}
test "isExpired always returns false for expecting requests" {
PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with RequestType = Expecting }
test "IsExpired always returns false for expecting requests" {
{ PrayerRequest.Empty with RequestType = Expecting }.IsExpired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isFalse "An expecting request should never be considered expired"
}
test "isExpired always returns false for manually-expired requests" {
PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with UpdatedDate = (instantNow ()) - Duration.FromDays 1; Expiration = Manual }
test "IsExpired always returns false for manually-expired requests" {
{ PrayerRequest.Empty with
UpdatedDate = (instantNow ()) - Duration.FromDays 1
Expiration = Manual }.IsExpired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isFalse "A never-expired request should never be considered expired"
}
test "isExpired always returns false for long term/recurring requests" {
PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with RequestType = LongTermRequest }
test "IsExpired always returns false for long term/recurring requests" {
{ PrayerRequest.Empty with RequestType = LongTermRequest }.IsExpired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isFalse "A recurring/long-term request should never be considered expired"
}
test "isExpired always returns true for force-expired requests" {
PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with UpdatedDate = (instantNow ()); Expiration = Forced }
test "IsExpired always returns true for force-expired requests" {
{ PrayerRequest.Empty with UpdatedDate = (instantNow ()); Expiration = Forced }.IsExpired
(localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isTrue "A force-expired request should always be considered expired"
}
test "isExpired returns false for non-expired requests" {
test "IsExpired returns false for non-expired requests" {
let now = instantNow ()
PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
{ PrayerRequest.empty with UpdatedDate = now - Duration.FromDays 5 }
{ PrayerRequest.Empty with UpdatedDate = now - Duration.FromDays 5 }.IsExpired
(now.InUtc().Date) SmallGroup.Empty
|> Flip.Expect.isFalse "A request updated 5 days ago should not be considered expired"
}
test "isExpired returns true for expired requests" {
test "IsExpired returns true for expired requests" {
let now = instantNow ()
PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
{ PrayerRequest.empty with UpdatedDate = now - Duration.FromDays 15 }
{ PrayerRequest.Empty with UpdatedDate = now - Duration.FromDays 15 }.IsExpired
(now.InUtc().Date) SmallGroup.Empty
|> Flip.Expect.isTrue "A request updated 15 days ago should be considered expired"
}
test "isExpired returns true for same-day expired requests" {
test "IsExpired returns true for same-day expired requests" {
let now = instantNow ()
PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
{ PrayerRequest.empty with UpdatedDate = now - (Duration.FromDays 14) - (Duration.FromSeconds 1L) }
{ PrayerRequest.Empty with
UpdatedDate = now - (Duration.FromDays 14) - (Duration.FromSeconds 1L) }.IsExpired
(now.InUtc().Date) SmallGroup.Empty
|> Flip.Expect.isTrue "A request entered a second before midnight should be considered expired"
}
test "updateRequired returns false for expired requests" {
PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with Expiration = Forced }
test "UpdateRequired returns false for expired requests" {
{ PrayerRequest.Empty with Expiration = Forced }.UpdateRequired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isFalse "An expired request should not require an update"
}
test "updateRequired returns false when an update is not required for an active request" {
test "UpdateRequired returns false when an update is not required for an active request" {
let now = instantNow ()
PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with RequestType = LongTermRequest; UpdatedDate = now - Duration.FromDays 14 }
{ PrayerRequest.Empty with
RequestType = LongTermRequest
UpdatedDate = now - Duration.FromDays 14 }.UpdateRequired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isFalse "An active request updated 14 days ago should not require an update until 28 days"
}
test "UpdateRequired returns true when an update is required for an active request" {
let now = instantNow ()
PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
{ PrayerRequest.empty with RequestType = LongTermRequest; UpdatedDate = now - Duration.FromDays 34 }
{ PrayerRequest.Empty with
RequestType = LongTermRequest
UpdatedDate = now - Duration.FromDays 34 }.UpdateRequired (localDateNow ()) SmallGroup.Empty
|> Flip.Expect.isTrue "An active request updated 34 days ago should require an update (past 28 days)"
}
]
@@ -311,8 +311,8 @@ let smallGroupTests =
let now = Instant.FromDateTimeUtc (DateTime (2017, 5, 12, 12, 15, 0, DateTimeKind.Utc))
let withFakeClock f () =
FakeClock now |> f
yield test "empty is as expected" {
let mt = SmallGroup.empty
yield test "Empty is as expected" {
let mt = SmallGroup.Empty
Expect.equal mt.Id.Value Guid.Empty "The small group ID should have been an empty GUID"
Expect.equal mt.ChurchId.Value Guid.Empty "The church ID should have been an empty GUID"
Expect.equal mt.Name "" "The name should have been blank"
@@ -321,31 +321,31 @@ let smallGroupTests =
"LocalTimeNow adjusts the time ahead of UTC",
fun clock ->
let grp =
{ SmallGroup.empty with
Preferences = { ListPreferences.empty with TimeZoneId = TimeZoneId "Europe/Berlin" }
{ SmallGroup.Empty with
Preferences = { ListPreferences.Empty with TimeZoneId = TimeZoneId "Europe/Berlin" }
}
Expect.isGreaterThan (SmallGroup.localTimeNow clock grp) (now.InUtc().LocalDateTime)
Expect.isGreaterThan (grp.LocalTimeNow clock) (now.InUtc().LocalDateTime)
"UTC to Europe/Berlin should have added hours"
"LocalTimeNow adjusts the time behind UTC",
fun clock ->
Expect.isLessThan (SmallGroup.localTimeNow clock SmallGroup.empty) (now.InUtc().LocalDateTime)
Expect.isLessThan (SmallGroup.Empty.LocalTimeNow clock) (now.InUtc().LocalDateTime)
"UTC to America/Denver should have subtracted hours"
"LocalTimeNow returns UTC when the time zone is invalid",
fun clock ->
let grp =
{ SmallGroup.empty with
Preferences = { ListPreferences.empty with TimeZoneId = TimeZoneId "garbage" }
{ SmallGroup.Empty with
Preferences = { ListPreferences.Empty with TimeZoneId = TimeZoneId "garbage" }
}
Expect.equal (SmallGroup.localTimeNow clock grp) (now.InUtc().LocalDateTime)
Expect.equal (grp.LocalTimeNow clock) (now.InUtc().LocalDateTime)
"UTC should have been returned for an invalid time zone"
]
yield test "localTimeNow fails when clock is not passed" {
Expect.throws (fun () -> (SmallGroup.localTimeNow null SmallGroup.empty |> ignore))
Expect.throws (fun () -> SmallGroup.Empty.LocalTimeNow null |> ignore)
"Should have raised an exception for null clock"
}
yield test "LocalDateNow returns the date portion" {
let clock = FakeClock (Instant.FromDateTimeUtc (DateTime (2017, 5, 12, 1, 15, 0, DateTimeKind.Utc)))
Expect.isLessThan (SmallGroup.localDateNow clock SmallGroup.empty) (now.InUtc().Date)
Expect.isLessThan (SmallGroup.Empty.LocalDateNow clock) (now.InUtc().Date)
"The date should have been a day earlier"
}
]
@@ -353,8 +353,8 @@ let smallGroupTests =
[<Tests>]
let userTests =
testList "User" [
test "empty is as expected" {
let mt = User.empty
test "Empty is as expected" {
let mt = User.Empty
Expect.equal mt.Id.Value Guid.Empty "The user ID should have been an empty GUID"
Expect.equal mt.FirstName "" "The first name should have been blank"
Expect.equal mt.LastName "" "The last name should have been blank"
@@ -363,7 +363,7 @@ let userTests =
Expect.equal mt.PasswordHash "" "The password hash should have been blank"
}
test "Name concatenates first and last names" {
let user = { User.empty with FirstName = "Unit"; LastName = "Test" }
let user = { User.Empty with FirstName = "Unit"; LastName = "Test" }
Expect.equal user.Name "Unit Test" "The full name should be the first and last, separated by a space"
}
]
@@ -371,8 +371,8 @@ let userTests =
[<Tests>]
let userSmallGroupTests =
testList "UserSmallGroup" [
test "empty is as expected" {
let mt = UserSmallGroup.empty
test "Empty is as expected" {
let mt = UserSmallGroup.Empty
Expect.equal mt.UserId.Value Guid.Empty "The user ID should have been an empty GUID"
Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
}