Skip to content

Commit b189bfd

Browse files
committed
use of static RNG and MockClock in tests
1 parent a75ca69 commit b189bfd

File tree

1 file changed

+14
-31
lines changed

1 file changed

+14
-31
lines changed

crates/data-model/src/oauth2/authorization_grant.rs

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -285,17 +285,15 @@ impl AuthorizationGrant {
285285

286286
#[cfg(test)]
287287
mod tests {
288-
use rand::thread_rng;
288+
use rand::SeedableRng;
289289

290290
use super::*;
291+
use crate::clock::{Clock, MockClock};
291292

292293
#[test]
293294
fn no_login_hint() {
294-
#[allow(clippy::disallowed_methods)]
295-
let mut rng = thread_rng();
296-
297-
#[allow(clippy::disallowed_methods)]
298-
let now = Utc::now();
295+
let now = MockClock::default().now();
296+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
299297

300298
let grant = AuthorizationGrant {
301299
login_hint: None,
@@ -309,11 +307,8 @@ mod tests {
309307

310308
#[test]
311309
fn valid_login_hint() {
312-
#[allow(clippy::disallowed_methods)]
313-
let mut rng = thread_rng();
314-
315-
#[allow(clippy::disallowed_methods)]
316-
let now = Utc::now();
310+
let now = MockClock::default().now();
311+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
317312

318313
let grant = AuthorizationGrant {
319314
login_hint: Some(String::from("mxid:@example-user:example.com")),
@@ -327,11 +322,8 @@ mod tests {
327322

328323
#[test]
329324
fn valid_login_hint_with_email() {
330-
#[allow(clippy::disallowed_methods)]
331-
let mut rng = thread_rng();
332-
333-
#[allow(clippy::disallowed_methods)]
334-
let now = Utc::now();
325+
let now = MockClock::default().now();
326+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
335327

336328
let grant = AuthorizationGrant {
337329
login_hint: Some(String::from("example@user")),
@@ -345,11 +337,8 @@ mod tests {
345337

346338
#[test]
347339
fn invalid_login_hint() {
348-
#[allow(clippy::disallowed_methods)]
349-
let mut rng = thread_rng();
350-
351-
#[allow(clippy::disallowed_methods)]
352-
let now = Utc::now();
340+
let now = MockClock::default().now();
341+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
353342

354343
let grant = AuthorizationGrant {
355344
login_hint: Some(String::from("example-user")),
@@ -363,11 +352,8 @@ mod tests {
363352

364353
#[test]
365354
fn valid_login_hint_for_wrong_homeserver() {
366-
#[allow(clippy::disallowed_methods)]
367-
let mut rng = thread_rng();
368-
369-
#[allow(clippy::disallowed_methods)]
370-
let now = Utc::now();
355+
let now = MockClock::default().now();
356+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
371357

372358
let grant = AuthorizationGrant {
373359
login_hint: Some(String::from("mxid:@example-user:matrix.org")),
@@ -381,11 +367,8 @@ mod tests {
381367

382368
#[test]
383369
fn unknown_login_hint_type() {
384-
#[allow(clippy::disallowed_methods)]
385-
let mut rng = thread_rng();
386-
387-
#[allow(clippy::disallowed_methods)]
388-
let now = Utc::now();
370+
let now = MockClock::default().now();
371+
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
389372

390373
let grant = AuthorizationGrant {
391374
login_hint: Some(String::from("something:anything")),

0 commit comments

Comments
 (0)