diff --git a/MacUtilGUI.Tests/InstallTabTests.fs b/MacUtilGUI.Tests/InstallTabTests.fs index 150a1c2..7ac65c5 100644 --- a/MacUtilGUI.Tests/InstallTabTests.fs +++ b/MacUtilGUI.Tests/InstallTabTests.fs @@ -49,7 +49,8 @@ module InstallTabTests = vm.InstallSelected() Assert.Empty(brew.InstallCalls) - Assert.Equal("Nothing is selected.", vm.StatusText) + Assert.Equal("Nothing is selected.", vm.InstallStatus) + Assert.Equal("", vm.TweaksStatus) Assert.Empty(vm.SelectedAppIds) [] @@ -60,7 +61,8 @@ module InstallTabTests = vm.UninstallSelected() Assert.Empty(brew.UninstallCalls) - Assert.Equal("Nothing is selected.", vm.StatusText) + Assert.Equal("Nothing is selected.", vm.InstallStatus) + Assert.Equal("", vm.TweaksStatus) Assert.Empty(vm.SelectedAppIds) [] diff --git a/MacUtilGUI.Tests/MacUtilGUI.Tests.fsproj b/MacUtilGUI.Tests/MacUtilGUI.Tests.fsproj index 58fb4b0..522dca4 100644 --- a/MacUtilGUI.Tests/MacUtilGUI.Tests.fsproj +++ b/MacUtilGUI.Tests/MacUtilGUI.Tests.fsproj @@ -4,6 +4,7 @@ net9.0 false true + false diff --git a/MacUtilGUI.Tests/MaintenanceTests.fs b/MacUtilGUI.Tests/MaintenanceTests.fs index 47e3669..b9a81d3 100644 --- a/MacUtilGUI.Tests/MaintenanceTests.fs +++ b/MacUtilGUI.Tests/MaintenanceTests.fs @@ -92,7 +92,9 @@ module MaintenanceTests = let brew = RecordingBrew("/tmp/macutil-not-used") let vm = makeVm brew vm.RunBrewCleanup() - Assert.Equal("Ran brew cleanup.", vm.StatusText) + Assert.Equal("Ran brew cleanup.", vm.MaintenanceStatus) + Assert.Equal("", vm.TweaksStatus) + Assert.Equal("", vm.InstallStatus) Assert.Equal(1, brew.CleanupCalls.Length) Assert.NotEmpty(vm.SafeTweaks) Assert.Equal(26, Seq.length vm.AllApps) diff --git a/MacUtilGUI.Tests/PresetTests.fs b/MacUtilGUI.Tests/PresetTests.fs index 0c104fa..8386155 100644 --- a/MacUtilGUI.Tests/PresetTests.fs +++ b/MacUtilGUI.Tests/PresetTests.fs @@ -1,6 +1,8 @@ namespace MacUtilGUI.Tests +open System open System.IO +open System.Text.Json open System.Text.Json.Nodes open Xunit open MacUtilGUI.Models @@ -86,7 +88,8 @@ module PresetTests = Assert.False(vm.ImportJson json) Assert.True(pathBar.IsChecked) Assert.Equal(writesBefore, client.WriteCount) - Assert.Contains("Unknown tweak id", vm.StatusText) + Assert.Contains("Unknown tweak id", vm.TweaksStatus) + Assert.Equal("", vm.InstallStatus) let path = Path.GetTempFileName() File.WriteAllText(path, json) @@ -159,3 +162,73 @@ module PresetTests = Assert.True(vm.ImportJson json) Assert.True((findRow vm.SafeTweaks "finder-path-bar").IsChecked) Assert.False((findRow vm.SafeTweaks "finder-show-hidden").IsChecked) + + let private findPresetService () = + let rec walk dir = + if String.IsNullOrEmpty dir then + None + else + let candidate = Path.Combine(dir, "MacUtilGUI", "Services", "PresetService.fs") + + if File.Exists candidate then + Some candidate + else + let parent = Directory.GetParent dir + + if isNull parent then None else walk parent.FullName + + match walk AppContext.BaseDirectory with + | Some path -> path + | None -> + match walk (Directory.GetCurrentDirectory()) with + | Some path -> path + | None -> failwith "PresetService.fs not found" + + [] + let ExportTrimSafe () = + let loaded = catalog () + let ids = [ "finder-path-bar"; "finder-show-extensions" ] + let json = PresetService.exportIds ids + Assert.Equal("""["finder-path-bar","finder-show-extensions"]""", json) + + match PresetService.parseImport loaded json with + | Ok parsed -> Assert.Equal(ids, parsed) + | Error msg -> Assert.Fail msg + + Assert.Equal("[]", PresetService.exportIds []) + + let quoted = PresetService.exportIds [ "quote\"slash\\" ] + use doc = JsonDocument.Parse(quoted) + Assert.Equal(JsonValueKind.Array, doc.RootElement.ValueKind) + let quotedEl = doc.RootElement.EnumerateArray() |> Seq.exactlyOne + Assert.Equal("quote\"slash\\", quotedEl.GetString()) + + let src = File.ReadAllText(findPresetService ()) + Assert.DoesNotContain("JsonSerializer.Serialize", src) + Assert.Contains("Utf8JsonWriter", src) + + let reflectionThrew = + try + JsonSerializer.Serialize([| "finder-path-bar" |]) |> ignore + false + with + | :? NotSupportedException -> true + | :? InvalidOperationException as ex -> ex.Message.Contains("Reflection-based serialization") + + Assert.True(reflectionThrew, "reflection Serialize of string[] must be disabled") + + let client = FakeDefaultsClient() + let killer = FakeProcessKiller() + ActionEngine.apply client killer loaded.Tweaks.["finder-path-bar"] + let code, stdout, err = runCli loaded client killer [| "export" |] + Assert.Equal(0, code) + Assert.Equal("", err) + use exported = JsonDocument.Parse(stdout.Trim()) + Assert.Equal(JsonValueKind.Array, exported.RootElement.ValueKind) + + let cliIds = + exported.RootElement.EnumerateArray() + |> Seq.map (fun el -> el.GetString()) + |> Set.ofSeq + + Assert.Contains("finder-path-bar", cliIds) diff --git a/MacUtilGUI.Tests/TweakTabTests.fs b/MacUtilGUI.Tests/TweakTabTests.fs index e14a21d..c2441d6 100644 --- a/MacUtilGUI.Tests/TweakTabTests.fs +++ b/MacUtilGUI.Tests/TweakTabTests.fs @@ -75,7 +75,8 @@ module TweakTabTests = let writesBefore = client.WriteCount vm.ApplySelected() Assert.Equal(writesBefore, client.WriteCount) - Assert.Equal("Nothing is selected.", vm.StatusText) + Assert.Equal("Nothing is selected.", vm.TweaksStatus) + Assert.Equal("", vm.InstallStatus) Assert.Empty(vm.SelectedIds) let pathBar = findRow vm.SafeTweaks "finder-path-bar" @@ -164,7 +165,8 @@ module TweakTabTests = let writesBefore = client.WriteCount vm.ApplySelected() Assert.Equal(writesBefore, client.WriteCount) - Assert.Equal("Nothing is selected.", vm.StatusText) + Assert.Equal("Nothing is selected.", vm.TweaksStatus) + Assert.Equal("", vm.InstallStatus) Assert.Empty(vm.SelectedIds) let axaml = @@ -179,3 +181,38 @@ module TweakTabTests = Assert.Contains("Maintenance", axaml) Assert.Contains("Updates", axaml) Assert.Contains("#1C1C1E", axaml) + Assert.Contains("{Binding TweaksStatus}", axaml) + Assert.Contains("{Binding InstallStatus}", axaml) + Assert.Contains("{Binding MaintenanceStatus}", axaml) + Assert.Contains("{Binding UpdatesStatus}", axaml) + Assert.DoesNotContain("{Binding StatusText}", axaml) + + let appAxaml = + File.ReadAllText(Path.Combine(repoRoot (), "MacUtilGUI", "App.axaml")) + + Assert.DoesNotContain("macos-terminal", appAxaml) + Assert.DoesNotContain("macos-left-panel", appAxaml) + Assert.DoesNotContain("macos-right-panel", appAxaml) + + [] + let PerTabStatusDoesNotLeak () = + let client = FakeDefaultsClient() + let vm = makeVm client + uncheckAll vm + + let pathBar = findRow vm.SafeTweaks "finder-path-bar" + pathBar.IsChecked <- true + vm.ApplySelected() + Assert.Equal("Applied 1 tweak(s).", vm.TweaksStatus) + Assert.Equal("", vm.InstallStatus) + Assert.Equal("", vm.MaintenanceStatus) + Assert.Equal("", vm.UpdatesStatus) + + for row in vm.AllApps do + row.IsChecked <- false + + vm.InstallSelected() + Assert.Equal("Nothing is selected.", vm.InstallStatus) + Assert.Equal("Applied 1 tweak(s).", vm.TweaksStatus) + Assert.Equal("", vm.MaintenanceStatus) + Assert.Equal("", vm.UpdatesStatus) diff --git a/MacUtilGUI.Tests/UpdateServiceTests.fs b/MacUtilGUI.Tests/UpdateServiceTests.fs index b5f453e..63ca804 100644 --- a/MacUtilGUI.Tests/UpdateServiceTests.fs +++ b/MacUtilGUI.Tests/UpdateServiceTests.fs @@ -171,13 +171,15 @@ module UpdateServiceTests = vm.UpdateHomebrew() Assert.Empty(brew.UpgradeCalls) - Assert.Equal("Nothing is selected.", vm.StatusText) + Assert.Equal("Nothing is selected.", vm.UpdatesStatus) + Assert.Equal("", vm.TweaksStatus) let wget = Seq.exactlyOne vm.BrewOutdated wget.IsChecked <- true vm.UpdateHomebrew() Assert.Equal([ [ "upgrade"; "wget" ] ], brew.UpgradeCalls) - Assert.Equal("Updated 1 Homebrew package(s).", vm.StatusText) + Assert.Equal("Updated 1 Homebrew package(s).", vm.UpdatesStatus) + Assert.Equal("", vm.InstallStatus) let axaml = File.ReadAllText(Path.Combine(root, "MacUtilGUI", "Views", "MainWindow.axaml")) diff --git a/MacUtilGUI/App.axaml b/MacUtilGUI/App.axaml index 8b3688c..dffed6d 100644 --- a/MacUtilGUI/App.axaml +++ b/MacUtilGUI/App.axaml @@ -52,18 +52,6 @@ - - - - - - - - -