Skip to content

Commit 9ff8f89

Browse files
Fix tests
1 parent 42eb15b commit 9ff8f89

File tree

3 files changed

+29
-8
lines changed

3 files changed

+29
-8
lines changed

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ path = "src/main.rs"
1717
[dependencies]
1818
chrono = "0.4.35"
1919
diff = "0.1.10"
20+
regex = "1.10.4"
2021
same-file = "1.0.6"
2122

2223
[dev-dependencies]

src/context_diff.rs

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,12 @@ mod tests {
433433
if f != 2 {
434434
bet.write_all(b"l\n").unwrap();
435435
}
436+
let _ = File::create(&format!("{target}/aalef")).unwrap();
436437
// This test diff is intentionally reversed.
437438
// We want it to turn the alef into bet.
438439
let diff = diff(
439440
&alef,
440-
"a/alef",
441+
&format!("{target}/aalef"),
441442
&bet,
442443
&format!("{target}/alef"),
443444
2,
@@ -512,11 +513,12 @@ mod tests {
512513
if f != 2 {
513514
bet.write_all(b"l\n").unwrap();
514515
}
516+
let _ = File::create(&format!("{target}/aalef_")).unwrap();
515517
// This test diff is intentionally reversed.
516518
// We want it to turn the alef into bet.
517519
let diff = diff(
518520
&alef,
519-
"a/alef_",
521+
&format!("{target}/aalef_"),
520522
&bet,
521523
&format!("{target}/alef_"),
522524
2,
@@ -594,11 +596,12 @@ mod tests {
594596
if alef.is_empty() && bet.is_empty() {
595597
continue;
596598
};
599+
let _ = File::create(&format!("{target}/aalefx")).unwrap();
597600
// This test diff is intentionally reversed.
598601
// We want it to turn the alef into bet.
599602
let diff = diff(
600603
&alef,
601-
"a/alefx",
604+
&format!("{target}/aalefx"),
602605
&bet,
603606
&format!("{target}/alefx"),
604607
2,
@@ -679,11 +682,12 @@ mod tests {
679682
if f != 2 {
680683
bet.write_all(b"f\n").unwrap();
681684
}
685+
let _ = File::create(&format!("{target}/aalefr")).unwrap();
682686
// This test diff is intentionally reversed.
683687
// We want it to turn the alef into bet.
684688
let diff = diff(
685689
&alef,
686-
"a/alefr",
690+
&format!("{target}/aalefr"),
687691
&bet,
688692
&format!("{target}/alefr"),
689693
2,
@@ -720,9 +724,15 @@ mod tests {
720724

721725
#[test]
722726
fn test_stop_early() {
727+
use regex::Regex;
728+
use std::fs::File;
729+
use std::str;
730+
723731
let from_filename = "foo";
732+
let _ = File::create(&format!("foo")).unwrap();
724733
let from = vec!["a", "b", "c", ""].join("\n");
725734
let to_filename = "bar";
735+
let _ = File::create(&format!("bar")).unwrap();
726736
let to = vec!["a", "d", "c", ""].join("\n");
727737
let context_size: usize = 3;
728738

@@ -734,6 +744,11 @@ mod tests {
734744
context_size,
735745
false,
736746
);
747+
748+
let diff_full_text = str::from_utf8(&diff_full).unwrap();
749+
let re = Regex::new(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [+-]\d{4}").unwrap();
750+
let diff_full = re.replace_all(diff_full_text, "");
751+
737752
let expected_full = vec![
738753
"*** foo\t",
739754
"--- bar\t",
@@ -749,7 +764,7 @@ mod tests {
749764
"",
750765
]
751766
.join("\n");
752-
assert_eq!(diff_full, expected_full.as_bytes());
767+
assert_eq!(diff_full, expected_full);
753768

754769
let diff_brief = diff(
755770
from.as_bytes(),
@@ -759,8 +774,12 @@ mod tests {
759774
context_size,
760775
true,
761776
);
777+
778+
let diff_brief_text = str::from_utf8(&diff_brief).unwrap();
779+
let re = Regex::new(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [+-]\d{4}").unwrap();
780+
let diff_brief = re.replace_all(diff_brief_text, "");
762781
let expected_brief = vec!["*** foo\t", "--- bar\t", ""].join("\n");
763-
assert_eq!(diff_brief, expected_brief.as_bytes());
782+
assert_eq!(diff_brief, expected_brief);
764783

765784
let nodiff_full = diff(
766785
from.as_bytes(),

0 commit comments

Comments
 (0)