test: add nvchecker config patch and mock tools to harness

- Patch NVCHECKER_CONFIG in run_mkhint() sed block
- Add nvchecker.toml + new_ver.json/old_ver.json fixtures in setup()
- Add github (ghpkg) and pypi (pypkg) .info fixtures
- Add mock_nvchecker_tools() with no-op nvchecker and logging nvtake
- Call mock_nvchecker_tools after mock_wget

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

1 files changed, 211 insertions, 0 deletions

diff --git a/tests/mkhint_test.sh b/tests/mkhint_test.sh
index dbcc86a..591c163 100755
--- a/tests/mkhint_test.sh
+++ b/tests/mkhint_test.sh
@@ -15,6 +15,8 @@ setup() {
     mkdir -p "$MOCK_REPO/network/curl" \
              "$MOCK_REPO/development/protoc-gen-go-grpc" \
              "$MOCK_REPO/development/clion" \
+             "$MOCK_REPO/development/ghpkg" \
+             "$MOCK_REPO/python/pypkg" \
              "$MOCK_HINT" \
              "$MOCK_TMP"
 
@@ -61,6 +63,44 @@ REQUIRES=""
 MAINTAINER="Test"
 EMAIL="test@test.com"
 EOF
+
+    cat > "$MOCK_REPO/development/ghpkg/ghpkg.info" << 'EOF'
+PRGNAM="ghpkg"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/someowner/ghpkg"
+DOWNLOAD="https://github.com/someowner/ghpkg/archive/v1.0.0/ghpkg-1.0.0.tar.gz"
+MD5SUM="11111111111111111111111111111111"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Test"
+EMAIL="test@test.com"
+EOF
+
+    cat > "$MOCK_REPO/python/pypkg/pypkg.info" << 'EOF'
+PRGNAM="pypkg"
+VERSION="2.0.0"
+HOMEPAGE="https://pypi.org/project/pypkg/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pypkg/pypkg-2.0.0.tar.gz"
+MD5SUM="22222222222222222222222222222222"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Test"
+EMAIL="test@test.com"
+EOF
+
+    # nvchecker config + keyfile for tests
+    cat > "$MOCK_BASE/nvchecker.toml" << EOF
+[__config__]
+oldver = "$MOCK_BASE/old_ver.json"
+newver = "$MOCK_BASE/new_ver.json"
+EOF
+    # keyfile pre-seeded with versions the mock nvchecker will "find"
+    cat > "$MOCK_BASE/new_ver.json" << 'EOF'
+{ "version": 2, "data": { "curl": { "version": "8.9.0" }, "clion": { "version": "2025.4" } } }
+EOF
+    cp "$MOCK_BASE/new_ver.json" "$MOCK_BASE/old_ver.json"
 }
 
 teardown() {
@@ -74,6 +114,7 @@ run_mkhint() {
         -e "s|REPO_DIR=\".*\"|REPO_DIR=\"$MOCK_REPO\"|" \
         -e "s|HINT_DIR=\".*\"|HINT_DIR=\"$MOCK_HINT\"|" \
         -e "s|TMP_DIR=\".*\"|TMP_DIR=\"$MOCK_TMP\"|" \
+        -e "s|NVCHECKER_CONFIG=\".*\"|NVCHECKER_CONFIG=\"$MOCK_BASE/nvchecker.toml\"|" \
         "$SCRIPT" > "$tmp_script"
     bash "$tmp_script" "$@"
     local rc=$?
@@ -103,6 +144,30 @@ EOF
     export PATH="$MOCK_BASE/bin:$PATH"
 }
 
+# Mock nvchecker, nvtake into $MOCK_BASE/bin (real jq used if present)
+mock_nvchecker_tools() {
+    mkdir -p "$MOCK_BASE/bin"
+
+    # nvchecker: no-op success (keyfile is pre-seeded by setup/tests)
+    cat > "$MOCK_BASE/bin/nvchecker" << 'EOF'
+#!/bin/bash
+exit 0
+EOF
+    chmod +x "$MOCK_BASE/bin/nvchecker"
+
+    # nvtake: record invocations, otherwise no-op
+    cat > "$MOCK_BASE/bin/nvtake" << EOF
+#!/bin/bash
+echo "nvtake \$*" >> "$MOCK_BASE/nvtake.log"
+exit 0
+EOF
+    chmod +x "$MOCK_BASE/bin/nvtake"
+
+    if ! command -v jq &> /dev/null; then
+        echo "WARNING: real jq not found; install jq to run nvchecker tests" >&2
+    fi
+}
+
 assert_contains() {
     local desc="$1" file="$2" pattern="$3"
     if grep -q "$pattern" "$file" 2>/dev/null; then
@@ -175,6 +240,7 @@ echo "========================================"
 
 setup
 mock_wget
+mock_nvchecker_tools
 
 # ── T1: --new from .info, no version ──────────────────────────────────────────
 echo ""
@@ -333,6 +399,151 @@ run_mkhint -c
 assert_file_not_exists "a.bak removed"           "$MOCK_HINT/a.hint.bak"
 assert_file_not_exists "b.bak removed"           "$MOCK_HINT/b.hint.bak"
 
+# ── T16: --new github .info → github source section ───────────────────────────
+echo ""
+echo "T16: --new github .info → [pkg] source=github appended"
+run_mkhint -n ghpkg
+assert_contains "github section header"  "$MOCK_BASE/nvchecker.toml" '\[ghpkg\]'
+assert_contains "github source"          "$MOCK_BASE/nvchecker.toml" 'source = "github"'
+assert_contains "github owner/repo"      "$MOCK_BASE/nvchecker.toml" 'github = "someowner/ghpkg"'
+
+# ── T17: --new pypi .info → pypi source section ───────────────────────────────
+echo ""
+echo "T17: --new pypi .info → [pkg] source=pypi appended"
+run_mkhint -n pypkg
+assert_contains "pypi section header"     "$MOCK_BASE/nvchecker.toml" '\[pypkg\]'
+assert_contains "pypi source"             "$MOCK_BASE/nvchecker.toml" 'source = "pypi"'
+assert_contains "pypi name"               "$MOCK_BASE/nvchecker.toml" 'pypi = "pypkg"'
+
+# ── T18: --new unrecognised URL → commented stub ──────────────────────────────
+echo ""
+echo "T18: --new unknown source → commented stub appended"
+run_mkhint -n clion
+assert_contains "clion section header"    "$MOCK_BASE/nvchecker.toml" '\[clion\]'
+assert_contains "stub TODO"               "$MOCK_BASE/nvchecker.toml" 'TODO: configure nvchecker source'
+
+# ── T19: --new when [pkg] already present → no duplicate ───────────────────────
+echo ""
+echo "T19: --new when section exists → not duplicated"
+run_mkhint -n ghpkg  # ghpkg section already added in T16
+dup_count=$(grep -c '^\[ghpkg\]' "$MOCK_BASE/nvchecker.toml")
+assert_exit_code "ghpkg section appears once" 1 "$dup_count"
+
+# ── T20: --hintfile no -v, accept suggestion → VERSION=latest, nvtake called ───
+echo ""
+echo "T20: --hintfile no -v, accept suggestion"
+cat > "$MOCK_HINT/curl.hint" << 'EOF'
+VERSION="8.5.0"
+ARCH="x86_64"
+DOWNLOAD="https://curl.se/download/curl-8.5.0.tar.gz"
+MD5SUM="abc123def456abc123def456abc123de"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+EOF
+rm -f "$MOCK_BASE/nvtake.log"
+# blank = accept latest (8.9.0 from keyfile); n = skip slackrepo
+run_mkhint -f curl < <(printf '\nn\n')
+assert_contains "VERSION set to latest"   "$MOCK_HINT/curl.hint" 'VERSION="8.9.0"'
+assert_contains "URL has latest version"  "$MOCK_HINT/curl.hint" 'curl-8.9.0'
+assert_file_exists "nvtake was called"    "$MOCK_BASE/nvtake.log"
+
+# ── T21: --hintfile no -v, type override version ──────────────────────────────
+echo ""
+echo "T21: --hintfile no -v, type override version"
+cat > "$MOCK_HINT/curl.hint" << 'EOF'
+VERSION="8.5.0"
+ARCH="x86_64"
+DOWNLOAD="https://curl.se/download/curl-8.5.0.tar.gz"
+MD5SUM="abc123def456abc123def456abc123de"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+EOF
+run_mkhint -f curl < <(printf '8.8.8\nn\n')
+assert_contains "VERSION = typed value"   "$MOCK_HINT/curl.hint" 'VERSION="8.8.8"'
+assert_contains "URL has typed version"   "$MOCK_HINT/curl.hint" 'curl-8.8.8'
+
+# ── T22: --hintfile no -v, package absent from keyfile → graceful abort ────────
+echo ""
+echo "T22: --hintfile no -v, package absent from keyfile → error, hint untouched"
+cat > "$MOCK_HINT/protoc-gen-go-grpc.hint" << 'EOF'
+VERSION="1.3.0"
+ARCH="x86_64"
+DOWNLOAD="https://example.com/x-1.3.0.tar.gz"
+MD5SUM="33333333333333333333333333333333"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+EOF
+set +e
+run_mkhint -f protoc-gen-go-grpc < <(printf '\n') >/dev/null 2>&1
+code=$?
+set -e
+assert_exit_code "graceful abort on no result" 0 "$code"
+assert_contains  "hint version unchanged"      "$MOCK_HINT/protoc-gen-go-grpc.hint" 'VERSION="1.3.0"'
+
+# ── T23: --check one outdated, confirm → updated + nvtake + slackrepo prompt ───
+echo ""
+echo "T23: --check single outdated package, confirm update"
+cat > "$MOCK_BASE/new_ver.json" << 'EOF'
+{ "version": 2, "data": { "curl": { "version": "8.9.0" } } }
+EOF
+cat > "$MOCK_HINT/curl.hint" << 'EOF'
+VERSION="8.5.0"
+ARCH="x86_64"
+DOWNLOAD="https://curl.se/download/curl-8.5.0.tar.gz"
+MD5SUM="abc123def456abc123def456abc123de"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+EOF
+rm -f "$MOCK_HINT/clion.hint" "$MOCK_HINT/protoc-gen-go-grpc.hint" "$MOCK_HINT"/*.bak 2>/dev/null
+rm -f "$MOCK_BASE/nvtake.log"
+run_mkhint -C curl < <(printf 'Y\nn\n')
+assert_contains "curl updated to 8.9.0"   "$MOCK_HINT/curl.hint" 'VERSION="8.9.0"'
+assert_file_exists "nvtake called"        "$MOCK_BASE/nvtake.log"
+
+# ── T24: --check all current → 'all up to date', no slackrepo ──────────────────
+echo ""
+echo "T24: --check when everything current"
+out=$(run_mkhint -C curl < <(printf '\n') 2>&1)
+echo "$out" | grep -q "all up to date" \
+    && { echo "  PASS: reports all up to date"; (( PASS++ )); } \
+    || { echo "  FAIL: did not report all up to date"; (( FAIL++ )); ERRORS+=("T24 up to date"); }
+
+# ── T25: --check two outdated, decline first accept second ─────────────────────
+echo ""
+echo "T25: --check two outdated, decline first accept second"
+cat > "$MOCK_BASE/new_ver.json" << 'EOF'
+{ "version": 2, "data": { "curl": { "version": "9.0.0" }, "clion": { "version": "2025.5" } } }
+EOF
+cat > "$MOCK_HINT/curl.hint" << 'EOF'
+VERSION="8.9.0"
+ARCH="x86_64"
+DOWNLOAD="https://curl.se/download/curl-8.9.0.tar.gz"
+MD5SUM="abc123def456abc123def456abc123de"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+EOF
+cat > "$MOCK_HINT/clion.hint" << 'EOF'
+VERSION="2025.4"
+ARCH="x86_64"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.jetbrains.com/cpp/CLion-2025.4.tar.gz"
+MD5SUM_x86_64="dff91fe793b8d3ee2446dd340288eef5"
+EOF
+# explicit order curl clion → answers: n (decline curl), Y (accept clion), n (slackrepo)
+run_mkhint -C curl clion < <(printf 'n\nY\nn\n')
+assert_contains     "curl declined (unchanged)"  "$MOCK_HINT/curl.hint"  'VERSION="8.9.0"'
+assert_contains     "clion accepted (updated)"   "$MOCK_HINT/clion.hint" 'VERSION="2025.5"'
+
+# ── T26: --check with -v → mutually-exclusive error exit 1 ─────────────────────
+echo ""
+echo "T26: --check combined with -v → exit 1"
+set +e
+run_mkhint -C -v 1.0 2>/dev/null
+code=$?
+set -e
+assert_exit_code "check + -v exits 1" 1 "$code"
+
 # ─── SUMMARY ──────────────────────────────────────────────────────────────────
 teardown