move transport tests to API tests

Author: sourcefrog

src/transport/mod.rs

@@ -150,13 +150,6 @@ pub struct ListDirNames {
 ///
 /// Locations can be parsed from strings. At present the only supported form is an absolute
 /// or relative filename.
-/// ```
-/// use std::str::FromStr;
-/// use conserve::transport::Location;
-///
-/// let location: Location = Location::from_str("/backup/example").unwrap();
-/// let transport = location.open();
-/// ```
 #[derive(Debug, Eq, PartialEq)]
 pub enum Location {
     /// A local directory.
@@ -167,14 +160,6 @@ impl Location {
     /// Open a Transport that can read and write this location.
     ///
     /// The location need not already exist.
-    ///
-    /// ```
-    /// use std::path::PathBuf;
-    /// use conserve::transport::Location;
-    ///
-    /// let location = Location::Local("/backup".to_owned().into());
-    /// let transport = location.open().unwrap();
-    /// ```
     pub fn open(&self) -> Result<Box<dyn Transport>> {
         match self {
             Location::Local(pathbuf) => Ok(Box::new(local::LocalTransport::new(&pathbuf))),
@@ -190,28 +175,3 @@ impl FromStr for Location {
         Ok(Location::Local(s.into()))
     }
 }
-
-#[cfg(test)]
-mod test {
-    use assert_fs::prelude::*;
-
-    use super::*;
-    use crate::transport::local::LocalTransport;
-
-    #[test]
-    fn list_dir_names() {
-        let temp = assert_fs::TempDir::new().unwrap();
-        temp.child("a dir").create_dir_all().unwrap();
-        temp.child("a file").touch().unwrap();
-        temp.child("another file").touch().unwrap();
-
-        let transport = LocalTransport::new(&temp.path());
-
-        let ListDirNames { mut files, dirs } = transport.list_dir_names("").unwrap();
-        assert_eq!(dirs, ["a dir"]);
-        files.sort();
-        assert_eq!(files, ["a file", "another file"]);
-
-        temp.close().unwrap();
-    }
-}

tests/api/main.rs

@@ -20,3 +20,4 @@ mod delete;
 mod gc;
 mod old_archives;
 mod restore;
+mod transport;

tests/api/transport.rs

@@ -0,0 +1,48 @@
+// Copyright 2021 Martin Pool.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+use assert_fs::prelude::*;
+
+use conserve::transport::{ListDirNames, Location};
+
+#[test]
+fn open_local() {
+    let location = Location::Local("/backup".to_owned().into());
+    let _transport = location.open().unwrap();
+}
+
+#[test]
+fn parse_location() {
+    use conserve::transport::Location;
+    use std::str::FromStr;
+    let location: Location = Location::from_str("/backup/example").unwrap();
+    let _transport = location.open();
+}
+
+#[test]
+fn list_dir_names() {
+    let temp = assert_fs::TempDir::new().unwrap();
+    temp.child("a dir").create_dir_all().unwrap();
+    temp.child("a file").touch().unwrap();
+    temp.child("another file").touch().unwrap();
+
+    let transport = Location::Local((&temp.path()).to_path_buf())
+        .open()
+        .unwrap();
+
+    let ListDirNames { mut files, dirs } = transport.list_dir_names("").unwrap();
+    assert_eq!(dirs, ["a dir"]);
+    files.sort();
+    assert_eq!(files, ["a file", "another file"]);
+
+    temp.close().unwrap();
+}