Merge SockAddr tests

The two tests were testing the same thing.

Author: Thomasdezeeuw

src/sockaddr.rs

@@ -233,28 +233,40 @@ impl fmt::Debug for SockAddr {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::net::{Ipv4Addr, Ipv6Addr};
+#[test]
+fn ipv4() {
+    use std::net::Ipv4Addr;
+    let std = SocketAddrV4::new(Ipv4Addr::new(1, 2, 3, 4), 9876);
+    let addr = SockAddr::from(std);
+    assert_eq!(addr.family(), AF_INET as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in>() as socklen_t);
+    assert_eq!(addr.as_std(), Some(SocketAddr::V4(std)));
+    assert_eq!(addr.as_inet(), Some(std));
+    assert!(addr.as_inet6().is_none());
 
-    #[test]
-    fn conversion_v4() {
-        let addr = SocketAddrV4::new(Ipv4Addr::new(1, 2, 3, 4), 9876);
-        let sockaddr = SockAddr::from(addr);
-        assert_eq!(sockaddr.family(), AF_INET as sa_family_t);
-        assert!(sockaddr.as_inet6().is_none());
-        assert_eq!(sockaddr.as_inet(), Some(addr));
-        assert_eq!(sockaddr.as_std(), Some(SocketAddr::V4(addr)));
-    }
+    let addr = SockAddr::from(SocketAddr::from(std));
+    assert_eq!(addr.family(), AF_INET as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in>() as socklen_t);
+    assert_eq!(addr.as_std(), Some(SocketAddr::V4(std)));
+    assert_eq!(addr.as_inet(), Some(std));
+    assert!(addr.as_inet6().is_none());
+}
 
-    #[test]
-    fn conversion_v6() {
-        let addr = SocketAddrV6::new(Ipv6Addr::new(1, 2, 3, 4, 5, 6, 7, 8), 9876, 11, 12);
-        let sockaddr = SockAddr::from(addr);
-        assert_eq!(sockaddr.family(), AF_INET6 as sa_family_t);
-        assert!(sockaddr.as_inet().is_none());
-        assert_eq!(sockaddr.as_inet6(), Some(addr));
-        assert_eq!(sockaddr.as_std(), Some(SocketAddr::V6(addr)));
-    }
+#[test]
+fn ipv6() {
+    use std::net::Ipv6Addr;
+    let std = SocketAddrV6::new(Ipv6Addr::new(1, 2, 3, 4, 5, 6, 7, 8), 9876, 11, 12);
+    let addr = SockAddr::from(std);
+    assert_eq!(addr.family(), AF_INET6 as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in6>() as socklen_t);
+    assert_eq!(addr.as_std(), Some(SocketAddr::V6(std)));
+    assert!(addr.as_inet().is_none());
+    assert_eq!(addr.as_inet6(), Some(std));
+
+    let addr = SockAddr::from(SocketAddr::from(std));
+    assert_eq!(addr.family(), AF_INET6 as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in6>() as socklen_t);
+    assert_eq!(addr.as_std(), Some(SocketAddr::V6(std)));
+    assert!(addr.as_inet().is_none());
+    assert_eq!(addr.as_inet6(), Some(std));
 }

tests/socket.rs

@@ -5,9 +5,7 @@ use std::io;
 use std::io::Write;
 #[cfg(not(target_os = "redox"))]
 use std::io::{IoSlice, IoSliceMut};
-#[cfg(not(target_os = "redox"))]
-use std::net::Ipv6Addr;
-use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::net::{Ipv6Addr, SocketAddr, SocketAddrV6};
 #[cfg(unix)]
 use std::os::unix::io::AsRawFd;
 #[cfg(windows)]
@@ -22,7 +20,9 @@ use winapi::um::handleapi::GetHandleInformation;
 #[cfg(windows)]
 use winapi::um::winbase::HANDLE_FLAG_INHERIT;
 
-use socket2::{Domain, Protocol, SockAddr, Socket, TcpKeepalive, Type};
+#[cfg(all(unix, feature = "all"))]
+use socket2::SockAddr;
+use socket2::{Domain, Protocol, Socket, TcpKeepalive, Type};
 
 #[test]
 fn domain_for_address() {
@@ -97,28 +97,6 @@ fn protocol_fmt_debug() {
     }
 }
 
-#[test]
-fn socket_address_ipv4() {
-    let string = "127.0.0.1:80";
-    let std = string.parse::<SocketAddrV4>().unwrap();
-    let addr = SockAddr::from(std);
-
-    assert_eq!(addr.as_std(), Some(SocketAddr::V4(std)));
-    assert_eq!(addr.as_inet(), Some(std));
-    assert!(addr.as_inet6().is_none());
-}
-
-#[test]
-fn socket_address_ipv6() {
-    let string = "[2001:db8::ff00:42:8329]:80";
-    let std = string.parse::<SocketAddrV6>().unwrap();
-    let addr = SockAddr::from(std);
-
-    assert_eq!(addr.as_std(), Some(SocketAddr::V6(std)));
-    assert!(addr.as_inet().is_none());
-    assert_eq!(addr.as_inet6(), Some(std));
-}
-
 #[test]
 #[cfg(all(unix, feature = "all"))]
 fn socket_address_unix() {