|
17 | 17 |
|
18 | 18 | //! Module for converting Variant data to JSON format |
19 | 19 | use arrow_schema::ArrowError; |
20 | | -use base64::{engine::general_purpose, Engine as _}; |
| 20 | +use base64::{Engine as _, engine::general_purpose}; |
21 | 21 | use chrono::Timelike; |
22 | 22 | use parquet_variant::{Variant, VariantList, VariantObject}; |
23 | 23 | use serde_json::Value; |
@@ -417,7 +417,7 @@ fn convert_array_to_json(buffer: &mut impl Write, arr: &VariantList) -> Result<( |
417 | 417 | mod tests { |
418 | 418 | use super::*; |
419 | 419 | use chrono::{DateTime, NaiveDate, NaiveTime, Utc}; |
420 | | - use parquet_variant::{VariantDecimal16, VariantDecimal4, VariantDecimal8}; |
| 420 | + use parquet_variant::{VariantDecimal4, VariantDecimal8, VariantDecimal16}; |
421 | 421 |
|
422 | 422 | #[test] |
423 | 423 | fn test_decimal_edge_cases() -> Result<(), ArrowError> { |
@@ -1267,53 +1267,65 @@ mod tests { |
1267 | 1267 | let nan_variant = Variant::Float(f32::NAN); |
1268 | 1268 | let nan_result = nan_variant.to_json_value(); |
1269 | 1269 | assert!(nan_result.is_err()); |
1270 | | - assert!(nan_result |
1271 | | - .unwrap_err() |
1272 | | - .to_string() |
1273 | | - .contains("Invalid float value")); |
| 1270 | + assert!( |
| 1271 | + nan_result |
| 1272 | + .unwrap_err() |
| 1273 | + .to_string() |
| 1274 | + .contains("Invalid float value") |
| 1275 | + ); |
1274 | 1276 |
|
1275 | 1277 | // Test positive infinity - should return an error since JSON doesn't support Infinity |
1276 | 1278 | let pos_inf_variant = Variant::Float(f32::INFINITY); |
1277 | 1279 | let pos_inf_result = pos_inf_variant.to_json_value(); |
1278 | 1280 | assert!(pos_inf_result.is_err()); |
1279 | | - assert!(pos_inf_result |
1280 | | - .unwrap_err() |
1281 | | - .to_string() |
1282 | | - .contains("Invalid float value")); |
| 1281 | + assert!( |
| 1282 | + pos_inf_result |
| 1283 | + .unwrap_err() |
| 1284 | + .to_string() |
| 1285 | + .contains("Invalid float value") |
| 1286 | + ); |
1283 | 1287 |
|
1284 | 1288 | // Test negative infinity - should return an error since JSON doesn't support -Infinity |
1285 | 1289 | let neg_inf_variant = Variant::Float(f32::NEG_INFINITY); |
1286 | 1290 | let neg_inf_result = neg_inf_variant.to_json_value(); |
1287 | 1291 | assert!(neg_inf_result.is_err()); |
1288 | | - assert!(neg_inf_result |
1289 | | - .unwrap_err() |
1290 | | - .to_string() |
1291 | | - .contains("Invalid float value")); |
| 1292 | + assert!( |
| 1293 | + neg_inf_result |
| 1294 | + .unwrap_err() |
| 1295 | + .to_string() |
| 1296 | + .contains("Invalid float value") |
| 1297 | + ); |
1292 | 1298 |
|
1293 | 1299 | // Test the same for Double variants |
1294 | 1300 | let nan_double_variant = Variant::Double(f64::NAN); |
1295 | 1301 | let nan_double_result = nan_double_variant.to_json_value(); |
1296 | 1302 | assert!(nan_double_result.is_err()); |
1297 | | - assert!(nan_double_result |
1298 | | - .unwrap_err() |
1299 | | - .to_string() |
1300 | | - .contains("Invalid double value")); |
| 1303 | + assert!( |
| 1304 | + nan_double_result |
| 1305 | + .unwrap_err() |
| 1306 | + .to_string() |
| 1307 | + .contains("Invalid double value") |
| 1308 | + ); |
1301 | 1309 |
|
1302 | 1310 | let pos_inf_double_variant = Variant::Double(f64::INFINITY); |
1303 | 1311 | let pos_inf_double_result = pos_inf_double_variant.to_json_value(); |
1304 | 1312 | assert!(pos_inf_double_result.is_err()); |
1305 | | - assert!(pos_inf_double_result |
1306 | | - .unwrap_err() |
1307 | | - .to_string() |
1308 | | - .contains("Invalid double value")); |
| 1313 | + assert!( |
| 1314 | + pos_inf_double_result |
| 1315 | + .unwrap_err() |
| 1316 | + .to_string() |
| 1317 | + .contains("Invalid double value") |
| 1318 | + ); |
1309 | 1319 |
|
1310 | 1320 | let neg_inf_double_variant = Variant::Double(f64::NEG_INFINITY); |
1311 | 1321 | let neg_inf_double_result = neg_inf_double_variant.to_json_value(); |
1312 | 1322 | assert!(neg_inf_double_result.is_err()); |
1313 | | - assert!(neg_inf_double_result |
1314 | | - .unwrap_err() |
1315 | | - .to_string() |
1316 | | - .contains("Invalid double value")); |
| 1323 | + assert!( |
| 1324 | + neg_inf_double_result |
| 1325 | + .unwrap_err() |
| 1326 | + .to_string() |
| 1327 | + .contains("Invalid double value") |
| 1328 | + ); |
1317 | 1329 |
|
1318 | 1330 | // Test normal float values still work |
1319 | 1331 | let normal_float = Variant::Float(std::f32::consts::PI); |
|
0 commit comments