From f2ec776d3fb31772db8c371f9b1a3671dc037e70 Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 16 May 2021 20:47:23 -0400 Subject: [PATCH] unit test cleanups test using the safe getter methods, instead of directly accessing the union fields --- psoutils/src/quest/bin.rs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/psoutils/src/quest/bin.rs b/psoutils/src/quest/bin.rs index 3796f0f..cc929b5 100644 --- a/psoutils/src/quest/bin.rs +++ b/psoutils/src/quest/bin.rs @@ -292,13 +292,9 @@ mod tests { assert_eq!(4008, bin.function_offset_table.len()); assert_eq!(6476, bin.calculate_size()); - assert_eq!(58, unsafe { bin.header.quest_number.number }); - assert_eq!(0, unsafe { - bin.header.quest_number.number_and_episode.episode - }); - assert_eq!(58, unsafe { - bin.header.quest_number.number_and_episode.number - }); + assert_eq!(58, bin.header.quest_number()); + assert_eq!(0, bin.header.episode()); + assert_eq!(58, bin.header.quest_number_u16()); assert_eq!(false, bin.header.is_download); assert_eq!(Language::Japanese, bin.header.language); @@ -319,13 +315,9 @@ mod tests { assert_eq!(22004, bin.function_offset_table.len()); assert_eq!(55332, bin.calculate_size()); - assert_eq!(118, unsafe { bin.header.quest_number.number }); - assert_eq!(0, unsafe { - bin.header.quest_number.number_and_episode.episode - }); - assert_eq!(118, unsafe { - bin.header.quest_number.number_and_episode.number - }); + assert_eq!(118, bin.header.quest_number()); + assert_eq!(0, bin.header.episode()); + assert_eq!(118, bin.header.quest_number_u16()); assert_eq!(false, bin.header.is_download); assert_eq!(Language::Japanese, bin.header.language);