Auto merge of #347 - jimblandy:move-bq-tests, r=jdm

markup5ever: Move BufferQueue tests into that module.

The tests in the top-level `lib.rs` file of `markup5ever` exercise only `BufferQueue`, so it seems like it would be clearer for them to live in `util/buffer_queue.rs`.

Author: bors-servo

markup5ever/lib.rs

@@ -47,71 +47,3 @@ mod util {
 pub use util::*;
 pub use interface::{ExpandedName, QualName, Attribute};
 pub use util::smallcharset::SmallCharSet;
-
-
-
-#[cfg(test)]
-#[allow(non_snake_case)]
-mod test {
-    use tendril::SliceExt;
-
-    use super::util::buffer_queue::{BufferQueue, FromSet, NotFromSet};
-
-    #[test]
-    fn smoke_test() {
-        let mut bq = BufferQueue::new();
-        assert_eq!(bq.peek(), None);
-        assert_eq!(bq.next(), None);
-
-        bq.push_back("abc".to_tendril());
-        assert_eq!(bq.peek(), Some('a'));
-        assert_eq!(bq.next(), Some('a'));
-        assert_eq!(bq.peek(), Some('b'));
-        assert_eq!(bq.peek(), Some('b'));
-        assert_eq!(bq.next(), Some('b'));
-        assert_eq!(bq.peek(), Some('c'));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.peek(), None);
-        assert_eq!(bq.next(), None);
-    }
-
-    #[test]
-    fn can_unconsume() {
-        let mut bq = BufferQueue::new();
-        bq.push_back("abc".to_tendril());
-        assert_eq!(bq.next(), Some('a'));
-
-        bq.push_front("xy".to_tendril());
-        assert_eq!(bq.next(), Some('x'));
-        assert_eq!(bq.next(), Some('y'));
-        assert_eq!(bq.next(), Some('b'));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.next(), None);
-    }
-
-    #[test]
-    fn can_pop_except_set() {
-        let mut bq = BufferQueue::new();
-        bq.push_back("abc&def".to_tendril());
-        let mut pop = || bq.pop_except_from(small_char_set!('&'));
-        assert_eq!(pop(), Some(NotFromSet("abc".to_tendril())));
-        assert_eq!(pop(), Some(FromSet('&')));
-        assert_eq!(pop(), Some(NotFromSet("def".to_tendril())));
-        assert_eq!(pop(), None);
-    }
-
-    #[test]
-    fn can_eat() {
-        // This is not very comprehensive.  We rely on the tokenizer
-        // integration tests for more thorough testing with many
-        // different input buffer splits.
-        let mut bq = BufferQueue::new();
-        bq.push_back("a".to_tendril());
-        bq.push_back("bc".to_tendril());
-        assert_eq!(bq.eat("abcd", u8::eq_ignore_ascii_case), None);
-        assert_eq!(bq.eat("ax", u8::eq_ignore_ascii_case), Some(false));
-        assert_eq!(bq.eat("ab", u8::eq_ignore_ascii_case), Some(true));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.next(), None);
-    }
-}

markup5ever/util/buffer_queue.rs

@@ -230,3 +230,70 @@ impl BufferQueue {
         Some(true)
     }
 }
+
+#[cfg(test)]
+#[allow(non_snake_case)]
+mod test {
+    use tendril::SliceExt;
+
+    use super::BufferQueue;
+    use super::SetResult::{FromSet, NotFromSet};
+
+    #[test]
+    fn smoke_test() {
+        let mut bq = BufferQueue::new();
+        assert_eq!(bq.peek(), None);
+        assert_eq!(bq.next(), None);
+
+        bq.push_back("abc".to_tendril());
+        assert_eq!(bq.peek(), Some('a'));
+        assert_eq!(bq.next(), Some('a'));
+        assert_eq!(bq.peek(), Some('b'));
+        assert_eq!(bq.peek(), Some('b'));
+        assert_eq!(bq.next(), Some('b'));
+        assert_eq!(bq.peek(), Some('c'));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.peek(), None);
+        assert_eq!(bq.next(), None);
+    }
+
+    #[test]
+    fn can_unconsume() {
+        let mut bq = BufferQueue::new();
+        bq.push_back("abc".to_tendril());
+        assert_eq!(bq.next(), Some('a'));
+
+        bq.push_front("xy".to_tendril());
+        assert_eq!(bq.next(), Some('x'));
+        assert_eq!(bq.next(), Some('y'));
+        assert_eq!(bq.next(), Some('b'));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.next(), None);
+    }
+
+    #[test]
+    fn can_pop_except_set() {
+        let mut bq = BufferQueue::new();
+        bq.push_back("abc&def".to_tendril());
+        let mut pop = || bq.pop_except_from(small_char_set!('&'));
+        assert_eq!(pop(), Some(NotFromSet("abc".to_tendril())));
+        assert_eq!(pop(), Some(FromSet('&')));
+        assert_eq!(pop(), Some(NotFromSet("def".to_tendril())));
+        assert_eq!(pop(), None);
+    }
+
+    #[test]
+    fn can_eat() {
+        // This is not very comprehensive.  We rely on the tokenizer
+        // integration tests for more thorough testing with many
+        // different input buffer splits.
+        let mut bq = BufferQueue::new();
+        bq.push_back("a".to_tendril());
+        bq.push_back("bc".to_tendril());
+        assert_eq!(bq.eat("abcd", u8::eq_ignore_ascii_case), None);
+        assert_eq!(bq.eat("ax", u8::eq_ignore_ascii_case), Some(false));
+        assert_eq!(bq.eat("ab", u8::eq_ignore_ascii_case), Some(true));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.next(), None);
+    }
+}