From c86e25f039de324a96b5b2b41fc0e16db95aaf4b Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Tue, 12 Mar 2019 18:28:43 -0700
Subject: [PATCH] Reorganize tree-related snapshot code

---
 server/tests/snapshots.rs          |  2 +-
 server/tests/test_util/snapshot.rs | 24 ------------------------
 server/tests/test_util/tree.rs     | 24 ++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/server/tests/snapshots.rs b/server/tests/snapshots.rs
index 28114a53..10ecadb9 100644
--- a/server/tests/snapshots.rs
+++ b/server/tests/snapshots.rs
@@ -24,7 +24,7 @@ use librojo::{
 use crate::test_util::{
     copy_recursive,
     snapshot::*,
-    tree::trees_equal,
+    tree::{read_tree_by_name, write_tree_by_name, trees_equal},
 };
 
 macro_rules! generate_snapshot_tests {
diff --git a/server/tests/test_util/snapshot.rs b/server/tests/test_util/snapshot.rs
index 534805b5..3e61292f 100644
--- a/server/tests/test_util/snapshot.rs
+++ b/server/tests/test_util/snapshot.rs
@@ -3,8 +3,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use rbx_dom_weak::RbxTree;
-
 use librojo::{
     project::ProjectNode,
     snapshot_reconciler::RbxSnapshotInstance,
@@ -59,28 +57,6 @@ pub fn anonymize_path(project_folder_path: &Path, path: &Path) -> PathBuf {
     }
 }
 
-pub fn read_tree_by_name(path: &Path, identifier: &str) -> Option<RbxTree> {
-    let mut file_path = path.join(identifier);
-    file_path.set_extension("tree.json");
-
-    let contents = fs::read(&file_path).ok()?;
-    let tree: RbxTree = serde_json::from_slice(&contents)
-        .expect("Could not deserialize tree");
-
-    Some(tree)
-}
-
-pub fn write_tree_by_name(path: &Path, identifier: &str, tree: &RbxTree) {
-    let mut file_path = path.join(identifier);
-    file_path.set_extension("tree.json");
-
-    let mut file = File::create(file_path)
-        .expect("Could not open file to write tree");
-
-    serde_json::to_writer_pretty(&mut file, tree)
-        .expect("Could not serialize tree to file");
-}
-
 pub fn read_expected_snapshot(path: &Path) -> Option<Option<RbxSnapshotInstance<'static>>> {
     let contents = fs::read(path.join(SNAPSHOT_EXPECTED_NAME)).ok()?;
     let snapshot: Option<RbxSnapshotInstance<'static>> = serde_json::from_slice(&contents)
diff --git a/server/tests/test_util/tree.rs b/server/tests/test_util/tree.rs
index 7bc2b7fc..e8f230fe 100644
--- a/server/tests/test_util/tree.rs
+++ b/server/tests/test_util/tree.rs
@@ -13,11 +13,35 @@
 use std::{
     borrow::Cow,
     collections::HashSet,
+    path::Path,
+    fs::{self, File},
     fmt,
 };
 
 use rbx_dom_weak::{RbxId, RbxTree};
 
+pub fn read_tree_by_name(path: &Path, identifier: &str) -> Option<RbxTree> {
+    let mut file_path = path.join(identifier);
+    file_path.set_extension("tree.json");
+
+    let contents = fs::read(&file_path).ok()?;
+    let tree: RbxTree = serde_json::from_slice(&contents)
+        .expect("Could not deserialize tree");
+
+    Some(tree)
+}
+
+pub fn write_tree_by_name(path: &Path, identifier: &str, tree: &RbxTree) {
+    let mut file_path = path.join(identifier);
+    file_path.set_extension("tree.json");
+
+    let mut file = File::create(file_path)
+        .expect("Could not open file to write tree");
+
+    serde_json::to_writer_pretty(&mut file, tree)
+        .expect("Could not serialize tree to file");
+}
+
 #[derive(Debug)]
 pub struct TreeMismatch {
     pub path: Cow<'static, str>,