From 05d67a9a0efafb3dd5087aad17d75aa88aa85178 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 1 Jul 2020 11:25:22 +0200 Subject: [PATCH] Move test data to test_data directory --- crates/expect/src/lib.rs | 2 +- crates/ra_ide/src/syntax_highlighting/tests.rs | 12 ++++++------ .../snapshots => test_data}/highlight_doctest.html | 0 .../snapshots => test_data}/highlight_injection.html | 0 .../snapshots => test_data}/highlight_strings.html | 0 .../snapshots => test_data}/highlight_unsafe.html | 0 .../{src/snapshots => test_data}/highlighting.html | 0 .../rainbow_highlighting.html | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename crates/ra_ide/{src/snapshots => test_data}/highlight_doctest.html (100%) rename crates/ra_ide/{src/snapshots => test_data}/highlight_injection.html (100%) rename crates/ra_ide/{src/snapshots => test_data}/highlight_strings.html (100%) rename crates/ra_ide/{src/snapshots => test_data}/highlight_unsafe.html (100%) rename crates/ra_ide/{src/snapshots => test_data}/highlighting.html (100%) rename crates/ra_ide/{src/snapshots => test_data}/rainbow_highlighting.html (100%) diff --git a/crates/expect/src/lib.rs b/crates/expect/src/lib.rs index 3f293f5d577..a5e26faded7 100644 --- a/crates/expect/src/lib.rs +++ b/crates/expect/src/lib.rs @@ -39,7 +39,7 @@ macro_rules! expect { [[]] => { $crate::expect![[""]] }; } -/// expect_file!["/crates/foo/test_data/foo.rs"] +/// expect_file!["/crates/foo/test_data/bar.html"] #[macro_export] macro_rules! expect_file { [$path:literal] => {$crate::ExpectFile { path: $path }}; diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs index f19628485db..aa7c887d674 100644 --- a/crates/ra_ide/src/syntax_highlighting/tests.rs +++ b/crates/ra_ide/src/syntax_highlighting/tests.rs @@ -92,7 +92,7 @@ impl Option { } "# .trim(), - expect_file!["crates/ra_ide/src/snapshots/highlighting.html"], + expect_file!["crates/ra_ide/test_data/highlighting.html"], false, ); } @@ -115,7 +115,7 @@ fn bar() { } "# .trim(), - expect_file!["crates/ra_ide/src/snapshots/rainbow_highlighting.html"], + expect_file!["crates/ra_ide/test_data/rainbow_highlighting.html"], true, ); } @@ -168,7 +168,7 @@ fn main() { ); }"## .trim(), - expect_file!["crates/ra_ide/src/snapshots/highlight_injection.html"], + expect_file!["crates/ra_ide/test_data/highlight_injection.html"], false, ); } @@ -251,7 +251,7 @@ fn main() { println!("{ничоси}", ничоси = 92); }"# .trim(), - expect_file!["crates/ra_ide/src/snapshots/highlight_strings.html"], + expect_file!["crates/ra_ide/test_data/highlight_strings.html"], false, ); } @@ -279,7 +279,7 @@ fn main() { } "# .trim(), - expect_file!["crates/ra_ide/src/snapshots/highlight_unsafe.html"], + expect_file!["crates/ra_ide/test_data/highlight_unsafe.html"], false, ); } @@ -355,7 +355,7 @@ macro_rules! noop { } "# .trim(), - expect_file!["crates/ra_ide/src/snapshots/highlight_doctest.html"], + expect_file!["crates/ra_ide/test_data/highlight_doctest.html"], false, ); } diff --git a/crates/ra_ide/src/snapshots/highlight_doctest.html b/crates/ra_ide/test_data/highlight_doctest.html similarity index 100% rename from crates/ra_ide/src/snapshots/highlight_doctest.html rename to crates/ra_ide/test_data/highlight_doctest.html diff --git a/crates/ra_ide/src/snapshots/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html similarity index 100% rename from crates/ra_ide/src/snapshots/highlight_injection.html rename to crates/ra_ide/test_data/highlight_injection.html diff --git a/crates/ra_ide/src/snapshots/highlight_strings.html b/crates/ra_ide/test_data/highlight_strings.html similarity index 100% rename from crates/ra_ide/src/snapshots/highlight_strings.html rename to crates/ra_ide/test_data/highlight_strings.html diff --git a/crates/ra_ide/src/snapshots/highlight_unsafe.html b/crates/ra_ide/test_data/highlight_unsafe.html similarity index 100% rename from crates/ra_ide/src/snapshots/highlight_unsafe.html rename to crates/ra_ide/test_data/highlight_unsafe.html diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/test_data/highlighting.html similarity index 100% rename from crates/ra_ide/src/snapshots/highlighting.html rename to crates/ra_ide/test_data/highlighting.html diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/test_data/rainbow_highlighting.html similarity index 100% rename from crates/ra_ide/src/snapshots/rainbow_highlighting.html rename to crates/ra_ide/test_data/rainbow_highlighting.html