diff --git a/rtc-ice/src/rand/mod.rs b/rtc-ice/src/rand/mod.rs index c92bb77..84001a8 100644 --- a/rtc-ice/src/rand/mod.rs +++ b/rtc-ice/src/rand/mod.rs @@ -1,5 +1,5 @@ -//TODO:#[cfg(test)] -//TODO:mod rand_test; +#[cfg(test)] +mod rand_test; use rand::{thread_rng, Rng}; diff --git a/rtc-ice/src/rand/rand_test.rs b/rtc-ice/src/rand/rand_test.rs index bf2fdca..568bfc5 100644 --- a/rtc-ice/src/rand/rand_test.rs +++ b/rtc-ice/src/rand/rand_test.rs @@ -1,13 +1,8 @@ -use std::sync::Arc; - -use tokio::sync::Mutex; -use waitgroup::WaitGroup; - use super::*; -use crate::error::Result; +use shared::error::Result; -#[tokio::test] -async fn test_random_generator_collision() -> Result<()> { +#[test] +fn test_random_generator_collision() -> Result<()> { let test_cases = vec![ ( "CandidateID", @@ -32,33 +27,20 @@ async fn test_random_generator_collision() -> Result<()> { for (name, test_case) in test_cases { for _ in 0..ITERATION { - let rands = Arc::new(Mutex::new(vec![])); - - // Create a new wait group. - let wg = WaitGroup::new(); + let mut rs = vec![]; for _ in 0..N { - let w = wg.worker(); - let rs = Arc::clone(&rands); - - tokio::spawn(async move { - let _d = w; - - let s = if test_case == 0 { - generate_cand_id() - } else if test_case == 1 { - generate_pwd() - } else { - generate_ufrag() - }; - - let mut r = rs.lock().await; - r.push(s); - }); + let s = if test_case == 0 { + generate_cand_id() + } else if test_case == 1 { + generate_pwd() + } else { + generate_ufrag() + }; + + rs.push(s); } - wg.wait().await; - let rs = rands.lock().await; assert_eq!(rs.len(), N, "{name} Failed to generate randoms"); for i in 0..N {