diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-01 15:32:02 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-01 15:32:02 +0100 |
commit | 51dacafc64336bc7fa02de1ec032d651b1d2b0e1 (patch) | |
tree | da8b9e88a9f37bf769ddfd5414c8dc33738ade54 | |
parent | 6878d1026bc5ed519e1c0d87e208fa2f5e291ff9 (diff) | |
download | php-git-51dacafc64336bc7fa02de1ec032d651b1d2b0e1.tar.gz |
Use separate files for SplFileObject::setCsvControl() tests
5 files changed, 15 insertions, 15 deletions
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt index c7f4710868..c2eb623be9 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt @@ -4,14 +4,14 @@ SPL: SplFileObject::setCsvControl basic Erwin Poeze <erwin.poeze at gmail.com> --FILE-- <?php -file_put_contents('csv_control_data.csv', +file_put_contents('csv_control_data_basic.csv', <<<CDATA 'groene appelen'|10 'gele bananen'|20 'rode kersen'|30 CDATA ); -$s = new SplFileObject('csv_control_data.csv'); +$s = new SplFileObject('csv_control_data_basic.csv'); $s->setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', '\'', '/'); foreach ($s as $row) { @@ -21,7 +21,7 @@ foreach ($s as $row) { ?> --CLEAN-- <?php -unlink('csv_control_data.csv'); +unlink('csv_control_data_basic.csv'); ?> --EXPECT-- groene appelen : 10 diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt index 384fed5d23..296c4a1aa0 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt @@ -4,20 +4,20 @@ SPL: SplFileObject::setCsvControl error 001 Erwin Poeze <erwin.poeze at gmail.com> --FILE-- <?php -file_put_contents('csv_control_data.csv', +file_put_contents('csv_control_data_error001.csv', <<<CDATA 'groene appelen'|10 'gele bananen'|20 'rode kersen'|30 CDATA ); -$s = new SplFileObject('csv_control_data.csv'); +$s = new SplFileObject('csv_control_data_error001.csv'); $s->setFlags(SplFileObject::READ_CSV); $s->setCsvControl('||'); ?> --CLEAN-- <?php -unlink('csv_control_data.csv'); +unlink('csv_control_data_error001.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): delimiter must be a character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt index 6452212ee7..885d600225 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt @@ -4,20 +4,20 @@ SPL: SplFileObject::setCsvControl error 002 Erwin Poeze <erwin.poeze at gmail.com> --FILE-- <?php -file_put_contents('csv_control_data.csv', +file_put_contents('csv_control_data_error002.csv', <<<CDATA 'groene appelen'|10 'gele bananen'|20 'rode kersen'|30 CDATA ); -$s = new SplFileObject('csv_control_data.csv'); +$s = new SplFileObject('csv_control_data_error002.csv'); $s->setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', 'two'); ?> --CLEAN-- <?php -unlink('csv_control_data.csv'); +unlink('csv_control_data_error002.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): enclosure must be a character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt index 071c54c1f0..9e885cbbe3 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt @@ -6,20 +6,20 @@ Erwin Poeze <erwin.poeze at gmail.com> include_path=. --FILE-- <?php -file_put_contents('csv_control_data.csv', +file_put_contents('csv_control_data_error003.csv', <<<CDATA 'groene appelen'|10 'gele bananen'|20 'rode kersen'|30 CDATA ); -$s = new SplFileObject('csv_control_data.csv'); +$s = new SplFileObject('csv_control_data_error003.csv'); $s->setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', '\'', 'three'); ?> --CLEAN-- <?php -unlink('csv_control_data.csv'); +unlink('csv_control_data_error003.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): escape must be empty or a single character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt index c6da6b3d48..f54f8eeabd 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt @@ -4,14 +4,14 @@ SPL: SplFileObject::setCsvControl variation 001 Erwin Poeze <erwin.poeze at gmail.com> --FILE-- <?php -file_put_contents('csv_control_data.csv', +file_put_contents('csv_control_data_variation001.csv', <<<CDATA "groene appelen",10 "gele bananen",20 "rode kersen",30 CDATA ); -$s = new SplFileObject('csv_control_data.csv'); +$s = new SplFileObject('csv_control_data_variation001.csv'); $s->setFlags(SplFileObject::READ_CSV); $s->setCsvControl(); foreach ($s as $row) { @@ -21,7 +21,7 @@ foreach ($s as $row) { ?> --CLEAN-- <?php -unlink('csv_control_data.csv'); +unlink('csv_control_data_variation001.csv'); ?> --EXPECT-- groene appelen : 10 |