mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize test newlines

Browse Source 
Tests pass with CRLF newlines now
This commit is contained in:
Christopher Durham 2018-01-27 19:17:05 -05:00
parent e6e61251ab
commit 58ff03086f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/testutils/src/lib.rs
View File

@ -6,6 +6,21 @@
use difference::Changeset;
/// Read file and normalize newlines.
///
/// `rustc` seems to always normalize `\r\n` newlines to `\n`:
///
/// ```
/// let s = "
/// ";
/// assert_eq!(s.as_bytes(), &[10]);
/// ```
///
/// so this should always be correct.
fn read_text(path: &Path) -> String {
file::get_text(path).unwrap().replace("\r\n", "\n")
}
pub fn dir_tests<F>(
paths: &[&str],
f: F
@ -15,7 +30,7 @@ pub fn dir_tests<F>(
{
for path in collect_tests(paths) {
let actual = {
let text = file::get_text(&path).unwrap();
let text = read_text(&path);
f(&text)
};
let path = path.with_extension("txt");
@ -25,7 +40,7 @@ pub fn dir_tests<F>(
file::put_text(&path, actual).unwrap();
panic!("No expected result")
}
let expected = file::get_text(&path).unwrap();
let expected = read_text(&path);
let expected = expected.as_str();
let actual = actual.as_str();
assert_equal_text(expected, actual, &path);