Clean up DefineSceneAndFrameLabel unit test

src/read.rs

@@ -607,11 +607,11 @@ pub mod tests {
 
     #[test]
     fn read_swfs() {
-        assert_eq!(read_from_file("test/swfs/uncompressed.swf").compression,
+        assert_eq!(read_from_file("tests/swfs/uncompressed.swf").compression,
                    Compression::None);
-        assert_eq!(read_from_file("test/swfs/zlib.swf").compression,
+        assert_eq!(read_from_file("tests/swfs/zlib.swf").compression,
                    Compression::Zlib);
-        assert_eq!(read_from_file("test/swfs/lzma.swf").compression,
+        assert_eq!(read_from_file("tests/swfs/lzma.swf").compression,
                    Compression::Lzma);
     }
 
@@ -957,23 +957,8 @@ pub mod tests {
 
     #[test]
     fn read_define_scene_and_frame_label_data() {
-        assert_eq!(read_tag_from_file("test/swfs/define_scene_and_frame_label_data.bin", 8),
-                   Tag::DefineSceneAndFrameLabelData {
-                       scenes: vec![
-                    FrameLabel { frame_num: 0, label: "Scene 1".to_string() },
-                    FrameLabel {
-                        frame_num: 25,
-                        label: "Scene2Scene2Scene2Scene2Scene2".to_string()
-                    },
-                    FrameLabel { frame_num: 26, label: "test日本語test".to_string() },
-                ],
-                       frame_labels: vec![
-                    FrameLabel { frame_num: 0, label: "a".to_string() },
-                    FrameLabel { frame_num: 9, label: "b".to_string() },
-                    FrameLabel { frame_num: 17, label: "❤😁aaa".to_string() },
-                    FrameLabel { frame_num: 25, label: "frameInScene2".to_string() },
-                ],
-                   });
+        let (tag, tag_bytes) = test_data::define_scene_and_frame_label_data();
+        assert_eq!(reader(&tag_bytes).read_tag().unwrap().unwrap(), tag);
     }
 
     #[test]

src/test_data.rs

@@ -16,6 +16,31 @@ pub fn echo_swf(filename: &str) {
 
 type TagTestData = (Tag, Vec<u8>);
 
+pub fn define_scene_and_frame_label_data() -> TagTestData {
+    (
+        Tag::DefineSceneAndFrameLabelData {
+            scenes: vec![
+                FrameLabel { frame_num: 0, label: "Scene 1".to_string() },
+                FrameLabel {
+                    frame_num: 25,
+                    label: "Scene2Scene2Scene2Scene2Scene2".to_string()
+                },
+                FrameLabel { frame_num: 26, label: "test日本語test".to_string() },
+            ],
+            frame_labels: vec![
+                FrameLabel { frame_num: 0, label: "a".to_string() },
+                FrameLabel { frame_num: 9, label: "b".to_string() },
+                FrameLabel { frame_num: 17, label: "❤😁aaa".to_string() },
+                FrameLabel { frame_num: 25, label: "frameInScene2".to_string() },
+            ],
+        },
+        read_tag_bytes_from_file(
+            "tests/swfs/define_scene_and_frame_label_data.swf",
+            TagCode::DefineSceneAndFrameLabelData
+        )
+    )
+}
+
 pub fn define_shape() -> TagTestData {
     (
         Tag::DefineShape(Shape {
@@ -58,6 +83,6 @@ pub fn define_shape() -> TagTestData {
                 },
             ]
         }),
-        read_tag_bytes_from_file("test/swfs/define_shape.swf", TagCode::DefineShape)
+        read_tag_bytes_from_file("tests/swfs/define_shape.swf", TagCode::DefineShape)
     )
 }

src/write.rs

@@ -926,21 +926,8 @@ mod tests {
 
     #[test]
     fn write_define_scene_and_frame_label_data() {
-        let frame_labels_tag = Tag::DefineSceneAndFrameLabelData {
-            scenes: vec![
-                FrameLabel { frame_num: 0, label: "Scene 1".to_string() },
-                FrameLabel { frame_num: 25, label: "Scene2Scene2Scene2Scene2Scene2".to_string() },
-                FrameLabel { frame_num: 26, label: "test日本語test".to_string() },
-            ],
-            frame_labels: vec![
-                FrameLabel { frame_num: 0, label: "a".to_string() },
-                FrameLabel { frame_num: 9, label: "b".to_string() },
-                FrameLabel { frame_num: 17, label: "❤😁aaa".to_string() },
-                FrameLabel { frame_num: 25, label: "frameInScene2".to_string() },
-            ],
-        };
-        assert_eq!(write_tag_to_buf(&frame_labels_tag, 8),
-                   get_file_contents("test/swfs/define_scene_and_frame_label_data.bin"));
+        let (tag, tag_bytes) = test_data::define_scene_and_frame_label_data();
+        assert_eq!(write_tag_to_buf(&tag, 1), tag_bytes);
     }
 
     #[test]