test and improve customfield import handling
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 26 Aug 2016 13:34:14 +0000 (15:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 29 Aug 2016 07:18:14 +0000 (09:18 +0200)
commitd2c918e4d219b04293fd96db332c172d3009ce38
tree32e5e38bd145370f01d65fc2e72d0f0c10b993af
parentad94091ed0dbbfdfda560d0458ec1c8cd48b9519
test and improve customfield import handling

* adds a test with customfield merge for duplicates
* adds cf sorting by key

Change-Id: Ib229335785de5ead2f07d39e495e8b28e778bc0c
Reviewed-on: http://gerrit.tine20.com/customers/3486
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
tests/tine20/Addressbook/Import/CsvTest.php
tests/tine20/Addressbook/Import/files/adb_import_csv_duplicate.xml
tests/tine20/Addressbook/Import/files/import_duplicate_1_cf.csv [new file with mode: 0644]
tests/tine20/Addressbook/Import/files/import_duplicate_2_cf.csv [new file with mode: 0644]
tine20/Tinebase/CustomField.php
tine20/Tinebase/Model/Filter/CustomField.php