From 2c2564e10299c029b92f049c97bf4737fe0b3b3e Mon Sep 17 00:00:00 2001
From: Ity Kaul <itykaul@gmail.com>
Date: Tue, 14 Aug 2018 14:06:58 -0700
Subject: [PATCH] Added granular tests

---
 src/rust/engine/fs/src/store.rs      | 30 ++++++++++++++++++++++++----
 src/rust/engine/testutil/src/data.rs |  1 +
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/rust/engine/fs/src/store.rs b/src/rust/engine/fs/src/store.rs
index 732204b70e07..220391a8f9e0 100644
--- a/src/rust/engine/fs/src/store.rs
+++ b/src/rust/engine/fs/src/store.rs
@@ -2261,15 +2261,37 @@ mod tests {
     let roland = TestData::roland();
     let catnip = TestData::catnip();
     let testdir = TestDirectory::containing_roland();
+    let testdir_digest = testdir.digest();
+    let testdir_directory = testdir.directory();
     let recursive_testdir = TestDirectory::recursive();
+    let recursive_testdir_directory = recursive_testdir.directory();
+    let recursive_testdir_digest = recursive_testdir.digest();
 
-    let cas = StubCAS::with_content(1024, vec![roland, catnip], vec![testdir, recursive_testdir]);
+    let cas = StubCAS::with_content(
+        1024,
+        vec![roland.clone(), catnip.clone()], vec![testdir, recursive_testdir]
+    );
     new_store(dir.path(), cas.address())
-      .ensure_local_has_recursive_directory(recursive_testdir.digest())
+      .ensure_local_has_recursive_directory(recursive_testdir_digest)
       .wait()
-      .expect("Successfully downloaded recursive dir");
+      .expect("Downloading recursive directory should have succeeded.");
 
-    // TODO(ity): Add check for individual directory/file bytes
+    assert_eq!(
+      load_file_bytes(&new_local_store(dir.path()), roland.digest()),
+      Ok(Some(roland.bytes()))
+    );
+    assert_eq!(
+      load_file_bytes(&new_local_store(dir.path()), catnip.digest()),
+      Ok(Some(catnip.bytes()))
+    );
+    assert_eq!(
+      new_local_store(dir.path()).load_directory(testdir_digest).wait(),
+      Ok(Some(testdir_directory))
+    );
+    assert_eq!(
+      new_local_store(dir.path()).load_directory(recursive_testdir_digest).wait(),
+      Ok(Some(recursive_testdir_directory))
+    );
   }
 
 
diff --git a/src/rust/engine/testutil/src/data.rs b/src/rust/engine/testutil/src/data.rs
index f6867bb448ce..c5129959dfa8 100644
--- a/src/rust/engine/testutil/src/data.rs
+++ b/src/rust/engine/testutil/src/data.rs
@@ -5,6 +5,7 @@ use hashing;
 use protobuf::Message;
 use sha2::{self, Digest};
 
+#[derive(Clone)]
 pub struct TestData {
   string: String,
 }