refactor: move window tests into window file

The recommended standard for unit tests in Rust is to include the unit tests in the file that they're testing

2 files changed, 107 insertions, 109 deletions

diff --git a/src/joshuto/window.rs b/src/joshuto/window.rs
index e9c3608..ac8f544 100644
--- a/src/joshuto/window.rs
+++ b/src/joshuto/window.rs
@@ -3,9 +3,6 @@ extern crate ncurses;
 use joshuto::structs;
 use joshuto::ui;
 
-#[cfg(test)]
-mod test;
-
 #[derive(Clone, Debug)]
 pub struct JoshutoPageState {
     pub start: usize,
@@ -245,3 +242,110 @@ impl JoshutoView {
         self.right_win = new_view.right_win;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn shorter_than_viewable_region() {
+        let mut page_state = JoshutoPageState::new();
+        let index = 5;
+        let win_rows = 37;
+        let vec_len = 12;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(12, page_state.end);
+        let index = 30;
+        let win_rows = 37;
+        let vec_len = 12;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(12, page_state.end);
+    }
+    #[test]
+    fn test_01() {
+        let mut page_state = JoshutoPageState::new();
+        let index = 3;
+        let win_rows = 25;
+        let vec_len = 40;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(25, page_state.end);
+    }
+    #[test]
+    fn test_02() {
+        let mut page_state = JoshutoPageState::new();
+        let index = 12;
+        let win_rows = 25;
+        let vec_len = 40;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(25, page_state.end);
+    }
+    #[test]
+    fn test_inside_top_offset() {
+        let mut page_state = JoshutoPageState::new();
+        page_state.start = 10;
+        let index = 12;
+        let win_rows = 25;
+        let vec_len = 40;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(6, page_state.start);
+        assert_eq!(31, page_state.end);
+    }
+    #[test]
+    fn test_inside_bottom_offset() {
+        let mut page_state = JoshutoPageState::new();
+        page_state.start = 36;
+        let index = 34;
+        let win_rows = 25;
+        let vec_len = 40;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(15, page_state.start);
+        assert_eq!(40, page_state.end);
+    }
+    #[test]
+    fn test_small_size() {
+        let mut page_state = JoshutoPageState::new();
+        let index = 3;
+        let win_rows = 6;
+        let vec_len = 6;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(6, page_state.end);
+        let index = 0;
+        let win_rows = 6;
+        let vec_len = 6;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(6, page_state.end);
+        let index = 6;
+        let win_rows = 6;
+        let vec_len = 6;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(0, page_state.start);
+        assert_eq!(6, page_state.end);
+    }
+    #[test]
+    fn test_negative() {
+        let mut page_state = JoshutoPageState::new();
+        page_state.start = 10;
+        page_state.end = 5;
+        let index = 7;
+        let win_rows = 30;
+        let vec_len = 35;
+        let offset = 6;
+        page_state.update_page_state(index, win_rows, vec_len, offset);
+        assert_eq!(1, page_state.start);
+        assert_eq!(31, page_state.end);
+    }
+}
diff --git a/src/joshuto/window/test.rs b/src/joshuto/window/test.rs
deleted file mode 100644
index 0ed3997..0000000
--- a/src/joshuto/window/test.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use super::super::*;
-    #[test]
-    fn shorter_than_viewable_region() {
-        let mut page_state = JoshutoPageState::new();
-        let index = 5;
-        let win_rows = 37;
-        let vec_len = 12;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(12, page_state.end);
-        let index = 30;
-        let win_rows = 37;
-        let vec_len = 12;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(12, page_state.end);
-    }
-    #[test]
-    fn test_01() {
-        let mut page_state = JoshutoPageState::new();
-        let index = 3;
-        let win_rows = 25;
-        let vec_len = 40;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(25, page_state.end);
-    }
-    #[test]
-    fn test_02() {
-        let mut page_state = JoshutoPageState::new();
-        let index = 12;
-        let win_rows = 25;
-        let vec_len = 40;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(25, page_state.end);
-    }
-    #[test]
-    fn test_inside_top_offset() {
-        let mut page_state = JoshutoPageState::new();
-        page_state.start = 10;
-        let index = 12;
-        let win_rows = 25;
-        let vec_len = 40;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(6, page_state.start);
-        assert_eq!(31, page_state.end);
-    }
-    #[test]
-    fn test_inside_bottom_offset() {
-        let mut page_state = JoshutoPageState::new();
-        page_state.start = 36;
-        let index = 34;
-        let win_rows = 25;
-        let vec_len = 40;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(15, page_state.start);
-        assert_eq!(40, page_state.end);
-    }
-    #[test]
-    fn test_small_size() {
-        let mut page_state = JoshutoPageState::new();
-        let index = 3;
-        let win_rows = 6;
-        let vec_len = 6;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(6, page_state.end);
-        let index = 0;
-        let win_rows = 6;
-        let vec_len = 6;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(6, page_state.end);
-        let index = 6;
-        let win_rows = 6;
-        let vec_len = 6;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(0, page_state.start);
-        assert_eq!(6, page_state.end);
-    }
-    #[test]
-    fn test_negative() {
-        let mut page_state = JoshutoPageState::new();
-        page_state.start = 10;
-        page_state.end = 5;
-        let index = 7;
-        let win_rows = 30;
-        let vec_len = 35;
-        let offset = 6;
-        page_state.update_page_state(index, win_rows, vec_len, offset);
-        assert_eq!(1, page_state.start);
-        assert_eq!(31, page_state.end);
-    }
-}