Update expected test results

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

tests/data/filetest/binary/windows.dll.yml

@@ -1,5 +1,5 @@
-filetype_file: PE32+ executable (DLL) (Control Panel Item) x86-64
-mimetype_file: application/vnd.microsoft.portable-executable
+filetype_file: PE32+
+mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes

tests/data/filetest/certificate/ECLIPSE.RSA.yml

@@ -1,7 +1,8 @@
-filetype_file: DER Encoded PKCS#7 Signed Data
+filetype_file: data
 mimetype_file: application/octet-stream
 is_file: yes
 is_regular: yes
 size: 3487
 is_binary: yes
+is_data: yes
 contains_text: yes

tests/data/filetest/code/scala/Applicative.scala.yml

@@ -1,4 +1,4 @@
-filetype_file: Unicode text
+filetype_file: UTF-8
 mimetype_file: text/plain
 filetype_pygment: Scala
 programming_language: Scala

tests/data/filetest/compiled/win/file.exe.yml

@@ -1,5 +1,5 @@
-filetype_file: PE32 executable (console) Intel 80386 (stripped to external PDB)
-mimetype_file: application/vnd.microsoft.portable-executable
+filetype_file: PE32
+mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes

tests/data/filetest/compiled/win/zlib1.dll.yml

@@ -1,5 +1,5 @@
-filetype_file: PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB)
-mimetype_file: application/vnd.microsoft.portable-executable
+filetype_file: PE32
+mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes
 is_regular: yes

tests/data/filetest/doc/pdf/notpdf.pdf.yml

@@ -1,5 +1,5 @@
-filetype_file: CSV ASCII text
-mimetype_file: text/csv
+filetype_file: CSV
+mimetype_file: application/csv
 mimetype_python: application/pdf
 is_file: yes
 is_regular: yes

tests/data/filetest/media/Image-ascii.pgm.yml

@@ -1,5 +1,5 @@
-filetype_file: Netpbm image data
-mimetype_file: image/x-portable-graymap
+filetype_file: Netpbm
+mimetype_file: image/x-portable-greymap
 mimetype_python: image/x-portable-graymap
 is_file: yes
 is_regular: yes

tests/data/filetest/media/Image1.tga.yml

@@ -1,9 +1,9 @@
-filetype_file: Targa image data - RGB - RLE 1 x 1 x 24 - author " " - comment " " 23-2-2010
-  10:24:54 - job " " - Paint Shop Pro 12.80
-mimetype_file: image/x-tga
+filetype_file: data
+mimetype_file: application/octet-stream
 is_file: yes
 is_regular: yes
 size: 543
 is_binary: yes
+is_data: yes
 is_media: yes
 is_media_with_meta: yes

tests/filetype_test_utils.py

@@ -111,17 +111,19 @@ def __attrs_post_init__(self, *args, **kwargs):
         if isinstance(self.size, str):
             self.size = int(self.size)
 
-    def to_dict(self, filter_empty=False, filter_extra=False, normalize_filetype_file=True):
+    def to_dict(self, filter_empty=False, filter_extra=False, normalize_filetype=True):
         """
         Serialize self to an ordered mapping.
         """
         filtered = [field for field in attr.fields(FileTypeTest)
                     if field.name in ('data_file', 'test_file')]
         fields_filter = attr.filters.exclude(*filtered)
-        if normalize_filetype_file:
-            split_filetype_file = self.filetype_file.split(',')
+
+        if normalize_filetype:
+            split_filetype_file = self.filetype_file.split(' ')
             if split_filetype_file:
                 self.filetype_file = split_filetype_file[0]
+
         data = attr.asdict(self, filter=fields_filter)
         data = data.items()
         if filter_empty: