refactor: move unit tests into <module>_tests.rs files

CONTRIBUTING.md

@@ -45,7 +45,8 @@ examples/      Working reference configurations
 
 ## Making changes
 
-- **New checklist logic** — add to `core/src/run.rs`; unit tests live in the same file
+- **New checklist logic** — add to `core/src/run.rs`; unit tests live in `core/src/run_tests.rs`
+- **Unit tests** — each module `<x>.rs` keeps its unit tests in a sibling `<x>_tests.rs`, declared with `#[cfg(test)] #[path = "<x>_tests.rs"] mod tests;`. Property tests go in `<x>_proptest_tests.rs`
 - **CEL evaluation** — `core/src/cel_eval.rs`
 - **Mermaid parsing** — `core/src/flow.rs`
 - **Shell scripts** — edit `core/scripts/ack.sh`; the binary embeds it via `include_str!` so a rebuild picks up your changes

core/Cargo.toml

@@ -11,6 +11,8 @@ readme = "README.md"
 keywords = ["ai", "hooks", "quality-gate", "polyhook", "checklist"]
 categories = ["development-tools", "command-line-utilities"]
 exclude = ["Architecture.md", "deny.toml"]
+# Only src/bin/main.rs is a binary; src/bin/main_tests.rs holds its unit tests.
+autobins = false
 
 [package.metadata.docs.rs]
 all-features = true
@@ -83,6 +85,7 @@ wildcard_imports = "deny"
 enum_glob_use = "deny"
 single_match_else = "deny"
 manual_let_else = "deny"
+items_after_statements = "deny"
 
 [dependencies]
 cel-interpreter = "0.10"

core/src/audit.rs

@@ -26,30 +26,5 @@ pub fn append(steplock_dir: &Path, event: &str, checklist: &str, state: &str, se
 
 #[cfg(test)]
 #[allow(clippy::indexing_slicing, clippy::unwrap_used)]
-mod tests {
-    use super::*;
-    use std::fs;
-    use tempfile::TempDir;
-
-    #[test]
-    fn appends_jsonl_line() {
-        let tmp = TempDir::new().unwrap();
-        append(tmp.path(), "block", "my-checklist", "step_one", "sess-abc");
-        let content = fs::read_to_string(tmp.path().join("audit.log")).unwrap();
-        let parsed: serde_json::Value = serde_json::from_str(content.trim()).unwrap();
-        assert_eq!(parsed["event"], "block");
-        assert_eq!(parsed["checklist"], "my-checklist");
-        assert_eq!(parsed["state"], "step_one");
-        assert_eq!(parsed["session"], "sess-abc");
-        assert!(parsed["ts"].is_string());
-    }
-
-    #[test]
-    fn appends_multiple_lines() {
-        let tmp = TempDir::new().unwrap();
-        append(tmp.path(), "block", "cl", "s1", "sess");
-        append(tmp.path(), "ack", "cl", "s1", "sess");
-        let content = fs::read_to_string(tmp.path().join("audit.log")).unwrap();
-        assert_eq!(content.lines().count(), 2);
-    }
-}
+#[path = "audit_tests.rs"]
+mod tests;

core/src/audit_tests.rs

@@ -0,0 +1,26 @@
+//! Unit tests for `audit`.
+use super::*;
+use std::fs;
+use tempfile::TempDir;
+
+#[test]
+fn appends_jsonl_line() {
+    let tmp = TempDir::new().unwrap();
+    append(tmp.path(), "block", "my-checklist", "step_one", "sess-abc");
+    let content = fs::read_to_string(tmp.path().join("audit.log")).unwrap();
+    let parsed: serde_json::Value = serde_json::from_str(content.trim()).unwrap();
+    assert_eq!(parsed["event"], "block");
+    assert_eq!(parsed["checklist"], "my-checklist");
+    assert_eq!(parsed["state"], "step_one");
+    assert_eq!(parsed["session"], "sess-abc");
+    assert!(parsed["ts"].is_string());
+}
+
+#[test]
+fn appends_multiple_lines() {
+    let tmp = TempDir::new().unwrap();
+    append(tmp.path(), "block", "cl", "s1", "sess");
+    append(tmp.path(), "ack", "cl", "s1", "sess");
+    let content = fs::read_to_string(tmp.path().join("audit.log")).unwrap();
+    assert_eq!(content.lines().count(), 2);
+}

core/src/bin/main.rs

@@ -293,305 +293,5 @@ fn find_repo_root_from(start: &Path) -> Option<PathBuf> {
 
 #[cfg(test)]
 #[allow(clippy::unwrap_used)]
-mod tests {
-    use super::*;
-    use std::fs;
-    use tempfile::TempDir;
-
-    fn claude_stdin(cmd: &str, session: &str) -> String {
-        serde_json::json!({
-            "hook_event_name": "PreToolUse",
-            "tool_name": "Bash",
-            "tool_input": { "command": cmd },
-            "tool_output": {},
-            "session_id": session
-        })
-        .to_string()
-    }
-
-    fn setup_checklist(root: &Path) {
-        let cl_dir = root.join(".steplock/checklists/quality-gate");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(
-            cl_dir.join("config.toml"),
-            r#"on_event = "tool:before"
-on_tool = "bash"
-match_input = "input.command.contains('git push')"
-reset = "session"
-"#,
-        )
-        .unwrap();
-        fs::write(
-            cl_dir.join("flow.mmd"),
-            r"stateDiagram-v2
-    [*] --> check
-    check --> [*]
-    check: Did you check?
-",
-        )
-        .unwrap();
-    }
-
-    #[test]
-    fn polyhook_event_maps_correctly() {
-        let stdin = claude_stdin("git push origin main", "s1");
-        let ph_event = parse::parse_event(stdin.as_bytes()).unwrap();
-        let event = polyhook_to_hook_event(ph_event);
-        assert_eq!(event.event, "tool:before");
-        assert_eq!(event.tool, "bash");
-        assert_eq!(event.session_id, "s1");
-        assert_eq!(event.caller, "claude-code");
-        assert_eq!(
-            event.input.get("command").and_then(|v| v.as_str()),
-            Some("git push origin main")
-        );
-    }
-
-    #[test]
-    fn run_app_approves_non_matching_command() {
-        let tmp = TempDir::new().unwrap();
-        setup_checklist(tmp.path());
-        let stdin = claude_stdin("ls -la", "s1");
-        let resp = run_app(stdin.as_bytes(), tmp.path(), None).unwrap();
-        assert!(matches!(resp, polyhook::HookResponse::ApproveResponse(_)));
-    }
-
-    #[test]
-    fn run_app_blocks_matching_command() {
-        let tmp = TempDir::new().unwrap();
-        setup_checklist(tmp.path());
-        let stdin = claude_stdin("git push origin main", "s1");
-        let resp = run_app(stdin.as_bytes(), tmp.path(), None).unwrap();
-        assert!(matches!(resp, polyhook::HookResponse::BlockResponse(_)));
-    }
-
-    #[test]
-    fn run_app_error_on_invalid_input() {
-        let tmp = TempDir::new().unwrap();
-        let err = run_app(b"not valid json".as_ref(), tmp.path(), None);
-        assert!(err.is_err());
-        assert!(err
-            .unwrap_err()
-            .contains("steplock: failed to read hook input"));
-    }
-
-    #[test]
-    fn run_app_error_on_invalid_cel_expression() {
-        let tmp = TempDir::new().unwrap();
-        let cl_dir = tmp.path().join(".steplock/checklists/bad-gate");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(
-            cl_dir.join("config.toml"),
-            r#"on_event = "tool:before"
-on_tool = "bash"
-match_input = "!!!invalid cel!!!"
-reset = "session"
-"#,
-        )
-        .unwrap();
-        fs::write(
-            cl_dir.join("flow.mmd"),
-            "stateDiagram-v2\n    [*] --> check\n    check --> [*]\n    check: Check\n",
-        )
-        .unwrap();
-        let stdin = claude_stdin("anything", "s1");
-        let err = run_app(stdin.as_bytes(), tmp.path(), None);
-        assert!(err.is_err());
-        assert!(err.unwrap_err().contains("steplock: error:"));
-    }
-
-    #[test]
-    fn find_repo_root_finds_steplock_dir() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir(tmp.path().join(".steplock")).unwrap();
-        let root = find_repo_root_from(tmp.path()).unwrap();
-        assert_eq!(root, tmp.path());
-    }
-
-    #[test]
-    fn find_repo_root_walks_up() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir(tmp.path().join(".steplock")).unwrap();
-        let subdir = tmp.path().join("a/b/c");
-        fs::create_dir_all(&subdir).unwrap();
-        let root = find_repo_root_from(&subdir).unwrap();
-        assert_eq!(root, tmp.path());
-    }
-
-    #[test]
-    fn find_repo_root_returns_none_when_not_found() {
-        let tmp = TempDir::new().unwrap();
-        let result = find_repo_root_from(tmp.path());
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn init_creates_checklists_dir_and_gitignore() {
-        let tmp = TempDir::new().unwrap();
-        run_init(tmp.path()).unwrap();
-        assert!(tmp.path().join(".steplock/checklists").is_dir());
-        let gitignore = fs::read_to_string(tmp.path().join(".steplock/.gitignore")).unwrap();
-        assert!(gitignore.contains("sessions/"));
-        assert!(gitignore.contains("audit.log"));
-    }
-
-    #[test]
-    fn init_scaffolds_sample_checklist() {
-        let tmp = TempDir::new().unwrap();
-        run_init(tmp.path()).unwrap();
-        let sample = tmp.path().join(".steplock/checklists/example-gate");
-        assert!(sample.join("config.toml").exists());
-        assert!(sample.join("flow.mmd").exists());
-        let cfg = fs::read_to_string(sample.join("config.toml")).unwrap();
-        assert!(cfg.contains("git push"));
-        let flow = fs::read_to_string(sample.join("flow.mmd")).unwrap();
-        assert!(flow.contains("stateDiagram-v2"));
-    }
-
-    #[test]
-    fn init_sample_checklist_is_valid() {
-        let tmp = TempDir::new().unwrap();
-        run_init(tmp.path()).unwrap();
-        let stdin = claude_stdin("git push origin main", "s1");
-        let resp = run_app(stdin.as_bytes(), tmp.path(), None).unwrap();
-        assert!(matches!(resp, polyhook::HookResponse::BlockResponse(_)));
-    }
-
-    #[test]
-    fn init_is_idempotent_when_checklists_exists() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir_all(tmp.path().join(".steplock/checklists")).unwrap();
-        run_init(tmp.path()).unwrap();
-    }
-
-    #[test]
-    fn clean_removes_session_dirs() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir_all(tmp.path().join(".steplock/sessions/sess-abc/gate")).unwrap();
-        fs::create_dir_all(tmp.path().join(".steplock/sessions/sess-xyz/gate")).unwrap();
-        run_clean(tmp.path()).unwrap();
-        assert!(!tmp.path().join(".steplock/sessions/sess-abc").exists());
-        assert!(!tmp.path().join(".steplock/sessions/sess-xyz").exists());
-    }
-
-    #[test]
-    fn clean_removes_fallback_id_file() {
-        let tmp = TempDir::new().unwrap();
-        let sessions = tmp.path().join(".steplock/sessions");
-        fs::create_dir_all(&sessions).unwrap();
-        fs::write(sessions.join("fallback-id"), "some-uuid").unwrap();
-        run_clean(tmp.path()).unwrap();
-        assert!(!sessions.join("fallback-id").exists());
-    }
-
-    #[test]
-    fn clean_is_noop_when_no_sessions_dir() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir_all(tmp.path().join(".steplock/checklists")).unwrap();
-        run_clean(tmp.path()).unwrap();
-    }
-
-    #[test]
-    fn clean_is_noop_when_no_steplock_dir() {
-        let tmp = TempDir::new().unwrap();
-        run_clean(tmp.path()).unwrap();
-    }
-
-    #[test]
-    fn clean_leaves_sessions_dir_intact() {
-        let tmp = TempDir::new().unwrap();
-        let sessions = tmp.path().join(".steplock/sessions");
-        fs::create_dir_all(sessions.join("sess-1/gate")).unwrap();
-        run_clean(tmp.path()).unwrap();
-        assert!(sessions.exists());
-    }
-
-    #[test]
-    fn validate_returns_true_when_no_checklists_dir() {
-        let tmp = TempDir::new().unwrap();
-        assert!(run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_true_when_checklists_empty() {
-        let tmp = TempDir::new().unwrap();
-        fs::create_dir_all(tmp.path().join(".steplock/checklists")).unwrap();
-        assert!(run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_true_for_valid_checklist() {
-        let tmp = TempDir::new().unwrap();
-        setup_checklist(tmp.path());
-        assert!(run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_false_when_config_toml_missing() {
-        let tmp = TempDir::new().unwrap();
-        let cl_dir = tmp.path().join(".steplock/checklists/no-config");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(
-            cl_dir.join("flow.mmd"),
-            "stateDiagram-v2\n    [*] --> s\n    s --> [*]\n    s: Step\n",
-        )
-        .unwrap();
-        assert!(!run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_false_when_flow_mmd_missing() {
-        let tmp = TempDir::new().unwrap();
-        let cl_dir = tmp.path().join(".steplock/checklists/no-flow");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(
-            cl_dir.join("config.toml"),
-            "on_event = \"tool:before\"\nreset = \"session\"\n",
-        )
-        .unwrap();
-        assert!(!run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_false_for_invalid_config_toml() {
-        let tmp = TempDir::new().unwrap();
-        let cl_dir = tmp.path().join(".steplock/checklists/bad-config");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(cl_dir.join("config.toml"), "not valid toml !!!").unwrap();
-        fs::write(
-            cl_dir.join("flow.mmd"),
-            "stateDiagram-v2\n    [*] --> s\n    s --> [*]\n    s: Step\n",
-        )
-        .unwrap();
-        assert!(!run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_returns_false_for_invalid_flow_mmd() {
-        let tmp = TempDir::new().unwrap();
-        let cl_dir = tmp.path().join(".steplock/checklists/bad-flow");
-        fs::create_dir_all(&cl_dir).unwrap();
-        fs::write(
-            cl_dir.join("config.toml"),
-            "on_event = \"tool:before\"\nreset = \"session\"\n",
-        )
-        .unwrap();
-        fs::write(cl_dir.join("flow.mmd"), "stateDiagram-v2\n    a --> b\n").unwrap();
-        assert!(!run_validate(tmp.path(), None).unwrap());
-    }
-
-    #[test]
-    fn validate_continues_checking_all_checklists_after_failure() {
-        let tmp = TempDir::new().unwrap();
-        setup_checklist(tmp.path());
-        let bad_dir = tmp.path().join(".steplock/checklists/0-bad");
-        fs::create_dir_all(&bad_dir).unwrap();
-        fs::write(bad_dir.join("config.toml"), "not valid").unwrap();
-        fs::write(
-            bad_dir.join("flow.mmd"),
-            "stateDiagram-v2\n    [*] --> s\n    s --> [*]\n    s: Step\n",
-        )
-        .unwrap();
-        assert!(!run_validate(tmp.path(), None).unwrap());
-    }
-}
+#[path = "main_tests.rs"]
+mod tests;