Refactor unit tests in mod builder & error (#55)

Wrap them in a `tests` module, which is only compiled in testing and
ignored in release.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Author: NobodyXu

src/builder.rs

@@ -365,41 +365,46 @@ impl KnownHosts {
     }
 }
 
-#[test]
-fn resolve() {
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("ssh://test-user@127.0.0.1:2222");
-    assert_eq!(b.port.as_deref(), Some("2222"));
-    assert_eq!(b.user.as_deref(), Some("test-user"));
-    assert_eq!(d, "127.0.0.1");
-
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("ssh://test-user@opensshtest:2222");
-    assert_eq!(b.port.as_deref(), Some("2222"));
-    assert_eq!(b.user.as_deref(), Some("test-user"));
-    assert_eq!(d, "opensshtest");
-
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("ssh://opensshtest:2222");
-    assert_eq!(b.port.as_deref(), Some("2222"));
-    assert_eq!(b.user.as_deref(), None);
-    assert_eq!(d, "opensshtest");
-
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("ssh://test-user@opensshtest");
-    assert_eq!(b.port.as_deref(), None);
-    assert_eq!(b.user.as_deref(), Some("test-user"));
-    assert_eq!(d, "opensshtest");
-
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("ssh://opensshtest");
-    assert_eq!(b.port.as_deref(), None);
-    assert_eq!(b.user.as_deref(), None);
-    assert_eq!(d, "opensshtest");
-
-    let b = SessionBuilder::default();
-    let (b, d) = b.resolve("opensshtest");
-    assert_eq!(b.port.as_deref(), None);
-    assert_eq!(b.user.as_deref(), None);
-    assert_eq!(d, "opensshtest");
+#[cfg(test)]
+mod tests {
+    use super::SessionBuilder;
+
+    #[test]
+    fn resolve() {
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("ssh://test-user@127.0.0.1:2222");
+        assert_eq!(b.port.as_deref(), Some("2222"));
+        assert_eq!(b.user.as_deref(), Some("test-user"));
+        assert_eq!(d, "127.0.0.1");
+
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("ssh://test-user@opensshtest:2222");
+        assert_eq!(b.port.as_deref(), Some("2222"));
+        assert_eq!(b.user.as_deref(), Some("test-user"));
+        assert_eq!(d, "opensshtest");
+
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("ssh://opensshtest:2222");
+        assert_eq!(b.port.as_deref(), Some("2222"));
+        assert_eq!(b.user.as_deref(), None);
+        assert_eq!(d, "opensshtest");
+
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("ssh://test-user@opensshtest");
+        assert_eq!(b.port.as_deref(), None);
+        assert_eq!(b.user.as_deref(), Some("test-user"));
+        assert_eq!(d, "opensshtest");
+
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("ssh://opensshtest");
+        assert_eq!(b.port.as_deref(), None);
+        assert_eq!(b.user.as_deref(), None);
+        assert_eq!(d, "opensshtest");
+
+        let b = SessionBuilder::default();
+        let (b, d) = b.resolve("opensshtest");
+        assert_eq!(b.port.as_deref(), None);
+        assert_eq!(b.user.as_deref(), None);
+        assert_eq!(d, "opensshtest");
+    }
 }

src/error.rs

@@ -194,49 +194,41 @@ impl Error {
     }
 }
 
-#[test]
-fn parse_error() {
-    let err = "ssh: Warning: Permanently added \'login.csail.mit.edu,128.52.131.0\' (ECDSA) to the list of known hosts.\r\nopenssh-tester@login.csail.mit.edu: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password,keyboard-interactive).";
-    let err = Error::interpret_ssh_error(err);
-    let target = io::Error::new(io::ErrorKind::PermissionDenied, "openssh-tester@login.csail.mit.edu: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password,keyboard-interactive).");
-    if let Error::Connect(e) = err {
-        assert_eq!(e.kind(), target.kind());
-        assert_eq!(format!("{}", e), format!("{}", target));
-    } else {
-        unreachable!("{:?}", err);
+#[cfg(test)]
+mod tests {
+    use super::{io, Error};
+
+    #[test]
+    fn parse_error() {
+        let err = "ssh: Warning: Permanently added \'login.csail.mit.edu,128.52.131.0\' (ECDSA) to the list of known hosts.\r\nopenssh-tester@login.csail.mit.edu: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password,keyboard-interactive).";
+        let err = Error::interpret_ssh_error(err);
+        let target = io::Error::new(io::ErrorKind::PermissionDenied, "openssh-tester@login.csail.mit.edu: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password,keyboard-interactive).");
+        if let Error::Connect(e) = err {
+            assert_eq!(e.kind(), target.kind());
+            assert_eq!(format!("{}", e), format!("{}", target));
+        } else {
+            unreachable!("{:?}", err);
+        }
     }
-}
 
-#[test]
-fn error_sanity() {
-    use std::error::Error as _;
-
-    let ioe = || io::Error::new(io::ErrorKind::Other, "test");
-    let expect = ioe();
-
-    let e = Error::Master(ioe());
-    assert!(!format!("{}", e).is_empty());
-    let e = e
-        .source()
-        .expect("source failed")
-        .downcast_ref::<io::Error>()
-        .expect("source not io");
-    assert_eq!(e.kind(), expect.kind());
-    assert_eq!(format!("{}", e), format!("{}", expect));
-
-    let e = Error::Connect(ioe());
-    assert!(!format!("{}", e).is_empty());
-    let e = e
-        .source()
-        .expect("source failed")
-        .downcast_ref::<io::Error>()
-        .expect("source not io");
-    assert_eq!(e.kind(), expect.kind());
-    assert_eq!(format!("{}", e), format!("{}", expect));
+    #[test]
+    fn error_sanity() {
+        use std::error::Error as _;
 
-    #[cfg(feature = "process-mux")]
-    {
-        let e = Error::Ssh(ioe());
+        let ioe = || io::Error::new(io::ErrorKind::Other, "test");
+        let expect = ioe();
+
+        let e = Error::Master(ioe());
+        assert!(!format!("{}", e).is_empty());
+        let e = e
+            .source()
+            .expect("source failed")
+            .downcast_ref::<io::Error>()
+            .expect("source not io");
+        assert_eq!(e.kind(), expect.kind());
+        assert_eq!(format!("{}", e), format!("{}", expect));
+
+        let e = Error::Connect(ioe());
         assert!(!format!("{}", e).is_empty());
         let e = e
             .source()
@@ -245,19 +237,32 @@ fn error_sanity() {
             .expect("source not io");
         assert_eq!(e.kind(), expect.kind());
         assert_eq!(format!("{}", e), format!("{}", expect));
-    }
 
-    let e = Error::Remote(ioe());
-    assert!(!format!("{}", e).is_empty());
-    let e = e
-        .source()
-        .expect("source failed")
-        .downcast_ref::<io::Error>()
-        .expect("source not io");
-    assert_eq!(e.kind(), expect.kind());
-    assert_eq!(format!("{}", e), format!("{}", expect));
-
-    let e = Error::Disconnected;
-    assert!(!format!("{}", e).is_empty());
-    assert!(e.source().is_none());
+        #[cfg(feature = "process-mux")]
+        {
+            let e = Error::Ssh(ioe());
+            assert!(!format!("{}", e).is_empty());
+            let e = e
+                .source()
+                .expect("source failed")
+                .downcast_ref::<io::Error>()
+                .expect("source not io");
+            assert_eq!(e.kind(), expect.kind());
+            assert_eq!(format!("{}", e), format!("{}", expect));
+        }
+
+        let e = Error::Remote(ioe());
+        assert!(!format!("{}", e).is_empty());
+        let e = e
+            .source()
+            .expect("source failed")
+            .downcast_ref::<io::Error>()
+            .expect("source not io");
+        assert_eq!(e.kind(), expect.kind());
+        assert_eq!(format!("{}", e), format!("{}", expect));
+
+        let e = Error::Disconnected;
+        assert!(!format!("{}", e).is_empty());
+        assert!(e.source().is_none());
+    }
 }