alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/gh-7 

# Conflicts:
#	tests/PhpSpreadsheet/Shared/DateTest.php
#	tests/rawTestData/Shared/DateTimeExcelToPHP1900.data
#	tests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data
#	tests/rawTestData/Shared/DateTimeExcelToPHP1904.data
#	unitTests/rawTestData/Shared/DateTimeExcelToPHP1900.data
#	unitTests/rawTestData/Shared/DateTimeExcelToPHP1904.data
#	unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1900.data
#	unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1904.data
This commit is contained in:
MarkBaker 2016-08-14 02:07:10 +01:00
parent e149c1f191 00657c906e
commit 850594c4d2
257 changed files with 3517 additions and 3346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1,3 +1,3 @@
/Build export-ignore /Build export-ignore
/unitTests export-ignore /tests export-ignore
README.md export-ignore README.md export-ignore

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
build/PHPExcel.phar build/PHPExcel.phar
unitTests/codeCoverage tests/codeCoverage
analysis analysis
## IDE support ## IDE support

4
.travis.yml
View File

@ -26,6 +26,6 @@ before_script:
script: script:
## PHP_CodeSniffer ## PHP_CodeSniffer
- ./vendor/bin/phpcs --report-width=200 --report-summary --report-full src/ unitTests/ --standard=PSR2 -n - ./vendor/bin/phpcs --report-width=200 --report-summary --report-full src/ tests/ --standard=PSR2 -n
## PHPUnit ## PHPUnit
- ./vendor/bin/phpunit -c ./unitTests/ - ./vendor/bin/phpunit

5
composer.json
View File

@ -45,5 +45,10 @@
"psr-4": { "psr-4": {
"PHPExcel\\": "src/PhpSpreadsheet" "PHPExcel\\": "src/PhpSpreadsheet"
} }
},
"autoload-dev": {
"psr-4": {
"PhpSpreadsheet\\Tests\\": "tests/PhpSpreadsheet"
}
} }
} }

42
phpunit-cc.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./tests/bootstrap.php"
backupGlobals="true"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
syntaxCheck="true"
verbose="true"
reportUselessTests="true"
strictCoverage="true"
disallowTestOutput="true"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false">
<php>
<ini name="memory_limit" value="2048M"/>
</php>
<testsuite name="PHPExcel Unit Test Suite">
<directory suffix="Test.php">./tests/PhpSpreadsheet</directory>
</testsuite>
<filter>
<whitelist>
<directory suffix=".php">./src</directory>
<exclude>
<directory>./src/PhpSpreadsheet/Shared/PCLZip</directory>
<directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
<directory>./src/PhpSpreadsheet/Writer/PDF</directory>
</exclude>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="./tests/codeCoverage" charset="UTF-8"
yui="true" highlight="false"
lowUpperBound="35" highLowerBound="70"/>
<log type="coverage-clover" target="./tests/codeCoverage/codeCoverage.xml"/>
<log type="metrics-xml" target="./tests/metrics/metrics.xml"/>
<log type="test-xml" target="./tests/testResults/logfile.xml" logIncompleteSkipped="false"/>
</logging>
</phpunit>

34
phpunit.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./tests/bootstrap.php"
backupGlobals="true"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
syntaxCheck="true"
verbose="true"
reportUselessTests="true"
strictCoverage="true"
disallowTestOutput="true"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false">
<php>
<ini name="memory_limit" value="2048M"/>
</php>
<testsuite name="PHPExcel Unit Test Suite">
<directory suffix="Test.php">./tests/PhpSpreadsheet</directory>
</testsuite>
<filter>
<whitelist>
<directory suffix=".php">./src</directory>
<exclude>
<directory>./src/PhpSpreadsheet/Shared/PCLZip</directory>
<directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
<directory>./src/PhpSpreadsheet/Writer/PDF</directory>
</exclude>
</whitelist>
</filter>
</phpunit>

4
src/PhpSpreadsheet/Shared/Date.php
View File

@ -196,6 +196,8 @@ class Date
* Convert a MS serialized datetime value from Excel to a unix timestamp * Convert a MS serialized datetime value from Excel to a unix timestamp
* *
* @param integer|float $dateValue Excel date/time value * @param integer|float $dateValue Excel date/time value
* @param \DateTimeZone|string|null $timezone The timezone to assume for the Excel timestamp,
* if you don't want to treat it as a UTC value
* @return integer Unix timetamp for this date/time * @return integer Unix timetamp for this date/time
* @throws \Exception * @throws \Exception
*/ */
@ -226,7 +228,7 @@ class Date
0; 0;
$retValue = false; $retValue = false;
if ((is_object($dateValue)) && ($dateValue instanceof \DateTime)) { if ((is_object($dateValue)) && ($dateValue instanceof \DateTimeInterface)) {
$dateValue->add(new \DateInterval('PT' . $timezoneAdjustment . 'S')); $dateValue->add(new \DateInterval('PT' . $timezoneAdjustment . 'S'));
$retValue = self::formattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')); $retValue = self::formattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s'));
} elseif (is_numeric($dateValue)) { } elseif (is_numeric($dateValue)) {

6
unitTests/Classes/src/Calculation/DateTimeTest.php → tests/PhpSpreadsheet/Calculation/DateTimeTest.php
View File

@ -1,9 +1,11 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
use PhpSpreadhsheet\unitTests\TestDataFileIterator; use PhpSpreadsheet\Tests\TestDataFileIterator;
use PHPExcel\Shared\Date; use PHPExcel\Shared\Date;
use PHPExcel\Calculation\Functions;
use PHPExcel\Calculation\DateTime;
/** /**
* Class DateTimeTest * Class DateTimeTest

91
unitTests/Classes/src/Calculation/EngineeringTest.php → tests/PhpSpreadsheet/Calculation/EngineeringTest.php
View File

@ -1,25 +1,18 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
// Custom assertion class for handling precision of Complex numbers
require_once 'custom/complexAssert.php';
// Data Provider handler
require_once 'testDataFileIterator.php';
class EngineeringTest extends \PHPUnit_Framework_TestCase class EngineeringTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @var \PhpSpreadhsheet\unitTests\custom\ComplexAssert * @var \PhpSpreadsheet\Tests\Custom\ComplexAssert
*/ */
protected $complexAssert; protected $complexAssert;
public function setUp() public function setUp()
{ {
$this->complexAssert = new \PhpSpreadhsheet\unitTests\custom\ComplexAssert(); $this->complexAssert = new \PhpSpreadsheet\Tests\Custom\ComplexAssert();
\PHPExcel\Calculation\Functions::setCompatibilityMode(\PHPExcel\Calculation\Functions::COMPATIBILITY_EXCEL); \PHPExcel\Calculation\Functions::setCompatibilityMode(\PHPExcel\Calculation\Functions::COMPATIBILITY_EXCEL);
} }
@ -41,7 +34,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELI() public function providerBESSELI()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
} }
/** /**
@ -57,7 +50,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELJ() public function providerBESSELJ()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
} }
/** /**
@ -73,7 +66,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELK() public function providerBESSELK()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
} }
/** /**
@ -89,7 +82,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELY() public function providerBESSELY()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
} }
/** /**
@ -105,7 +98,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerCOMPLEX() public function providerCOMPLEX()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
} }
/** /**
@ -121,7 +114,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMAGINARY() public function providerIMAGINARY()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
} }
/** /**
@ -137,7 +130,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMREAL() public function providerIMREAL()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
} }
/** /**
@ -153,7 +146,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMABS() public function providerIMABS()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
} }
/** /**
@ -170,7 +163,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMARGUMENT() public function providerIMARGUMENT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
} }
/** /**
@ -186,7 +179,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMCONJUGATE() public function providerIMCONJUGATE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
} }
/** /**
@ -202,7 +195,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMCOS() public function providerIMCOS()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
} }
/** /**
@ -219,7 +212,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMDIV() public function providerIMDIV()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
} }
/** /**
@ -235,7 +228,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMEXP() public function providerIMEXP()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
} }
/** /**
@ -251,7 +244,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMLN() public function providerIMLN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
} }
/** /**
@ -267,7 +260,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMLOG2() public function providerIMLOG2()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
} }
/** /**
@ -283,7 +276,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMLOG10() public function providerIMLOG10()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
} }
/** /**
@ -300,7 +293,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMPOWER() public function providerIMPOWER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
} }
/** /**
@ -316,7 +309,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMPRODUCT() public function providerIMPRODUCT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
} }
/** /**
@ -332,7 +325,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMSIN() public function providerIMSIN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
} }
/** /**
@ -348,7 +341,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMSQRT() public function providerIMSQRT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
} }
/** /**
@ -365,7 +358,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMSUB() public function providerIMSUB()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
} }
/** /**
@ -382,7 +375,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMSUM() public function providerIMSUM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
} }
/** /**
@ -398,7 +391,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerERF() public function providerERF()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
} }
/** /**
@ -414,7 +407,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerERFC() public function providerERFC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
} }
/** /**
@ -430,7 +423,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2DEC() public function providerBIN2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
} }
/** /**
@ -446,7 +439,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2HEX() public function providerBIN2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
} }
/** /**
@ -462,7 +455,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2OCT() public function providerBIN2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
} }
/** /**
@ -478,7 +471,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2BIN() public function providerDEC2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
} }
/** /**
@ -494,7 +487,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2HEX() public function providerDEC2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
} }
/** /**
@ -510,7 +503,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2OCT() public function providerDEC2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
} }
/** /**
@ -526,7 +519,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2BIN() public function providerHEX2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
} }
/** /**
@ -542,7 +535,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2DEC() public function providerHEX2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
} }
/** /**
@ -558,7 +551,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2OCT() public function providerHEX2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
} }
/** /**
@ -574,7 +567,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2BIN() public function providerOCT2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
} }
/** /**
@ -590,7 +583,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2DEC() public function providerOCT2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
} }
/** /**
@ -606,7 +599,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2HEX() public function providerOCT2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
} }
/** /**
@ -622,7 +615,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDELTA() public function providerDELTA()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
} }
/** /**
@ -638,7 +631,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerGESTEP() public function providerGESTEP()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
} }
public function testGetConversionGroups() public function testGetConversionGroups()
@ -678,6 +671,6 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerCONVERTUOM() public function providerCONVERTUOM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
} }
} }

66
unitTests/Classes/src/Calculation/FinancialTest.php → tests/PhpSpreadsheet/Calculation/FinancialTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
class FinancialTest extends \PHPUnit_Framework_TestCase class FinancialTest extends \PHPUnit_Framework_TestCase
{ {
@ -26,7 +24,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerACCRINT() public function providerACCRINT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
} }
/** /**
@ -42,7 +40,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerACCRINTM() public function providerACCRINTM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
} }
/** /**
@ -58,7 +56,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerAMORDEGRC() public function providerAMORDEGRC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
} }
/** /**
@ -74,7 +72,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerAMORLINC() public function providerAMORLINC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
} }
/** /**
@ -90,7 +88,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYBS() public function providerCOUPDAYBS()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
} }
/** /**
@ -106,7 +104,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYS() public function providerCOUPDAYS()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
} }
/** /**
@ -122,7 +120,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYSNC() public function providerCOUPDAYSNC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
} }
/** /**
@ -138,7 +136,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPNCD() public function providerCOUPNCD()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
} }
/** /**
@ -154,7 +152,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPNUM() public function providerCOUPNUM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
} }
/** /**
@ -170,7 +168,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPPCD() public function providerCOUPPCD()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
} }
/** /**
@ -186,7 +184,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCUMIPMT() public function providerCUMIPMT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
} }
/** /**
@ -202,7 +200,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCUMPRINC() public function providerCUMPRINC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
} }
/** /**
@ -218,7 +216,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDB() public function providerDB()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data');
} }
/** /**
@ -234,7 +232,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDDB() public function providerDDB()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
} }
/** /**
@ -250,7 +248,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDISC() public function providerDISC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
} }
/** /**
@ -266,7 +264,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDOLLARDE() public function providerDOLLARDE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
} }
/** /**
@ -282,7 +280,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDOLLARFR() public function providerDOLLARFR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
} }
/** /**
@ -298,7 +296,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerEFFECT() public function providerEFFECT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
} }
/** /**
@ -314,7 +312,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerFV() public function providerFV()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data');
} }
/** /**
@ -330,7 +328,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerFVSCHEDULE() public function providerFVSCHEDULE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
} }
/** /**
@ -346,7 +344,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerINTRATE() public function providerINTRATE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
} }
/** /**
@ -362,7 +360,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerIPMT() public function providerIPMT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
} }
/** /**
@ -378,7 +376,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerIRR() public function providerIRR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
} }
/** /**
@ -394,7 +392,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerISPMT() public function providerISPMT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
} }
/** /**
@ -410,7 +408,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerMIRR() public function providerMIRR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
} }
/** /**
@ -426,7 +424,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNOMINAL() public function providerNOMINAL()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
} }
/** /**
@ -442,7 +440,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNPER() public function providerNPER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
} }
/** /**
@ -458,7 +456,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNPV() public function providerNPV()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
} }
/** /**
@ -475,7 +473,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerPRICE() public function providerPRICE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
} }
/** /**
@ -492,7 +490,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerRATE() public function providerRATE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
} }
/** /**
@ -509,6 +507,6 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerXIRR() public function providerXIRR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
} }
} }

30
unitTests/Classes/src/Calculation/FunctionsTest.php → tests/PhpSpreadsheet/Calculation/FunctionsTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
class FunctionsTest extends \PHPUnit_Framework_TestCase class FunctionsTest extends \PHPUnit_Framework_TestCase
{ {
@ -73,7 +71,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsBlank() public function providerIsBlank()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
} }
/** /**
@ -89,7 +87,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsErr() public function providerIsErr()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
} }
/** /**
@ -105,7 +103,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsError() public function providerIsError()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
} }
/** /**
@ -121,7 +119,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerErrorType() public function providerErrorType()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
} }
/** /**
@ -137,7 +135,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsLogical() public function providerIsLogical()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
} }
/** /**
@ -153,7 +151,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsNa() public function providerIsNa()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
} }
/** /**
@ -169,7 +167,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsNumber() public function providerIsNumber()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
} }
/** /**
@ -185,7 +183,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsText() public function providerIsText()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
} }
/** /**
@ -201,7 +199,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsNonText() public function providerIsNonText()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
} }
/** /**
@ -217,7 +215,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsEven() public function providerIsEven()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
} }
/** /**
@ -233,7 +231,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsOdd() public function providerIsOdd()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
} }
/** /**
@ -249,7 +247,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerTYPE() public function providerTYPE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
} }
/** /**
@ -265,6 +263,6 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerN() public function providerN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data');
} }
} }

14
unitTests/Classes/src/Calculation/LogicalTest.php → tests/PhpSpreadsheet/Calculation/LogicalTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
class LogicalTest extends \PHPUnit_Framework_TestCase class LogicalTest extends \PHPUnit_Framework_TestCase
{ {
@ -37,7 +35,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerAND() public function providerAND()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data');
} }
/** /**
@ -53,7 +51,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerOR() public function providerOR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data');
} }
/** /**
@ -69,7 +67,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerNOT() public function providerNOT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
} }
/** /**
@ -85,7 +83,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerIF() public function providerIF()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data');
} }
/** /**
@ -101,6 +99,6 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerIFERROR() public function providerIFERROR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
} }
} }

8
unitTests/Classes/src/Calculation/LookupRefTest.php → tests/PhpSpreadsheet/Calculation/LookupRefTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
/** /**
* Class LookupRefTest * Class LookupRefTest
@ -30,7 +28,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
public function providerHLOOKUP() public function providerHLOOKUP()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
} }
/** /**
@ -47,6 +45,6 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
public function providerVLOOKUP() public function providerVLOOKUP()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
} }
} }

62
unitTests/Classes/src/Calculation/MathTrigTest.php → tests/PhpSpreadsheet/Calculation/MathTrigTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
class MathTrigTest extends \PHPUnit_Framework_TestCase class MathTrigTest extends \PHPUnit_Framework_TestCase
{ {
@ -25,7 +23,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerATAN2() public function providerATAN2()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
} }
/** /**
@ -41,7 +39,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerCEILING() public function providerCEILING()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
} }
/** /**
@ -57,7 +55,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerCOMBIN() public function providerCOMBIN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
} }
/** /**
@ -73,7 +71,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerEVEN() public function providerEVEN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
} }
/** /**
@ -89,7 +87,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerODD() public function providerODD()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
} }
/** /**
@ -105,7 +103,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFACT() public function providerFACT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
} }
/** /**
@ -121,7 +119,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFACTDOUBLE() public function providerFACTDOUBLE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
} }
/** /**
@ -137,7 +135,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFLOOR() public function providerFLOOR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
} }
/** /**
@ -153,7 +151,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerGCD() public function providerGCD()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
} }
/** /**
@ -169,7 +167,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerLCM() public function providerLCM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
} }
/** /**
@ -185,7 +183,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerINT() public function providerINT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
} }
/** /**
@ -201,7 +199,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSIGN() public function providerSIGN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
} }
/** /**
@ -217,7 +215,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerPOWER() public function providerPOWER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
} }
/** /**
@ -233,7 +231,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerLOG() public function providerLOG()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
} }
/** /**
@ -249,7 +247,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMOD() public function providerMOD()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
} }
/** /**
@ -266,7 +264,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMDETERM() public function providerMDETERM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
} }
/** /**
@ -283,7 +281,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMINVERSE() public function providerMINVERSE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
} }
/** /**
@ -300,7 +298,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMMULT() public function providerMMULT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
} }
/** /**
@ -316,7 +314,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMULTINOMIAL() public function providerMULTINOMIAL()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
} }
/** /**
@ -334,7 +332,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMROUND() public function providerMROUND()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
} }
/** /**
@ -350,7 +348,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerPRODUCT() public function providerPRODUCT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
} }
/** /**
@ -366,7 +364,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerQUOTIENT() public function providerQUOTIENT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
} }
/** /**
@ -382,7 +380,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROUNDUP() public function providerROUNDUP()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
} }
/** /**
@ -398,7 +396,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROUNDDOWN() public function providerROUNDDOWN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
} }
/** /**
@ -414,7 +412,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSERIESSUM() public function providerSERIESSUM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
} }
/** /**
@ -430,7 +428,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSUMSQ() public function providerSUMSQ()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
} }
/** /**
@ -446,7 +444,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerTRUNC() public function providerTRUNC()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
} }
/** /**
@ -462,7 +460,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROMAN() public function providerROMAN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
} }
/** /**
@ -478,7 +476,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSQRTPI() public function providerSQRTPI()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
} }
/** /**

46
unitTests/Classes/src/Calculation/TextDataTest.php → tests/PhpSpreadsheet/Calculation/TextDataTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Calculation; namespace PhpSpreadsheet\Tests\Calculation;
require_once 'testDataFileIterator.php';
class TextDataTest extends \PHPUnit_Framework_TestCase class TextDataTest extends \PHPUnit_Framework_TestCase
{ {
@ -25,7 +23,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCHAR() public function providerCHAR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
} }
/** /**
@ -41,7 +39,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCODE() public function providerCODE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
} }
/** /**
@ -57,7 +55,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCONCATENATE() public function providerCONCATENATE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
} }
/** /**
@ -73,7 +71,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLEFT() public function providerLEFT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
} }
/** /**
@ -89,7 +87,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerMID() public function providerMID()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data');
} }
/** /**
@ -105,7 +103,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerRIGHT() public function providerRIGHT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
} }
/** /**
@ -121,7 +119,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLOWER() public function providerLOWER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
} }
/** /**
@ -137,7 +135,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerUPPER() public function providerUPPER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
} }
/** /**
@ -153,7 +151,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerPROPER() public function providerPROPER()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
} }
/** /**
@ -169,7 +167,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLEN() public function providerLEN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
} }
/** /**
@ -185,7 +183,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerSEARCH() public function providerSEARCH()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
} }
/** /**
@ -201,7 +199,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerFIND() public function providerFIND()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
} }
/** /**
@ -217,7 +215,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerREPLACE() public function providerREPLACE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
} }
/** /**
@ -233,7 +231,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerSUBSTITUTE() public function providerSUBSTITUTE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
} }
/** /**
@ -249,7 +247,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerTRIM() public function providerTRIM()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
} }
/** /**
@ -265,7 +263,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCLEAN() public function providerCLEAN()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
} }
/** /**
@ -281,7 +279,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerDOLLAR() public function providerDOLLAR()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
} }
/** /**
@ -297,7 +295,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerFIXED() public function providerFIXED()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
} }
/** /**
@ -313,7 +311,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerT() public function providerT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data');
} }
/** /**
@ -334,7 +332,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerTEXT() public function providerTEXT()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
} }
/** /**
@ -354,6 +352,6 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerVALUE() public function providerVALUE()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
} }
} }

4
unitTests/Classes/src/CalculationTest.php → tests/PhpSpreadsheet/CalculationTest.php
View File

@ -2,8 +2,6 @@
namespace PHPExcel; namespace PHPExcel;
require_once 'testDataFileIterator.php';
class CalculationTest extends \PHPUnit_Framework_TestCase class CalculationTest extends \PHPUnit_Framework_TestCase
{ {
public function setUp() public function setUp()
@ -27,6 +25,6 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
public function providerBinaryComparisonOperation() public function providerBinaryComparisonOperation()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data');
} }
} }

2
unitTests/Classes/src/Cell/AdvancedValueBinderTest.php → tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Cell; namespace PhpSpreadsheet\Tests\Cell;
class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Cell/DataTypeTest.php → tests/PhpSpreadsheet/Cell/DataTypeTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Cell; namespace PhpSpreadsheet\Tests\Cell;
class DataTypeTest extends \PHPUnit_Framework_TestCase class DataTypeTest extends \PHPUnit_Framework_TestCase
{ {

6
unitTests/Classes/src/Cell/DefaultValueBinderTest.php → tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Cell; namespace PhpSpreadsheet\Tests\Cell;
require_once 'testDataFileIteratorJson.php';
class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
{ {
@ -69,7 +67,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
public function providerDataTypeForValue() public function providerDataTypeForValue()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json'); return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
} }
public function testDataTypeForRichTextObject() public function testDataTypeForRichTextObject()

2
unitTests/Classes/src/Cell/HyperlinkTest.php → tests/PhpSpreadsheet/Cell/HyperlinkTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Cell; namespace PhpSpreadsheet\Tests\Cell;
class HyperlinkTest extends \PHPUnit_Framework_TestCase class HyperlinkTest extends \PHPUnit_Framework_TestCase
{ {

24
unitTests/Classes/src/CellTest.php → tests/PhpSpreadsheet/CellTest.php
View File

@ -2,8 +2,6 @@
namespace PHPExcel; namespace PHPExcel;
require_once 'testDataFileIterator.php';
class CellTest extends \PHPUnit_Framework_TestCase class CellTest extends \PHPUnit_Framework_TestCase
{ {
@ -24,7 +22,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerColumnString() public function providerColumnString()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnString.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnString.data');
} }
public function testColumnIndexFromStringTooLong() public function testColumnIndexFromStringTooLong()
@ -66,7 +64,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerColumnIndex() public function providerColumnIndex()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnIndex.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnIndex.data');
} }
/** /**
@ -82,7 +80,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerCoordinates() public function providerCoordinates()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellCoordinates.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellCoordinates.data');
} }
public function testCoordinateFromStringWithRangeAddress() public function testCoordinateFromStringWithRangeAddress()
@ -137,7 +135,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerAbsoluteCoordinates() public function providerAbsoluteCoordinates()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data');
} }
public function testAbsoluteCoordinateFromStringWithRangeAddress() public function testAbsoluteCoordinateFromStringWithRangeAddress()
@ -166,7 +164,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerAbsoluteReferences() public function providerAbsoluteReferences()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data');
} }
public function testAbsoluteReferenceFromStringWithRangeAddress() public function testAbsoluteReferenceFromStringWithRangeAddress()
@ -201,7 +199,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerSplitRange() public function providerSplitRange()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellSplitRange.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellSplitRange.data');
} }
/** /**
@ -217,7 +215,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerBuildRange() public function providerBuildRange()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellBuildRange.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellBuildRange.data');
} }
public function testBuildRangeInvalid() public function testBuildRangeInvalid()
@ -246,7 +244,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerRangeBoundaries() public function providerRangeBoundaries()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data');
} }
/** /**
@ -262,7 +260,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerRangeDimension() public function providerRangeDimension()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeDimension.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeDimension.data');
} }
/** /**
@ -278,7 +276,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerGetRangeBoundaries() public function providerGetRangeBoundaries()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data');
} }
/** /**
@ -294,6 +292,6 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerExtractAllCellReferencesInRange() public function providerExtractAllCellReferencesInRange()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data');
} }
} }

4
unitTests/Classes/src/Chart/DataSeriesValuesTest.php → tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Chart; namespace PhpSpreadsheet\Tests\Chart;
class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase
{ {
@ -25,7 +25,7 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase
try { try {
$result = $testInstance->setDataType('BOOLEAN'); $result = $testInstance->setDataType('BOOLEAN');
} catch (Exception $e) { } catch (\PHPExcel\Exception $e) {
$this->assertEquals($e->getMessage(), 'Invalid datatype for chart data series values'); $this->assertEquals($e->getMessage(), 'Invalid datatype for chart data series values');
return; return;
} }

2
unitTests/Classes/src/Chart/LayoutTest.php → tests/PhpSpreadsheet/Chart/LayoutTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Chart; namespace PhpSpreadsheet\Tests\Chart;
class LayoutTest extends \PHPUnit_Framework_TestCase class LayoutTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Chart/LegendTest.php → tests/PhpSpreadsheet/Chart/LegendTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Chart; namespace PhpSpreadsheet\Tests\Chart;
class LegendTest extends \PHPUnit_Framework_TestCase class LegendTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/custom/Complex.php → tests/PhpSpreadsheet/Custom/Complex.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpSpreadhsheet\unitTests\custom; namespace PhpSpreadsheet\Tests\Custom;
class Complex class Complex
{ {

4
unitTests/custom/complexAssert.php → tests/PhpSpreadsheet/Custom/ComplexAssert.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PhpSpreadhsheet\unitTests\custom; namespace PhpSpreadsheet\Tests\Custom;
include_once dirname(__FILE__).'/Complex.php';
class ComplexAssert class ComplexAssert
{ {

2
unitTests/Classes/src/Reader/XEEValidatorTest.php → tests/PhpSpreadsheet/Reader/XEEValidatorTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Reader; namespace PhpSpreadsheet\Tests\Reader;
class XEEValidatorTest extends \PHPUnit_Framework_TestCase class XEEValidatorTest extends \PHPUnit_Framework_TestCase
{ {

0
unitTests/Classes/src/ReferenceHelperTest.php → tests/PhpSpreadsheet/ReferenceHelperTest.php
View File

0
unitTests/classes/src/SettingsTest.php → tests/PhpSpreadsheet/SettingsTest.php
View File

6
unitTests/Classes/src/Shared/CodePageTest.php → tests/PhpSpreadsheet/Shared/CodePageTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php';
class CodePageTest extends \PHPUnit_Framework_TestCase class CodePageTest extends \PHPUnit_Framework_TestCase
{ {
@ -19,7 +17,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase
public function providerCodePage() public function providerCodePage()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CodePage.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CodePage.data');
} }
public function testNumberToNameWithInvalidCodePage() public function testNumberToNameWithInvalidCodePage()

18
unitTests/Classes/src/Shared/DateTest.php → tests/PhpSpreadsheet/Shared/DateTest.php
View File

@ -1,8 +1,8 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php'; use PhpSpreadsheet\TestDataFileIterator;
class DateTest extends \PHPUnit_Framework_TestCase class DateTest extends \PHPUnit_Framework_TestCase
{ {
@ -44,7 +44,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToTimestamp1900() public function providerDateTimeExcelToTimestamp1900()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToTimestamp1900.data'); return include 'rawTestData/Shared/Date/ExcelToTimestamp1900.php';
} }
/** /**
@ -65,7 +65,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimePHPToExcel1900() public function providerDateTimePHPToExcel1900()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data'); return include 'rawTestData/Shared/Date/PHPToExcel1900.php';
} }
/** /**
@ -86,7 +86,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeFormattedPHPToExcel1900() public function providerDateTimeFormattedPHPToExcel1900()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data'); return include 'rawTestData/Shared/Date/FormattedPHPToExcel1900.php';
} }
/** /**
@ -107,7 +107,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToTimestamp1904() public function providerDateTimeExcelToTimestamp1904()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToTimestamp1904.data'); return include 'rawTestData/Shared/Date/ExcelToTimestamp1904.php';
} }
/** /**
@ -128,7 +128,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimePHPToExcel1904() public function providerDateTimePHPToExcel1904()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data'); return include 'rawTestData/Shared/Date/PHPToExcel1904.php';
} }
/** /**
@ -144,7 +144,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerIsDateTimeFormatCode() public function providerIsDateTimeFormatCode()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data'); return include 'rawTestData/Shared/Date/FormatCodes.php';
} }
/** /**
@ -166,6 +166,6 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToTimestamp1900Timezone() public function providerDateTimeExcelToTimestamp1900Timezone()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToTimestamp1900Timezone.data'); return include 'rawTestData/Shared/Date/ExcelToTimestamp1900Timezone.php';
} }
} }

4
unitTests/Classes/src/Shared/FileTest.php → tests/PhpSpreadsheet/Shared/FileTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php';
class FileTest extends \PHPUnit_Framework_TestCase class FileTest extends \PHPUnit_Framework_TestCase
{ {

10
unitTests/Classes/src/Shared/FontTest.php → tests/PhpSpreadsheet/Shared/FontTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php';
class FontTest extends \PHPUnit_Framework_TestCase class FontTest extends \PHPUnit_Framework_TestCase
{ {
@ -48,7 +46,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerFontSizeToPixels() public function providerFontSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
} }
/** /**
@ -64,7 +62,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerInchSizeToPixels() public function providerInchSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
} }
/** /**
@ -80,6 +78,6 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerCentimeterSizeToPixels() public function providerCentimeterSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
} }
} }

6
unitTests/Classes/src/Shared/PasswordHasherTest.php → tests/PhpSpreadsheet/Shared/PasswordHasherTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php';
class PasswordHasherTest extends \PHPUnit_Framework_TestCase class PasswordHasherTest extends \PHPUnit_Framework_TestCase
{ {
@ -20,6 +18,6 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase
public function providerHashPassword() public function providerHashPassword()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data');
} }
} }

4
unitTests/Classes/src/Shared/StringTest.php → tests/PhpSpreadsheet/Shared/StringTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
require_once 'testDataFileIterator.php';
class StringTest extends \PHPUnit_Framework_TestCase class StringTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Shared/TimeZoneTest.php → tests/PhpSpreadsheet/Shared/TimeZoneTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Shared; namespace PhpSpreadsheet\Tests\Shared;
class TimeZoneTest extends \PHPUnit_Framework_TestCase class TimeZoneTest extends \PHPUnit_Framework_TestCase
{ {

13
unitTests/Classes/src/Style/ColorTest.php → tests/PhpSpreadsheet/Style/ColorTest.php
View File

@ -1,9 +1,6 @@
<?php <?php
namespace PHPExcel\Style; namespace PhpSpreadsheet\Tests\Style;
require_once 'testDataFileIterator.php';
require_once 'testDataFileIteratorJson.php';
class ColorTest extends \PHPUnit_Framework_TestCase class ColorTest extends \PHPUnit_Framework_TestCase
{ {
@ -20,7 +17,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetRed() public function providerColorGetRed()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data');
} }
/** /**
@ -36,7 +33,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetGreen() public function providerColorGetGreen()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data');
} }
/** /**
@ -52,7 +49,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetBlue() public function providerColorGetBlue()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data');
} }
/** /**
@ -67,6 +64,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorChangeBrightness() public function providerColorChangeBrightness()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json'); return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
} }
} }

6
unitTests/Classes/src/Style/NumberFormatDateTest.php → tests/PhpSpreadsheet/Style/NumberFormatDateTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Style; namespace PhpSpreadsheet\Tests\Style;
require_once 'testDataFileIterator.php';
class NumberFormatDateTest extends \PHPUnit_Framework_TestCase class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
{ {
@ -26,6 +24,6 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
public function providerNumberFormat() public function providerNumberFormat()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data');
} }
} }

6
unitTests/Classes/src/Style/NumberFormatTest.php → tests/PhpSpreadsheet/Style/NumberFormatTest.php
View File

@ -1,8 +1,6 @@
<?php <?php
namespace PHPExcel\Style; namespace PhpSpreadsheet\Tests\Style;
require_once 'testDataFileIterator.php';
class NumberFormatTest extends \PHPUnit_Framework_TestCase class NumberFormatTest extends \PHPUnit_Framework_TestCase
{ {
@ -26,6 +24,6 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
public function providerNumberFormat() public function providerNumberFormat()
{ {
return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormat.data'); return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormat.data');
} }
} }

2
unitTests/testDataFileIterator.php → tests/PhpSpreadsheet/TestDataFileIterator.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpSpreadhsheet\unitTests; namespace PhpSpreadsheet\Tests;
class TestDataFileIterator implements \Iterator class TestDataFileIterator implements \Iterator
{ {

2
unitTests/testDataFileIteratorJson.php → tests/PhpSpreadsheet/TestDataFileIteratorJson.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpSpreadhsheet\unitTests; namespace PhpSpreadsheet\Tests;
class TestDataFileIteratorJson implements \Iterator class TestDataFileIteratorJson implements \Iterator
{ {

2
unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php → tests/PhpSpreadsheet/Worksheet/AutoFilter/Column/RuleTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet\AutoFilter\Column; namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter\Column;
class RuleTest extends \PHPUnit_Framework_TestCase class RuleTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php → tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet\AutoFilter; namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter;
class AutofilterColumnTest extends \PHPUnit_Framework_TestCase class AutofilterColumnTest extends \PHPUnit_Framework_TestCase
{ {

4
unitTests/Classes/src/Worksheet/AutoFilterTest.php → tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php
View File

@ -1,6 +1,8 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
use PHPExcel\Worksheet\AutoFilter;
class AutoFilterTest extends \PHPUnit_Framework_TestCase class AutoFilterTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/CellCollectionTest.php → tests/PhpSpreadsheet/Worksheet/CellCollectionTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
class CellCollectionTest extends \PHPUnit_Framework_TestCase class CellCollectionTest extends \PHPUnit_Framework_TestCase
{ {

4
unitTests/Classes/src/Worksheet/ColumnCellIteratorTest.php → tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php
View File

@ -1,6 +1,8 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
use PHPExcel\Worksheet\ColumnCellIterator;
class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
{ {

4
unitTests/Classes/src/Worksheet/ColumnIteratorTest.php → tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php
View File

@ -1,6 +1,8 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
use PHPExcel\Worksheet\ColumnIterator;
class ColumnIteratorTest extends \PHPUnit_Framework_TestCase class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/RowCellIteratorTest.php → tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
class RowCellIteratorTest extends \PHPUnit_Framework_TestCase class RowCellIteratorTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/RowIteratorTest.php → tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
class RowIteratorTest extends \PHPUnit_Framework_TestCase class RowIteratorTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/WorksheetColumnTest.php → tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
class WorksheetColumnTest extends \PHPUnit_Framework_TestCase class WorksheetColumnTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/Classes/src/Worksheet/WorksheetRowTest.php → tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PHPExcel\Worksheet; namespace PhpSpreadsheet\Tests\Worksheet;
class WorksheetRowTest extends \PHPUnit_Framework_TestCase class WorksheetRowTest extends \PHPUnit_Framework_TestCase
{ {

2
unitTests/bootstrap.php → tests/bootstrap.php
View File

@ -40,8 +40,6 @@ if (!defined('PHPEXCEL_ROOT')) {
} }
require_once(PHPEXCEL_ROOT . 'Bootstrap.php'); require_once(PHPEXCEL_ROOT . 'Bootstrap.php');
require_once 'testDataFileIterator.php';
/** /**
* @todo Sort out xdebug in vagrant so that this works in all sandboxes * @todo Sort out xdebug in vagrant so that this works in all sandboxes
* For now, it is safer to test for it rather then remove it. * For now, it is safer to test for it rather then remove it.

0
unitTests/rawTestData/Calculation/DateTime/DATE.data → tests/rawTestData/Calculation/DateTime/DATE.data
View File

0
unitTests/rawTestData/Calculation/DateTime/DATEDIF.data → tests/rawTestData/Calculation/DateTime/DATEDIF.data
View File

0
unitTests/rawTestData/Calculation/DateTime/DATEVALUE.data → tests/rawTestData/Calculation/DateTime/DATEVALUE.data
View File

0
unitTests/rawTestData/Calculation/DateTime/DAY.data → tests/rawTestData/Calculation/DateTime/DAY.data
View File

0
unitTests/rawTestData/Calculation/DateTime/DAYS360.data → tests/rawTestData/Calculation/DateTime/DAYS360.data
View File

0
unitTests/rawTestData/Calculation/DateTime/EDATE.data → tests/rawTestData/Calculation/DateTime/EDATE.data
View File

0
unitTests/rawTestData/Calculation/DateTime/EOMONTH.data → tests/rawTestData/Calculation/DateTime/EOMONTH.data
View File

0
unitTests/rawTestData/Calculation/DateTime/HOUR.data → tests/rawTestData/Calculation/DateTime/HOUR.data
View File

0
unitTests/rawTestData/Calculation/DateTime/MINUTE.data → tests/rawTestData/Calculation/DateTime/MINUTE.data
View File

0
unitTests/rawTestData/Calculation/DateTime/MONTH.data → tests/rawTestData/Calculation/DateTime/MONTH.data
View File

0
unitTests/rawTestData/Calculation/DateTime/NETWORKDAYS.data → tests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
View File

0
unitTests/rawTestData/Calculation/DateTime/SECOND.data → tests/rawTestData/Calculation/DateTime/SECOND.data
View File

0
unitTests/rawTestData/Calculation/DateTime/TIME.data → tests/rawTestData/Calculation/DateTime/TIME.data
View File

0
unitTests/rawTestData/Calculation/DateTime/TIMEVALUE.data → tests/rawTestData/Calculation/DateTime/TIMEVALUE.data
View File

0
unitTests/rawTestData/Calculation/DateTime/WEEKDAY.data → tests/rawTestData/Calculation/DateTime/WEEKDAY.data
View File

0
unitTests/rawTestData/Calculation/DateTime/WEEKNUM.data → tests/rawTestData/Calculation/DateTime/WEEKNUM.data
View File

0
unitTests/rawTestData/Calculation/DateTime/WORKDAY.data → tests/rawTestData/Calculation/DateTime/WORKDAY.data
View File

0
unitTests/rawTestData/Calculation/DateTime/YEAR.data → tests/rawTestData/Calculation/DateTime/YEAR.data
View File

0
unitTests/rawTestData/Calculation/DateTime/YEARFRAC.data → tests/rawTestData/Calculation/DateTime/YEARFRAC.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BESSELI.data → tests/rawTestData/Calculation/Engineering/BESSELI.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BESSELJ.data → tests/rawTestData/Calculation/Engineering/BESSELJ.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BESSELK.data → tests/rawTestData/Calculation/Engineering/BESSELK.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BESSELY.data → tests/rawTestData/Calculation/Engineering/BESSELY.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data → tests/rawTestData/Calculation/Engineering/BIN2DEC.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data → tests/rawTestData/Calculation/Engineering/BIN2HEX.data
View File

0
unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data → tests/rawTestData/Calculation/Engineering/BIN2OCT.data
View File

0
unitTests/rawTestData/Calculation/Engineering/COMPLEX.data → tests/rawTestData/Calculation/Engineering/COMPLEX.data
View File

0
unitTests/rawTestData/Calculation/Engineering/CONVERTUOM.data → tests/rawTestData/Calculation/Engineering/CONVERTUOM.data
View File

0
unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data → tests/rawTestData/Calculation/Engineering/DEC2BIN.data
View File

0
unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data → tests/rawTestData/Calculation/Engineering/DEC2HEX.data
View File

0
unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data → tests/rawTestData/Calculation/Engineering/DEC2OCT.data
View File

0
unitTests/rawTestData/Calculation/Engineering/DELTA.data → tests/rawTestData/Calculation/Engineering/DELTA.data
View File

0
unitTests/rawTestData/Calculation/Engineering/ERF.data → tests/rawTestData/Calculation/Engineering/ERF.data
View File

0
unitTests/rawTestData/Calculation/Engineering/ERFC.data → tests/rawTestData/Calculation/Engineering/ERFC.data
View File

0
unitTests/rawTestData/Calculation/Engineering/GESTEP.data → tests/rawTestData/Calculation/Engineering/GESTEP.data
View File

0
unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data → tests/rawTestData/Calculation/Engineering/HEX2BIN.data
View File

0
unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data → tests/rawTestData/Calculation/Engineering/HEX2DEC.data
View File

0
unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data → tests/rawTestData/Calculation/Engineering/HEX2OCT.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMABS.data → tests/rawTestData/Calculation/Engineering/IMABS.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMAGINARY.data → tests/rawTestData/Calculation/Engineering/IMAGINARY.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMARGUMENT.data → tests/rawTestData/Calculation/Engineering/IMARGUMENT.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMCONJUGATE.data → tests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMCOS.data → tests/rawTestData/Calculation/Engineering/IMCOS.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMDIV.data → tests/rawTestData/Calculation/Engineering/IMDIV.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMEXP.data → tests/rawTestData/Calculation/Engineering/IMEXP.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMLN.data → tests/rawTestData/Calculation/Engineering/IMLN.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMLOG10.data → tests/rawTestData/Calculation/Engineering/IMLOG10.data
View File

0
unitTests/rawTestData/Calculation/Engineering/IMLOG2.data → tests/rawTestData/Calculation/Engineering/IMLOG2.data
View File

Some files were not shown because too many files have changed in this diff Show More