Skip to content

Commit 502c172

Browse files
committed
Stop using serde_json for deserialization tests
1 parent fdee54b commit 502c172

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

ext_tests/src/lib.rs

+35-35
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ mod tests {
1414

1515
#[test]
1616
fn deserialize_int() {
17-
assert_eq!(from_json_str::<Int>("100").unwrap(), int!(100));
18-
assert_eq!(from_json_str::<Int>("0").unwrap(), int!(0));
19-
assert_eq!(from_json_str::<Int>("-100").unwrap(), int!(-100));
20-
assert_eq!(from_json_str::<Int>("-9007199254740991").unwrap(), Int::MIN);
21-
assert_eq!(from_json_str::<Int>("9007199254740991").unwrap(), Int::MAX);
22-
assert!(from_json_str::<Int>("9007199254740992").is_err());
23-
assert!(from_json_str::<Int>("-9007199254740992").is_err());
17+
assert_eq!(deserialize_int_from(100).unwrap(), int!(100));
18+
assert_eq!(deserialize_int_from(0).unwrap(), int!(0));
19+
assert_eq!(deserialize_int_from(-100).unwrap(), int!(-100));
20+
assert_eq!(deserialize_int_from(-9007199254740991i64).unwrap(), Int::MIN);
21+
assert_eq!(deserialize_int_from(9007199254740991i64).unwrap(), Int::MAX);
22+
assert!(deserialize_int_from(9007199254740992i64).is_err());
23+
assert!(deserialize_int_from(-9007199254740992i64).is_err());
2424
}
2525

2626
#[test]
@@ -31,44 +31,44 @@ mod tests {
3131

3232
#[test]
3333
fn deserialize_uint() {
34-
assert_eq!(from_json_str::<UInt>("100").unwrap(), uint!(100));
35-
assert_eq!(from_json_str::<UInt>("0").unwrap(), uint!(0));
36-
assert_eq!(from_json_str::<UInt>("9007199254740991").unwrap(), UInt::MAX);
37-
assert!(from_json_str::<UInt>("9007199254740992").is_err());
34+
assert_eq!(deserialize_uint_from(100).unwrap(), uint!(100));
35+
assert_eq!(deserialize_uint_from(0).unwrap(), uint!(0));
36+
assert_eq!(deserialize_uint_from(9007199254740991i64).unwrap(), UInt::MAX);
37+
assert!(deserialize_uint_from(9007199254740992i64).is_err());
3838
}
3939

4040
#[test]
4141
#[cfg_attr(feature = "lax_deserialize", ignore)]
4242
fn strict_deserialize_int() {
43-
assert!(from_json_str::<Int>("-10.0").is_err());
44-
assert!(from_json_str::<Int>("-0.0").is_err());
45-
assert!(from_json_str::<Int>("0.5").is_err());
46-
assert!(from_json_str::<Int>("1.0").is_err());
47-
assert!(from_json_str::<Int>("9007199254740991.0").is_err());
48-
assert!(from_json_str::<Int>("9007199254740991.49").is_err());
49-
assert!(from_json_str::<Int>("9007199254740992.0").is_err());
43+
assert!(deserialize_int_from(-10.0).is_err());
44+
assert!(deserialize_int_from(-0.0).is_err());
45+
assert!(deserialize_int_from(0.5).is_err());
46+
assert!(deserialize_int_from(1.0).is_err());
47+
assert!(deserialize_int_from(9007199254740991.0).is_err());
48+
assert!(deserialize_int_from(9007199254740991.49).is_err());
49+
assert!(deserialize_int_from(9007199254740992.0).is_err());
5050
}
5151

5252
#[test]
5353
#[cfg_attr(feature = "lax_deserialize", ignore)]
5454
fn strict_deserialize_uint() {
55-
assert!(from_json_str::<UInt>("0.5").is_err());
56-
assert!(from_json_str::<UInt>("1.0").is_err());
57-
assert!(from_json_str::<UInt>("9007199254740991.0").is_err());
58-
assert!(from_json_str::<UInt>("9007199254740991.49").is_err());
59-
assert!(from_json_str::<UInt>("9007199254740992.0").is_err());
55+
assert!(deserialize_uint_from(0.5).is_err());
56+
assert!(deserialize_uint_from(1.0).is_err());
57+
assert!(deserialize_uint_from(9007199254740991.0).is_err());
58+
assert!(deserialize_uint_from(9007199254740991.49).is_err());
59+
assert!(deserialize_uint_from(9007199254740992.0).is_err());
6060
}
6161

6262
#[test]
6363
#[cfg_attr(not(feature = "lax_deserialize"), ignore)]
6464
fn lax_deserialize_int() {
65-
assert_eq!(from_json_str::<Int>("-10.0").unwrap(), int!(-10));
66-
assert_eq!(from_json_str::<Int>("-0.0").unwrap(), int!(0));
67-
assert_eq!(from_json_str::<Int>("0.5").unwrap(), int!(0));
68-
assert_eq!(from_json_str::<Int>("1.0").unwrap(), int!(1));
69-
assert_eq!(from_json_str::<Int>("9007199254740991.0").unwrap(), Int::MAX);
70-
assert_eq!(from_json_str::<Int>("9007199254740991.49").unwrap(), Int::MAX);
71-
assert!(from_json_str::<Int>("9007199254740992.0").is_err());
65+
assert_eq!(deserialize_int_from(-10.0).unwrap(), int!(-10));
66+
assert_eq!(deserialize_int_from(-0.0).unwrap(), int!(0));
67+
assert_eq!(deserialize_int_from(0.5).unwrap(), int!(0));
68+
assert_eq!(deserialize_int_from(1.0).unwrap(), int!(1));
69+
assert_eq!(deserialize_int_from(9007199254740991.0).unwrap(), Int::MAX);
70+
assert_eq!(deserialize_int_from(9007199254740991.49).unwrap(), Int::MAX);
71+
assert!(deserialize_int_from(9007199254740992.0).is_err());
7272

7373
assert!(deserialize_int_from(f64::NAN).is_err());
7474
assert!(deserialize_int_from(f64::INFINITY).is_err());
@@ -78,11 +78,11 @@ mod tests {
7878
#[test]
7979
#[cfg_attr(not(feature = "lax_deserialize"), ignore)]
8080
fn lax_deserialize_uint() {
81-
assert_eq!(from_json_str::<UInt>("0.5").unwrap(), uint!(0));
82-
assert_eq!(from_json_str::<UInt>("1.0").unwrap(), uint!(1));
83-
assert_eq!(from_json_str::<UInt>("9007199254740991.0").unwrap(), UInt::MAX);
84-
assert_eq!(from_json_str::<UInt>("9007199254740991.49").unwrap(), UInt::MAX);
85-
assert!(from_json_str::<UInt>("9007199254740992.0").is_err());
81+
assert_eq!(deserialize_uint_from(0.5).unwrap(), uint!(0));
82+
assert_eq!(deserialize_uint_from(1.0).unwrap(), uint!(1));
83+
assert_eq!(deserialize_uint_from(9007199254740991.0).unwrap(), UInt::MAX);
84+
assert_eq!(deserialize_uint_from(9007199254740991.49).unwrap(), UInt::MAX);
85+
assert!(deserialize_uint_from(9007199254740992.0).is_err());
8686

8787
assert!(deserialize_uint_from(f64::NAN).is_err());
8888
assert!(deserialize_uint_from(f64::INFINITY).is_err());

0 commit comments

Comments
 (0)