Skip to content

Add expect -- a light-weight alternative to insta #5101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions crates/expect/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "expect"
version = "0.1.0"
authors = ["rust-analyzer developers"]
edition = "2018"

[dependencies]
once_cell = "1"
difference = "2"
stdx = { path = "../stdx" }
293 changes: 293 additions & 0 deletions crates/expect/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
//! Snapshot testing library, see
//! https://github.com/rust-analyzer/rust-analyzer/pull/5101
use std::{
collections::HashMap,
env, fmt, fs,
ops::Range,
panic,
path::{Path, PathBuf},
sync::Mutex,
};

use difference::Changeset;
use once_cell::sync::Lazy;
use stdx::{lines_with_ends, trim_indent};

const HELP: &str = "
You can update all `expect![[]]` tests by:

env UPDATE_EXPECT=1 cargo test

To update a single test, place the cursor on `expect` token and use `run` feature of rust-analyzer.
";

fn update_expect() -> bool {
env::var("UPDATE_EXPECT").is_ok()
}

/// expect![[""]]
#[macro_export]
macro_rules! expect {
[[$lit:literal]] => {$crate::Expect {
file: file!(),
line: line!(),
column: column!(),
data: $lit,
}};
[[]] => { $crate::expect![[""]] };
}

#[derive(Debug)]
pub struct Expect {
pub file: &'static str,
pub line: u32,
pub column: u32,
pub data: &'static str,
}

impl Expect {
pub fn assert_eq(&self, actual: &str) {
let trimmed = self.trimmed();
if &trimmed == actual {
return;
}
Runtime::fail(self, &trimmed, actual);
}
pub fn assert_debug_eq(&self, actual: &impl fmt::Debug) {
let actual = format!("{:#?}\n", actual);
self.assert_eq(&actual)
}

fn trimmed(&self) -> String {
if !self.data.contains('\n') {
return self.data.to_string();
}
trim_indent(self.data)
}

fn locate(&self, file: &str) -> Location {
let mut target_line = None;
let mut line_start = 0;
for (i, line) in lines_with_ends(file).enumerate() {
if i == self.line as usize - 1 {
let pat = "expect![[";
let offset = line.find(pat).unwrap();
let literal_start = line_start + offset + pat.len();
let indent = line.chars().take_while(|&it| it == ' ').count();
target_line = Some((literal_start, indent));
break;
}
line_start += line.len();
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if you write expect![ [? I think it should give an error in that case instead of just silently going to the end of the file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that detecting this error condition doesn't worth additional code complexity. Another bug here is that we might hit false positive on ]], but I think that should be acceptable for internal tool. We can always wait until someone actually hits the case :)

let (literal_start, line_indent) = target_line.unwrap();
let literal_length =
file[literal_start..].find("]]").expect("Couldn't find matching `]]` for `expect![[`.");
let literal_range = literal_start..literal_start + literal_length;
Location { line_indent, literal_range }
}
}

#[derive(Default)]
struct Runtime {
help_printed: bool,
per_file: HashMap<&'static str, FileRuntime>,
}
static RT: Lazy<Mutex<Runtime>> = Lazy::new(Default::default);

impl Runtime {
fn fail(expect: &Expect, expected: &str, actual: &str) {
let mut rt = RT.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
let mut updated = "";
if update_expect() {
updated = " (updated)";
rt.per_file
.entry(expect.file)
.or_insert_with(|| FileRuntime::new(expect))
.update(expect, actual);
}
let print_help = !rt.help_printed && !update_expect();
rt.help_printed = true;

let help = if print_help { HELP } else { "" };

let diff = Changeset::new(actual, expected, "\n");

println!(
"\n
\x1b[1m\x1b[91merror\x1b[97m: expect test failed\x1b[0m{}
\x1b[1m\x1b[34m-->\x1b[0m {}:{}:{}
{}
\x1b[1mExpect\x1b[0m:
----
{}
----

\x1b[1mActual\x1b[0m:
----
{}
----

\x1b[1mDiff\x1b[0m:
----
{}
----
",
updated, expect.file, expect.line, expect.column, help, expected, actual, diff
);
// Use resume_unwind instead of panic!() to prevent a backtrace, which is unnecessary noise.
panic::resume_unwind(Box::new(()));
}
}

struct FileRuntime {
path: PathBuf,
original_text: String,
patchwork: Patchwork,
}

impl FileRuntime {
fn new(expect: &Expect) -> FileRuntime {
let path = workspace_root().join(expect.file);
let original_text = fs::read_to_string(&path).unwrap();
let patchwork = Patchwork::new(original_text.clone());
FileRuntime { path, original_text, patchwork }
}
fn update(&mut self, expect: &Expect, actual: &str) {
let loc = expect.locate(&self.original_text);
let patch = format_patch(loc.line_indent.clone(), actual);
self.patchwork.patch(loc.literal_range, &patch);
fs::write(&self.path, &self.patchwork.text).unwrap()
}
}

#[derive(Debug)]
struct Location {
line_indent: usize,
literal_range: Range<usize>,
}

#[derive(Debug)]
struct Patchwork {
text: String,
indels: Vec<(Range<usize>, usize)>,
}

impl Patchwork {
fn new(text: String) -> Patchwork {
Patchwork { text, indels: Vec::new() }
}
fn patch(&mut self, mut range: Range<usize>, patch: &str) {
self.indels.push((range.clone(), patch.len()));
self.indels.sort_by_key(|(delete, _insert)| delete.start);

let (delete, insert) = self
.indels
.iter()
.take_while(|(delete, _)| delete.start < range.start)
.map(|(delete, insert)| (delete.end - delete.start, insert))
.fold((0usize, 0usize), |(x1, y1), (x2, y2)| (x1 + x2, y1 + y2));

for pos in &mut [&mut range.start, &mut range.end] {
**pos -= delete;
**pos += insert;
}

self.text.replace_range(range, &patch);
}
}

fn format_patch(line_indent: usize, patch: &str) -> String {
let mut max_hashes = 0;
let mut cur_hashes = 0;
for byte in patch.bytes() {
if byte != b'#' {
cur_hashes = 0;
continue;
}
cur_hashes += 1;
max_hashes = max_hashes.max(cur_hashes);
}
let hashes = &"#".repeat(max_hashes + 1);
let indent = &" ".repeat(line_indent);
let is_multiline = patch.contains('\n');

let mut buf = String::new();
buf.push('r');
buf.push_str(hashes);
buf.push('"');
if is_multiline {
buf.push('\n');
}
let mut final_newline = false;
for line in lines_with_ends(patch) {
if is_multiline {
buf.push_str(indent);
buf.push_str(" ");
}
buf.push_str(line);
final_newline = line.ends_with('\n');
}
if final_newline {
buf.push_str(indent);
}
buf.push('"');
buf.push_str(hashes);
buf
}

fn workspace_root() -> PathBuf {
Path::new(
&env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned()),

This comment was marked as resolved.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember :-) This is copy-pasted from project_dir in xtask, should probably contain more info in git blame.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, this explains it

)
.ancestors()
.nth(2)
.unwrap()
.to_path_buf()
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_format_patch() {
let patch = format_patch(0, "hello\nworld\n");
expect![[r##"
r#"
hello
world
"#"##]]
.assert_eq(&patch);

let patch = format_patch(4, "single line");
expect![[r##"r#"single line"#"##]].assert_eq(&patch);
}

#[test]
fn test_patchwork() {
let mut patchwork = Patchwork::new("one two three".to_string());
patchwork.patch(4..7, "zwei");
patchwork.patch(0..3, "один");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume these are one and two in Russian, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Russian and German

patchwork.patch(8..13, "3");
expect![[r#"
Patchwork {
text: "один zwei 3",
indels: [
(
0..3,
8,
),
(
4..7,
4,
),
(
8..13,
1,
),
],
}
"#]]
.assert_debug_eq(&patchwork);
}
}
1 change: 1 addition & 0 deletions crates/ra_ide/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ra_cfg = { path = "../ra_cfg" }
ra_fmt = { path = "../ra_fmt" }
ra_prof = { path = "../ra_prof" }
test_utils = { path = "../test_utils" }
expect = { path = "../expect" }
ra_assists = { path = "../ra_assists" }
ra_ssr = { path = "../ra_ssr" }

Expand Down
41 changes: 33 additions & 8 deletions crates/ra_ide/src/goto_definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ pub(crate) fn reference_definition(

#[cfg(test)]
mod tests {
use expect::{expect, Expect};
use test_utils::assert_eq_text;

use crate::mock_analysis::analysis_and_position;
Expand Down Expand Up @@ -142,16 +143,40 @@ mod tests {
nav.assert_match(expected);
}

fn check(ra_fixture: &str, expect: Expect) {
let (analysis, pos) = analysis_and_position(ra_fixture);

let mut navs = analysis.goto_definition(pos).unwrap().unwrap().info;
if navs.len() == 0 {
panic!("unresolved reference")
}
assert_eq!(navs.len(), 1);

let nav = navs.pop().unwrap();
let file_text = analysis.file_text(nav.file_id()).unwrap();

let mut actual = nav.debug_render();
actual += "\n";
actual += &file_text[nav.full_range()].to_string();
if let Some(focus) = nav.focus_range() {
actual += "|";
actual += &file_text[focus];
actual += "\n";
}
expect.assert_eq(&actual);
}

#[test]
fn goto_def_in_items() {
check_goto(
"
//- /lib.rs
struct Foo;
enum E { X(Foo<|>) }
",
"Foo STRUCT_DEF FileId(1) 0..11 7..10",
"struct Foo;|Foo",
check(
r#"
struct Foo;
enum E { X(Foo<|>) }
"#,
expect![[r#"
Foo STRUCT_DEF FileId(1) 0..11 7..10
struct Foo;|Foo
"#]],
);
}

Expand Down
Loading