clean brittle tests (#9)

Reviewed-on: #9 Reviewed-by: xtul <mpiasecki720@protonmail.com> Co-authored-by: vickydotbat <vickydotbat@tutamail.com> Co-committed-by: vickydotbat <vickydotbat@tutamail.com>
2026-06-20 10:32:20 +00:00
parent f1fd03ee83
commit 13c8ced5e8
8 changed files with 145 additions and 194 deletions
@@ -2,6 +2,7 @@ package app

 import (
 	"bytes"
+	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
@@ -47,9 +48,21 @@ func TestParseBuildHAKArgsHelpListsContentAddressedRoot(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected help usage error")
 	}
-	const want = "usage: build-haks [--hak <hak-name> ...] [--archive <archive-name> ...] [--source-manifest <path>] [--content-addressed-root <path>] [--plan-only] [--skip-music] [--music-dataset <id> ...] [--quiet|--verbose|--debug]"
-	if err.Error() != want {
-		t.Fatalf("help usage = %q, want %q", err.Error(), want)
+	for _, flag := range []string{
+		"--hak",
+		"--archive",
+		"--source-manifest",
+		"--content-addressed-root",
+		"--plan-only",
+		"--skip-music",
+		"--music-dataset",
+		"--quiet",
+		"--verbose",
+		"--debug",
+	} {
+		if !strings.Contains(err.Error(), flag) {
+			t.Errorf("help usage missing documented flag %q: %v", flag, err)
+		}
 	}
 }

@@ -85,9 +98,8 @@ topdata:
 	setFileTime(t, filepath.Join(root, ".cache", "2da", "repadjust.2da"), outputTime)
 	setFileTime(t, filepath.Join(root, "build", "sow_tlk.tlk"), outputTime)

-	var stdout bytes.Buffer
 	ctx := context{
-		stdout: &stdout,
+		stdout: &bytes.Buffer{},
 		stderr: &bytes.Buffer{},
 		cwd:    root,
 		args:   []string{"build-top-package"},
@@ -96,19 +108,12 @@ topdata:
 	if err := runBuildTopPackage(ctx); err != nil {
 		t.Fatalf("runBuildTopPackage failed: %v", err)
 	}
-	output := stdout.String()
-	if !strings.Contains(output, "top package hak: build/sow_top.hak") {
-		t.Fatalf("expected build-top-package output, got %q", output)
-	}
-	if strings.Contains(output, "[build-top-package]") {
-		t.Fatalf("did not expect raw progress lines in normal output, got %q", output)
-	}
 	if _, err := os.Stat(filepath.Join(root, "build", "sow_top.hak")); err != nil {
 		t.Fatalf("expected packaged hak output: %v", err)
 	}
 }

-func TestRunBuildHAKsEmitsCompactSummary(t *testing.T) {
+func TestRunBuildHAKsNormalOutputOmitsPerFileMappings(t *testing.T) {
 	root := t.TempDir()
 	mkdirAll(t, filepath.Join(root, "assets", "envi", "music", "westgate"))
 	mkdirAll(t, filepath.Join(root, "build"))
@@ -161,18 +166,9 @@ haks:
 	}

 	output := stdout.String()
-	if !strings.Contains(output, "Build HAKs ----------") {
-		t.Fatalf("expected build header, got %q", output)
-	}
-	if !strings.Contains(output, "mapped: 1 music file(s); use --verbose to list mappings") {
-		t.Fatalf("expected compact mapping summary, got %q", output)
-	}
-	if strings.Contains(output, "AleandAnecdotes.mp3 -> mus_wg_andnc.bmu") {
+	if strings.Contains(output, "AleandAnecdotes.mp3") || strings.Contains(output, "mus_wg_andnc.bmu") {
 		t.Fatalf("did not expect verbose mapping in normal mode, got %q", output)
 	}
-	if !strings.Contains(output, "manifest: build/haks.json") {
-		t.Fatalf("expected relative manifest path, got %q", output)
-	}
 }

 func setTreeTime(t *testing.T, root string, modTime time.Time) {
@@ -241,15 +237,9 @@ haks:
 	}

 	output := stdout.String()
-	if !strings.Contains(output, "mappings:") {
-		t.Fatalf("expected verbose mappings header, got %q", output)
-	}
-	if !strings.Contains(output, "AleandAnecdotes.mp3 -> mus_wg_andnc.bmu") {
+	if !strings.Contains(output, "AleandAnecdotes.mp3") || !strings.Contains(output, "mus_wg_andnc.bmu") {
 		t.Fatalf("expected verbose mapping output, got %q", output)
 	}
-	if !strings.Contains(output, "wrote: envi (1 assets)") {
-		t.Fatalf("expected verbose archive action, got %q", output)
-	}
 }

 func TestTopdataConsoleSuppressesProgressInNormalMode(t *testing.T) {
@@ -292,16 +282,10 @@ func TestTopdataConsoleDebugProgressAndRelativePaths(t *testing.T) {
 	console.emitWikiDeployResult(10, 1, 2, 3, 4, 5, 6, 0, "/workspace/project/build/wiki/deploy-manifest.json")

 	output := stdout.String()
-	if !strings.Contains(output, "[debug] NodeBB wiki plan: create 1, update 2, skip 3, stale 4, archive 5, purge 6, drift 0") {
+	if !strings.Contains(output, "NodeBB wiki plan") {
 		t.Fatalf("expected debug progress line, got %q", output)
 	}
-	if !strings.Contains(output, "archived: 5") {
-		t.Fatalf("expected archived deploy count, got %q", output)
-	}
-	if !strings.Contains(output, "purged: 6") {
-		t.Fatalf("expected purged deploy count, got %q", output)
-	}
-	if !strings.Contains(output, "manifest: build/wiki/deploy-manifest.json") {
+	if !strings.Contains(output, "build/wiki/deploy-manifest.json") || strings.Contains(output, "/workspace/project/") {
 		t.Fatalf("expected relative deploy manifest path, got %q", output)
 	}
 }
@@ -359,7 +343,7 @@ func TestProjectConsoleEmitsRelativePaths(t *testing.T) {
 	})

 	output := stdout.String()
-	if !strings.Contains(output, "module: build/test.mod") {
+	if !strings.Contains(output, "build/test.mod") || strings.Contains(output, "/workspace/project/") {
 		t.Fatalf("expected relative module path, got %q", output)
 	}
 }
@@ -384,9 +368,8 @@ music:
 `)
 	writeFile(t, filepath.Join(root, "assets", "audio", "westgate", "Theme Song.mp3"), "source-mp3")

-	var stdout bytes.Buffer
 	ctx := context{
-		stdout: &stdout,
+		stdout: &bytes.Buffer{},
 		stderr: &bytes.Buffer{},
 		cwd:    root,
 		args:   []string{"music", "scan", "--dataset", "westgate_audio"},
@@ -395,10 +378,6 @@ music:
 	if err := runMusic(ctx); err != nil {
 		t.Fatalf("runMusic failed: %v", err)
 	}
-	output := stdout.String()
-	if !strings.Contains(output, "music scan") || !strings.Contains(output, "tracks: 1") {
-		t.Fatalf("unexpected music scan output: %q", output)
-	}
 	if _, err := os.Stat(filepath.Join(root, ".cache", "credits")); !os.IsNotExist(err) {
 		t.Fatalf("music scan should not write credits artifacts, stat err=%v", err)
 	}
@@ -433,8 +412,10 @@ music:
 	if err := runMusic(ctx); err != nil {
 		t.Fatalf("runMusic failed: %v", err)
 	}
-	if !strings.Contains(stdout.String(), "westgate_audio: source=audio/westgate output=generated/music prefix=wg_") {
-		t.Fatalf("unexpected dataset list: %q", stdout.String())
+	for _, value := range []string{"westgate_audio", "audio/westgate", "generated/music", "wg_"} {
+		if !strings.Contains(stdout.String(), value) {
+			t.Errorf("dataset list missing configured value %q: %q", value, stdout.String())
+		}
 	}
 }

@@ -459,12 +440,16 @@ paths:
 	if err := runConfig(ctx); err != nil {
 		t.Fatalf("runConfig failed: %v", err)
 	}
-	output := stdout.String()
-	if !strings.Contains(output, `"hak_manifest": "haks.json"`) {
-		t.Fatalf("expected HAK manifest default in effective config, got %q", output)
+	var effective map[string]any
+	if err := json.Unmarshal(stdout.Bytes(), &effective); err != nil {
+		t.Fatalf("effective config is not JSON: %v\n%s", err, stdout.String())
 	}
-	if !strings.Contains(output, `"paths.build":`) || !strings.Contains(output, `"toolkit default"`) {
-		t.Fatalf("expected default provenance in effective config, got %q", output)
+	provenance, ok := effective["provenance"].(map[string]any)
+	if !ok || len(provenance) == 0 {
+		t.Fatalf("effective config missing provenance: %#v", effective["provenance"])
+	}
+	if _, ok := provenance["paths.build"]; !ok {
+		t.Fatalf("effective config missing provenance for omitted paths.build: %#v", provenance)
 	}
 }

@@ -490,10 +475,10 @@ paths:
 		t.Fatalf("runConfig failed: %v", err)
 	}
 	output := stdout.String()
-	if !strings.Contains(output, "value: \"output\"") {
+	if !strings.Contains(output, "output") {
 		t.Fatalf("expected configured build value, got %q", output)
 	}
-	if !strings.Contains(output, "source: yaml") {
+	if !strings.Contains(strings.ToLower(output), "yaml") {
 		t.Fatalf("expected YAML source, got %q", output)
 	}
 }
@@ -510,9 +495,8 @@ paths:
  build: build
 `)

-	var stdout bytes.Buffer
 	ctx := context{
-		stdout: &stdout,
+		stdout: &bytes.Buffer{},
 		stderr: &bytes.Buffer{},
 		cwd:    root,
 		args:   []string{"config", "validate"},
@@ -521,9 +505,6 @@ paths:
 	if err := runConfig(ctx); err != nil {
 		t.Fatalf("runConfig failed: %v", err)
 	}
-	if !strings.Contains(stdout.String(), "config: ok") {
-		t.Fatalf("expected config validation output, got %q", stdout.String())
-	}
 }

 func TestRunConfigSourcesListsActiveOverrides(t *testing.T) {
@@ -549,25 +530,22 @@ paths:
 		t.Fatalf("runConfig failed: %v", err)
 	}
 	output := stdout.String()
-	if !strings.Contains(output, "active overrides:") {
-		t.Fatalf("expected active overrides section, got %q", output)
-	}
-	if !strings.Contains(output, "build.keep_existing_haks=1") {
+	if !strings.Contains(output, "build.keep_existing_haks") {
 		t.Fatalf("expected keep existing override, got %q", output)
 	}
 }

 func TestInlineFlagParsersRejectEmptyValues(t *testing.T) {
-	if _, err := parseBuildHAKArgs([]string{"--hak="}); err == nil || !strings.Contains(err.Error(), "--hak requires a value") {
+	if _, err := parseBuildHAKArgs([]string{"--hak="}); err == nil {
 		t.Fatalf("expected empty --hak inline value error, got %v", err)
 	}
-	if _, err := parseMusicCommandArgs([]string{"--dataset="}); err == nil || !strings.Contains(err.Error(), "--dataset requires a value") {
+	if _, err := parseMusicCommandArgs([]string{"--dataset="}); err == nil {
 		t.Fatalf("expected empty --dataset inline value error, got %v", err)
 	}
-	if _, err := parseDeployWikiArgs("deploy-wiki", []string{"--endpoint="}); err == nil || !strings.Contains(err.Error(), "--endpoint requires a value") {
+	if _, err := parseDeployWikiArgs("deploy-wiki", []string{"--endpoint="}); err == nil {
 		t.Fatalf("expected empty --endpoint inline value error, got %v", err)
 	}
-	if _, err := parseBuildChangelogArgs("build-changelog", []string{"--output="}); err == nil || !strings.Contains(err.Error(), "--output requires a value") {
+	if _, err := parseBuildChangelogArgs("build-changelog", []string{"--output="}); err == nil {
 		t.Fatalf("expected empty --output inline value error, got %v", err)
 	}
 }