Move tests for public APIs into the integration level.

That way one won't accidentally access private APIs, while staying
consistent with a standard Rust crate layout.

Personally, I really want to keep modules small and the `src/` tree
free of any extras.

Author: Byron

crates/gitbutler-hunk-dependency/src/hunk.rs

@@ -72,154 +72,3 @@ impl HunkRange {
         self.start > (start + lines - 1)
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_deleted_file_intersects_everything() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Deleted,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 0,
-            lines: 0,
-            line_shift: 0,
-        };
-
-        assert!(range.intersects(1, 1));
-        assert!(range.intersects(2, 2));
-        assert!(range.intersects(1, 1));
-        assert!(range.intersects(12, 10));
-        assert!(range.intersects(4, 0));
-        assert!(range.intersects(0, 0));
-    }
-
-    #[test]
-    fn test_hunk_at_the_beginning() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Modified,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 1,
-            lines: 10,
-            line_shift: 0,
-        };
-
-        assert!(range.intersects(1, 1));
-        assert!(range.intersects(1, 10));
-        assert!(range.intersects(4, 2));
-        assert!(range.intersects(10, 20));
-        assert!(range.intersects(4, 0));
-        // Adding lines at the beginning of the file.
-        assert!(!range.intersects(0, 0));
-
-        assert!(!range.intersects(11, 20));
-        assert!(!range.intersects(30, 1));
-    }
-
-    #[test]
-    fn test_hunk_in_the_middle() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Modified,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 10,
-            lines: 10,
-            line_shift: 0,
-        };
-
-        assert!(range.intersects(1, 10));
-        assert!(range.intersects(1, 20));
-        assert!(range.intersects(1, 30));
-        assert!(range.intersects(4, 10));
-        assert!(range.intersects(19, 0));
-        assert!(range.intersects(10, 0));
-        assert!(range.intersects(10, 10));
-        assert!(range.intersects(10, 20));
-        assert!(range.intersects(11, 20));
-        assert!(range.intersects(15, 1));
-
-        // Adding lines at the beginning of the file.
-        assert!(!range.intersects(0, 0));
-
-        assert!(!range.intersects(20, 0));
-        assert!(!range.intersects(1, 1));
-        assert!(!range.intersects(1, 9));
-        assert!(!range.intersects(20, 1));
-        assert!(!range.intersects(30, 1));
-    }
-
-    #[test]
-    fn test_is_covered_by() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Modified,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 10,
-            lines: 10,
-            line_shift: 0,
-        };
-
-        assert!(range.covered_by(1, 20));
-        assert!(range.covered_by(1, 30));
-        assert!(range.covered_by(4, 16));
-        assert!(range.covered_by(10, 20));
-        // Adding lines at the beginning of the file.
-        assert!(!range.covered_by(0, 0));
-
-        assert!(!range.covered_by(10, 9));
-        assert!(!range.covered_by(11, 20));
-        assert!(!range.covered_by(15, 1));
-        assert!(!range.covered_by(1, 1));
-        assert!(!range.covered_by(1, 18));
-        assert!(!range.covered_by(20, 1));
-        assert!(!range.covered_by(30, 10));
-    }
-
-    #[test]
-    fn test_contains() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Modified,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 10,
-            lines: 10,
-            line_shift: 0,
-        };
-
-        assert!(!range.contains(0, 0));
-        assert!(!range.contains(1, 20));
-        assert!(!range.contains(1, 30));
-        assert!(!range.contains(4, 16));
-        assert!(!range.contains(10, 20));
-        assert!(!range.contains(10, 10));
-        assert!(!range.contains(19, 0));
-        assert!(range.contains(11, 8));
-        assert!(range.contains(11, 9));
-        assert!(range.contains(10, 0));
-        assert!(range.contains(18, 0));
-    }
-
-    #[test]
-    fn test_follows() {
-        let range = HunkRange {
-            change_type: gitbutler_diff::ChangeType::Modified,
-            stack_id: StackId::generate(),
-            commit_id: git2::Oid::from_str("a").unwrap(),
-            start: 10,
-            lines: 10,
-            line_shift: 0,
-        };
-
-        assert!(range.follows(0, 0));
-        assert!(range.follows(1, 9));
-        assert!(range.follows(9, 1));
-        assert!(!range.follows(10, 0));
-        assert!(!range.follows(11, 0));
-        assert!(!range.follows(10, 1));
-        assert!(!range.follows(11, 1));
-        assert!(!range.follows(20, 1));
-    }
-}

crates/gitbutler-hunk-dependency/src/input.rs

@@ -90,53 +90,3 @@ fn parse_header(hunk_info: &str) -> (u32, u32) {
     };
     (start, lines)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn diff_simple() -> anyhow::Result<()> {
-        let header = parse_diff_from_string(
-            "@@ -1,6 +1,7 @@
-1
-2
-3
-+4
-5
-6
-7
-",
-            gitbutler_diff::ChangeType::Modified,
-        )?;
-        assert_eq!(header.old_start, 4);
-        assert_eq!(header.old_lines, 0);
-        assert_eq!(header.new_start, 4);
-        assert_eq!(header.new_lines, 1);
-        assert_eq!(header.net_lines()?, 1);
-        Ok(())
-    }
-
-    #[test]
-    fn diff_complex() -> anyhow::Result<()> {
-        let header = parse_diff_from_string(
-            "@@ -5,7 +5,6 @@
-5
-6
-7
--8
--9
-+a
-10
-11
-",
-            gitbutler_diff::ChangeType::Modified,
-        )?;
-        assert_eq!(header.old_start, 8);
-        assert_eq!(header.old_lines, 2);
-        assert_eq!(header.new_start, 8);
-        assert_eq!(header.new_lines, 1);
-        assert_eq!(header.net_lines()?, -1);
-        Ok(())
-    }
-}

crates/gitbutler-hunk-dependency/src/path.rs

@@ -787,7 +787,6 @@ fn insert_hunk_ranges(
 }
 
 #[cfg(test)]
-
 mod tests {
     use super::*;
 

crates/gitbutler-hunk-dependency/tests/hunk.rs

@@ -0,0 +1,148 @@
+use gitbutler_hunk_dependency::HunkRange;
+use gitbutler_stack::StackId;
+
+#[test]
+fn test_deleted_file_intersects_everything() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Deleted,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 0,
+        lines: 0,
+        line_shift: 0,
+    };
+
+    assert!(range.intersects(1, 1));
+    assert!(range.intersects(2, 2));
+    assert!(range.intersects(1, 1));
+    assert!(range.intersects(12, 10));
+    assert!(range.intersects(4, 0));
+    assert!(range.intersects(0, 0));
+}
+
+#[test]
+fn test_hunk_at_the_beginning() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Modified,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 1,
+        lines: 10,
+        line_shift: 0,
+    };
+
+    assert!(range.intersects(1, 1));
+    assert!(range.intersects(1, 10));
+    assert!(range.intersects(4, 2));
+    assert!(range.intersects(10, 20));
+    assert!(range.intersects(4, 0));
+    // Adding lines at the beginning of the file.
+    assert!(!range.intersects(0, 0));
+
+    assert!(!range.intersects(11, 20));
+    assert!(!range.intersects(30, 1));
+}
+
+#[test]
+fn test_hunk_in_the_middle() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Modified,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 10,
+        lines: 10,
+        line_shift: 0,
+    };
+
+    assert!(range.intersects(1, 10));
+    assert!(range.intersects(1, 20));
+    assert!(range.intersects(1, 30));
+    assert!(range.intersects(4, 10));
+    assert!(range.intersects(19, 0));
+    assert!(range.intersects(10, 0));
+    assert!(range.intersects(10, 10));
+    assert!(range.intersects(10, 20));
+    assert!(range.intersects(11, 20));
+    assert!(range.intersects(15, 1));
+
+    // Adding lines at the beginning of the file.
+    assert!(!range.intersects(0, 0));
+
+    assert!(!range.intersects(20, 0));
+    assert!(!range.intersects(1, 1));
+    assert!(!range.intersects(1, 9));
+    assert!(!range.intersects(20, 1));
+    assert!(!range.intersects(30, 1));
+}
+
+#[test]
+fn test_is_covered_by() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Modified,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 10,
+        lines: 10,
+        line_shift: 0,
+    };
+
+    assert!(range.covered_by(1, 20));
+    assert!(range.covered_by(1, 30));
+    assert!(range.covered_by(4, 16));
+    assert!(range.covered_by(10, 20));
+    // Adding lines at the beginning of the file.
+    assert!(!range.covered_by(0, 0));
+
+    assert!(!range.covered_by(10, 9));
+    assert!(!range.covered_by(11, 20));
+    assert!(!range.covered_by(15, 1));
+    assert!(!range.covered_by(1, 1));
+    assert!(!range.covered_by(1, 18));
+    assert!(!range.covered_by(20, 1));
+    assert!(!range.covered_by(30, 10));
+}
+
+#[test]
+fn test_contains() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Modified,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 10,
+        lines: 10,
+        line_shift: 0,
+    };
+
+    assert!(!range.contains(0, 0));
+    assert!(!range.contains(1, 20));
+    assert!(!range.contains(1, 30));
+    assert!(!range.contains(4, 16));
+    assert!(!range.contains(10, 20));
+    assert!(!range.contains(10, 10));
+    assert!(!range.contains(19, 0));
+    assert!(range.contains(11, 8));
+    assert!(range.contains(11, 9));
+    assert!(range.contains(10, 0));
+    assert!(range.contains(18, 0));
+}
+
+#[test]
+fn test_follows() {
+    let range = HunkRange {
+        change_type: gitbutler_diff::ChangeType::Modified,
+        stack_id: StackId::generate(),
+        commit_id: git2::Oid::from_str("a").unwrap(),
+        start: 10,
+        lines: 10,
+        line_shift: 0,
+    };
+
+    assert!(range.follows(0, 0));
+    assert!(range.follows(1, 9));
+    assert!(range.follows(9, 1));
+    assert!(!range.follows(10, 0));
+    assert!(!range.follows(11, 0));
+    assert!(!range.follows(10, 1));
+    assert!(!range.follows(11, 1));
+    assert!(!range.follows(20, 1));
+}