common: Consistently use int macros for tests

crates/ruma-common/src/events/room/encrypted.rs

@@ -304,6 +304,7 @@ impl From<MegolmV1AesSha2ContentInit> for MegolmV1AesSha2Content {
 #[cfg(test)]
 mod tests {
     use crate::{event_id, serde::Raw};
+    use js_int::uint;
     use matches::assert_matches;
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
@@ -398,7 +399,7 @@ mod tests {
                 assert_eq!(c.sender_key, "test_key");
                 assert_eq!(c.ciphertext.len(), 1);
                 assert_eq!(c.ciphertext["test_curve_key"].body, "encrypted_body");
-                assert_eq!(c.ciphertext["test_curve_key"].message_type, 1_u16.into());
+                assert_eq!(c.ciphertext["test_curve_key"].message_type, uint!(1));
             }
             _ => panic!("Wrong content type, expected a OlmV1 content"),
         }

crates/ruma-common/src/push.rs

@@ -466,7 +466,7 @@ impl PushFormat {
 mod tests {
     use std::collections::BTreeMap;
 
-    use js_int::uint;
+    use js_int::{int, uint};
     use matches::assert_matches;
     use serde_json::{
         from_value as from_json_value, json, to_value as to_json_value,
@@ -966,20 +966,20 @@ mod tests {
 
         let context_one_to_one = &PushConditionRoomCtx {
             room_id: room_id!("!dm:server.name").to_owned(),
-            member_count: 2_u32.into(),
+            member_count: uint!(2),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
-            default_power_level: 50.into(),
+            default_power_level: int!(50),
-            notification_power_levels: NotificationPowerLevels { room: 50.into() },
+            notification_power_levels: NotificationPowerLevels { room: int!(50) },
         };
 
         let context_public_room = &PushConditionRoomCtx {
             room_id: room_id!("!far_west:server.name").to_owned(),
-            member_count: 100_u32.into(),
+            member_count: uint!(100),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
-            default_power_level: 50.into(),
+            default_power_level: int!(50),
-            notification_power_levels: NotificationPowerLevels { room: 50.into() },
+            notification_power_levels: NotificationPowerLevels { room: int!(50) },
         };
 
         let message = serde_json::from_str::<Raw<JsonValue>>(
@@ -1065,11 +1065,11 @@ mod tests {
     fn custom_ruleset_applies() {
         let context_one_to_one = &PushConditionRoomCtx {
             room_id: room_id!("!dm:server.name").to_owned(),
-            member_count: 2_u32.into(),
+            member_count: uint!(2),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
-            default_power_level: 50.into(),
+            default_power_level: int!(50),
-            notification_power_levels: NotificationPowerLevels { room: 50.into() },
+            notification_power_levels: NotificationPowerLevels { room: int!(50) },
         };
 
         let message = serde_json::from_str::<Raw<JsonValue>>(

crates/ruma-common/src/push/condition.rs

@@ -305,7 +305,7 @@ mod tests {
     use std::collections::BTreeMap;
 
     use crate::{room_id, serde::Raw, user_id};
-    use js_int::uint;
+    use js_int::{int, uint};
     use maplit::btreemap;
     use matches::assert_matches;
     use serde_json::{
@@ -468,15 +468,15 @@ mod tests {
         let first_sender = user_id!("@worthy_whale:server.name").to_owned();
 
         let mut users_power_levels = BTreeMap::new();
-        users_power_levels.insert(first_sender, 25.into());
+        users_power_levels.insert(first_sender, int!(25));
 
         let context = PushConditionRoomCtx {
             room_id: room_id!("!room:server.name").to_owned(),
-            member_count: 3_u8.into(),
+            member_count: uint!(3),
             user_display_name: "Groovy Gorilla".into(),
             users_power_levels,
-            default_power_level: 50.into(),
+            default_power_level: int!(50),
-            notification_power_levels: NotificationPowerLevels { room: 50.into() },
+            notification_power_levels: NotificationPowerLevels { room: int!(50) },
         };
 
         let first_event_raw = serde_json::from_str::<Raw<JsonValue>>(

crates/ruma-common/src/push/condition/room_member_count_is.rs

@@ -192,7 +192,7 @@ mod tests {
 
     #[test]
     fn eq_range_contains_its_own_count() {
-        let count = 2_u32.into();
+        let count = uint!(2);
         let range = RoomMemberCountIs::from(count);
 
         assert!(range.contains(&count));
@@ -201,7 +201,7 @@ mod tests {
     #[test]
     fn ge_range_contains_large_number() {
         let range = RoomMemberCountIs::from(uint!(2)..);
-        let large_number = 9001_u32.into();
+        let large_number = uint!(9001);
 
         assert!(range.contains(&large_number));
     }

crates/ruma-common/tests/events/pdu.rs

@@ -2,6 +2,7 @@
 
 use std::{collections::BTreeMap, convert::TryInto};
 
+use js_int::uint;
 use ruma_common::{
     event_id,
     events::{
@@ -40,7 +41,7 @@ fn serialize_pdu_as_v1() {
             event_id!("$previousevent:matrix.org").to_owned(),
             EventHash::new("123567".into()),
         )],
-        depth: 2_u32.into(),
+        depth: uint!(2),
         auth_events: vec![(
             event_id!("$someauthevent:matrix.org").to_owned(),
             EventHash::new("21389CFEDABC".into()),
@@ -101,7 +102,7 @@ fn serialize_pdu_as_v3() {
         content: to_raw_json_value(&json!({ "testing": 123 })).unwrap(),
         state_key: Some("state".into()),
         prev_events: vec![event_id!("$previousevent:matrix.org").to_owned()],
-        depth: 2_u32.into(),
+        depth: uint!(2),
         auth_events: vec![event_id!("$someauthevent:matrix.org").to_owned()],
         redacts: Some(event_id!("$9654:matrix.org").to_owned()),
         unsigned,