aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/json
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/tests/json')
-rw-r--r--crates/shirabe/tests/json/json_file_test.rs8
-rw-r--r--crates/shirabe/tests/json/json_manipulator_test.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/shirabe/tests/json/json_file_test.rs b/crates/shirabe/tests/json/json_file_test.rs
index 195c6918..7aac35a9 100644
--- a/crates/shirabe/tests/json/json_file_test.rs
+++ b/crates/shirabe/tests/json/json_file_test.rs
@@ -16,8 +16,8 @@ fn expect_parse_exception(text: &str, json: &str) {
fn assert_json_format(json: &str, data: &PhpMixed, options: Option<JsonEncodeOptions>) {
let json = json.replace('\r', "");
match options {
- None => assert_eq!(json, JsonFile::encode(data)),
- Some(options) => assert_eq!(json, JsonFile::encode_with_options(data, options)),
+ None => assert_eq!(json, JsonFile::encode(data).unwrap()),
+ Some(options) => assert_eq!(json, JsonFile::encode_with_options(data, options).unwrap()),
}
}
@@ -191,11 +191,11 @@ fn test_double_escaped_unicode() {
PhpMixed::String("Zdjęcia".to_string()),
PhpMixed::String("hjkjhl\\u0119kkjk".to_string()),
]);
- let encoded_data = JsonFile::encode(&data);
+ let encoded_data = JsonFile::encode(&data).unwrap();
let mut wrapper: IndexMap<String, PhpMixed> = IndexMap::new();
wrapper.insert("t".to_string(), PhpMixed::String(encoded_data));
- let double_encoded_data = JsonFile::encode(&PhpMixed::Array(wrapper));
+ let double_encoded_data = JsonFile::encode(&PhpMixed::Array(wrapper)).unwrap();
let decoded_data = shirabe_php_shim::json_decode(&double_encoded_data, true).unwrap();
let t = decoded_data.as_array().unwrap().get("t").unwrap();
diff --git a/crates/shirabe/tests/json/json_manipulator_test.rs b/crates/shirabe/tests/json/json_manipulator_test.rs
index 00fa7c24..8e418e2d 100644
--- a/crates/shirabe/tests/json/json_manipulator_test.rs
+++ b/crates/shirabe/tests/json/json_manipulator_test.rs
@@ -4128,7 +4128,7 @@ fn test_remove_main_key_removes_key_where_value_is_null() {
manipulator.remove_main_key("bar").unwrap();
- let expected = JsonFile::encode(&arr(&[("foo", PhpMixed::Int(9000))]));
+ let expected = JsonFile::encode(&arr(&[("foo", PhpMixed::Int(9000))])).unwrap();
assert_eq!(
JsonFile::parse_json(Some(&expected), None).unwrap(),