diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2016-12-12 14:13:05 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2016-12-12 14:13:05 +0100 |
| commit | 46f8803eb65a13090bba6381c80b9522fbca1965 (patch) | |
| tree | 2188267e915228e687b04eb67e5da221a6f18f7f | |
| parent | f983a28679572b380204b576d40956919cf8a10d (diff) | |
| download | mullvadvpn-46f8803eb65a13090bba6381c80b9522fbca1965.tar.xz mullvadvpn-46f8803eb65a13090bba6381c80b9522fbca1965.zip | |
Clean up tests, rename to testee
| -rw-r--r-- | src/process.rs | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/process.rs b/src/process.rs index fce338ade7..6239f535e7 100644 --- a/src/process.rs +++ b/src/process.rs @@ -103,30 +103,30 @@ mod tests { #[test] fn no_arguments() { - let args = OpenVpnBuilder::new("").get_arguments(); - assert_eq!(0, args.len()); + let testee_args = OpenVpnBuilder::new("").get_arguments(); + assert_eq!(0, testee_args.len()); } #[test] fn passes_one_remote() { - let remotes = RemoteAddr::new("example.com", 3333); + let remote = RemoteAddr::new("example.com", 3333); - let args = OpenVpnBuilder::new("").remotes(remotes).unwrap().get_arguments(); + let testee_args = OpenVpnBuilder::new("").remotes(remote).unwrap().get_arguments(); - assert!(args.contains(&OsString::from("example.com"))); - assert!(args.contains(&OsString::from("3333"))); + assert!(testee_args.contains(&OsString::from("example.com"))); + assert!(testee_args.contains(&OsString::from("3333"))); } #[test] fn passes_two_remotes() { let remotes = vec![RemoteAddr::new("127.0.0.1", 998), RemoteAddr::new("fe80::1", 1337)]; - let args = OpenVpnBuilder::new("").remotes(&remotes[..]).unwrap().get_arguments(); + let testee_args = OpenVpnBuilder::new("").remotes(&remotes[..]).unwrap().get_arguments(); - assert!(args.contains(&OsString::from("127.0.0.1"))); - assert!(args.contains(&OsString::from("998"))); - assert!(args.contains(&OsString::from("fe80::1"))); - assert!(args.contains(&OsString::from("1337"))); + assert!(testee_args.contains(&OsString::from("127.0.0.1"))); + assert!(testee_args.contains(&OsString::from("998"))); + assert!(testee_args.contains(&OsString::from("fe80::1"))); + assert!(testee_args.contains(&OsString::from("1337"))); } #[test] @@ -136,7 +136,13 @@ mod tests { #[test] fn accepts_slice_of_str() { - let remotes = ["10.0.0.1:1377", "127.0.0.1:99"]; - assert!(OpenVpnBuilder::new("").remotes(&remotes[..]).is_ok()); + let remotes = ["10.0.0.1:1337", "127.0.0.1:99"]; + + let testee_args = OpenVpnBuilder::new("").remotes(&remotes[..]).unwrap().get_arguments(); + + assert!(testee_args.contains(&OsString::from("10.0.0.1"))); + assert!(testee_args.contains(&OsString::from("1337"))); + assert!(testee_args.contains(&OsString::from("127.0.0.1"))); + assert!(testee_args.contains(&OsString::from("99"))); } } |
