Skip to content

Commit 688e472

Browse files
chansukecalebcartwright
chansuke
authored andcommitted
Fix test references from writemode to emit
1 parent 906b5fd commit 688e472

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

Diff for: src/test/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,16 @@ fn system_tests() {
201201
#[test]
202202
fn checkstyle_test() {
203203
init_log();
204-
let filename = "tests/writemode/source/fn-single-line.rs";
205-
let expected_filename = "tests/writemode/target/checkstyle.xml";
204+
let filename = "tests/emit/source/fn-single-line.rs";
205+
let expected_filename = "tests/emit/target/checkstyle.xml";
206206
assert_output(Path::new(filename), Path::new(expected_filename));
207207
}
208208

209209
#[test]
210210
fn json_test() {
211211
init_log();
212-
let filename = "tests/writemode/source/json.rs";
213-
let expected_filename = "tests/writemode/target/output.json";
212+
let filename = "tests/emit/source/json.rs";
213+
let expected_filename = "tests/emit/target/output.json";
214214
assert_output(Path::new(filename), Path::new(expected_filename));
215215
}
216216

@@ -220,7 +220,7 @@ fn modified_test() {
220220
use std::io::BufRead;
221221

222222
// Test "modified" output
223-
let filename = "tests/writemode/source/modified.rs";
223+
let filename = "tests/emit/source/modified.rs";
224224
let config = Config::default();
225225
let setting = OperationSetting::default();
226226

@@ -481,8 +481,8 @@ fn stdin_works_with_modified_lines() {
481481
fn stdin_works_with_json() {
482482
init_log();
483483
assert_stdin_output(
484-
Path::new("tests/writemode/source/stdin.rs"),
485-
Path::new("tests/writemode/target/stdin.json"),
484+
Path::new("tests/emit/source/stdin.rs"),
485+
Path::new("tests/emit/target/stdin.json"),
486486
EmitMode::Json,
487487
true,
488488
);
@@ -493,8 +493,8 @@ fn stdin_works_with_json() {
493493
fn stdin_works_with_checkstyle() {
494494
init_log();
495495
assert_stdin_output(
496-
Path::new("tests/writemode/source/stdin.rs"),
497-
Path::new("tests/writemode/target/stdin.xml"),
496+
Path::new("tests/emit/source/stdin.rs"),
497+
Path::new("tests/emit/target/stdin.xml"),
498498
EmitMode::Checkstyle,
499499
false,
500500
);
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: tests/emit/target/checkstyle.xml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<checkstyle version="4.3"><file name="tests/emit/source/fn-single-line.rs"><error line="5" severity="warning" message="Should be `fn foo_expr() { 1 }`" /><error line="7" severity="warning" message="Should be `fn foo_stmt() { foo(); }`" /><error line="9" severity="warning" message="Should be `fn foo_decl_local() { let z = 5; }`" /><error line="11" severity="warning" message="Should be `fn foo_decl_item(x: &amp;mut i32) { x = 3; }`" /><error line="13" severity="warning" message="Should be `fn empty() {}`" /><error line="15" severity="warning" message="Should be `fn foo_return() -&gt; String { &quot;yay&quot; }`" /><error line="17" severity="warning" message="Should be `fn foo_where() -&gt; T`" /><error line="18" severity="warning" message="Should be `where`" /><error line="19" severity="warning" message="Should be ` T: Sync,`" /><error line="20" severity="warning" message="Should be `{`" /><error line="24" severity="warning" message="Should be `fn fooblock() { { &quot;inner-block&quot; } }`" /><error line="51" severity="warning" message="Should be `fn lots_of_space() { 1 }`" /><error line="56" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="59" severity="warning" message="Should be `trait CoolerTypes {`" /><error line="60" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="63" severity="warning" message="Should be `fn Foo&lt;T&gt;()`" /><error line="64" severity="warning" message="Should be `where`" /><error line="65" severity="warning" message="Should be ` T: Bar,`" /><error line="66" severity="warning" message="Should be `{`" /></file></checkstyle>
File renamed without changes.

Diff for: tests/emit/target/output.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"name":"tests/emit/source/json.rs","mismatches":[{"original_begin_line":5,"original_end_line":7,"expected_begin_line":5,"expected_end_line":5,"original":"fn foo_expr() {\n 1\n}\n","expected":"fn foo_expr() { 1 }\n"},{"original_begin_line":9,"original_end_line":11,"expected_begin_line":7,"expected_end_line":7,"original":"fn foo_stmt() {\n foo();\n}\n","expected":"fn foo_stmt() { foo(); }\n"},{"original_begin_line":13,"original_end_line":15,"expected_begin_line":9,"expected_end_line":9,"original":"fn foo_decl_local() {\n let z = 5;\n }\n","expected":"fn foo_decl_local() { let z = 5; }\n"},{"original_begin_line":17,"original_end_line":19,"expected_begin_line":11,"expected_end_line":11,"original":"fn foo_decl_item(x: &mut i32) {\n x = 3;\n}\n","expected":"fn foo_decl_item(x: &mut i32) { x = 3; }\n"},{"original_begin_line":21,"original_end_line":21,"expected_begin_line":13,"expected_end_line":13,"original":" fn empty() {\n","expected":"fn empty() {}\n"},{"original_begin_line":23,"original_end_line":23,"expected_begin_line":15,"expected_end_line":15,"original":"}\n","expected":"fn foo_return() -> String { \"yay\" }\n"},{"original_begin_line":25,"original_end_line":29,"expected_begin_line":17,"expected_end_line":20,"original":"fn foo_return() -> String {\n \"yay\"\n}\n\nfn foo_where() -> T where T: Sync {\n","expected":"fn foo_where() -> T\nwhere\n T: Sync,\n{\n"},{"original_begin_line":33,"original_end_line":37,"expected_begin_line":24,"expected_end_line":24,"original":"fn fooblock() {\n {\n \"inner-block\"\n }\n}\n","expected":"fn fooblock() { { \"inner-block\" } }\n"},{"original_begin_line":64,"original_end_line":66,"expected_begin_line":51,"expected_end_line":51,"original":"fn lots_of_space () {\n 1 \n}\n","expected":"fn lots_of_space() { 1 }\n"},{"original_begin_line":71,"original_end_line":72,"expected_begin_line":56,"expected_end_line":56,"original":" fn dummy(&self) {\n }\n","expected":" fn dummy(&self) {}\n"},{"original_begin_line":75,"original_end_line":75,"expected_begin_line":59,"expected_end_line":60,"original":"trait CoolerTypes { fn dummy(&self) { \n","expected":"trait CoolerTypes {\n fn dummy(&self) {}\n"},{"original_begin_line":77,"original_end_line":77,"expected_begin_line":62,"expected_end_line":62,"original":"}\n","expected":""},{"original_begin_line":79,"original_end_line":79,"expected_begin_line":63,"expected_end_line":66,"original":"fn Foo<T>() where T: Bar {\n","expected":"fn Foo<T>()\nwhere\n T: Bar,\n{\n"}]}]
File renamed without changes.
File renamed without changes.

Diff for: tests/writemode/target/checkstyle.xml

-2
This file was deleted.

Diff for: tests/writemode/target/output.json

-1
This file was deleted.

0 commit comments

Comments
 (0)