Move tests into test modules0.11.0

3 files changed, 99 insertions, 85 deletions

diff --git a/src/disk_buffer/mod.rs b/src/disk_buffer/mod.rs
index 901d594..7379f0e 100644
--- a/src/disk_buffer/mod.rs
+++ b/src/disk_buffer/mod.rs
@@ -73,24 +73,29 @@ impl DiskBufferReader {
     }
 }
 
-#[test]
-fn test_disk_buffer_reader_simple() {
-    let file = include_bytes!("../../tests/buffer.dat");
-    let mut disk_buffer_reader = DiskBuffer::new(Path::new("tests/buffer.dat")).read().unwrap();
-    let _ = disk_buffer_reader.buffer(0);
-    assert_eq!(&file[0..BUFFER_SIZE], &disk_buffer_reader.data[..]);
-    let _ = disk_buffer_reader.buffer(0);
-    assert_eq!(&file[BUFFER_SIZE..BUFFER_SIZE*2], &disk_buffer_reader.data[..]);
-    let _ = disk_buffer_reader.buffer(0);
-    assert_eq!(&file[BUFFER_SIZE*2..], &disk_buffer_reader.data[..2989]);
-}
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_disk_buffer_reader_simple() {
+        let file = include_bytes!("../../tests/buffer.dat");
+        let mut disk_buffer_reader = DiskBuffer::new(Path::new("tests/buffer.dat")).read().unwrap();
+        let _ = disk_buffer_reader.buffer(0);
+        assert_eq!(&file[0..BUFFER_SIZE], &disk_buffer_reader.data[..]);
+        let _ = disk_buffer_reader.buffer(0);
+        assert_eq!(&file[BUFFER_SIZE..BUFFER_SIZE*2], &disk_buffer_reader.data[..]);
+        let _ = disk_buffer_reader.buffer(0);
+        assert_eq!(&file[BUFFER_SIZE*2..], &disk_buffer_reader.data[..2989]);
+    }
 
-#[test]
-fn test_disk_buffer_reader_byte_shifting() {
-    let file = include_bytes!("../../tests/buffer.dat");
-    let mut disk_buffer_reader = DiskBuffer::new(Path::new("tests/buffer.dat")).read().unwrap();
-    let _ = disk_buffer_reader.buffer(0);
-    assert_eq!(&file[0..BUFFER_SIZE], &disk_buffer_reader.data[..]);
-    let _ = disk_buffer_reader.buffer(BUFFER_SIZE/2);
-    assert_eq!(&file[BUFFER_SIZE/2+1..BUFFER_SIZE/2+1+BUFFER_SIZE], &disk_buffer_reader.data[0..BUFFER_SIZE]);
+    #[test]
+    fn test_disk_buffer_reader_byte_shifting() {
+        let file = include_bytes!("../../tests/buffer.dat");
+        let mut disk_buffer_reader = DiskBuffer::new(Path::new("tests/buffer.dat")).read().unwrap();
+        let _ = disk_buffer_reader.buffer(0);
+        assert_eq!(&file[0..BUFFER_SIZE], &disk_buffer_reader.data[..]);
+        let _ = disk_buffer_reader.buffer(BUFFER_SIZE/2);
+        assert_eq!(&file[BUFFER_SIZE/2+1..BUFFER_SIZE/2+1+BUFFER_SIZE], &disk_buffer_reader.data[0..BUFFER_SIZE]);
+    }
 }
diff --git a/src/execute/argument_splitter.rs b/src/execute/argument_splitter.rs
index 1f2cd9d..6f53e2f 100644
--- a/src/execute/argument_splitter.rs
+++ b/src/execute/argument_splitter.rs
@@ -53,19 +53,24 @@ impl<'a> Iterator for ArgumentSplitter<'a> {
     }
 }
 
-#[test]
-fn test_split_args() {
-    use std::str;
+#[cfg(test)]
+mod tests {
+    use super::*;
+    
+    #[test]
+    fn test_split_args() {
+        use std::str;
 
-    let argument = ArgumentSplitter::new("ffmpeg -i \"file with spaces\" \"output with spaces\"");
-    let expected = vec!["ffmpeg", "-i", "file with spaces", "output with spaces"];
-    let argument = argument.collect::<Vec<Vec<u8>>>();
-    let argument = argument.iter().map(|x| str::from_utf8(x).unwrap()).collect::<Vec<&str>>();
-    assert_eq!(argument, expected);
+        let argument = ArgumentSplitter::new("ffmpeg -i \"file with spaces\" \"output with spaces\"");
+        let expected = vec!["ffmpeg", "-i", "file with spaces", "output with spaces"];
+        let argument = argument.collect::<Vec<Vec<u8>>>();
+        let argument = argument.iter().map(|x| str::from_utf8(x).unwrap()).collect::<Vec<&str>>();
+        assert_eq!(argument, expected);
 
-    let argument = ArgumentSplitter::new("one\\ two\\\\ a\\\'b\\\"c");
-    let expected = vec!["one two\\", "a\'b\"c"];
-    let argument = argument.collect::<Vec<Vec<u8>>>();
-    let argument = argument.iter().map(|x| str::from_utf8(x).unwrap()).collect::<Vec<&str>>();
-    assert_eq!(argument, expected);
+        let argument = ArgumentSplitter::new("one\\ two\\\\ a\\\'b\\\"c");
+        let expected = vec!["one two\\", "a\'b\"c"];
+        let argument = argument.collect::<Vec<Vec<u8>>>();
+        let argument = argument.iter().map(|x| str::from_utf8(x).unwrap()).collect::<Vec<&str>>();
+        assert_eq!(argument, expected);
+    }
 }
diff --git a/src/tokenizer/functions.rs b/src/tokenizer/functions.rs
index b8b1ec2..cbc9c61 100644
--- a/src/tokenizer/functions.rs
+++ b/src/tokenizer/functions.rs
@@ -28,69 +28,73 @@ pub fn dirname(input: &str) -> &str {
     if index == 0 { "." } else { &input[0..index] }
 }
 
-#[test]
-fn path_remove_ext_simple() {
-    assert_eq!(remove_extension("foo.txt"), "foo");
-}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn path_remove_ext_simple() {
+        assert_eq!(remove_extension("foo.txt"), "foo");
+    }
 
-#[test]
-fn path_remove_ext_dir() {
-    assert_eq!(remove_extension("dir/foo.txt"), "dir/foo");
-}
+    #[test]
+    fn path_remove_ext_dir() {
+        assert_eq!(remove_extension("dir/foo.txt"), "dir/foo");
+    }
 
-#[test]
-fn path_hidden() {
-    assert_eq!(remove_extension(".foo"), ".foo")
-}
+    #[test]
+    fn path_hidden() {
+        assert_eq!(remove_extension(".foo"), ".foo")
+    }
 
-#[test]
-fn path_remove_ext_utf8() {
-    assert_eq!(remove_extension("💖.txt"), "💖");
-}
+    #[test]
+    fn path_remove_ext_utf8() {
+        assert_eq!(remove_extension("💖.txt"), "💖");
+    }
 
-#[test]
-fn path_remove_ext_empty() {
-    assert_eq!(remove_extension(""), "");
-}
+    #[test]
+    fn path_remove_ext_empty() {
+        assert_eq!(remove_extension(""), "");
+    }
 
-#[test]
-fn path_basename_simple() {
-    assert_eq!(basename("foo.txt"), "foo.txt");
-}
+    #[test]
+    fn path_basename_simple() {
+        assert_eq!(basename("foo.txt"), "foo.txt");
+    }
 
-#[test]
-fn path_basename_dir() {
-    assert_eq!(basename("dir/foo.txt"), "foo.txt");
-}
+    #[test]
+    fn path_basename_dir() {
+        assert_eq!(basename("dir/foo.txt"), "foo.txt");
+    }
 
-#[test]
-fn path_basename_empty() {
-    assert_eq!(basename(""), "");
-}
+    #[test]
+    fn path_basename_empty() {
+        assert_eq!(basename(""), "");
+    }
 
-#[test]
-fn path_basename_utf8() {
-    assert_eq!(basename("💖/foo.txt"), "foo.txt");
-    assert_eq!(basename("dir/💖.txt"), "💖.txt");
-}
+    #[test]
+    fn path_basename_utf8() {
+        assert_eq!(basename("💖/foo.txt"), "foo.txt");
+        assert_eq!(basename("dir/💖.txt"), "💖.txt");
+    }
 
-#[test]
-fn path_dirname_simple() {
-    assert_eq!(dirname("foo.txt"), ".");
-}
+    #[test]
+    fn path_dirname_simple() {
+        assert_eq!(dirname("foo.txt"), ".");
+    }
 
-#[test]
-fn path_dirname_dir() {
-    assert_eq!(dirname("dir/foo.txt"), "dir");
-}
+    #[test]
+    fn path_dirname_dir() {
+        assert_eq!(dirname("dir/foo.txt"), "dir");
+    }
 
-#[test]
-fn path_dirname_utf8() {
-    assert_eq!(dirname("💖/foo.txt"), "💖");
-    assert_eq!(dirname("dir/💖.txt"), "dir");
-}
+    #[test]
+    fn path_dirname_utf8() {
+        assert_eq!(dirname("💖/foo.txt"), "💖");
+        assert_eq!(dirname("dir/💖.txt"), "dir");
+    }
 
-#[test]
-fn path_dirname_empty() {
-    assert_eq!(dirname(""), ".");
+    #[test]
+    fn path_dirname_empty() {
+        assert_eq!(dirname(""), ".");
+    }
 }