From af83e8034e05b4aa00512128828bdd1b4046dffc Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 25 Jan 2019 16:40:26 -0800
Subject: [PATCH] Move test helpers into their own folder

---
 cli/src/tests/{corpuses.rs => corpus_test.rs}  | 18 ++++++++++++------
 cli/src/tests/{ => helpers}/allocations.rs     |  0
 cli/src/tests/{ => helpers}/fixtures.rs        |  0
 cli/src/tests/helpers/mod.rs                   |  4 ++++
 cli/src/tests/{ => helpers}/random.rs          |  0
 cli/src/tests/{ => helpers}/scope_sequence.rs  |  0
 cli/src/tests/mod.rs                           |  9 +++------
 .../{parser_api.rs => parser_api_test.rs}      |  4 ++--
 8 files changed, 21 insertions(+), 14 deletions(-)
 rename cli/src/tests/{corpuses.rs => corpus_test.rs} (96%)
 rename cli/src/tests/{ => helpers}/allocations.rs (100%)
 rename cli/src/tests/{ => helpers}/fixtures.rs (100%)
 create mode 100644 cli/src/tests/helpers/mod.rs
 rename cli/src/tests/{ => helpers}/random.rs (100%)
 rename cli/src/tests/{ => helpers}/scope_sequence.rs (100%)
 rename cli/src/tests/{parser_api.rs => parser_api_test.rs} (99%)

diff --git a/cli/src/tests/corpuses.rs b/cli/src/tests/corpus_test.rs
similarity index 96%
rename from cli/src/tests/corpuses.rs
rename to cli/src/tests/corpus_test.rs
index 9b60d685..587a3752 100644
--- a/cli/src/tests/corpuses.rs
+++ b/cli/src/tests/corpus_test.rs
@@ -1,7 +1,7 @@
-use super::allocations;
-use super::fixtures::{fixtures_dir, get_language, get_test_language};
-use super::random::Rand;
-use super::scope_sequence::ScopeSequence;
+use super::helpers::allocations;
+use super::helpers::fixtures::{fixtures_dir, get_language, get_test_language};
+use super::helpers::random::Rand;
+use super::helpers::scope_sequence::ScopeSequence;
 use crate::generate;
 use crate::test::{parse_tests, print_diff, print_diff_key, TestEntry};
 use crate::util;
@@ -127,7 +127,10 @@ fn test_real_language_corpus_files() {
                     // Check that the new tree is consistent.
                     check_consistent_sizes(&tree2, &input);
                     if let Err(message) = check_changed_ranges(&tree, &tree2, &input) {
-                        println!("\nUnexpected scope change in trial {}\n{}\n\n", trial, message);
+                        println!(
+                            "\nUnexpected scope change in trial {}\n{}\n\n",
+                            trial, message
+                        );
                         failure_count += 1;
                         break;
                     }
@@ -161,7 +164,10 @@ fn test_real_language_corpus_files() {
                     // Check that the edited tree is consistent.
                     check_consistent_sizes(&tree3, &input);
                     if let Err(message) = check_changed_ranges(&tree2, &tree3, &input) {
-                        eprintln!("Unexpected scope change in trial {}\n{}\n\n", trial, message);
+                        eprintln!(
+                            "Unexpected scope change in trial {}\n{}\n\n",
+                            trial, message
+                        );
                         failure_count += 1;
                         break;
                     }
diff --git a/cli/src/tests/allocations.rs b/cli/src/tests/helpers/allocations.rs
similarity index 100%
rename from cli/src/tests/allocations.rs
rename to cli/src/tests/helpers/allocations.rs
diff --git a/cli/src/tests/fixtures.rs b/cli/src/tests/helpers/fixtures.rs
similarity index 100%
rename from cli/src/tests/fixtures.rs
rename to cli/src/tests/helpers/fixtures.rs
diff --git a/cli/src/tests/helpers/mod.rs b/cli/src/tests/helpers/mod.rs
new file mode 100644
index 00000000..bd5c6517
--- /dev/null
+++ b/cli/src/tests/helpers/mod.rs
@@ -0,0 +1,4 @@
+pub(super) mod allocations;
+pub(super) mod fixtures;
+pub(super) mod random;
+pub(super) mod scope_sequence;
diff --git a/cli/src/tests/random.rs b/cli/src/tests/helpers/random.rs
similarity index 100%
rename from cli/src/tests/random.rs
rename to cli/src/tests/helpers/random.rs
diff --git a/cli/src/tests/scope_sequence.rs b/cli/src/tests/helpers/scope_sequence.rs
similarity index 100%
rename from cli/src/tests/scope_sequence.rs
rename to cli/src/tests/helpers/scope_sequence.rs
diff --git a/cli/src/tests/mod.rs b/cli/src/tests/mod.rs
index fa841382..beafa172 100644
--- a/cli/src/tests/mod.rs
+++ b/cli/src/tests/mod.rs
@@ -1,6 +1,3 @@
-mod allocations;
-mod corpuses;
-mod fixtures;
-mod random;
-mod parser_api;
-mod scope_sequence;
+mod corpus_test;
+mod helpers;
+mod parser_api_test;
diff --git a/cli/src/tests/parser_api.rs b/cli/src/tests/parser_api_test.rs
similarity index 99%
rename from cli/src/tests/parser_api.rs
rename to cli/src/tests/parser_api_test.rs
index 38bc0b69..9584ac4e 100644
--- a/cli/src/tests/parser_api.rs
+++ b/cli/src/tests/parser_api_test.rs
@@ -1,4 +1,4 @@
-use super::fixtures::get_language;
+use super::helpers::fixtures::get_language;
 use std::thread;
 use tree_sitter::{InputEdit, Language, LogType, Parser, Point, PropertySheet};
 
@@ -453,7 +453,7 @@ fn test_editing() {
 fn test_parallel_parsing() {
     // Parse this source file so that each thread has a non-trivial amount of
     // work to do.
-    let this_file_source = include_str!("parser_api.rs");
+    let this_file_source = include_str!("parser_api_test.rs");
 
     let mut parser = Parser::new();
     parser.set_language(rust()).unwrap();