mirror of
https://github.com/rtk-ai/rtk.git
synced 2026-09-19 07:33:17 +08:00
Ben Younes
0cb34acccb
rtk diff compared files via str::lines(), which strips a trailing \r and drops a trailing newline. CRLF-vs-LF and trailing-newline-only differences therefore produced an empty line-diff and were reported as "[ok] Files are identical" with exit 0 — a false-equal result that defeats rtk diff used to verify two files are equal. Guard the identical branch with a byte comparison: only claim identical when the bytes truly match; otherwise surface the whitespace/line-ending difference and exit 1 per the diff convention. Fixes #3469 Co-authored-by: Luca "Hydr0gen" Vitale <78725363+Hydr0gen19@users.noreply.github.com>
47 lines
1.5 KiB
Rust
47 lines
1.5 KiB
Rust
use std::fs;
|
|
use std::path::Path;
|
|
use std::process::{Command, Output};
|
|
|
|
const RTK_BIN: &str = env!("CARGO_BIN_EXE_rtk");
|
|
const DIFF_SUBCOMMAND: &str = "diff";
|
|
const LF_FILE: &str = "lf.txt";
|
|
const CRLF_FILE: &str = "crlf.txt";
|
|
const LF_CONTENT: &str = "alpha\nbeta\n";
|
|
const CRLF_CONTENT: &str = "alpha\r\nbeta\r\n";
|
|
const WHITESPACE_ONLY_MESSAGE: &str = "whitespace or line endings";
|
|
const IDENTICAL_MESSAGE: &str = "[ok] Files are identical";
|
|
const DIFF_EXIT_CODE: i32 = 1;
|
|
|
|
fn run_rtk_diff(file1: &Path, file2: &Path) -> Output {
|
|
let file1 = file1.display().to_string();
|
|
let file2 = file2.display().to_string();
|
|
|
|
Command::new(RTK_BIN)
|
|
.args([DIFF_SUBCOMMAND, &file1, &file2])
|
|
.output()
|
|
.expect("run rtk diff")
|
|
}
|
|
|
|
#[test]
|
|
fn small_crlf_vs_lf_diff_prints_whitespace_message() {
|
|
let dir = tempfile::tempdir().expect("tempdir");
|
|
let lf = dir.path().join(LF_FILE);
|
|
let crlf = dir.path().join(CRLF_FILE);
|
|
|
|
fs::write(&lf, LF_CONTENT).expect("write LF fixture");
|
|
fs::write(&crlf, CRLF_CONTENT).expect("write CRLF fixture");
|
|
|
|
let output = run_rtk_diff(&lf, &crlf);
|
|
let stdout = String::from_utf8(output.stdout).expect("stdout utf8");
|
|
|
|
assert_eq!(output.status.code(), Some(DIFF_EXIT_CODE), "{stdout}");
|
|
assert!(
|
|
stdout.contains(WHITESPACE_ONLY_MESSAGE),
|
|
"small CRLF-vs-LF diff should explain the byte-only difference:\n{stdout}"
|
|
);
|
|
assert!(
|
|
!stdout.contains(IDENTICAL_MESSAGE),
|
|
"byte-different files must not be reported identical:\n{stdout}"
|
|
);
|
|
}
|