From edb3974a0d7c987486bc6b677e6bcc9d234194f7 Mon Sep 17 00:00:00 2001 From: Alexander Kurilo Date: Mon, 17 Oct 2016 00:12:26 +0300 Subject: [PATCH] Move XEEE test data to add data for other readers --- .../PhpSpreadsheetTests/Reader/XEEValidatorTest.php | 4 ++-- .../data/Reader/{ => XEE}/XEETestInvalidUTF-16.xml | Bin .../Reader/{ => XEE}/XEETestInvalidUTF-16BE.xml | Bin .../Reader/{ => XEE}/XEETestInvalidUTF-16LE.xml | Bin tests/data/Reader/{ => XEE}/XEETestInvalidUTF-8.xml | 0 tests/data/Reader/{ => XEE}/XEETestValidUTF-16.xml | Bin .../data/Reader/{ => XEE}/XEETestValidUTF-16BE.xml | Bin .../data/Reader/{ => XEE}/XEETestValidUTF-16LE.xml | Bin tests/data/Reader/{ => XEE}/XEETestValidUTF-8.xml | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename tests/data/Reader/{ => XEE}/XEETestInvalidUTF-16.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestInvalidUTF-16BE.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestInvalidUTF-16LE.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestInvalidUTF-8.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestValidUTF-16.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestValidUTF-16BE.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestValidUTF-16LE.xml (100%) rename tests/data/Reader/{ => XEE}/XEETestValidUTF-8.xml (100%) diff --git a/tests/PhpSpreadsheetTests/Reader/XEEValidatorTest.php b/tests/PhpSpreadsheetTests/Reader/XEEValidatorTest.php index be2d1cae..83b7d99b 100644 --- a/tests/PhpSpreadsheetTests/Reader/XEEValidatorTest.php +++ b/tests/PhpSpreadsheetTests/Reader/XEEValidatorTest.php @@ -21,7 +21,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerInvalidXML() { $tests = []; - foreach (glob('data/Reader/XEETestInvalid*.xml') as $file) { + foreach (glob(__DIR__ . '/../../data/Reader/XEE/XEETestInvalid*.xml') as $file) { $tests[] = [realpath($file), true]; } @@ -41,7 +41,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerValidXML() { $tests = []; - foreach (glob('data/Reader/XEETestValid*.xml') as $file) { + foreach (glob(__DIR__ . '/../../data/Reader/XEE/XEETestValid*.xml') as $file) { $tests[] = [realpath($file), file_get_contents($file)]; } diff --git a/tests/data/Reader/XEETestInvalidUTF-16.xml b/tests/data/Reader/XEE/XEETestInvalidUTF-16.xml similarity index 100% rename from tests/data/Reader/XEETestInvalidUTF-16.xml rename to tests/data/Reader/XEE/XEETestInvalidUTF-16.xml diff --git a/tests/data/Reader/XEETestInvalidUTF-16BE.xml b/tests/data/Reader/XEE/XEETestInvalidUTF-16BE.xml similarity index 100% rename from tests/data/Reader/XEETestInvalidUTF-16BE.xml rename to tests/data/Reader/XEE/XEETestInvalidUTF-16BE.xml diff --git a/tests/data/Reader/XEETestInvalidUTF-16LE.xml b/tests/data/Reader/XEE/XEETestInvalidUTF-16LE.xml similarity index 100% rename from tests/data/Reader/XEETestInvalidUTF-16LE.xml rename to tests/data/Reader/XEE/XEETestInvalidUTF-16LE.xml diff --git a/tests/data/Reader/XEETestInvalidUTF-8.xml b/tests/data/Reader/XEE/XEETestInvalidUTF-8.xml similarity index 100% rename from tests/data/Reader/XEETestInvalidUTF-8.xml rename to tests/data/Reader/XEE/XEETestInvalidUTF-8.xml diff --git a/tests/data/Reader/XEETestValidUTF-16.xml b/tests/data/Reader/XEE/XEETestValidUTF-16.xml similarity index 100% rename from tests/data/Reader/XEETestValidUTF-16.xml rename to tests/data/Reader/XEE/XEETestValidUTF-16.xml diff --git a/tests/data/Reader/XEETestValidUTF-16BE.xml b/tests/data/Reader/XEE/XEETestValidUTF-16BE.xml similarity index 100% rename from tests/data/Reader/XEETestValidUTF-16BE.xml rename to tests/data/Reader/XEE/XEETestValidUTF-16BE.xml diff --git a/tests/data/Reader/XEETestValidUTF-16LE.xml b/tests/data/Reader/XEE/XEETestValidUTF-16LE.xml similarity index 100% rename from tests/data/Reader/XEETestValidUTF-16LE.xml rename to tests/data/Reader/XEE/XEETestValidUTF-16LE.xml diff --git a/tests/data/Reader/XEETestValidUTF-8.xml b/tests/data/Reader/XEE/XEETestValidUTF-8.xml similarity index 100% rename from tests/data/Reader/XEETestValidUTF-8.xml rename to tests/data/Reader/XEE/XEETestValidUTF-8.xml