[TASK] Fix functional tests for EXT:impexp 64/33064/4
authorOliver Hader <oliver@typo3.org>
Tue, 30 Sep 2014 08:50:24 +0000 (10:50 +0200)
committerOliver Hader <oliver.hader@typo3.org>
Tue, 30 Sep 2014 09:59:52 +0000 (11:59 +0200)
After issue #61944 has been merged, sys_file_reference.link does
not support NULL values anymore (which is fine). However, in the
past the default has been NULL and also has been written in the
accordant functional test data assertions.

Thus, NULL assertions are removed from the test. The change of
the "size" property by 5 bytes can be explained by a difference
in serializing NULL values and serializing an empty string.

Releases: master, 6.2
Related: #61944
Change-Id: Ia8700d6b6e374412e3300f12f4d6bb341deb4cfe
Reviewed-on: http://review.typo3.org/33064
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
typo3/sysext/impexp/Tests/Functional/Fixtures/ImportExportXml/pages-and-ttcontent-with-image-but-not-included.xml
typo3/sysext/impexp/Tests/Functional/Fixtures/ImportExportXml/pages-and-ttcontent-with-image.xml
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentUploads/DataSet/Assertion/importPagesAndTtContentUploads.csv

index 473cd1e..5794752 100644 (file)
@@ -72,7 +72,7 @@
                                        <uid>1</uid>
                                        <pid>1</pid>
                                        <title>1</title>
-                                       <size>292</size>
+                                       <size>297</size>
                                        <relations index="rels" type="array">
                                                <element index="sys_file:1" type="array">
                                                        <id>1</id>
                                <field index="title" type="NULL"></field>
                                <field index="description" type="NULL"></field>
                                <field index="alternative" type="NULL"></field>
-                               <field index="link" type="NULL"></field>
+                               <field index="link"></field>
                        </fieldlist>
                        <related index="rels" type="array">
                                <field index="uid_local" type="array">
index c4f3341..8342a52 100644 (file)
@@ -72,7 +72,7 @@
                                        <uid>1</uid>
                                        <pid>1</pid>
                                        <title>1</title>
-                                       <size>292</size>
+                                       <size>297</size>
                                        <relations index="rels" type="array">
                                                <element index="sys_file:1" type="array">
                                                        <id>1</id>
                                <field index="title" type="NULL"></field>
                                <field index="description" type="NULL"></field>
                                <field index="alternative" type="NULL"></field>
-                               <field index="link" type="NULL"></field>
+                               <field index="link"></field>
                        </fieldlist>
                        <related index="rels" type="array">
                                <field index="uid_local" type="array">
index a0296e9..c8f16ab 100644 (file)
@@ -10,8 +10,8 @@
 ,2,0,1,2,"/user_upload/_imported/typo3_image3.jpg","6fe0d531fb52945d0b943b54aa20116e5533284a","d62c2c9935d7b7e4f3ed493282bf8287abd80f93","jpg","image/jpeg","typo3_image3.jpg","e873c1e2ffd0f191e183a1057de3eef4d62e782d","5565"
 "sys_file_reference"
 ,"uid","pid","uid_local","uid_foreign","tablenames","fieldname","table_local","title","description","alternative","link"
-,1,1,1,1,"tt_content","media","sys_file",\NULL,"Description text one",\NULL,\NULL
-,2,1,2,1,"tt_content","media","sys_file",\NULL,"Description text two",\NULL,\NULL
+,1,1,1,1,"tt_content","media","sys_file",\NULL,"Description text one",\NULL,""
+,2,1,2,1,"tt_content","media","sys_file",\NULL,"Description text two",\NULL,""
 "sys_file_metadata"
 ,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent"
 ,1,0,1,\NULL,400,300,\NULL,\NULL,0,0