Add more bridges for consistency, printout units

 Committer: ltulloch <ltulloch@uwaterloo.ca>

src/tests.rs

@@ -714,7 +714,7 @@ fn test_blockage_migration() {
 
 #[test]
 fn stats_test_open_invite() {
-    let mut th = TestHarness::new_buckets(10, 10);
+    let mut th = TestHarness::new_buckets(150, 150);
 
     let mut req_size: Vec<f64> = Vec::new();
     let mut resp_size: Vec<f64> = Vec::new();
@@ -742,7 +742,7 @@ fn stats_test_open_invite() {
 
 #[test]
 fn stats_test_trust_promotion() {
-    let mut th = TestHarness::new_buckets(10, 10);
+    let mut th = TestHarness::new_buckets(150, 150);
 
     let mut req_size: Vec<f64> = Vec::new();
     let mut resp_size: Vec<f64> = Vec::new();
@@ -772,7 +772,7 @@ fn stats_test_trust_promotion() {
 
 #[test]
 fn stats_test_trust_level0_migration() {
-    let mut th = TestHarness::new_buckets(10, 10);
+    let mut th = TestHarness::new_buckets(150, 150);
 
     let mut req_size: Vec<f64> = Vec::new();
     let mut resp_size: Vec<f64> = Vec::new();
@@ -823,7 +823,7 @@ fn stats_test_trust_level0_migration() {
 
 #[test]
 fn stats_test_trust_level_up() {
-    let mut th = TestHarness::new_buckets(10, 10);
+    let mut th = TestHarness::new_buckets(150, 150);
 
     let mut req_size: Vec<f64> = Vec::new();
     let mut resp_size: Vec<f64> = Vec::new();
@@ -918,7 +918,7 @@ fn stats_test_trust_level_up() {
 
 #[test]
 fn stats_test_invitations() {
-    let mut th = TestHarness::new_buckets(10, 10);
+    let mut th = TestHarness::new_buckets(150, 150);
 
     let mut req_size: Vec<f64> = Vec::new();
     let mut resp_size: Vec<f64> = Vec::new();
@@ -973,7 +973,7 @@ fn stats_test_invitations() {
 
 #[test]
 fn stats_test_blockage_migration_5() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..1000 {
         let cred = th.open_invite().1 .0;
@@ -995,7 +995,7 @@ fn stats_test_blockage_migration_5() {
 
 #[test]
 fn stats_test_blockage_migration_10() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..1000 {
         let cred = th.open_invite().1 .0;
@@ -1017,7 +1017,7 @@ fn stats_test_blockage_migration_10() {
 
 #[test]
 fn stats_test_blockage_migration_15() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1039,7 +1039,7 @@ fn stats_test_blockage_migration_15() {
 
 #[test]
 fn stats_test_blockage_migration_20() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1061,7 +1061,7 @@ fn stats_test_blockage_migration_20() {
 
 #[test]
 fn stats_test_blockage_migration_25() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1083,7 +1083,7 @@ fn stats_test_blockage_migration_25() {
 
 #[test]
 fn stats_test_blockage_migration_30() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1105,7 +1105,7 @@ fn stats_test_blockage_migration_30() {
 
 #[test]
 fn stats_test_blockage_migration_35() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1127,7 +1127,7 @@ fn stats_test_blockage_migration_35() {
 
 #[test]
 fn stats_test_blockage_migration_40() {
-    let mut th = TestHarness::new_buckets(15, 15);
+    let mut th = TestHarness::new_buckets(150, 150);
     let mut credentials: Vec<cred::Lox> = Vec::new();
     for _ in 0..10000 {
         let cred = th.open_invite().1 .0;
@@ -1234,9 +1234,9 @@ fn block_bridges(th: &mut TestHarness, percentage: usize, credentials: Vec<cred:
 }
 
 fn print_test_results(perf_stat: PerfStat) {
-    println!("Request size = {:?}", perf_stat.req_len);
+    println!("Request size = {:?} bytes", perf_stat.req_len);
     println!("Request time = {:?}", perf_stat.req_t);
-    println!("Response size = {:?}", perf_stat.resp_len);
+    println!("Response size = {:?} bytes", perf_stat.resp_len);
     println!("Response time = {:?}", perf_stat.resp_t);
     println!("Response handle time = {:?}", perf_stat.resp_handle_t);
 }
@@ -1260,32 +1260,32 @@ fn print_stats_test_results(
     let resp_handle_t_std_dev =
         standard_deviation(&resp_handle_t_size, Some(mean_resp_handle_t_size));
 
-    println!("Average Request size = {}", mean_req_size);
-    println!("Request Standard Deviation = {}", req_std_dev);
+    println!("Average request size = {} bytes", mean_req_size);
+    println!("Request size standard deviation = {} bytes", req_std_dev);
     println!(
-        "Average Request Time = {:?}",
+        "Average request time = {:?}",
         Duration::from_secs_f64(mean_req_t_size)
     );
     println!(
-        "Request time Standard Deviation = {:?}",
+        "Request time standard deviation = {:?}",
         Duration::from_secs_f64(req_t_std_dev)
     );
-    println!("Average Response size = {}", mean_resp_size);
-    println!("Response Standard Deviation = {}", resp_std_dev);
+    println!("Average response size = {} bytes", mean_resp_size);
+    println!("Response standard deviation = {} bytes", resp_std_dev);
     println!(
-        "Average Response Time = {:?}",
+        "Average response time = {:?}",
         Duration::from_secs_f64(mean_resp_t_size)
     );
     println!(
-        "Response Time Standard Deviation = {:?}",
+        "Response time standard deviation = {:?}",
         Duration::from_secs_f64(resp_t_std_dev)
     );
     println!(
-        "Average Response Handling Time = {:?}",
+        "Average response handling time = {:?}",
         Duration::from_secs_f64(mean_resp_handle_t_size)
     );
     println!(
-        "Response Handling Time Standard Deviation = {:?}",
+        "Response handling time standard deviation = {:?}",
         Duration::from_secs_f64(resp_handle_t_std_dev)
     );
 }