Move tests to separate module

Author: kyeah

.travis.yml

@@ -1,5 +1,8 @@
 language: rust
 
+env:
+    - RUST_TEST_THREADS=1
+
 script:
     - cargo build -v
     - cargo test -v

src/encoder.rs

@@ -166,51 +166,3 @@ fn encode_bson<W: Write + ?Sized>(writer: &mut W, key: &str, val: &Bson) -> Enco
         &Bson::Null => Ok(())
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::encode_document;
-    use bson::{Document, Bson};
-
-    #[test]
-    fn test_encode_floating_point() {
-        let src = 1020.123;
-        let dst = [18, 0, 0, 0, 1, 107, 101, 121, 0, 68, 139, 108, 231, 251, 224, 143, 64, 0];
-
-        let mut doc = Document::new();
-        doc.insert("key".to_owned(), Bson::FloatingPoint(src));
-
-        let mut buf = Vec::new();
-        encode_document(&mut buf, &doc).unwrap();
-
-        assert_eq!(&buf, &dst);
-    }
-
-    #[test]
-    fn test_encode_utf8_string() {
-        let src = "test你好吗".to_owned();
-        let dst = [28, 0, 0, 0, 2, 107, 101, 121, 0, 14, 0, 0, 0, 116, 101, 115, 116, 228, 189, 160, 229, 165, 189, 229, 144, 151, 0, 0];
-
-        let mut doc = Document::new();
-        doc.insert("key".to_owned(), Bson::String(src));
-
-        let mut buf = Vec::new();
-        encode_document(&mut buf, &doc).unwrap();
-
-        assert_eq!(&buf, &dst);
-    }
-
-    #[test]
-    fn test_encode_array() {
-        let src = vec![Bson::FloatingPoint(1.01), Bson::String("xyz".to_owned())];
-        let dst = [37, 0, 0, 0, 4, 107, 101, 121, 0, 27, 0, 0, 0, 1, 48, 0, 41, 92, 143, 194, 245, 40, 240, 63, 2, 49, 0, 4, 0, 0, 0, 120, 121, 122, 0, 0, 0];
-
-        let mut doc = Document::new();
-        doc.insert("key".to_owned(), Bson::Array(src));
-
-        let mut buf = Vec::new();
-        encode_document(&mut buf, &doc).unwrap();
-
-        assert_eq!(&buf[..], &dst[..]);
-    }
-}

src/ordered.rs

@@ -193,45 +193,3 @@ impl OrderedDocument {
         self.document.remove(key)
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::OrderedDocument;
-    use bson::Bson;
-
-    #[test]
-    fn ordered_insert() {
-        let mut doc = OrderedDocument::new();
-        doc.insert("first".to_owned(), Bson::I32(1));
-        doc.insert("second".to_owned(), Bson::String("foo".to_owned()));
-        doc.insert("alphanumeric".to_owned(), Bson::String("bar".to_owned()));
-
-        let expected_keys = vec!(
-            "first".to_owned(),
-            "second".to_owned(),
-            "alphanumeric".to_owned(),
-        );
-
-        let keys: Vec<_> = doc.iter().map(|(key, _)| key.to_owned()).collect();
-        assert_eq!(expected_keys, keys);
-    }
-
-    #[test]
-    fn remove() {
-        let mut doc = OrderedDocument::new();
-        doc.insert("first".to_owned(), Bson::I32(1));
-        doc.insert("second".to_owned(), Bson::String("foo".to_owned()));
-        doc.insert("alphanumeric".to_owned(), Bson::String("bar".to_owned()));
-
-        assert!(doc.remove("second").is_some());
-        assert!(doc.remove("none").is_none());
-
-        let expected_keys = vec!(
-            "first",
-            "alphanumeric",
-        );
-
-        let keys: Vec<_> = doc.iter().map(|(key, _)| key.to_owned()).collect();
-        assert_eq!(expected_keys, keys);
-    }
-}

tests/lib.rs

@@ -1,4 +1,4 @@
 extern crate bson;
 extern crate rustc_serialize;
 
-mod oid;
+mod modules;

tests/modules/encoder.rs

@@ -0,0 +1,45 @@
+extern crate bson;
+
+use bson::{Document, Bson, encode_document};
+
+#[test]
+fn test_encode_floating_point() {
+    let src = 1020.123;
+    let dst = [18, 0, 0, 0, 1, 107, 101, 121, 0, 68, 139, 108, 231, 251, 224, 143, 64, 0];
+
+    let mut doc = Document::new();
+    doc.insert("key".to_owned(), Bson::FloatingPoint(src));
+
+    let mut buf = Vec::new();
+    encode_document(&mut buf, &doc).unwrap();
+
+    assert_eq!(&buf, &dst);
+}
+
+#[test]
+fn test_encode_utf8_string() {
+    let src = "test你好吗".to_owned();
+    let dst = [28, 0, 0, 0, 2, 107, 101, 121, 0, 14, 0, 0, 0, 116, 101, 115, 116, 228, 189, 160, 229, 165, 189, 229, 144, 151, 0, 0];
+
+    let mut doc = Document::new();
+    doc.insert("key".to_owned(), Bson::String(src));
+
+    let mut buf = Vec::new();
+    encode_document(&mut buf, &doc).unwrap();
+
+    assert_eq!(&buf, &dst);
+}
+
+#[test]
+fn test_encode_array() {
+    let src = vec![Bson::FloatingPoint(1.01), Bson::String("xyz".to_owned())];
+    let dst = [37, 0, 0, 0, 4, 107, 101, 121, 0, 27, 0, 0, 0, 1, 48, 0, 41, 92, 143, 194, 245, 40, 240, 63, 2, 49, 0, 4, 0, 0, 0, 120, 121, 122, 0, 0, 0];
+
+    let mut doc = Document::new();
+    doc.insert("key".to_owned(), Bson::Array(src));
+
+    let mut buf = Vec::new();
+    encode_document(&mut buf, &doc).unwrap();
+
+    assert_eq!(&buf[..], &dst[..]);
+}

tests/modules/mod.rs

@@ -0,0 +1,3 @@
+mod encoder;
+mod oid;
+mod ordered;

tests/oid.rs renamed to tests/modules/oid.rs

@@ -1,6 +1,3 @@
-extern crate bson;
-extern crate rustc_serialize;
-
 use bson::oid::ObjectId;
 use rustc_serialize::hex::ToHex;
 

tests/modules/ordered.rs

@@ -0,0 +1,37 @@
+use bson::{Bson, Document};
+
+#[test]
+fn ordered_insert() {
+    let mut doc = Document::new();
+    doc.insert("first".to_owned(), Bson::I32(1));
+    doc.insert("second".to_owned(), Bson::String("foo".to_owned()));
+    doc.insert("alphanumeric".to_owned(), Bson::String("bar".to_owned()));
+
+    let expected_keys = vec!(
+        "first".to_owned(),
+        "second".to_owned(),
+        "alphanumeric".to_owned(),
+        );
+
+    let keys: Vec<_> = doc.iter().map(|(key, _)| key.to_owned()).collect();
+    assert_eq!(expected_keys, keys);
+}
+
+#[test]
+fn remove() {
+    let mut doc = Document::new();
+    doc.insert("first".to_owned(), Bson::I32(1));
+    doc.insert("second".to_owned(), Bson::String("foo".to_owned()));
+    doc.insert("alphanumeric".to_owned(), Bson::String("bar".to_owned()));
+
+    assert!(doc.remove("second").is_some());
+    assert!(doc.remove("none").is_none());
+
+    let expected_keys = vec!(
+        "first",
+        "alphanumeric",
+        );
+
+    let keys: Vec<_> = doc.iter().map(|(key, _)| key.to_owned()).collect();
+    assert_eq!(expected_keys, keys);
+}