liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

more refactor

Browse Source
This commit is contained in:
John Smith
2022-01-03 16:29:04 -05:00
parent 94772094c5
commit 55a44e0c8f
18 changed files with 261 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
veilid-core/src/tests/common/test_connection_table.rs
View File

@@ -1,3 +1,4 @@
use crate::connection_manager::*;
use crate::connection_table::*;
use crate::intf::*;
use crate::xx::*;
@@ -6,18 +7,11 @@ use crate::*;
pub async fn test_add_get_remove() {
let mut table = ConnectionTable::new();
let c1 = NetworkConnection::Dummy(DummyNetworkConnection {});
let c2 = NetworkConnection::Dummy(DummyNetworkConnection {});
let c3 = NetworkConnection::Dummy(DummyNetworkConnection {});
let a1 = ConnectionDescriptor::new_no_local(PeerAddress::new(
SocketAddress::new(Address::IPV4(Ipv4Addr::new(127, 0, 0, 1)), 8080),
ProtocolType::TCP,
));
let a2 = ConnectionDescriptor::new_no_local(PeerAddress::new(
SocketAddress::new(Address::IPV4(Ipv4Addr::new(127, 0, 0, 1)), 8080),
ProtocolType::TCP,
));
let a2 = a1.clone();
let a3 = ConnectionDescriptor::new(
PeerAddress::new(
SocketAddress::new(Address::IPV6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8090),
@@ -55,13 +49,19 @@ pub async fn test_add_get_remove() {
))),
);
assert_eq!(a1, a2);
assert_ne!(a3, a4);
assert_ne!(a4, a5);
let c1 = NetworkConnection::Dummy(DummyNetworkConnection::new(a1.clone()));
let c2 = NetworkConnection::Dummy(DummyNetworkConnection::new(a2.clone()));
let c3 = NetworkConnection::Dummy(DummyNetworkConnection::new(a3.clone()));
let c4 = NetworkConnection::Dummy(DummyNetworkConnection::new(a4.clone()));
let c5 = NetworkConnection::Dummy(DummyNetworkConnection::new(a5));
assert_eq!(a1, c2.connection_descriptor());
assert_ne!(a3, c4.connection_descriptor());
assert_ne!(a4, c5.connection_descriptor());
assert_eq!(table.connection_count(), 0);
assert_eq!(table.get_connection(&a1), None);
let entry1 = table.add_connection(a1.clone(), c1.clone()).unwrap();
let entry1 = table.add_connection(c1.clone()).unwrap();
assert_eq!(table.connection_count(), 1);
assert_err!(table.remove_connection(&a3));
@@ -70,8 +70,8 @@ pub async fn test_add_get_remove() {
assert_eq!(table.get_connection(&a1), Some(entry1.clone()));
assert_eq!(table.get_connection(&a1), Some(entry1.clone()));
assert_eq!(table.connection_count(), 1);
assert_err!(table.add_connection(a1.clone(), c1.clone()));
assert_err!(table.add_connection(a1.clone(), c2.clone()));
assert_err!(table.add_connection(c1.clone()));
assert_err!(table.add_connection(c2.clone()));
assert_eq!(table.connection_count(), 1);
assert_eq!(table.get_connection(&a1), Some(entry1.clone()));
assert_eq!(table.get_connection(&a1), Some(entry1.clone()));
@@ -83,10 +83,10 @@ pub async fn test_add_get_remove() {
assert_eq!(table.get_connection(&a2), None);
assert_eq!(table.get_connection(&a1), None);
assert_eq!(table.connection_count(), 0);
let entry2 = table.add_connection(a1, c1.clone()).unwrap();
assert_err!(table.add_connection(a2.clone(), c1));
let entry3 = table.add_connection(a3.clone(), c2).unwrap();
let entry4 = table.add_connection(a4.clone(), c3).unwrap();
let entry2 = table.add_connection(c1).unwrap();
assert_err!(table.add_connection(c2));
let entry3 = table.add_connection(c3).unwrap();
let entry4 = table.add_connection(c4).unwrap();
assert_eq!(table.connection_count(), 3);
assert_eq!(table.remove_connection(&a2), Ok(entry2));
assert_eq!(table.remove_connection(&a3), Ok(entry3));