Version 2.1 #41

Merged
danieljsummers merged 123 commits from version-2.1 into main 2024-03-27 00:13:28 +00:00
2 changed files with 101 additions and 7 deletions
Showing only changes of commit 5126e2029b - Show all commits

View File

@ -381,8 +381,12 @@ type WebLog = {
/// Any extra path where this web log is hosted (blank if web log is hosted at the root of the domain)
[<JsonIgnore>]
member this.ExtraPath =
let path = this.UrlBase.Split("://").[1].Split "/"
if path.Length > 1 then $"""/{String.Join("/", path |> Array.skip 1)}""" else ""
let pathParts = this.UrlBase.Split("://")
if pathParts.Length < 2 then
""
else
let path = pathParts[1].Split "/"
if path.Length > 1 then $"""/{String.Join("/", path |> Array.skip 1)}""" else ""
/// Generate an absolute URL for the given link
member this.AbsoluteUrl(permalink: Permalink) =
@ -394,7 +398,7 @@ type WebLog = {
/// Convert an Instant (UTC reference) to the web log's local date/time
member this.LocalTime(date: Instant) =
match DateTimeZoneProviders.Tzdb[this.TimeZone] with
match DateTimeZoneProviders.Tzdb.GetZoneOrNull this.TimeZone with
| null -> date.ToDateTimeUtc()
| tz -> date.InZone(tz).ToDateTimeUnspecified()
@ -454,5 +458,5 @@ type WebLogUser = {
/// Get the user's displayed name
[<JsonIgnore>]
member this.DisplayName =
(seq { match this.PreferredName with "" -> this.FirstName | n -> n; " "; this.LastName }
(seq { (match this.PreferredName with "" -> this.FirstName | n -> n); " "; this.LastName }
|> Seq.reduce (+)).Trim()

View File

@ -5,6 +5,8 @@ open Expecto
open MyWebLog
open NodaTime
// --- SUPPORT TYPES ---
/// Tests for the NodaTime-wrapping module
let nodaTests =
testList "Noda" [
@ -398,7 +400,7 @@ let uploadDestinationTests =
Expect.equal (UploadDestination.Parse "Database") Database "\"Database\" not parsed correctly"
}
test "succeeds for \"Disk\"" {
Expect.equal (UploadDestination.Parse "Disk") Database "\"Disk\" not parsed correctly"
Expect.equal (UploadDestination.Parse "Disk") Disk "\"Disk\" not parsed correctly"
}
test "fails for unrecognized value" {
Expect.throwsT<ArgumentException>
@ -415,11 +417,96 @@ let uploadDestinationTests =
]
]
// --- DATA TYPES ---
/// Unit tests for the WebLog type
let webLogTests =
testList "WebLog" [
testList "ExtraPath" [
test "succeeds for blank URL base" {
Expect.equal WebLog.Empty.ExtraPath "" "Extra path should have been blank for blank URL base"
}
test "succeeds for domain root URL" {
Expect.equal
{ WebLog.Empty with UrlBase = "https://example.com" }.ExtraPath
""
"Extra path should have been blank for domain root"
}
test "succeeds for single subdirectory" {
Expect.equal
{ WebLog.Empty with UrlBase = "http://a.com/subdir" }.ExtraPath
"/subdir"
"Extra path incorrect for a single subdirectory"
}
test "succeeds for deeper nesting" {
Expect.equal
{ WebLog.Empty with UrlBase = "http://b.com/users/test/units" }.ExtraPath
"/users/test/units"
"Extra path incorrect for deeper nesting"
}
]
test "AbsoluteUrl succeeds" {
Expect.equal
({ WebLog.Empty with UrlBase = "http://my.site" }.AbsoluteUrl(Permalink "blog/page.html"))
"http://my.site/blog/page.html"
"Absolute URL is incorrect"
}
testList "RelativeUrl" [
test "succeeds for domain root URL" {
Expect.equal
({ WebLog.Empty with UrlBase = "http://test.me" }.RelativeUrl(Permalink "about.htm"))
"/about.htm"
"Relative URL is incorrect for domain root site"
}
test "succeeds for domain non-root URL" {
Expect.equal
({ WebLog.Empty with UrlBase = "http://site.page/a/b/c" }.RelativeUrl(Permalink "x/y/z"))
"/a/b/c/x/y/z"
"Relative URL is incorrect for domain non-root site"
}
]
testList "LocalTime" [
test "succeeds when no time zone is set" {
Expect.equal
(WebLog.Empty.LocalTime(Noda.epoch))
(Noda.epoch.ToDateTimeUtc())
"Reference should be UTC when no time zone is specified"
}
test "succeeds when time zone is set" {
Expect.equal
({ WebLog.Empty with TimeZone = "Etc/GMT-1" }.LocalTime(Noda.epoch))
(Noda.epoch.ToDateTimeUtc().AddHours 1)
"The time should have been adjusted by one hour"
}
]
]
/// Unit tests for the WebLogUser type
let webLogUserTests =
testList "WebLogUser" [
testList "DisplayName" [
test "succeeds when a preferred name is present" {
Expect.equal
{ WebLogUser.Empty with
FirstName = "Thomas"; PreferredName = "Tom"; LastName = "Tester" }.DisplayName
"Tom Tester"
"Display name incorrect when preferred name is present"
}
test "succeeds when a preferred name is absent" {
Expect.equal
{ WebLogUser.Empty with FirstName = "Test"; LastName = "Units" }.DisplayName
"Test Units"
"Display name incorrect when preferred name is absent"
}
]
]
/// All tests for the Domain namespace
let all =
testList
"Domain"
[ nodaTests
[ // support types
nodaTests
accessLevelTests
commentStatusTests
explicitRatingTests
@ -429,4 +516,7 @@ let all =
postStatusTests
customFeedSourceTests
themeAssetIdTests
uploadDestinationTests ]
uploadDestinationTests
// data types
webLogTests
webLogUserTests ]