Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TASK] CSV integrity test script can fix fixtures
CSV fixture files are a straight way to feed test database with stuff and to assert database state after operations. Script Build/Scripts/checkIntegrityCsvFixtures.php tests those files for integrity, making sure all lines have the same number of columns. Maintaining the number of commas when fiddling with functional tests however is annoying. The patch adds options to checkIntegrityCsvFixtures.php: * '--fix' simply fixes files with broken integrity * '--fixAll' goes through all files and looks for details like superfluous comma. While --fixAll is used once now to establish a good baseline on all .csv fixtutre files, --fix can be used whenever the integrity script mumbles about broken stuff: Build/Scripts/checkIntegrityCsvFixtures.php --fix It is also added to runTests.sh: Build/Scripts/runTests.sh -s fixCsvFixtures Change-Id: Idee2a97094f56d059b02f801ffecb50a7ce21a5c Resolves: #92207 Releases: master, 10.4, 9.5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65584 Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by: Benni Mack <benni@typo3.org> Tested-by: TYPO3com <noreply@typo3.com> Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by: Benni Mack <benni@typo3.org>
- Loading branch information
Showing
65 changed files
with
1,715 additions
and
1,587 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/TranslatedSubpages.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
"sys_language",,,,,,,,,,,,,,,,,, | ||
,"uid","pid","hidden","title","flag",,,,,,,,,,,,, | ||
,1,0,0,"Dansk","dk",,,,,,,,,,,,, | ||
,2,0,0,"Deutsch","de",,,,,,,,,,,,, | ||
"pages",,,,,,,,,,,,,,,,,, | ||
,"uid","pid","title","sys_language_uid","l10n_parent",,,,,,,,,,,,, | ||
,1,0,"Startpage",0,0,,,,,,,,,,,,, | ||
,2,0,"Startpage - Dansk",1,1,,,,,,,,,,,,, | ||
,3,1,"Subpage",0,0,,,,,,,,,,,,, | ||
,4,1,"Subpage - Dansk",1,3,,,,,,,,,,,,, | ||
"sys_language",,,,, | ||
,"uid","pid","hidden","title","flag" | ||
,1,0,0,"Dansk","dk" | ||
,2,0,0,"Deutsch","de" | ||
"pages",,,,, | ||
,"uid","pid","title","sys_language_uid","l10n_parent" | ||
,1,0,"Startpage",0,0 | ||
,2,0,"Startpage - Dansk",1,1 | ||
,3,1,"Subpage",0,0 | ||
,4,1,"Subpage - Dansk",1,3 |
56 changes: 28 additions & 28 deletions
56
typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,28 @@ | ||
"sys_language",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","hidden","title","flag",,,,,,,,,,,,,,,,, | ||
,1,0,0,"Dansk","dk",,,,,,,,,,,,,,,,, | ||
,2,0,0,"Deutsch","de",,,,,,,,,,,,,,,,, | ||
"sys_category",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parent","items","l10n_diffsource","description",,,,, | ||
,28,0,256,0,0,0,0,0,0,0,0,0,"Category A",0,0,,,,,,, | ||
,29,0,512,0,0,0,0,0,0,0,0,0,"Category B",0,0,,,,,,, | ||
,30,0,768,0,0,0,0,0,0,0,0,0,"Category C",0,0,,,,,,, | ||
,31,0,1024,0,0,0,0,0,0,0,0,0,"Category A.A",28,0,,,,,,, | ||
"sys_file",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","type","storage","identifier","extension","mime_type","name","sha1","size","creation_date","modification_date","missing","metadata","identifier_hash","folder_hash","last_indexed",,,,, | ||
,1,0,2,1,"/_migrated/pics/kasper-skarhoj1_01.jpeg","jpeg","image/jpeg","kasper-skarhoj1_01.jpeg","b841902021bbe23bd71e4a5b5b97626da7734b90",39056,1375080761,1374139442,0,0,"2a4941658e4bd943048a234a5e1f305a1f736b10","f6e391567e01bdb14eac504413794a3bc1300abd",0,,,,, | ||
,21,0,2,1,"/_migrated/pics/typo3_image5_01.jpg","jpg","image/jpeg","typo3_image5_01.jpg","ce136877a22606a6e44ce9b1f8ed3be70c74e6ee",126872,1375080761,1374139442,0,0,"9df04e41b37d2c29777ee64ced3f612b2422a02e","f6e391567e01bdb14eac504413794a3bc1300abd",0,,,,, | ||
"sys_file_metadata",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","file","title","width","height","description","alternative","categories","l10n_diffsource",,,, | ||
,1,0,0,0,0,0,0,0,0,0,1,"Image Kasper",401,600,,,0,,,,, | ||
,21,0,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,,,,, | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link","l10n_diffsource", | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,, | ||
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,, | ||
"sys_language",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","hidden","title","flag",,,,,,,,,,,,,,,, | ||
,1,0,0,"Dansk","dk",,,,,,,,,,,,,,,, | ||
,2,0,0,"Deutsch","de",,,,,,,,,,,,,,,, | ||
"sys_category",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parent","items","l10n_diffsource","description",,,, | ||
,28,0,256,0,0,0,0,0,0,0,0,0,"Category A",0,0,,,,,, | ||
,29,0,512,0,0,0,0,0,0,0,0,0,"Category B",0,0,,,,,, | ||
,30,0,768,0,0,0,0,0,0,0,0,0,"Category C",0,0,,,,,, | ||
,31,0,1024,0,0,0,0,0,0,0,0,0,"Category A.A",28,0,,,,,, | ||
"sys_file",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","type","storage","identifier","extension","mime_type","name","sha1","size","creation_date","modification_date","missing","metadata","identifier_hash","folder_hash","last_indexed",,,, | ||
,1,0,2,1,"/_migrated/pics/kasper-skarhoj1_01.jpeg","jpeg","image/jpeg","kasper-skarhoj1_01.jpeg","b841902021bbe23bd71e4a5b5b97626da7734b90",39056,1375080761,1374139442,0,0,"2a4941658e4bd943048a234a5e1f305a1f736b10","f6e391567e01bdb14eac504413794a3bc1300abd",0,,,, | ||
,21,0,2,1,"/_migrated/pics/typo3_image5_01.jpg","jpg","image/jpeg","typo3_image5_01.jpg","ce136877a22606a6e44ce9b1f8ed3be70c74e6ee",126872,1375080761,1374139442,0,0,"9df04e41b37d2c29777ee64ced3f612b2422a02e","f6e391567e01bdb14eac504413794a3bc1300abd",0,,,, | ||
"sys_file_metadata",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","file","title","width","height","description","alternative","categories","l10n_diffsource",,, | ||
,1,0,0,0,0,0,0,0,0,0,1,"Image Kasper",401,600,,,0,,,, | ||
,21,0,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,,,, | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link","l10n_diffsource" | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,, | ||
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,, |
24 changes: 12 additions & 12 deletions
24
typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link", | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,, | ||
,330,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,, | ||
"sys_refindex",,,,,,,,,,,,,,,,,,,,, | ||
,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,, | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link" | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,, | ||
,330,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,, | ||
"sys_refindex",,,,,,,,,,,,,,,,,,,, | ||
,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,, |
38 changes: 19 additions & 19 deletions
38
typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link", | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,, | ||
,130,89,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,, | ||
,131,89,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,, | ||
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,, | ||
,332,89,128,0,0,0,331,0,0,0,0,0,"Regular Element #2 (copy 1)",2,,,,,,, | ||
"sys_refindex",,,,,,,,,,,,,,,,,,,,, | ||
,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,, | ||
,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,, | ||
,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,, | ||
,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,,, | ||
,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",1,0,0,"sys_file_reference",131,,,,,,,,,,,, | ||
"sys_file_reference",,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link" | ||
,126,89,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,, | ||
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,, | ||
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, | ||
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, | ||
,130,89,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, | ||
,131,89,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,, | ||
"tt_content",,,,,,,,,,,,,,,,,,,, | ||
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,, | ||
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,, | ||
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,, | ||
,332,89,128,0,0,0,331,0,0,0,0,0,"Regular Element #2 (copy 1)",2,,,,,, | ||
"sys_refindex",,,,,,,,,,,,,,,,,,,, | ||
,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,, | ||
,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,, | ||
,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,, | ||
,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,, | ||
,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",1,0,0,"sys_file_reference",131,,,,,,,,,,, |
Oops, something went wrong.