Move git-object tests to top-level for separation and cleanness

Author: Byron

git-object/src/borrowed/mod.rs

@@ -3,15 +3,15 @@ use bstr::BStr;
 use quick_error::quick_error;
 use std::str;
 
-pub(crate) mod commit;
-pub(crate) mod tag;
-pub(crate) mod tree;
-pub(crate) mod util;
+mod commit;
+mod tag;
+mod tree;
+mod util;
 
 pub use commit::Commit;
 use nom::error::ParseError;
 pub use tag::Tag;
-pub use tree::Tree;
+pub use tree::{Entry, Mode, Tree};
 
 quick_error! {
     #[derive(Debug)]

git-object/src/borrowed/tag.rs

@@ -28,7 +28,7 @@ pub struct Tag<'data> {
     pub pgp_signature: Option<&'data BStr>,
 }
 
-pub(crate) fn parse(i: &[u8]) -> IResult<&[u8], Tag, Error> {
+fn parse(i: &[u8]) -> IResult<&[u8], Tag, Error> {
     let (i, target) = parse_header_field(i, b"object", parse_hex_sha1)
         .map_err(Error::context("object <40 lowercase hex char>"))?;
 

git-object/src/lib.rs

@@ -3,7 +3,4 @@
 pub mod borrowed;
 mod types;
 
-#[cfg(test)]
-mod tests;
-
 pub use types::*;

git-object/src/tests/borrowed/commit.rs renamed to git-object/tests/borrowed/commit.rs

@@ -1,7 +1,6 @@
 mod method {
-    use crate::borrowed::commit::Commit;
-    use crate::tests::borrowed::fixture_bytes;
-    use crate::tests::hex_to_id;
+    use crate::{borrowed::fixture_bytes, hex_to_id};
+    use git_object::borrowed::Commit;
     use pretty_assertions::assert_eq;
 
     #[test]
@@ -17,17 +16,15 @@ mod method {
 }
 
 mod parse {
-    use crate::{
-        borrowed::{commit::parse, commit::Commit},
-        tests::{borrowed::fixture_bytes, borrowed::signature},
-    };
+    use crate::{borrowed::fixture_bytes, borrowed::signature};
     use bstr::ByteSlice;
+    use git_object::borrowed::Commit;
     use smallvec::SmallVec;
 
     #[test]
     fn unsigned() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "unsigned.txt")).unwrap().1,
+            Commit::from_bytes(&fixture_bytes("commit", "unsigned.txt")).unwrap(),
             Commit {
                 tree: b"1b2dfb4ac5e42080b682fc676e9738c94ce6d54d".as_bstr(),
                 parents: SmallVec::default(),
@@ -43,7 +40,7 @@ mod parse {
     #[test]
     fn whitespace() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "whitespace.txt")).unwrap().1,
+            Commit::from_bytes(&fixture_bytes("commit", "whitespace.txt")).unwrap(),
             Commit {
                 tree: b"9bed6275068a0575243ba8409253e61af81ab2ff".as_bstr(),
                 parents: SmallVec::from(
@@ -61,9 +58,7 @@ mod parse {
     #[test]
     fn signed_singleline() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "signed-singleline.txt"))
-                .unwrap()
-                .1,
+            Commit::from_bytes(&fixture_bytes("commit", "signed-singleline.txt")).unwrap(),
             Commit {
                 tree: b"00fc39317701176e326974ce44f5bd545a32ec0b".as_bstr(),
                 parents: SmallVec::from(
@@ -81,7 +76,7 @@ mod parse {
     #[test]
     fn signed() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "signed.txt")).unwrap().1,
+            Commit::from_bytes(&fixture_bytes("commit", "signed.txt")).unwrap(),
             Commit {
                 tree: b"00fc39317701176e326974ce44f5bd545a32ec0b".as_bstr(),
                 parents: SmallVec::from(vec![b"09d8d3a12e161a7f6afb522dbe8900a9c09bce06".as_bstr()]),
@@ -97,7 +92,7 @@ mod parse {
     #[test]
     fn signed_with_encoding() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "signed-with-encoding.txt")).unwrap().1,
+            Commit::from_bytes(&fixture_bytes("commit", "signed-with-encoding.txt")).unwrap(),
             Commit {
                 tree: b"1973afa74d87b2bb73fa884aaaa8752aec43ea88".as_bstr(),
                 parents: SmallVec::from(vec![b"79c51cc86923e2b8ca0ee5c4eb75e48027133f9a".as_bstr()]),
@@ -113,9 +108,7 @@ mod parse {
     #[test]
     fn with_encoding() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "with-encoding.txt"))
-                .unwrap()
-                .1,
+            Commit::from_bytes(&fixture_bytes("commit", "with-encoding.txt")).unwrap(),
             Commit {
                 tree: b"4a1c03029e7407c0afe9fc0320b3258e188b115e".as_bstr(),
                 parents: SmallVec::from(
@@ -133,7 +126,7 @@ mod parse {
     #[test]
     fn merge() {
         assert_eq!(
-            parse(&fixture_bytes("commit", "merge.txt")).unwrap().1,
+            Commit::from_bytes(&fixture_bytes("commit", "merge.txt")).unwrap(),
             Commit {
                 tree: b"0cf16ce8e229b59a761198975f0c0263229faf82".as_bstr(),
                 parents: SmallVec::from(vec![

git-object/src/tests/borrowed/mod.rs renamed to git-object/tests/borrowed/mod.rs

@@ -1,4 +1,5 @@
-use crate::borrowed::Signature;
+use git_object::borrowed::Signature;
+use git_object::{Sign, Time};
 use std::path::PathBuf;
 
 mod commit;
@@ -10,7 +11,6 @@ fn fixture_bytes(kind: &str, path: &str) -> Vec<u8> {
 }
 
 fn signature(time: u32) -> Signature<'static> {
-    use crate::{Sign, Time};
     use bstr::ByteSlice;
     Signature {
         name: b"Sebastian Thiel".as_bstr(),

git-object/src/tests/borrowed/tag.rs renamed to git-object/tests/borrowed/tag.rs

@@ -1,13 +1,12 @@
-use crate::{
+use bstr::ByteSlice;
+use git_object::{
     borrowed::{Signature, Tag},
     Kind, Sign, Time,
 };
-use bstr::ByteSlice;
 
 mod method {
-    use crate::borrowed::Tag;
-    use crate::tests::borrowed::fixture_bytes;
-    use crate::tests::hex_to_id;
+    use crate::{borrowed::fixture_bytes, hex_to_id};
+    use git_object::borrowed::Tag;
     use pretty_assertions::assert_eq;
 
     #[test]
@@ -23,26 +22,24 @@ mod method {
 }
 
 mod parse {
-    use crate::{
-        borrowed::{tag::parse, Tag},
-        tests::borrowed::signature,
-        tests::{borrowed::fixture_bytes, borrowed::tag::tag_fixture},
-        Kind,
-    };
+    use crate::borrowed::tag::tag_fixture;
+    use crate::{borrowed::fixture_bytes, borrowed::signature};
     use bstr::ByteSlice;
+    use git_object::borrowed::Tag;
+    use git_object::Kind;
 
     #[test]
     fn signed() {
         assert_eq!(
-            parse(&fixture_bytes("tag", "signed.txt")).unwrap().1,
+            Tag::from_bytes(&fixture_bytes("tag", "signed.txt")).unwrap(),
             tag_fixture(9000)
         );
     }
 
     #[test]
     fn empty() {
         assert_eq!(
-            parse(&fixture_bytes("tag", "empty.txt")).unwrap().1,
+            Tag::from_bytes(&fixture_bytes("tag", "empty.txt")).unwrap(),
             Tag {
                 target: b"01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc".as_bstr(),
                 name: b"empty".as_bstr(),
@@ -57,7 +54,7 @@ mod parse {
     #[test]
     fn with_newlines() {
         assert_eq!(
-            parse(&fixture_bytes("tag", "with-newlines.txt")).unwrap().1,
+            Tag::from_bytes(&fixture_bytes("tag", "with-newlines.txt")).unwrap(),
             Tag {
                 target: b"ebdf205038b66108c0331aa590388431427493b7".as_bstr(),
                 name: b"baz".as_bstr(),
@@ -72,7 +69,7 @@ mod parse {
     #[test]
     fn whitespace() {
         assert_eq!(
-            parse(&fixture_bytes("tag", "whitespace.txt")).unwrap().1,
+            Tag::from_bytes(&fixture_bytes("tag", "whitespace.txt")).unwrap(),
             Tag {
                 target: b"01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc".as_bstr(),
                 name: b"whitespace".as_bstr(),

git-object/src/tests/borrowed/tree.rs renamed to git-object/tests/borrowed/tree.rs

@@ -1,11 +1,7 @@
 mod parse {
-    use crate::{
-        borrowed::tree::Tree,
-        borrowed::tree::{Entry, Mode},
-        tests::borrowed::fixture_bytes,
-        tests::hex_to_id,
-    };
+    use crate::{borrowed::fixture_bytes, hex_to_id};
     use bstr::ByteSlice;
+    use git_object::borrowed::{Entry, Mode, Tree};
 
     #[test]
     fn everything() {