refactor (#427)

git-revision/tests/spec/mod.rs

@@ -1,128 +1 @@
-mod parse {
-    use git_object::bstr::{BStr, BString};
-    use git_revision::spec;
-
-    #[derive(Default, Debug)]
-    struct Recorder {
-        resolve_ref_input: Option<BString>,
-        resolve_ref_input2: Option<BString>,
-        kind: Option<spec::Kind>,
-        calls: usize,
-    }
-    impl spec::parse::Delegate for Recorder {
-        fn resolve_ref(&mut self, input: &BStr) -> Option<()> {
-            if self.resolve_ref_input.is_none() {
-                self.resolve_ref_input = input.to_owned().into();
-            } else if self.resolve_ref_input2.is_none() {
-                self.resolve_ref_input2 = input.to_owned().into();
-            } else {
-                panic!("called resolve_ref more than twice with '{}'", input);
-            }
-            self.calls += 1;
-            Some(())
-        }
-
-        fn find_by_prefix(&mut self, _input: &BStr) -> Option<()> {
-            todo!()
-        }
-
-        fn nth_ancestor(&mut self, _n: usize) -> Option<()> {
-            todo!()
-        }
-
-        fn nth_parent(&mut self, _n: usize) -> Option<()> {
-            todo!()
-        }
-
-        fn kind(&mut self, kind: spec::Kind) {
-            self.calls += 1;
-            self.kind = Some(kind);
-        }
-    }
-
-    fn parse(spec: &str) -> Recorder {
-        let mut rec = Recorder::default();
-        spec::parse(spec.into(), &mut rec).unwrap();
-        rec
-    }
-
-    #[test]
-    #[ignore]
-    fn empty_specs_are_valid() {
-        // they should of course be invalid for the delegate. CLIs may pre-process the input as well if they wish
-        // but git itself doesn't do that.
-        for spec in ["", " ", "\n\t"] {
-            let rec = parse(spec);
-            assert_eq!(rec.calls, 0);
-        }
-    }
-
-    #[test]
-    #[ignore]
-    fn all_characters_are_taken_verbatim_which_includes_whitespace() {
-        let spec = "  HEAD \n";
-        let rec = parse(spec);
-        assert!(rec.kind.is_none());
-        assert_eq!(rec.resolve_ref_input.unwrap(), spec);
-    }
-
-    mod revision {
-        use crate::spec::parse::parse;
-
-        #[test]
-        fn at_by_iteself_is_shortcut_for_head() {
-            let rec = parse("@");
-            assert!(rec.kind.is_none());
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-        }
-
-        #[test]
-        fn refname_head() {
-            let rec = parse("HEAD");
-            assert!(rec.kind.is_none());
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-        }
-    }
-
-    mod range {
-        use crate::spec::parse::parse;
-        use git_revision::spec;
-
-        #[test]
-        fn leading_caret_is_range_kind() {
-            let rec = parse("^HEAD");
-            assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-        }
-
-        #[test]
-        fn trailing_dot_dot_is_range() {
-            let rec = parse("HEAD..");
-            assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-        }
-
-        #[test]
-        fn trailing_dot_dot_dot_is_merge_base() {
-            let rec = parse("HEAD...");
-            assert_eq!(rec.kind.unwrap(), spec::Kind::MergeBase);
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-        }
-
-        #[test]
-        fn middle_dot_dot_dot_is_merge_base() {
-            let rec = parse("HEAD...@");
-            assert_eq!(rec.kind.unwrap(), spec::Kind::MergeBase);
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-            assert_eq!(rec.resolve_ref_input2.unwrap(), "HEAD");
-        }
-
-        #[test]
-        fn middle_dot_dot_is_range() {
-            let rec = parse("@..HEAD");
-            assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
-            assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
-            assert_eq!(rec.resolve_ref_input2.unwrap(), "HEAD");
-        }
-    }
-}
+mod parse;

git-revision/tests/spec/parse.rs

@@ -0,0 +1,127 @@
+use git_object::bstr::{BStr, BString};
+use git_revision::spec;
+
+#[derive(Default, Debug)]
+struct Recorder {
+    resolve_ref_input: Option<BString>,
+    resolve_ref_input2: Option<BString>,
+    kind: Option<spec::Kind>,
+    calls: usize,
+}
+
+impl spec::parse::Delegate for Recorder {
+    fn resolve_ref(&mut self, input: &BStr) -> Option<()> {
+        if self.resolve_ref_input.is_none() {
+            self.resolve_ref_input = input.to_owned().into();
+        } else if self.resolve_ref_input2.is_none() {
+            self.resolve_ref_input2 = input.to_owned().into();
+        } else {
+            panic!("called resolve_ref more than twice with '{}'", input);
+        }
+        self.calls += 1;
+        Some(())
+    }
+
+    fn find_by_prefix(&mut self, _input: &BStr) -> Option<()> {
+        todo!()
+    }
+
+    fn nth_ancestor(&mut self, _n: usize) -> Option<()> {
+        todo!()
+    }
+
+    fn nth_parent(&mut self, _n: usize) -> Option<()> {
+        todo!()
+    }
+
+    fn kind(&mut self, kind: spec::Kind) {
+        self.calls += 1;
+        self.kind = Some(kind);
+    }
+}
+
+fn parse(spec: &str) -> Recorder {
+    let mut rec = Recorder::default();
+    spec::parse(spec.into(), &mut rec).unwrap();
+    rec
+}
+
+#[test]
+#[ignore]
+fn empty_specs_are_valid() {
+    // they should of course be invalid for the delegate. CLIs may pre-process the input as well if they wish
+    // but git itself doesn't do that.
+    for spec in ["", " ", "\n\t"] {
+        let rec = parse(spec);
+        assert_eq!(rec.calls, 0);
+    }
+}
+
+#[test]
+#[ignore]
+fn all_characters_are_taken_verbatim_which_includes_whitespace() {
+    let spec = "  HEAD \n";
+    let rec = parse(spec);
+    assert!(rec.kind.is_none());
+    assert_eq!(rec.resolve_ref_input.unwrap(), spec);
+}
+
+mod revision {
+    use crate::spec::parse::parse;
+
+    #[test]
+    fn at_by_iteself_is_shortcut_for_head() {
+        let rec = parse("@");
+        assert!(rec.kind.is_none());
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+    }
+
+    #[test]
+    fn refname_head() {
+        let rec = parse("HEAD");
+        assert!(rec.kind.is_none());
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+    }
+}
+
+mod range {
+    use crate::spec::parse::parse;
+    use git_revision::spec;
+
+    #[test]
+    fn leading_caret_is_range_kind() {
+        let rec = parse("^HEAD");
+        assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+    }
+
+    #[test]
+    fn trailing_dot_dot_is_range() {
+        let rec = parse("HEAD..");
+        assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+    }
+
+    #[test]
+    fn trailing_dot_dot_dot_is_merge_base() {
+        let rec = parse("HEAD...");
+        assert_eq!(rec.kind.unwrap(), spec::Kind::MergeBase);
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+    }
+
+    #[test]
+    fn middle_dot_dot_dot_is_merge_base() {
+        let rec = parse("HEAD...@");
+        assert_eq!(rec.kind.unwrap(), spec::Kind::MergeBase);
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+        assert_eq!(rec.resolve_ref_input2.unwrap(), "HEAD");
+    }
+
+    #[test]
+    fn middle_dot_dot_is_range() {
+        let rec = parse("@..HEAD");
+        assert_eq!(rec.kind.unwrap(), spec::Kind::Range);
+        assert_eq!(rec.resolve_ref_input.unwrap(), "HEAD");
+        assert_eq!(rec.resolve_ref_input2.unwrap(), "HEAD");
+    }
+}