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

7
composer.json
View File

@ -1,7 +1,7 @@
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
"description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
"keywords": ["PHP","OpenXML","Excel","xlsx","xls","ods","gnumeric","spreadsheet"], "keywords": ["PHP", "OpenXML", "Excel", "xlsx", "xls", "ods", "gnumeric", "spreadsheet"],
"homepage": "https://github.com/PHPOffice/PhpSpreadsheet", "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
"type": "library", "type": "library",
"license": "LGPL-2.1", "license": "LGPL-2.1",
@ -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
{ {

8
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
{ {
@ -31,7 +33,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
$iterator = new ColumnCellIterator($this->mockWorksheet, 'A'); $iterator = new ColumnCellIterator($this->mockWorksheet, 'A');
$ColumnCellIndexResult = 1; $ColumnCellIndexResult = 1;
$this->assertEquals($ColumnCellIndexResult, $iterator->key()); $this->assertEquals($ColumnCellIndexResult, $iterator->key());
foreach ($iterator as $key => $ColumnCell) { foreach ($iterator as $key => $ColumnCell) {
$this->assertEquals($ColumnCellIndexResult++, $key); $this->assertEquals($ColumnCellIndexResult++, $key);
$this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell); $this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell);
@ -43,7 +45,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
$iterator = new ColumnCellIterator($this->mockWorksheet, 'A', 2, 4); $iterator = new ColumnCellIterator($this->mockWorksheet, 'A', 2, 4);
$ColumnCellIndexResult = 2; $ColumnCellIndexResult = 2;
$this->assertEquals($ColumnCellIndexResult, $iterator->key()); $this->assertEquals($ColumnCellIndexResult, $iterator->key());
foreach ($iterator as $key => $ColumnCell) { foreach ($iterator as $key => $ColumnCell) {
$this->assertEquals($ColumnCellIndexResult++, $key); $this->assertEquals($ColumnCellIndexResult++, $key);
$this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell); $this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell);

8
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
{ {
@ -31,7 +33,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
$iterator = new ColumnIterator($this->mockWorksheet); $iterator = new ColumnIterator($this->mockWorksheet);
$columnIndexResult = 'A'; $columnIndexResult = 'A';
$this->assertEquals($columnIndexResult, $iterator->key()); $this->assertEquals($columnIndexResult, $iterator->key());
foreach ($iterator as $key => $column) { foreach ($iterator as $key => $column) {
$this->assertEquals($columnIndexResult++, $key); $this->assertEquals($columnIndexResult++, $key);
$this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column); $this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column);
@ -43,7 +45,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
$iterator = new ColumnIterator($this->mockWorksheet, 'B', 'D'); $iterator = new ColumnIterator($this->mockWorksheet, 'B', 'D');
$columnIndexResult = 'B'; $columnIndexResult = 'B';
$this->assertEquals($columnIndexResult, $iterator->key()); $this->assertEquals($columnIndexResult, $iterator->key());
foreach ($iterator as $key => $column) { foreach ($iterator as $key => $column) {
$this->assertEquals($columnIndexResult++, $key); $this->assertEquals($columnIndexResult++, $key);
$this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column); $this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column);

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.

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

@ -1,79 +1,79 @@
# Year Month Day Result Comments # Year Month Day Result Comments
18, 11, 11, 6890 18, 11, 11, 6890
1900, 1, 1, 1 // Excel 1900 Calendar Base Date 1900, 1, 1, 1 // Excel 1900 Calendar Base Date
1900, 2, 28, 59 // Day before Excel mythical 1900 leap day 1900, 2, 28, 59 // Day before Excel mythical 1900 leap day
1900, 2, 29, 60 // Excel mythical 1900 leap day 1900, 2, 29, 60 // Excel mythical 1900 leap day
1900, 3, 1, 61 // Day after Excel mythical 1900 leap day 1900, 3, 1, 61 // Day after Excel mythical 1900 leap day
1901, 12, 13, 713 // Day after Excel mythical 1900 leap day 1901, 12, 13, 713 // Day after Excel mythical 1900 leap day
1901, 12, 14, 714 // PHP 32-bit Earliest Date 1901, 12, 14, 714 // PHP 32-bit Earliest Date
1903, 12, 31, 1461 1903, 12, 31, 1461
1904, 1, 1, 1462 // Excel 1904 Calendar Base Date 1904, 1, 1, 1462 // Excel 1904 Calendar Base Date
1904, 1, 2, 1463 1904, 1, 2, 1463
1960, 12, 19, 22269 1960, 12, 19, 22269
1970, 1, 1, 25569 // PHP Base Date 1970, 1, 1, 25569 // PHP Base Date
1982, 12, 7, 30292 1982, 12, 7, 30292
2008, 6, 12, 39611 2008, 6, 12, 39611
2038, 1, 19, 50424 // PHP 32-bit Latest Date 2038, 1, 19, 50424 // PHP 32-bit Latest Date
2038, 1, 20, 50425 // Day after PHP 32-bit Latest Date 2038, 1, 20, 50425 // Day after PHP 32-bit Latest Date
2008, 1, 1, 39448 2008, 1, 1, 39448
2008, 1, , 39447 2008, 1, , 39447
2008, 1, -1, 39446 2008, 1, -1, 39446
2008, 1, -30, 39417 2008, 1, -30, 39417
2008, 1, -31, 39416 2008, 1, -31, 39416
2008, 1, -365, 39082 2008, 1, -365, 39082
2008, 3, 1, 39508 2008, 3, 1, 39508
2008, 3, , 39507 2008, 3, , 39507
2008, 3, -1, 39506 2008, 3, -1, 39506
2008, 3, -365, 39142 2008, 3, -365, 39142
2008, , 1, 39417 2008, , 1, 39417
2008, -1, 1, 39387 2008, -1, 1, 39387
2008, -11, 1, 39083 2008, -11, 1, 39083
2008, -12, 1, 39052 2008, -12, 1, 39052
2008, -13, 1, 39022 2008, -13, 1, 39022
2008, -13, 30, 39051 2008, -13, 30, 39051
2008, -13, , 39021 2008, -13, , 39021
2008, -13, -30, 38991 2008, -13, -30, 38991
2008, -13, -31, 38990 2008, -13, -31, 38990
2008, 13, 1, 39814 2008, 13, 1, 39814
2007, 15, , 39507 2007, 15, , 39507
2008, 26, 1, 40210 2008, 26, 1, 40210
2008, 26, -10, 40199 2008, 26, -10, 40199
2008, -26, 61, 38686 2008, -26, 61, 38686
2010, -15, -50, 39641 2010, -15, -50, 39641
2010, -15, 50, 39741 2010, -15, 50, 39741
2010, 15, -50, 40552 2010, 15, -50, 40552
2010, 15, 50, 40652 2010, 15, 50, 40652
2010, 1.5, 1, 40179 2010, 1.5, 1, 40179
2010, 1.5, 0, 40178 2010, 1.5, 0, 40178
2010, 0, 1.5, 40148 2010, 0, 1.5, 40148
2010, 1, 1.5, 40179 2010, 1, 1.5, 40179
2012, 6, 15, 41075 2012, 6, 15, 41075
2012, 6, , 41060 2012, 6, , 41060
2012, , 15, 40892 2012, , 15, 40892
, 6, 15, 167 , 6, 15, 167
10, 6, 15, 3819 10, 6, 15, 3819
10, , , 3622 10, , , 3622
, 10, , 274 , 10, , 274
, , 10, "#NUM!" , , 10, "#NUM!"
-20, , , "#NUM!" -20, , , "#NUM!"
-20, 6, 15, "#NUM!" -20, 6, 15, "#NUM!"
9999, 12, 31, 2958465 // Excel Maximum Date 9999, 12, 31, 2958465 // Excel Maximum Date
10000, 1, 1, "#NUM!" // Exceeded Excel Maximum Date 10000, 1, 1, "#NUM!" // Exceeded Excel Maximum Date
2008, 8, 10, 39670 2008, 8, 10, 39670
2008, 12, 31, 39813 2008, 12, 31, 39813
2008, 8, 32, 39692 2008, 8, 32, 39692
2008, 13, 31, 39844 2008, 13, 31, 39844
2009, 1, 0, 39813 2009, 1, 0, 39813
2009, 1, -1, 39812 2009, 1, -1, 39812
2009, 0, 0, 39782 2009, 0, 0, 39782
2009, 0, -1, 39781 2009, 0, -1, 39781
2009, -1, 0, 39752 2009, -1, 0, 39752
2009, -1, -1, 39751 2009, -1, -1, 39751
2010, 0, -1, 40146 2010, 0, -1, 40146
2010, 5, 31, 40329 2010, 5, 31, 40329
2010, 1, '21st', 40199 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date 2010, 1, '21st', 40199 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
2010, "March",'21st', 40258 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date 2010, "March",'21st', 40258 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
2010, "March",21, 40258 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date 2010, "March",21, 40258 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"ABC", 1, 21, "#VALUE!" "ABC", 1, 21, "#VALUE!"
2010, "DEF", 21, "#VALUE!" 2010, "DEF", 21, "#VALUE!"
2010, 3, "GHI", "#VALUE!" 2010, 3, "GHI", "#VALUE!"

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

@ -1,96 +1,96 @@
"ABC", "2007-1-10", "Y", "#VALUE!" "ABC", "2007-1-10", "Y", "#VALUE!"
"2007-1-1", "DEF", "Y", "#VALUE!" "2007-1-1", "DEF", "Y", "#VALUE!"
"2007-1-1", "2007-1-10", "XYZ", "#VALUE!" "2007-1-1", "2007-1-10", "XYZ", "#VALUE!"
"2007-1-10", "2007-1-1", "Y", "#NUM!" "2007-1-10", "2007-1-1", "Y", "#NUM!"
"2007-12-31", "2008-1-10", "Y", 0 "2007-12-31", "2008-1-10", "Y", 0
"2007-1-1", "2007-1-10", "Y", 0 "2007-1-1", "2007-1-10", "Y", 0
"2007-1-1", "2007-1-10", "M", 0 "2007-1-1", "2007-1-10", "M", 0
"2007-1-1", "2007-1-10", "D", 9 "2007-1-1", "2007-1-10", "D", 9
"2007-1-1", "2007-1-10", "YM", 0 "2007-1-1", "2007-1-10", "YM", 0
"2007-1-1", "2007-1-10", "YD", 9 "2007-1-1", "2007-1-10", "YD", 9
"2007-1-1", "2007-1-10", "MD", 9 "2007-1-1", "2007-1-10", "MD", 9
"2007-1-1", "2007-12-31", "Y", 0 "2007-1-1", "2007-12-31", "Y", 0
"2007-1-1", "2007-12-31", "M", 11 "2007-1-1", "2007-12-31", "M", 11
"2007-1-1", "2007-12-31", "D", 364 "2007-1-1", "2007-12-31", "D", 364
"2007-1-1", "2007-12-31", "YM", 11 "2007-1-1", "2007-12-31", "YM", 11
"2007-1-1", "2007-12-31", "YD", 364 "2007-1-1", "2007-12-31", "YD", 364
"2007-1-1", "2007-12-31", "MD", 30 "2007-1-1", "2007-12-31", "MD", 30
"2007-1-1", "2008-7-1", "Y", 1 "2007-1-1", "2008-7-1", "Y", 1
"2007-1-1", "2008-7-1", "M", 18 "2007-1-1", "2008-7-1", "M", 18
"2007-1-1", "2008-7-1", "D", 547 "2007-1-1", "2008-7-1", "D", 547
"2007-1-1", "2008-7-1", "YM", 6 "2007-1-1", "2008-7-1", "YM", 6
"2007-1-1", "2008-7-1", "YD", 181 "2007-1-1", "2008-7-1", "YD", 181
"2007-1-1", "2008-7-1", "MD", 0 "2007-1-1", "2008-7-1", "MD", 0
"2007-1-1", "2007-1-31", "Y", 0 "2007-1-1", "2007-1-31", "Y", 0
"2007-1-1", "2007-1-31", "M", 0 "2007-1-1", "2007-1-31", "M", 0
"2007-1-1", "2007-1-31", "D", 30 "2007-1-1", "2007-1-31", "D", 30
"2007-1-1", "2007-1-31", "YM", 0 "2007-1-1", "2007-1-31", "YM", 0
"2007-1-1", "2007-1-31", "YD", 30 "2007-1-1", "2007-1-31", "YD", 30
"2007-1-1", "2007-1-31", "MD", 30 "2007-1-1", "2007-1-31", "MD", 30
"2007-1-1", "2007-2-1", "Y", 0 "2007-1-1", "2007-2-1", "Y", 0
"2007-1-1", "2007-2-1", "M", 1 "2007-1-1", "2007-2-1", "M", 1
"2007-1-1", "2007-2-1", "D", 31 "2007-1-1", "2007-2-1", "D", 31
"2007-1-1", "2007-2-1", "YM", 1 "2007-1-1", "2007-2-1", "YM", 1
"2007-1-1", "2007-2-1", "YD", 31 "2007-1-1", "2007-2-1", "YD", 31
"2007-1-1", "2007-2-1", "MD", 0 "2007-1-1", "2007-2-1", "MD", 0
"2007-1-1", "2007-2-28", "Y", 0 "2007-1-1", "2007-2-28", "Y", 0
"2007-1-1", "2007-2-28", "M", 1 "2007-1-1", "2007-2-28", "M", 1
"2007-1-1", "2007-2-28", "D", 58 "2007-1-1", "2007-2-28", "D", 58
"2007-1-1", "2007-2-28", "YM", 1 "2007-1-1", "2007-2-28", "YM", 1
"2007-1-1", "2007-2-28", "YD", 58 "2007-1-1", "2007-2-28", "YD", 58
"2007-1-1", "2007-2-28", "MD", 27 "2007-1-1", "2007-2-28", "MD", 27
"2007-1-31", "2007-2-1", "Y", 0 "2007-1-31", "2007-2-1", "Y", 0
"2007-1-31", "2007-2-1", "M", 0 "2007-1-31", "2007-2-1", "M", 0
"2007-1-31", "2007-2-1", "D", 1 "2007-1-31", "2007-2-1", "D", 1
"2007-1-31", "2007-2-1", "YM", 0 "2007-1-31", "2007-2-1", "YM", 0
"2007-1-31", "2007-2-1", "YD", 1 "2007-1-31", "2007-2-1", "YD", 1
"2007-1-31", "2007-2-1", "MD", 1 "2007-1-31", "2007-2-1", "MD", 1
"2007-1-31", "2007-3-1", "Y", 0 "2007-1-31", "2007-3-1", "Y", 0
"2007-1-31", "2007-3-1", "M", 1 "2007-1-31", "2007-3-1", "M", 1
"2007-1-31", "2007-3-1", "D", 29 "2007-1-31", "2007-3-1", "D", 29
"2007-1-31", "2007-3-1", "YM", 1 "2007-1-31", "2007-3-1", "YM", 1
"2007-1-31", "2007-3-1", "YD", 29 "2007-1-31", "2007-3-1", "YD", 29
"2007-1-31", "2007-3-1", "MD", -2 "2007-1-31", "2007-3-1", "MD", -2
"2007-1-31", "2007-3-31", "Y", 0 "2007-1-31", "2007-3-31", "Y", 0
"2007-1-31", "2007-3-31", "M", 2 "2007-1-31", "2007-3-31", "M", 2
"2007-1-31", "2007-3-31", "D", 59 "2007-1-31", "2007-3-31", "D", 59
"2007-1-31", "2007-3-31", "YM", 2 "2007-1-31", "2007-3-31", "YM", 2
"2007-1-31", "2007-3-31", "YD", 59 "2007-1-31", "2007-3-31", "YD", 59
"2007-1-31", "2007-3-31", "MD", 0 "2007-1-31", "2007-3-31", "MD", 0
"2008-1-1", "2008-9-1", "Y", 0 "2008-1-1", "2008-9-1", "Y", 0
"2008-1-1", "2008-9-1", "M", 8 "2008-1-1", "2008-9-1", "M", 8
"2008-1-1", "2008-9-1", "D", 244 "2008-1-1", "2008-9-1", "D", 244
"2008-1-1", "2008-9-1", "YM", 8 "2008-1-1", "2008-9-1", "YM", 8
"2008-1-1", "2008-9-1", "YD", 244 "2008-1-1", "2008-9-1", "YD", 244
"2008-1-1", "2008-9-1", "MD", 0 "2008-1-1", "2008-9-1", "MD", 0
"2007-2-1", "2008-4-1", "Y", 1 "2007-2-1", "2008-4-1", "Y", 1
"2007-2-1", "2008-4-1", "M", 14 "2007-2-1", "2008-4-1", "M", 14
"2007-2-1", "2008-4-1", "D", 425 "2007-2-1", "2008-4-1", "D", 425
"2007-2-1", "2008-4-1", "YM", 2 "2007-2-1", "2008-4-1", "YM", 2
"2007-2-1", "2008-4-1", "YD", 59 "2007-2-1", "2008-4-1", "YD", 59
"2007-2-1", "2008-4-1", "MD", 0 "2007-2-1", "2008-4-1", "MD", 0
"1960-12-19", "2008-6-28", "Y", 47 "1960-12-19", "2008-6-28", "Y", 47
"1960-12-19", "2008-6-28", "M", 570 "1960-12-19", "2008-6-28", "M", 570
"1960-12-19", "2008-6-28", "D", 17358 "1960-12-19", "2008-6-28", "D", 17358
"1960-12-19", "2008-6-28", "YM", 6 "1960-12-19", "2008-6-28", "YM", 6
"1960-12-19", "2008-6-28", "YD", 191 "1960-12-19", "2008-6-28", "YD", 191
"1960-12-19", "2008-6-28", "MD", 9 "1960-12-19", "2008-6-28", "MD", 9
"1982-12-7", "2008-6-28", "Y", 25 "1982-12-7", "2008-6-28", "Y", 25
"1982-12-7", "2008-6-28", "M", 306 "1982-12-7", "2008-6-28", "M", 306
"1982-12-7", "2008-6-28", "D", 9335 "1982-12-7", "2008-6-28", "D", 9335
"1982-12-7", "2008-6-28", "YM", 6 "1982-12-7", "2008-6-28", "YM", 6
"1982-12-7", "2008-6-28", "YD", 203 "1982-12-7", "2008-6-28", "YD", 203
"1982-12-7", "2008-6-28", "MD", 21 "1982-12-7", "2008-6-28", "MD", 21
"2007-12-25", "2010-3-17", "Y", 2 "2007-12-25", "2010-3-17", "Y", 2
"2007-12-25", "2010-3-17", "M", 26 "2007-12-25", "2010-3-17", "M", 26
"2007-12-25", "2010-3-17", "D", 813 "2007-12-25", "2010-3-17", "D", 813
"2007-12-25", "2010-3-17", "YM", 2 "2007-12-25", "2010-3-17", "YM", 2
"2007-12-25", "2010-3-17", "YD", 82 "2007-12-25", "2010-3-17", "YD", 82
"2007-12-25", "2010-3-17", "MD", 20 "2007-12-25", "2010-3-17", "MD", 20
"19-12-1960", "26-01-2012", "Y", 51 "19-12-1960", "26-01-2012", "Y", 51
"19-12-1960", "26-01-2012", "M", 613 "19-12-1960", "26-01-2012", "M", 613
"19-12-1960", "26-01-2012", "D", 18665 "19-12-1960", "26-01-2012", "D", 18665
"19-12-1960", "26-01-2012", "YM", 1 "19-12-1960", "26-01-2012", "YM", 1
"19-12-1960", "26-01-2012", "YD", 38 "19-12-1960", "26-01-2012", "YD", 38
"19-12-1960", "26-01-2012", "MD", 7 "19-12-1960", "26-01-2012", "MD", 7
"19-12-1960", "12-12-2012", "Y", 50 "19-12-1960", "12-12-2012", "Y", 50

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

@ -1,66 +1,66 @@
# Date String Result # Date String Result
"25-Dec-1899", "#VALUE!" "25-Dec-1899", "#VALUE!"
"31-Dec-1899", "#VALUE!" "31-Dec-1899", "#VALUE!"
"1-Jan-1900", 1 "1-Jan-1900", 1
"1900/2/28", 59 "1900/2/28", 59
"29-02-1900", "#VALUE!" "29-02-1900", "#VALUE!"
"29th February 1900", "#VALUE!" // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "29th February 1900", "#VALUE!" // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"1900/3/1", 61 "1900/3/1", 61
"13-12-1901", 713 "13-12-1901", 713
"14-12-1901", 714 "14-12-1901", 714
"1903/12/31", 1461 "1903/12/31", 1461
"1-Jan-1904", 1462 "1-Jan-1904", 1462
"2nd-Jan-1904", 1463 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "2nd-Jan-1904", 1463 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"19-12-1960", 22269 "19-12-1960", 22269
"1st January 1970", 25569 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "1st January 1970", 25569 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"7-Dec-1982", 30292 "7-Dec-1982", 30292
"1-1-2008", 39448 "1-1-2008", 39448
"2038-01-19", 50424 "2038-01-19", 50424
"2-6-2008", 39601 "2-6-2008", 39601
"December 25th 2008", 39807 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "December 25th 2008", 39807 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"1 Jan-2008", 39448 "1 Jan-2008", 39448
"12-31-2008", 39813 // MS Excel success or failure dependent on country settings "12-31-2008", 39813 // MS Excel success or failure dependent on country settings
"31-12-2008", 39813 // PHPExcel tries to handle both US and UK formats, irrespective of country settings "31-12-2008", 39813 // PHPExcel tries to handle both US and UK formats, irrespective of country settings
"8/22/2008", 39682 // MS Excel success or failure dependent on country settings "8/22/2008", 39682 // MS Excel success or failure dependent on country settings
"22/8/2008", 39682 // PHPExcel tries to handle both US and UK formats, irrespective of country settings "22/8/2008", 39682 // PHPExcel tries to handle both US and UK formats, irrespective of country settings
"22/8/08", 39682 "22/8/08", 39682
"22-AUG-2008", 39682 "22-AUG-2008", 39682
"2008/02/23", 39501 "2008/02/23", 39501
"6-7-2008", 39635 "6-7-2008", 39635
"28-2-2007", 39141 // MS Excel success or failure dependent on country settings "28-2-2007", 39141 // MS Excel success or failure dependent on country settings
"2-28-2007", 39141 // PHPExcel tries to handle both US and UK formats, irrespective of country settings "2-28-2007", 39141 // PHPExcel tries to handle both US and UK formats, irrespective of country settings
"29-2-2007", "#VALUE!" // Should fail because it's an invalid date, but PHPExcel currently adjusts to 1-3-2007 - FIX NEEDED "29-2-2007", "#VALUE!" // Should fail because it's an invalid date, but PHPExcel currently adjusts to 1-3-2007 - FIX NEEDED
"1/1/1999", 36161 "1/1/1999", 36161
"1954-07-20", 19925 "1954-07-20", 19925
"22 August 98", 36029 "22 August 98", 36029
"1st March 2007", 39142 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "1st March 2007", 39142 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"The 1st day of March 2007", "#VALUE!" "The 1st day of March 2007", "#VALUE!"
"1 Jan", 42370 // 01/01 of the current year "1 Jan", 42370 // 01/01 of the current year
"31/12", 42735 // 31/12 of the current year "31/12", 42735 // 31/12 of the current year
"12/31", 11658 // Excel reads as 1st December 1931, not 31st December in current year "12/31", 11658 // Excel reads as 1st December 1931, not 31st December in current year
"5-JUL", 42556 // 05/07 of the current year "5-JUL", 42556 // 05/07 of the current year
"5 Jul", 42556 // 05/07 of the current year "5 Jul", 42556 // 05/07 of the current year
"12/2008", 39783 "12/2008", 39783
"10/32", 11963 "10/32", 11963
11, "#VALUE!" 11, "#VALUE!"
TRUE, "#VALUE!" TRUE, "#VALUE!"
FALSE, "#VALUE!" FALSE, "#VALUE!"
1, "#VALUE!" 1, "#VALUE!"
12345, "#VALUE!" 12345, "#VALUE!"
12, "#VALUE!" 12, "#VALUE!"
"12-Feb-2010", 40221 "12-Feb-2010", 40221
"Feb-12-2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "Feb-12-2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"February-12-2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "February-12-2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"February 12 2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "February 12 2010", 40221 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"18 Feb 2010", 40227 "18 Feb 2010", 40227
"17th 3rd 2010", 40254 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "17th 3rd 2010", 40254 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"Feb 18th 2010", 40227 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "Feb 18th 2010", 40227 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"1st Feb 2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "1st Feb 2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"1st-Feb-2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "1st-Feb-2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"1me Fev 2010", "#VALUE!" "1me Fev 2010", "#VALUE!"
"February 1st 2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "February 1st 2010", 40210 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"2nd Feb 2010", 40211 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "2nd Feb 2010", 40211 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"Second Feb 2010", "#VALUE!" "Second Feb 2010", "#VALUE!"
"First August 2010", "#VALUE!" "First August 2010", "#VALUE!"
"1st August 2010", 40391 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date "1st August 2010", 40391 // MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
"15:30:25", 0 "15:30:25", 0

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

@ -1,8 +1,8 @@
# Date Value Result # Date Value Result
22269, 19 22269, 19
30348, 1 30348, 1
30843, 10 30843, 10
"11-Nov-1918", 11 "11-Nov-1918", 11
"28-Feb-1904", 28 "28-Feb-1904", 28
"Invalid", "#VALUE!" "Invalid", "#VALUE!"
-1, "#NUM!" -1, "#NUM!"

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

@ -1,34 +1,34 @@
"ABC", "2007-1-10", FALSE, "#VALUE!" "ABC", "2007-1-10", FALSE, "#VALUE!"
"2007-1-1", "DEF", TRUE, "#VALUE!" "2007-1-1", "DEF", TRUE, "#VALUE!"
"2007-1-1", "2007-1-10", "XYZ", "#VALUE!" "2007-1-1", "2007-1-10", "XYZ", "#VALUE!"
"2007-1-10", "2007-1-1", "Y", "#VALUE!" "2007-1-10", "2007-1-1", "Y", "#VALUE!"
"2007-1-1", "2007-1-10", FALSE, 9 "2007-1-1", "2007-1-10", FALSE, 9
"2007-1-1", "2007-1-10", TRUE, 9 "2007-1-1", "2007-1-10", TRUE, 9
"2007-1-1", "2007-12-31", FALSE, 360 "2007-1-1", "2007-12-31", FALSE, 360
"2007-1-1", "2007-12-31", TRUE, 359 "2007-1-1", "2007-12-31", TRUE, 359
"2007-1-1", "2008-7-1", FALSE, 540 "2007-1-1", "2008-7-1", FALSE, 540
"2007-1-1", "2008-7-1", TRUE, 540 "2007-1-1", "2008-7-1", TRUE, 540
"2007-1-1", "2007-1-31", FALSE, 30 "2007-1-1", "2007-1-31", FALSE, 30
"2007-1-1", "2007-1-31", TRUE, 29 "2007-1-1", "2007-1-31", TRUE, 29
"2007-1-1", "2007-2-1", FALSE, 30 "2007-1-1", "2007-2-1", FALSE, 30
"2007-1-1", "2007-2-1", TRUE, 30 "2007-1-1", "2007-2-1", TRUE, 30
"2007-1-1", "2007-2-28", FALSE, 57 "2007-1-1", "2007-2-28", FALSE, 57
"2007-1-1", "2007-2-28", TRUE, 57 "2007-1-1", "2007-2-28", TRUE, 57
"2007-1-31", "2007-2-1", FALSE, 1 "2007-1-31", "2007-2-1", FALSE, 1
"2007-1-31", "2007-2-1", TRUE, 1 "2007-1-31", "2007-2-1", TRUE, 1
"2007-1-31", "2007-3-1", FALSE, 31 "2007-1-31", "2007-3-1", FALSE, 31
"2007-1-31", "2007-3-1", TRUE, 31 "2007-1-31", "2007-3-1", TRUE, 31
"2007-1-31", "2007-3-31", FALSE, 60 "2007-1-31", "2007-3-31", FALSE, 60
"2007-1-31", "2007-3-31", TRUE, 60 "2007-1-31", "2007-3-31", TRUE, 60
"2008-1-1", "2008-9-1", FALSE, 240 "2008-1-1", "2008-9-1", FALSE, 240
"2008-1-1", "2008-9-1", TRUE, 240 "2008-1-1", "2008-9-1", TRUE, 240
"2007-2-1", "2008-4-1", FALSE, 420 "2007-2-1", "2008-4-1", FALSE, 420
"2007-2-1", "2008-4-1", TRUE, 420 "2007-2-1", "2008-4-1", TRUE, 420
"1960-12-19", "2008-6-28", FALSE, 17109 "1960-12-19", "2008-6-28", FALSE, 17109
"1960-12-19", "2008-6-28", TRUE, 17109 "1960-12-19", "2008-6-28", TRUE, 17109
"1982-12-7", "2008-6-28", FALSE, 9201 "1982-12-7", "2008-6-28", FALSE, 9201
"1982-12-7", "2008-6-28", TRUE, 9201 "1982-12-7", "2008-6-28", TRUE, 9201
"2000-2-28", "2000-3-31", FALSE, 33 "2000-2-28", "2000-3-31", FALSE, 33
"2000-2-28", "2000-3-31", TRUE, 32 "2000-2-28", "2000-3-31", TRUE, 32
"2000-2-29", "2000-3-31", FALSE, 30 "2000-2-29", "2000-3-31", FALSE, 30
"2000-2-29", "2000-3-31", TRUE, 31 "2000-2-29", "2000-3-31", TRUE, 31

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

@ -1,15 +1,15 @@
"15-Jan-2008", 1, 39493 "15-Jan-2008", 1, 39493
"15-Jan-2008", -1, 39431 "15-Jan-2008", -1, 39431
"15-Jan-2008", 2, 39522 "15-Jan-2008", 2, 39522
"31-Mar-2007", 1, 39202 "31-Mar-2007", 1, 39202
"31-Mar-2007", -1, 39141 "31-Mar-2007", -1, 39141
"31-Mar-2008", -1, 39507 "31-Mar-2008", -1, 39507
"31-Mar-2008", -4, 39416 "31-Mar-2008", -4, 39416
"29-Feb-2008", -12, 39141 "29-Feb-2008", -12, 39141
"15-Mar-2007", 3, 39248 "15-Mar-2007", 3, 39248
22269.0, 0, 22269 22269.0, 0, 22269
22269.0, 2, 22331 22269.0, 2, 22331
22269.0, 110, 25618 22269.0, 110, 25618
22269.0, -110, 18920 22269.0, -110, 18920
"15-Mar-2007", "ABC", "#VALUE!" "15-Mar-2007", "ABC", "#VALUE!"
"Invalid", 12, "#VALUE!" "Invalid", 12, "#VALUE!"

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

@ -1,17 +1,17 @@
"15-Jan-2008", 1, 39507 "15-Jan-2008", 1, 39507
"15-Jan-2008", -1, 39447 "15-Jan-2008", -1, 39447
"15-Jan-2008", 2, 39538 "15-Jan-2008", 2, 39538
"31-Mar-2007", 1, 39202 "31-Mar-2007", 1, 39202
"31-Mar-2007", -1, 39141 "31-Mar-2007", -1, 39141
"31-Mar-2008", -1, 39507 "31-Mar-2008", -1, 39507
"31-Mar-2008", -4, 39416 "31-Mar-2008", -4, 39416
"29-Feb-2008", -12, 39141 "29-Feb-2008", -12, 39141
"15-Mar-2007", 3, 39263 "15-Mar-2007", 3, 39263
22269.0, 0, 22281 22269.0, 0, 22281
22269.0, 2, 22340 22269.0, 2, 22340
22269.0, 110, 25627 22269.0, 110, 25627
22269.0, -110, 18932 22269.0, -110, 18932
22269.0, 3, 22371 22269.0, 3, 22371
22269.0, 3.75, 22371 22269.0, 3.75, 22371
"15-Mar-2007", "ABC", "#VALUE!" "15-Mar-2007", "ABC", "#VALUE!"
"Invalid", 12, "#VALUE!" "Invalid", 12, "#VALUE!"

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

@ -1,12 +1,12 @@
0.25, 6 0.25, 6
0.75, 18 0.75, 18
0.5, 12 0.5, 12
0.6, 14 0.6, 14
"11-Nov-1918 11:11", 11 "11-Nov-1918 11:11", 11
"11:59 PM", 23 "11:59 PM", 23
"23:59:59", 23 "23:59:59", 23
3600, 0 3600, 0
-3600, "#NUM!" -3600, "#NUM!"
7200, 0 7200, 0
65535, 0 65535, 0
"1 O'Clock", "#VALUE!" "1 O'Clock", "#VALUE!"

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

@ -1,12 +1,12 @@
0.2, 48 0.2, 48
0.4, 36 0.4, 36
0.6, 24 0.6, 24
0.8, 12 0.8, 12
"11-Nov-1918 11:15", 15 "11-Nov-1918 11:15", 15
"11:59 PM", 59 "11:59 PM", 59
"23:59:59", 59 "23:59:59", 59
3600, 0 3600, 0
-3600, "#NUM!" -3600, "#NUM!"
12500, 0 12500, 0
65535, 0 65535, 0
"Half past 1 O'Clock", "#VALUE!" "Half past 1 O'Clock", "#VALUE!"

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

@ -1,12 +1,12 @@
, 1 , 1
0, 1 0, 1
22269.0, 12 22269.0, 12
30348.0, 2 30348.0, 2
30843.0, 6 30843.0, 6
"11-Nov-1918", 11 "11-Nov-1918", 11
"28-Feb-1904", 2 "28-Feb-1904", 2
"01 Jul 2003", 7 "01 Jul 2003", 7
38094, 4 38094, 4
"Dec 2003", 12 "Dec 2003", 12
-10, "#NUM!" -10, "#NUM!"
"ABCD", "#VALUE!" "ABCD", "#VALUE!"

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

@ -1,18 +1,18 @@
"1-Jan-2007", "10-Jan-2007", 8 "1-Jan-2007", "10-Jan-2007", 8
"18-Jun-2008", "20-Jun-2008", 3 "18-Jun-2008", "20-Jun-2008", 3
"16-Jun-2008", "20-Jun-2008", 5 "16-Jun-2008", "20-Jun-2008", 5
"14-Jun-2008", "20-Jun-2008", 5 "14-Jun-2008", "20-Jun-2008", 5
"20-Jun-2008", "20-Jun-2008", 1 "20-Jun-2008", "20-Jun-2008", 1
"21-Jun-2008", "21-Jun-2008", 0 "21-Jun-2008", "21-Jun-2008", 0
"20-Jun-2008", "20-Jun-2008", "20-Jun-2008", 0 "20-Jun-2008", "20-Jun-2008", "20-Jun-2008", 0
"20-Jun-2008", "20-Jun-2008", "20-Jun-2008", "20-Jun-2008", 0 "20-Jun-2008", "20-Jun-2008", "20-Jun-2008", "20-Jun-2008", 0
"14-Jun-2008", "25-Jun-2008", 8 "14-Jun-2008", "25-Jun-2008", 8
"19-Dec-1960", "10-Jan-1961", 17 "19-Dec-1960", "10-Jan-1961", 17
"10-Jan-1961", "19-Dec-1960", -17 "10-Jan-1961", "19-Dec-1960", -17
"19-Dec-1960", "10-Jan-1961", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961", 16 "19-Dec-1960", "10-Jan-1961", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961", 16
"10-Jan-1961", "19-Dec-1960", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961", -16 "10-Jan-1961", "19-Dec-1960", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961", -16
"1-Jan-2007", "31-Mar-2007", 65 "1-Jan-2007", "31-Mar-2007", 65
"1-Jan-2007", "31-Jan-2007", 23 "1-Jan-2007", "31-Jan-2007", 23
"1-Jan-2007", "1-Feb-2007", 24 "1-Jan-2007", "1-Feb-2007", 24
"1-Jan-2007", "28-Feb-2007", 43 "1-Jan-2007", "28-Feb-2007", 43
"31-Jan-2007", "1-Feb-2007", 2 "31-Jan-2007", "1-Feb-2007", 2

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

@ -1,12 +1,12 @@
0.2339930556, 57 0.2339930556, 57
0.4202893519, 13 0.4202893519, 13
0.6078935185, 22 0.6078935185, 22
0.8022106481, 11 0.8022106481, 11
"11-Nov-1918 11:15:35", 35 "11-Nov-1918 11:15:35", 35
"11:59 PM", 0 "11:59 PM", 0
"23:59:59", 59 "23:59:59", 59
3600, 0 3600, 0
-3601, "#NUM!" -3601, "#NUM!"
12500, 0 12500, 0
65535, 0 65535, 0
"Half past 1 O'Clock", "#VALUE!" "Half past 1 O'Clock", "#VALUE!"

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

@ -1,22 +1,22 @@
18, 11, 11, 0.757766203704 18, 11, 11, 0.757766203704
6, 15, 5, 0.260474537037 6, 15, 5, 0.260474537037
12, 30, 10, 0.520949074074 12, 30, 10, 0.520949074074
18, 45, 25, 0.781539351852 18, 45, 25, 0.781539351852
15, 32, 50, 0.647800925926 15, 32, 50, 0.647800925926
12, , 61, 0.500706018519 12, , 61, 0.500706018519
11, , -1, 0.458321759259 11, , -1, 0.458321759259
10, , -67, 0.415891203704 10, , -67, 0.415891203704
13, 62, 5, 0.584780092593 13, 62, 5, 0.584780092593
9, -80, 17, 0.319641203704 9, -80, 17, 0.319641203704
8, -162, , 0.220833333333 8, -162, , 0.220833333333
2, -120, -1, "#NUM!" 2, -120, -1, "#NUM!"
2, -120, , 0.000000000000 2, -120, , 0.000000000000
2, -120, 1, 0.000011574074 2, -120, 1, 0.000011574074
36, 1, 2, 0.500717592593 36, 1, 2, 0.500717592593
-1, 2, 3, "#NUM!" -1, 2, 3, "#NUM!"
-1, 61, 29, 0.001030092593 -1, 61, 29, 0.001030092593
-1, 61, -60, 0.000000000000 -1, 61, -60, 0.000000000000
"A", , , "#VALUE!" "A", , , "#VALUE!"
11, 59, 0, 0.499305555556 11, 59, 0, 0.499305555556
12, 0, 0, 0.500000000000 12, 0, 0, 0.500000000000
16, 48, 10, 0.700115740741 16, 48, 10, 0.700115740741

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

@ -1,13 +1,13 @@
"12:00:00 am", 0 "12:00:00 am", 0
"12:01:02 am", 0.000717593 "12:01:02 am", 0.000717593
"12:03 pm", 0.502083333 "12:03 pm", 0.502083333
"12:7:11 pm", 0.504988426 "12:7:11 pm", 0.504988426
"4:13:39", 0.176145833 "4:13:39", 0.176145833
"6:20:17 pm", 0.764085648 "6:20:17 pm", 0.764085648
"18:33:27", 0.773229167 "18:33:27", 0.773229167
"31/12/2007 03:27:15", 0.143923611 "31/12/2007 03:27:15", 0.143923611
"9:44:55 pm", 0.90619213 "9:44:55 pm", 0.90619213
12, "#VALUE!" 12, "#VALUE!"
"13:01", 0.542361111 "13:01", 0.542361111
"33:45", 0.40625 "33:45", 0.40625
"13:01PM", "#VALUE!" "13:01PM", "#VALUE!"

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

@ -1,27 +1,27 @@
"24-Oct-1968", 5 "24-Oct-1968", 5
"24-Oct-1968", 2, 4 "24-Oct-1968", 2, 4
"24-Oct-1968", 3, 3 "24-Oct-1968", 3, 3
"2000-06-14", 4 "2000-06-14", 4
"2000-06-14", 2, 3 "2000-06-14", 2, 3
"2000-06-14", 3, 2 "2000-06-14", 3, 2
"1996-07-24", 4 "1996-07-24", 4
"1996-07-24", 2, 3 "1996-07-24", 2, 3
"1996-07-24", 3, 2 "1996-07-24", 3, 2
"1996-07-27", 7 "1996-07-27", 7
"1996-07-27", 2, 6 "1996-07-27", 2, 6
"1996-07-27", 3, 5 "1996-07-27", 3, 5
"1977-7-31", 1 "1977-7-31", 1
"1977-7-31", 2, 7 "1977-7-31", 2, 7
"1977-7-31", 3, 6 "1977-7-31", 3, 6
"1977-8-1", 2 "1977-8-1", 2
"1977-8-1", 2, 1 "1977-8-1", 2, 1
"1977-8-1", 3, 0 "1977-8-1", 3, 0
"1900-2-5", 2, 7 "1900-2-5", 2, 7
"1900-2-1", 1 "1900-2-1", 1
38093, 6 38093, 6
38093, 2, 5 38093, 2, 5
38093, 3, 4 38093, 3, 4
"3/7/1977", "A", "#VALUE!" "3/7/1977", "A", "#VALUE!"
"3/7/1977", 0, "#NUM!" "3/7/1977", 0, "#NUM!"
"Invalid", 1, "#VALUE!" "Invalid", 1, "#VALUE!"
-1, "#NUM!" -1, "#NUM!"

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

@ -1,7 +1,7 @@
"21-Dec-2000", 1, 52 "21-Dec-2000", 1, 52
"1995-01-01", 1, 1 "1995-01-01", 1, 1
"3/7/1977", 27 "3/7/1977", 27
"3/7/1977", "A", "#VALUE!" "3/7/1977", "A", "#VALUE!"
"3/7/1977", 0, "#NUM!" "3/7/1977", 0, "#NUM!"
"Invalid", 1, "#VALUE!" "Invalid", 1, "#VALUE!"
-1, "#NUM!" -1, "#NUM!"

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

@ -1,13 +1,13 @@
"1-Jan-2007", "ABC", "#VALUE!" "1-Jan-2007", "ABC", "#VALUE!"
"1-Jan-2007", 9, 39094 "1-Jan-2007", 9, 39094
"18-Jun-2008", 2, 39619 "18-Jun-2008", 2, 39619
"16-Jun-2008", 4, 39619 "16-Jun-2008", 4, 39619
"14-Jun-2008", 6, 39622 "14-Jun-2008", 6, 39622
"14-Jun-2008", 11, 39629 "14-Jun-2008", 11, 39629
"14-Jun-2008", -2, 39611 "14-Jun-2008", -2, 39611
"14-Jun-2008", -6, 39605 "14-Jun-2008", -6, 39605
"19-Dec-2008", 10, 39815 "19-Dec-2008", 10, 39815
"19-Dec-2008", 10, "25-Dec-2008", "26-Dec-2008", "01-Jan-2009", 39820 "19-Dec-2008", 10, "25-Dec-2008", "26-Dec-2008", "01-Jan-2009", 39820
"19-Dec-2008", 10, {"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"}, 39820 "19-Dec-2008", 10, {"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"}, 39820
39820, -10, {"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"}, 39801 39820, -10, {"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"}, 39801
"5-Apr-2012", 3, {"6-Apr-2012"|"9-Apr-2012"}, 41010 "5-Apr-2012", 3, {"6-Apr-2012"|"9-Apr-2012"}, 41010

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

@ -1,11 +1,11 @@
, 1900 , 1900
1, 1900 1, 1900
33333.33, 1991 33333.33, 1991
22269.0, 1960 22269.0, 1960
30348.0, 1983 30348.0, 1983
30843.0, 1984 30843.0, 1984
"01 Jan 2525", 2525 "01 Jan 2525", 2525
"11-Nov-1918", 1918 "11-Nov-1918", 1918
"28-Feb-1904", 1904 "28-Feb-1904", 1904
-10, "#NUM!" -10, "#NUM!"
"ABCD", "#VALUE!" "ABCD", "#VALUE!"

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

@ -1,65 +1,65 @@
"2007-1-1", "2007-1-10", 0, 0.025 "2007-1-1", "2007-1-10", 0, 0.025
"2007-1-1", "2007-1-10", 1, 0.02465753424658 "2007-1-1", "2007-1-10", 1, 0.02465753424658
"2007-1-1", "2007-1-10", 2, 0.025 "2007-1-1", "2007-1-10", 2, 0.025
"2007-1-1", "2007-1-10", 3, 0.02465753424658 "2007-1-1", "2007-1-10", 3, 0.02465753424658
"2007-1-1", "2007-1-10", 4, 0.025 "2007-1-1", "2007-1-10", 4, 0.025
"2007-1-1", "2007-12-31", 0, 1.0 "2007-1-1", "2007-12-31", 0, 1.0
"2007-1-1", "2007-12-31", 1, 0.99726027397260 "2007-1-1", "2007-12-31", 1, 0.99726027397260
"2007-1-1", "2007-12-31", 2, 1.01111111111111 "2007-1-1", "2007-12-31", 2, 1.01111111111111
"2007-1-1", "2007-12-31", 3, 0.99726027397260 "2007-1-1", "2007-12-31", 3, 0.99726027397260
"2007-1-1", "2007-12-31", 4, 0.99722222222222 "2007-1-1", "2007-12-31", 4, 0.99722222222222
"2007-1-1", "2008-7-1", 0, 1.5 "2007-1-1", "2008-7-1", 0, 1.5
"2007-1-1", "2008-7-1", 1, 1.49658002735978 "2007-1-1", "2008-7-1", 1, 1.49658002735978
"2007-1-1", "2008-7-1", 2, 1.51944444444444 "2007-1-1", "2008-7-1", 2, 1.51944444444444
"2007-1-1", "2008-7-1", 3, 1.49863013698630 "2007-1-1", "2008-7-1", 3, 1.49863013698630
"2007-1-1", "2008-7-1", 4, 1.5 "2007-1-1", "2008-7-1", 4, 1.5
"2007-1-1", "2007-1-31", 0, 0.08333333333333 "2007-1-1", "2007-1-31", 0, 0.08333333333333
"2007-1-1", "2007-1-31", 1, 0.08219178082192 "2007-1-1", "2007-1-31", 1, 0.08219178082192
"2007-1-1", "2007-1-31", 2, 0.08333333333333 "2007-1-1", "2007-1-31", 2, 0.08333333333333
"2007-1-1", "2007-1-31", 3, 0.08219178082192 "2007-1-1", "2007-1-31", 3, 0.08219178082192
"2007-1-1", "2007-1-31", 4, 0.08055555555556 "2007-1-1", "2007-1-31", 4, 0.08055555555556
"2007-1-1", "2007-2-1", 0, 0.08333333333333 "2007-1-1", "2007-2-1", 0, 0.08333333333333
"2007-1-1", "2007-2-1", 1, 0.08493150684932 "2007-1-1", "2007-2-1", 1, 0.08493150684932
"2007-1-1", "2007-2-1", 2, 0.08611111111111 "2007-1-1", "2007-2-1", 2, 0.08611111111111
"2007-1-1", "2007-2-1", 3, 0.08493150684932 "2007-1-1", "2007-2-1", 3, 0.08493150684932
"2007-1-1", "2007-2-1", 4, 0.08333333333333 "2007-1-1", "2007-2-1", 4, 0.08333333333333
"2007-1-1", "2007-2-28", 0, 0.15833333333333 "2007-1-1", "2007-2-28", 0, 0.15833333333333
"2007-1-1", "2007-2-28", 1, 0.15890410958904 "2007-1-1", "2007-2-28", 1, 0.15890410958904
"2007-1-1", "2007-2-28", 2, 0.16111111111111 "2007-1-1", "2007-2-28", 2, 0.16111111111111
"2007-1-1", "2007-2-28", 3, 0.15890410958904 "2007-1-1", "2007-2-28", 3, 0.15890410958904
"2007-1-1", "2007-2-28", 4, 0.15833333333333 "2007-1-1", "2007-2-28", 4, 0.15833333333333
"2007-1-31", "2007-2-1", 0, 0.00277777777778 "2007-1-31", "2007-2-1", 0, 0.00277777777778
"2007-1-31", "2007-2-1", 1, 0.00273972602740 "2007-1-31", "2007-2-1", 1, 0.00273972602740
"2007-1-31", "2007-2-1", 2, 0.00277777777778 "2007-1-31", "2007-2-1", 2, 0.00277777777778
"2007-1-31", "2007-2-1", 3, 0.00273972602740 "2007-1-31", "2007-2-1", 3, 0.00273972602740
"2007-1-31", "2007-2-1", 4, 0.00277777777778 "2007-1-31", "2007-2-1", 4, 0.00277777777778
"2007-1-31", "2007-3-1", 0, 0.08611111111111 "2007-1-31", "2007-3-1", 0, 0.08611111111111
"2007-1-31", "2007-3-1", 1, 0.07945205479452 "2007-1-31", "2007-3-1", 1, 0.07945205479452
"2007-1-31", "2007-3-1", 2, 0.08055555555556 "2007-1-31", "2007-3-1", 2, 0.08055555555556
"2007-1-31", "2007-3-1", 3, 0.07945205479452 "2007-1-31", "2007-3-1", 3, 0.07945205479452
"2007-1-31", "2007-3-1", 4, 0.08611111111111 "2007-1-31", "2007-3-1", 4, 0.08611111111111
"2007-1-31", "2007-3-31", 0, 0.16666666666667 "2007-1-31", "2007-3-31", 0, 0.16666666666667
"2007-1-31", "2007-3-31", 1, 0.16164383561644 "2007-1-31", "2007-3-31", 1, 0.16164383561644
"2007-1-31", "2007-3-31", 2, 0.16388888888889 "2007-1-31", "2007-3-31", 2, 0.16388888888889
"2007-1-31", "2007-3-31", 3, 0.16164383561644 "2007-1-31", "2007-3-31", 3, 0.16164383561644
"2007-1-31", "2007-3-31", 4, 0.16666666666667 "2007-1-31", "2007-3-31", 4, 0.16666666666667
"2008-1-1", "2008-9-1", 0, 0.66666666666667 "2008-1-1", "2008-9-1", 0, 0.66666666666667
"2008-1-1", "2008-9-1", 1, 0.66666666666667 "2008-1-1", "2008-9-1", 1, 0.66666666666667
"2008-1-1", "2008-9-1", 2, 0.67777777777778 "2008-1-1", "2008-9-1", 2, 0.67777777777778
"2008-1-1", "2008-9-1", 3, 0.66849315068493 "2008-1-1", "2008-9-1", 3, 0.66849315068493
"2008-1-1", "2008-9-1", 4, 0.66666666666667 "2008-1-1", "2008-9-1", 4, 0.66666666666667
"2007-2-1", "2008-4-1", 0, 1.16666666666667 "2007-2-1", "2008-4-1", 0, 1.16666666666667
"2007-2-1", "2008-4-1", 1, 1.16279069767442 "2007-2-1", "2008-4-1", 1, 1.16279069767442
"2007-2-1", "2008-4-1", 2, 1.18055555555556 "2007-2-1", "2008-4-1", 2, 1.18055555555556
"2007-2-1", "2008-4-1", 3, 1.16438356164384 "2007-2-1", "2008-4-1", 3, 1.16438356164384
"2007-2-1", "2008-4-1", 4, 1.16666666666667 "2007-2-1", "2008-4-1", 4, 1.16666666666667
"1960-12-19", "2008-6-28", 0, 47.525 "1960-12-19", "2008-6-28", 0, 47.525
"1960-12-19", "2008-6-28", 1, 47.52162252765670 "1960-12-19", "2008-6-28", 1, 47.52162252765670
"1960-12-19", "2008-6-28", 2, 48.21666666666670 "1960-12-19", "2008-6-28", 2, 48.21666666666670
"1960-12-19", "2008-6-28", 3, 47.55616438356160 "1960-12-19", "2008-6-28", 3, 47.55616438356160
"1960-12-19", "2008-6-28", 4, 47.525 "1960-12-19", "2008-6-28", 4, 47.525
"1982-12-7", "2008-6-28", 0, 25.55833333333330 "1982-12-7", "2008-6-28", 0, 25.55833333333330
"1982-12-7", "2008-6-28", 1, 25.55718921111340 "1982-12-7", "2008-6-28", 1, 25.55718921111340
"1982-12-7", "2008-6-28", 2, 25.93055555555560 "1982-12-7", "2008-6-28", 2, 25.93055555555560
"1982-12-7", "2008-6-28", 3, 25.57534246575340 "1982-12-7", "2008-6-28", 3, 25.57534246575340
"1982-12-7", "2008-6-28", 4, 25.55833333333330 "1982-12-7", "2008-6-28", 4, 25.55833333333330

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

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

@ -1,10 +1,10 @@
"10110010", "178" "10110010", "178"
"1100100", "100" "1100100", "100"
"111001010101", "#NUM!" // Too large "111001010101", "#NUM!" // Too large
"101", "5" "101", "5"
"10", "2" "10", "2"
"0", "0" "0", "0"
"21", "#NUM!" // Invalid binary number "21", "#NUM!" // Invalid binary number
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
"1110010101", "-107" // 2's Complement "1110010101", "-107" // 2's Complement
"1111111111", "-1" // 2's Complement "1111111111", "-1" // 2's Complement

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

@ -1,14 +1,14 @@
"10110010", "B2" "10110010", "B2"
"111001010101", "#NUM!" // Too large "111001010101", "#NUM!" // Too large
"11111011", 4, "00FB" // Leading places "11111011", 4, "00FB" // Leading places
"11111011", 3.75, "0FB" // Leading places as a float "11111011", 3.75, "0FB" // Leading places as a float
"11111011", -1, "#NUM!" // Leading places negative "11111011", -1, "#NUM!" // Leading places negative
"11111011", "ABC", "#VALUE!" // Leading places non-numeric "11111011", "ABC", "#VALUE!" // Leading places non-numeric
"1110", "E" "1110", "E"
"101", "5" "101", "5"
"10", "2" "10", "2"
"0", "0" "0", "0"
"21", "#NUM!" // Invalid binary number "21", "#NUM!" // Invalid binary number
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
"1110010101", "FFFFFFFF95" // 2's Complement "1110010101", "FFFFFFFF95" // 2's Complement
"1111111111", "FFFFFFFFFF" // 2's Complement "1111111111", "FFFFFFFFFF" // 2's Complement

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

@ -1,15 +1,15 @@
"1100100", "144" "1100100", "144"
"10110010", "262" "10110010", "262"
"111001010101", "#NUM!" // Too large "111001010101", "#NUM!" // Too large
"1001", 3, "011" // Leading places "1001", 3, "011" // Leading places
"1001", 4.75, "0011" // Leading places as a float "1001", 4.75, "0011" // Leading places as a float
"1001", -1, "#NUM!" // Leading places negative "1001", -1, "#NUM!" // Leading places negative
"1001", "ABC", "#VALUE!" // Leading places non-numeric "1001", "ABC", "#VALUE!" // Leading places non-numeric
"00000010", "2" "00000010", "2"
"00000101", "5" "00000101", "5"
"00001101", "15" "00001101", "15"
"0", "0" "0", "0"
"21", "#NUM!" // Invalid binary number "21", "#NUM!" // Invalid binary number
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
"1110010101", "7777777625" // 2's Complement "1110010101", "7777777625" // 2's Complement
"1111111111", "7777777777" // 2's Complement "1111111111", "7777777777" // 2's Complement

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

File diff suppressed because it is too large Load Diff

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

@ -1,24 +1,24 @@
1.0, "lbm", "kg", 0.45359230974881 1.0, "lbm", "kg", 0.45359230974881
123.45, "kg", "kg", 123.45 123.45, "kg", "kg", 123.45
68, "F", "C", 20 68, "F", "C", 20
20, "C", "F", 68 20, "C", "F", 68
68, "F", "K", 293.15 68, "F", "K", 293.15
293.15, "K", "F", 68 293.15, "K", "F", 68
22, "C", "K", 295.15 22, "C", "K", 295.15
295.65, "K", "C", 22.5 295.65, "K", "C", 22.5
2.5, "ft", "sec", "#N/A" 2.5, "ft", "sec", "#N/A"
12345, "m", "km", 12.345 12345, "m", "km", 12.345
12.345, "km", "m", 12345 12.345, "km", "m", 12345
1, "km", "mi", 0.62137119223733 1, "km", "mi", 0.62137119223733
"three","ft", "yds", "#VALUE!" "three","ft", "yds", "#VALUE!"
123.45, "K", "kel", 123.45 123.45, "K", "kel", 123.45
123.45, "C", "cel", 123.45 123.45, "C", "cel", 123.45
123.45, "F", "fah", 123.45 123.45, "F", "fah", 123.45
1, "ft", "day", "#N/A" 1, "ft", "day", "#N/A"
123.45, "m", "m", 123.45 123.45, "m", "m", 123.45
234.56, "km", "km", 234.56 234.56, "km", "km", 234.56
234.56, "kpt", "lt", "#N/A" 234.56, "kpt", "lt", "#N/A"
234.56, "sm", "m", "#N/A" 234.56, "sm", "m", "#N/A"
234.56, "lt", "kpt", "#N/A" 234.56, "lt", "kpt", "#N/A"
234.56, "m", "sm", "#N/A" 234.56, "m", "sm", "#N/A"
12.345, "km", "mm", 12345000 12.345, "km", "mm", 12345000

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

@ -1,18 +1,18 @@
357, "101100101" 357, "101100101"
512, "#NUM!" // Too large 512, "#NUM!" // Too large
-513, "#NUM!" // Too small -513, "#NUM!" // Too small
9, 4, "1001" 9, 4, "1001"
9, 8, "00001001" 9, 8, "00001001"
9, 6.75, "001001" // Leading places as a float 9, 6.75, "001001" // Leading places as a float
9, -1, "#NUM!" // Leading places negative 9, -1, "#NUM!" // Leading places negative
9, "ABC", "#VALUE!" // Leading places non-numeric 9, "ABC", "#VALUE!" // Leading places non-numeric
246, "11110110" 246, "11110110"
12345, "#NUM!" 12345, "#NUM!"
123456789, "#NUM!" 123456789, "#NUM!"
123.45, "1111011" 123.45, "1111011"
0, "0" 0, "0"
"3579A", "#VALUE!" // Invalid decimal "3579A", "#VALUE!" // Invalid decimal
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
-100, "1110011100" // 2's Complement -100, "1110011100" // 2's Complement
-107, "1110010101" // 2's Complement -107, "1110010101" // 2's Complement
-512, "1000000000" // 2's Complement -512, "1000000000" // 2's Complement

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

@ -1,15 +1,15 @@
"357", "165" "357", "165"
"1357", "54D" "1357", "54D"
"246", "F6" "246", "F6"
"12345", "3039" "12345", "3039"
"123456789", "75BCD15" "123456789", "75BCD15"
"100", 4, "0064" "100", 4, "0064"
"100", 5.75, "00064" // Leading places as a float "100", 5.75, "00064" // Leading places as a float
"100", -1, "#NUM!" // Leading places negative "100", -1, "#NUM!" // Leading places negative
"100", "ABC", "#VALUE!" // Leading places non-numeric "100", "ABC", "#VALUE!" // Leading places non-numeric
"123.45", "7B" "123.45", "7B"
"0", "0" "0", "0"
"3579A", "#VALUE!" // Invalid decimal "3579A", "#VALUE!" // Invalid decimal
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
"-54", "FFFFFFFFCA" // 2's Complement "-54", "FFFFFFFFCA" // 2's Complement
"-107", "FFFFFFFF95" // 2's Complement "-107", "FFFFFFFF95" // 2's Complement

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

@ -1,12 +1,12 @@
"357", "545" "357", "545"
"1357", "2515" "1357", "2515"
"246", "366" "246", "366"
"12345", "30071" "12345", "30071"
"123456789", "726746425" "123456789", "726746425"
"123.45", "173" "123.45", "173"
"58", 3, "072" "58", 3, "072"
"0", "0" "0", "0"
"3579A", "#VALUE!" // Invalid decimal "3579A", "#VALUE!" // Invalid decimal
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string
"-100", "7777777634" // 2's Complement "-100", "7777777634" // 2's Complement
"-107", "7777777625" // 2's Complement "-107", "7777777625" // 2's Complement

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

@ -1,25 +1,25 @@
-1.5, -1.5, 1 -1.5, -1.5, 1
-0.75, -1.5, 0 -0.75, -1.5, 0
0, -1.5, 0 0, -1.5, 0
0.75, -1.5, 0 0.75, -1.5, 0
1.5, -1.5, 0 1.5, -1.5, 0
-1.5, -0.75, 0 -1.5, -0.75, 0
-0.75, -0.75, 1 -0.75, -0.75, 1
0, -0.75, 0 0, -0.75, 0
0.75, -0.75, 0 0.75, -0.75, 0
1.5, -0.75, 0 1.5, -0.75, 0
-1.5, 0, 0 -1.5, 0, 0
-0.75, 0, 0 -0.75, 0, 0
0, 0, 1 0, 0, 1
0.75, 0, 0 0.75, 0, 0
1.5, 0, 0 1.5, 0, 0
-1.5, 0.75, 0 -1.5, 0.75, 0
-0.75, 0.75, 0 -0.75, 0.75, 0
0, 0.75, 0 0, 0.75, 0
0.75, 0.75, 1 0.75, 0.75, 1
1.5, 0.75, 0 1.5, 0.75, 0
-1.5, 1.5, 0 -1.5, 1.5, 0
-0.75, 1.5, 0 -0.75, 1.5, 0
0, 1.5, 0 0, 1.5, 0
0.75, 1.5, 0 0.75, 1.5, 0
1.5, 1.5, 1 1.5, 1.5, 1

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

@ -1,124 +1,124 @@
# lower bound upper bound Result # lower bound upper bound Result
0, 0.0 0, 0.0
0.01, 0.0112834155558496 0.01, 0.0112834155558496
0.05, 0.0563719777970166 0.05, 0.0563719777970166
0.1, 0.1124629160182850 0.1, 0.1124629160182850
0.125, 0.1403162048013340 0.125, 0.1403162048013340
0.15, 0.1679959714273630 0.15, 0.1679959714273630
0.2, 0.2227025892104780 0.2, 0.2227025892104780
0.25, 0.2763263901682370 0.25, 0.2763263901682370
0.3, 0.3286267594591270 0.3, 0.3286267594591270
0.35, 0.3793820535623100 0.35, 0.3793820535623100
0.4, 0.4283923550466680 0.4, 0.4283923550466680
0.45, 0.4754817197869240 0.45, 0.4754817197869240
0.5, 0.5204998778130470 0.5, 0.5204998778130470
0.6, 0.6038560908479260 0.6, 0.6038560908479260
0.7, 0.6778011938374180 0.7, 0.6778011938374180
0.8, 0.7421009647076610 0.8, 0.7421009647076610
0.9, 0.7969082124228320 0.9, 0.7969082124228320
1, 0.8427007929497150 1, 0.8427007929497150
1.1, 0.8802050695740820 1.1, 0.8802050695740820
1.2, 0.9103139782296350 1.2, 0.9103139782296350
1.3, 0.9340079449406520 1.3, 0.9340079449406520
1.4, 0.9522851197626490 1.4, 0.9522851197626490
1.5, 0.9661051464753110 1.5, 0.9661051464753110
1.75, 0.9866716712191820 1.75, 0.9866716712191820
2, 0.9953222650189530 2, 0.9953222650189530
2.5, 0.9995930479825550 2.5, 0.9995930479825550
3, 0.9999779095030010 3, 0.9999779095030010
3.5, 0.9999992569016280 3.5, 0.9999992569016280
4, 0.9999999845827420 4, 0.9999999845827420
4.5, 0.9999999998033840 4.5, 0.9999999998033840
5, 0.9999999999984630 5, 0.9999999999984630
5.5, 0.9999999999999930 5.5, 0.9999999999999930
6, 1.0 6, 1.0
32, 1.0 32, 1.0
-0.1, -0.1124629160182850 -0.1, -0.1124629160182850
-1, -0.8427007929497150 -1, -0.8427007929497150
TRUE, "#VALUE!" TRUE, "#VALUE!"
FALSE, "#VALUE!" FALSE, "#VALUE!"
"2", 0.9953222650189530 "2", 0.9953222650189530
"TWO", "#VALUE!" "TWO", "#VALUE!"
-1.5, -1.5, 0.0 -1.5, -1.5, 0.0
-0.75, -1.5, -0.2549495128217960 -0.75, -1.5, -0.2549495128217960
0, -1.5, -0.9661051464753110 0, -1.5, -0.9661051464753110
0.75, -1.5, -1.6772607801288300 0.75, -1.5, -1.6772607801288300
1.5, -1.5, -1.9322102929506200 1.5, -1.5, -1.9322102929506200
2.25, -1.5, -1.9646424298886300 2.25, -1.5, -1.9646424298886300
3, -1.5, -1.9660830559783100 3, -1.5, -1.9660830559783100
3.75, -1.5, -1.9661050327480500 3.75, -1.5, -1.9661050327480500
4.5, -1.5, -1.9661051462786900 4.5, -1.5, -1.9661051462786900
-1.5, -0.75, 0.2549495128217960 -1.5, -0.75, 0.2549495128217960
-0.75, -0.75, 0.0 -0.75, -0.75, 0.0
0, -0.75, -0.7111556336535150 0, -0.75, -0.7111556336535150
0.75, -0.75, -1.4223112673070300 0.75, -0.75, -1.4223112673070300
1.5, -0.75, -1.6772607801288300 1.5, -0.75, -1.6772607801288300
2.25, -0.75, -1.7096929170668300 2.25, -0.75, -1.7096929170668300
3, -0.75, -1.7111335431565200 3, -0.75, -1.7111335431565200
3.75, -0.75, -1.7111555199262600 3.75, -0.75, -1.7111555199262600
4.5, -0.75, -1.7111556334569000 4.5, -0.75, -1.7111556334569000
-1.5, 0, 0.9661051464753110 -1.5, 0, 0.9661051464753110
-0.75, 0, 0.7111556336535150 -0.75, 0, 0.7111556336535150
0, 0, 0.0 0, 0, 0.0
0.75, 0, -0.7111556336535150 0.75, 0, -0.7111556336535150
1.5, 0, -0.9661051464753110 1.5, 0, -0.9661051464753110
2.25, 0, -0.9985372834133190 2.25, 0, -0.9985372834133190
3, 0, -0.9999779095030010 3, 0, -0.9999779095030010
3.75, 0, -0.9999998862727430 3.75, 0, -0.9999998862727430
4.5, 0, -0.9999999998033840 4.5, 0, -0.9999999998033840
-1.5, 0.75, 1.6772607801288300 -1.5, 0.75, 1.6772607801288300
-0.75, 0.75, 1.4223112673070300 -0.75, 0.75, 1.4223112673070300
0, 0.75, 0.7111556336535150 0, 0.75, 0.7111556336535150
0.75, 0.75, 0.0 0.75, 0.75, 0.0
1.5, 0.75, -0.2549495128217960 1.5, 0.75, -0.2549495128217960
2.25, 0.75, -0.2873816497598040 2.25, 0.75, -0.2873816497598040
3, 0.75, -0.2888222758494860 3, 0.75, -0.2888222758494860
3.75, 0.75, -0.2888442526192280 3.75, 0.75, -0.2888442526192280
4.5, 0.75, -0.2888443661498690 4.5, 0.75, -0.2888443661498690
-1.5, 1.5, 1.9322102929506200 -1.5, 1.5, 1.9322102929506200
-0.75, 1.5, 1.6772607801288300 -0.75, 1.5, 1.6772607801288300
0, 1.5, 0.9661051464753110 0, 1.5, 0.9661051464753110
0.75, 1.5, 0.2549495128217960 0.75, 1.5, 0.2549495128217960
1.5, 1.5, 0.0 1.5, 1.5, 0.0
2.25, 1.5, -0.0324321369380081 2.25, 1.5, -0.0324321369380081
3, 1.5, -0.0338727630276906 3, 1.5, -0.0338727630276906
3.75, 1.5, -0.0338947397974326 3.75, 1.5, -0.0338947397974326
4.5, 1.5, -0.0338948533280732 4.5, 1.5, -0.0338948533280732
-1.5, 2.25, 1.9646424298886300 -1.5, 2.25, 1.9646424298886300
-0.75, 2.25, 1.7096929170668300 -0.75, 2.25, 1.7096929170668300
0, 2.25, 0.9985372834133190 0, 2.25, 0.9985372834133190
0.75, 2.25, 0.2873816497598040 0.75, 2.25, 0.2873816497598040
1.5, 2.25, 0.0324321369380081 1.5, 2.25, 0.0324321369380081
2.25, 2.25, 0.0 2.25, 2.25, 0.0
3, 2.25, -0.0014406260896825 3, 2.25, -0.0014406260896825
3.75, 2.25, -0.0014626028594246 3.75, 2.25, -0.0014626028594246
4.5, 2.25, -0.0014627163900651 4.5, 2.25, -0.0014627163900651
-1.5, 3, 1.9660830559783100 -1.5, 3, 1.9660830559783100
-0.75, 3, 1.7111335431565200 -0.75, 3, 1.7111335431565200
0, 3, 0.9999779095030010 0, 3, 0.9999779095030010
0.75, 3, 0.2888222758494860 0.75, 3, 0.2888222758494860
1.5, 3, 0.0338727630276906 1.5, 3, 0.0338727630276906
2.25, 3, 0.0014406260896825 2.25, 3, 0.0014406260896825
3, 3, 0.0 3, 3, 0.0
3.75, 3, -0.0000219767697420 3.75, 3, -0.0000219767697420
4.5, 3, -0.0000220903003826 4.5, 3, -0.0000220903003826
-1.5, 3.75, 1.9661050327480500 -1.5, 3.75, 1.9661050327480500
-0.75, 3.75, 1.7111555199262600 -0.75, 3.75, 1.7111555199262600
0, 3.75, 0.9999998862727430 0, 3.75, 0.9999998862727430
0.75, 3.75, 0.2888442526192280 0.75, 3.75, 0.2888442526192280
1.5, 3.75, 0.0338947397974326 1.5, 3.75, 0.0338947397974326
2.25, 3.75, 0.0014626028594246 2.25, 3.75, 0.0014626028594246
3, 3.75, 0.0000219767697420 3, 3.75, 0.0000219767697420
3.75, 3.75, 0.0 3.75, 3.75, 0.0
4.5, 3.75, -0.0000001135306406 4.5, 3.75, -0.0000001135306406
-1.5, 4.5, 1.9661051462786900 -1.5, 4.5, 1.9661051462786900
-0.75, 4.5, 1.7111556334569000 -0.75, 4.5, 1.7111556334569000
0, 4.5, 0.9999999998033840 0, 4.5, 0.9999999998033840
0.75, 4.5, 0.2888443661498690 0.75, 4.5, 0.2888443661498690
1.5, 4.5, 0.0338948533280732 1.5, 4.5, 0.0338948533280732
2.25, 4.5, 0.0014627163900651 2.25, 4.5, 0.0014627163900651
3, 4.5, 0.0000220903003826 3, 4.5, 0.0000220903003826
3.75, 4.5, 0.0000001135306406 3.75, 4.5, 0.0000001135306406
4.5, 4.5, 0.0 4.5, 4.5, 0.0
5, -1, -1.8427007929481800 5, -1, -1.8427007929481800
-5, 1, 1.8427007929481800 -5, 1, 1.8427007929481800

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

@ -1,41 +1,41 @@
# x value Result # x value Result
0, 1.0 0, 1.0
0.01, 0.9887165844441500 0.01, 0.9887165844441500
0.05, 0.9436280222029830 0.05, 0.9436280222029830
0.1, 0.8875370839817150 0.1, 0.8875370839817150
0.125, 0.8596837951986660 0.125, 0.8596837951986660
0.15, 0.8320040285726360 0.15, 0.8320040285726360
0.2, 0.7772974107895220 0.2, 0.7772974107895220
0.25, 0.7236736098317630 0.25, 0.7236736098317630
0.3, 0.6713732405408730 0.3, 0.6713732405408730
0.35, 0.6206179464376900 0.35, 0.6206179464376900
0.4, 0.5716076449533320 0.4, 0.5716076449533320
0.45, 0.5245182802130760 0.45, 0.5245182802130760
0.5, 0.4795001221869530 0.5, 0.4795001221869530
0.6, 0.3961439091520740 0.6, 0.3961439091520740
0.7, 0.3221988061625820 0.7, 0.3221988061625820
0.8, 0.2578990352923390 0.8, 0.2578990352923390
0.9, 0.2030917875771680 0.9, 0.2030917875771680
1, 0.1572992070502850 1, 0.1572992070502850
1.1, 0.1197949304259180 1.1, 0.1197949304259180
1.2, 0.0896860217703646 1.2, 0.0896860217703646
1.3, 0.0659920550593475 1.3, 0.0659920550593475
1.4, 0.0477148802373512 1.4, 0.0477148802373512
1.5, 0.0338948535246893 1.5, 0.0338948535246893
1.75, 0.0133283287808176 1.75, 0.0133283287808176
2, 0.0046777349810473 2, 0.0046777349810473
2.5, 0.0004069520174450 2.5, 0.0004069520174450
3, 0.0000220904969986 3, 0.0000220904969986
3.5, 0.0000007430983723 3.5, 0.0000007430983723
4, 0.0000000154172579 4, 0.0000000154172579
4.5, 0.0000000001966160 4.5, 0.0000000001966160
5, 0.0000000000015375 5, 0.0000000000015375
5.5, 0.0000000000000074 5.5, 0.0000000000000074
6, 0.0 6, 0.0
32, 0.0 32, 0.0
-0.1, 1.1124629160182900 -0.1, 1.1124629160182900
-1, 1.8427007929497100 -1, 1.8427007929497100
TRUE, "#VALUE!" TRUE, "#VALUE!"
FALSE, "#VALUE!" FALSE, "#VALUE!"
"2", 0.0046777349810473 "2", 0.0046777349810473
"TWO", "#VALUE!" "TWO", "#VALUE!"

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

@ -1,81 +1,81 @@
-1.5, -1.5, 1 -1.5, -1.5, 1
-0.75, -1.5, 1 -0.75, -1.5, 1
0, -1.5, 1 0, -1.5, 1
0.75, -1.5, 1 0.75, -1.5, 1
1.5, -1.5, 1 1.5, -1.5, 1
2.25, -1.5, 1 2.25, -1.5, 1
3, -1.5, 1 3, -1.5, 1
3.75, -1.5, 1 3.75, -1.5, 1
4.5, -1.5, 1 4.5, -1.5, 1
-1.5, -0.75, 0 -1.5, -0.75, 0
-0.75, -0.75, 1 -0.75, -0.75, 1
0, -0.75, 1 0, -0.75, 1
0.75, -0.75, 1 0.75, -0.75, 1
1.5, -0.75, 1 1.5, -0.75, 1
2.25, -0.75, 1 2.25, -0.75, 1
3, -0.75, 1 3, -0.75, 1
3.75, -0.75, 1 3.75, -0.75, 1
4.5, -0.75, 1 4.5, -0.75, 1
-1.5, 0, 0 -1.5, 0, 0
-0.75, 0, 0 -0.75, 0, 0
0, 0, 1 0, 0, 1
0.75, 0, 1 0.75, 0, 1
1.5, 0, 1 1.5, 0, 1
2.25, 0, 1 2.25, 0, 1
3, 0, 1 3, 0, 1
3.75, 0, 1 3.75, 0, 1
4.5, 0, 1 4.5, 0, 1
-1.5, 0.75, 0 -1.5, 0.75, 0
-0.75, 0.75, 0 -0.75, 0.75, 0
0, 0.75, 0 0, 0.75, 0
0.75, 0.75, 1 0.75, 0.75, 1
1.5, 0.75, 1 1.5, 0.75, 1
2.25, 0.75, 1 2.25, 0.75, 1
3, 0.75, 1 3, 0.75, 1
3.75, 0.75, 1 3.75, 0.75, 1
4.5, 0.75, 1 4.5, 0.75, 1
-1.5, 1.5, 0 -1.5, 1.5, 0
-0.75, 1.5, 0 -0.75, 1.5, 0
0, 1.5, 0 0, 1.5, 0
0.75, 1.5, 0 0.75, 1.5, 0
1.5, 1.5, 1 1.5, 1.5, 1
2.25, 1.5, 1 2.25, 1.5, 1
3, 1.5, 1 3, 1.5, 1
3.75, 1.5, 1 3.75, 1.5, 1
4.5, 1.5, 1 4.5, 1.5, 1
-1.5, 2.25, 0 -1.5, 2.25, 0
-0.75, 2.25, 0 -0.75, 2.25, 0
0, 2.25, 0 0, 2.25, 0
0.75, 2.25, 0 0.75, 2.25, 0
1.5, 2.25, 0 1.5, 2.25, 0
2.25, 2.25, 1 2.25, 2.25, 1
3, 2.25, 1 3, 2.25, 1
3.75, 2.25, 1 3.75, 2.25, 1
4.5, 2.25, 1 4.5, 2.25, 1
-1.5, 3, 0 -1.5, 3, 0
-0.75, 3, 0 -0.75, 3, 0
0, 3, 0 0, 3, 0
0.75, 3, 0 0.75, 3, 0
1.5, 3, 0 1.5, 3, 0
2.25, 3, 0 2.25, 3, 0
3, 3, 1 3, 3, 1
3.75, 3, 1 3.75, 3, 1
4.5, 3, 1 4.5, 3, 1
-1.5, 3.75, 0 -1.5, 3.75, 0
-0.75, 3.75, 0 -0.75, 3.75, 0
0, 3.75, 0 0, 3.75, 0
0.75, 3.75, 0 0.75, 3.75, 0
1.5, 3.75, 0 1.5, 3.75, 0
2.25, 3.75, 0 2.25, 3.75, 0
3, 3.75, 0 3, 3.75, 0
3.75, 3.75, 1 3.75, 3.75, 1
4.5, 3.75, 1 4.5, 3.75, 1
-1.5, 4.5, 0 -1.5, 4.5, 0
-0.75, 4.5, 0 -0.75, 4.5, 0
0, 4.5, 0 0, 4.5, 0
0.75, 4.5, 0 0.75, 4.5, 0
1.5, 4.5, 0 1.5, 4.5, 0
2.25, 4.5, 0 2.25, 4.5, 0
3, 4.5, 0 3, 4.5, 0
3.75, 4.5, 0 3.75, 4.5, 0
4.5, 4.5, 1 4.5, 4.5, 1

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

@ -1,17 +1,17 @@
"FF", "11111111" "FF", "11111111"
"1FF", "111111111" "1FF", "111111111"
"200", "#NUM!" "200", "#NUM!"
"FFFFFFFE00", "1000000000" // 2's Complement "FFFFFFFE00", "1000000000" // 2's Complement
"FFFFFFFDFF", "#NUM!" // 2's Complement "FFFFFFFDFF", "#NUM!" // 2's Complement
"01AB", "110101011" "01AB", "110101011"
"ABCD", "#NUM!" "ABCD", "#NUM!"
"F6", "11110110" "F6", "11110110"
"F", 8, "00001111" "F", 8, "00001111"
"B7", "10110111" "B7", "10110111"
"12345", "#NUM!" "12345", "#NUM!"
"123456789", "#NUM!" "123456789", "#NUM!"
"123.45", "#NUM!" "123.45", "#NUM!"
"0", "0" "0", "0"
"G3579A", "#NUM!" "G3579A", "#NUM!"
TRUE, "#VALUE!" TRUE, "#VALUE!"
"-107", "#NUM!" "-107", "#NUM!"

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

@ -1,15 +1,15 @@
"01AB", "427" "01AB", "427"
"ABCD", "43981" "ABCD", "43981"
"F6", "246" "F6", "246"
"12345", "74565" "12345", "74565"
"123456789", "4886718345" "123456789", "4886718345"
"123.45", "#NUM!" "123.45", "#NUM!"
"0", "0" "0", "0"
"G3579A", "#NUM!" "G3579A", "#NUM!"
TRUE, "#VALUE!" TRUE, "#VALUE!"
"-107", "#NUM!" "-107", "#NUM!"
"A5", "165" "A5", "165"
"3DA408B9", "1034160313" "3DA408B9", "1034160313"
"FFFFFFFF5B", "-165" // 2's Complement "FFFFFFFF5B", "-165" // 2's Complement
"FFFFFFFFFF", "-1" // 2's Complement "FFFFFFFFFF", "-1" // 2's Complement
"1FFFFFFFFFF", "#NUM!" // Too large "1FFFFFFFFFF", "#NUM!" // Too large

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

@ -1,13 +1,13 @@
"01AB", "653" "01AB", "653"
"ABCD", "125715" "ABCD", "125715"
"F6", "366" "F6", "366"
"3B4E", "35516" "3B4E", "35516"
"F", 3, "017" "F", 3, "017"
"12345", "221505" "12345", "221505"
"123456789", "#NUM!" "123456789", "#NUM!"
"123.45", "#NUM!" "123.45", "#NUM!"
"0", "0" "0", "0"
"G3579A", "#NUM!" "G3579A", "#NUM!"
TRUE, "#VALUE!" TRUE, "#VALUE!"
"-107", "#NUM!" "-107", "#NUM!"
"FFFFFFFF00", "7777777400" // 2's Complement "FFFFFFFF00", "7777777400" // 2's Complement

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

@ -1,27 +1,27 @@
"12.34+5.67j", 13.580298229420 "12.34+5.67j", 13.580298229420
"1.234E-5+6.78E9i", 6.78E9 "1.234E-5+6.78E9i", 6.78E9
"3.5+2.5i", 4.301162633521 "3.5+2.5i", 4.301162633521
"3.5+i", 3.640054944640 "3.5+i", 3.640054944640
"3.5", 3.5 "3.5", 3.5
"3.5-i", 3.640054944640 "3.5-i", 3.640054944640
"3.5-2.5i", 4.301162633521 "3.5-2.5i", 4.301162633521
"1+2.5i", 2.692582403567 "1+2.5i", 2.692582403567
"1+i", 1.414213562373 "1+i", 1.414213562373
"1", 1 "1", 1
"1-i", 1.414213562373 "1-i", 1.414213562373
"1-2.5i", 2.692582403567 "1-2.5i", 2.692582403567
"2.5i", 2.5 "2.5i", 2.5
"i", 1 "i", 1
"0", 0 "0", 0
"-i", 1 "-i", 1
"-2.5i", 2.5 "-2.5i", 2.5
"-1+2.5i", 2.692582403567 "-1+2.5i", 2.692582403567
"-1+i", 1.414213562373 "-1+i", 1.414213562373
"-1", 1 "-1", 1
"-1-i", 1.414213562373 "-1-i", 1.414213562373
"-1-2.5i", 2.692582403567 "-1-2.5i", 2.692582403567
"-3.5+2.5i", 4.301162633521 "-3.5+2.5i", 4.301162633521
"-3.5+i", 3.640054944640 "-3.5+i", 3.640054944640
"-3.5", 3.5 "-3.5", 3.5
"-3.5-i", 3.640054944640 "-3.5-i", 3.640054944640
"-3.5-2.5i", 4.301162633521 "-3.5-2.5i", 4.301162633521

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

@ -1,30 +1,30 @@
"12.34+5.67j", 5.67 "12.34+5.67j", 5.67
"1.234E-5+6.78E9i", 6.78E9 "1.234E-5+6.78E9i", 6.78E9
"3.5+2.5i", 2.5 "3.5+2.5i", 2.5
"3.5+i", 1 "3.5+i", 1
"3.5", 0 "3.5", 0
"3.5-i", -1 "3.5-i", -1
"3.5-2.5i", -2.5 "3.5-2.5i", -2.5
"1+2.5i", 2.5 "1+2.5i", 2.5
"1+i", 1 "1+i", 1
"1", 0 "1", 0
1, 0 1, 0
"1-i", -1 "1-i", -1
"1-2.5i", -2.5 "1-2.5i", -2.5
"2.5i", 2.5 "2.5i", 2.5
"i", 1 "i", 1
"0", 0 "0", 0
0, 0 0, 0
0.0, 0 0.0, 0
"-i", -1 "-i", -1
"-2.5i", -2.5 "-2.5i", -2.5
"-1+2.5i", 2.5 "-1+2.5i", 2.5
"-1+i", 1 "-1+i", 1
"-1", 0 "-1", 0
"-1-i", -1 "-1-i", -1
"-1-2.5i", -2.5 "-1-2.5i", -2.5
"-3.5+2.5i", 2.5 "-3.5+2.5i", 2.5
"-3.5+i", 1 "-3.5+i", 1
"-3.5", 0 "-3.5", 0
"-3.5-i", -1 "-3.5-i", -1
"-3.5-2.5i", -2.5 "-3.5-2.5i", -2.5

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

@ -1,26 +1,26 @@
"12.34+5.67j", 0.430710595550 "12.34+5.67j", 0.430710595550
"3.5+2.5i", 0.620249485983 "3.5+2.5i", 0.620249485983
"3.5+i", 0.278299659005 "3.5+i", 0.278299659005
"3.5", 0 "3.5", 0
"3.5-i", -0.278299659005 "3.5-i", -0.278299659005
"3.5-2.5i", -0.620249485983 "3.5-2.5i", -0.620249485983
"1+2.5i", 1.190289949683 "1+2.5i", 1.190289949683
"1+i", 0.785398163397 "1+i", 0.785398163397
"1", 0 "1", 0
"1-i", -0.785398163397 "1-i", -0.785398163397
"1-2.5i", -1.190289949683 "1-2.5i", -1.190289949683
"2.5i", 1.570796326795 "2.5i", 1.570796326795
"i", 1.570796326795 "i", 1.570796326795
"0", "#DIV/0!" "0", "#DIV/0!"
"-i", -1.570796326795 "-i", -1.570796326795
"-2.5i", -1.570796326795 "-2.5i", -1.570796326795
"-1+2.5i", 1.951302703907 "-1+2.5i", 1.951302703907
"-1+i", 2.356194490192 "-1+i", 2.356194490192
"-1", 3.141592653590 "-1", 3.141592653590
"-1-i", -2.356194490192 "-1-i", -2.356194490192
"-1-2.5i", -1.951302703907 "-1-2.5i", -1.951302703907
"-3.5+2.5i", 2.521343167607 "-3.5+2.5i", 2.521343167607
"-3.5+i", 2.863292994585 "-3.5+i", 2.863292994585
"-3.5", 3.141592653590 "-3.5", 3.141592653590
"-3.5-i", -2.863292994585 "-3.5-i", -2.863292994585
"-3.5-2.5i", -2.521343167607 "-3.5-2.5i", -2.521343167607

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

@ -1,26 +1,26 @@
"12.34+5.67j", "12.34-5.67j" "12.34+5.67j", "12.34-5.67j"
"3.5+2.5i", "3.5-2.5i" "3.5+2.5i", "3.5-2.5i"
"3.5+i", "3.5-i" "3.5+i", "3.5-i"
"3.5", "3.5" "3.5", "3.5"
"3.5-i", "3.5+i" "3.5-i", "3.5+i"
"3.5-2.5i", "3.5+2.5i" "3.5-2.5i", "3.5+2.5i"
"1+2.5i", "1-2.5i" "1+2.5i", "1-2.5i"
"1+i", "1-i" "1+i", "1-i"
"1", "1" "1", "1"
"1-i", "1+i" "1-i", "1+i"
"1-2.5i", "1+2.5i" "1-2.5i", "1+2.5i"
"2.5i", "-2.5i" "2.5i", "-2.5i"
"i", "-i" "i", "-i"
"0", "0" "0", "0"
"-i", "i" "-i", "i"
"-2.5i", "2.5i" "-2.5i", "2.5i"
"-1+2.5i", "-1-2.5i" "-1+2.5i", "-1-2.5i"
"-1+i", "-1-i" "-1+i", "-1-i"
"-1", "-1" "-1", "-1"
"-1-i", "-1+i" "-1-i", "-1+i"
"-1-2.5i", "-1+2.5i" "-1-2.5i", "-1+2.5i"
"-3.5+2.5i", "-3.5-2.5i" "-3.5+2.5i", "-3.5-2.5i"
"-3.5+i", "-3.5-i" "-3.5+i", "-3.5-i"
"-3.5", "-3.5" "-3.5", "-3.5"
"-3.5-i", "-3.5+i" "-3.5-i", "-3.5+i"
"-3.5-2.5i", "-3.5+2.5i" "-3.5-2.5i", "-3.5+2.5i"

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

@ -1,27 +1,27 @@
"12.34+5.67j", "141.319179436356+32.547610312508j" "12.34+5.67j", "141.319179436356+32.547610312508j"
"3.5+2.5i", "-5.74262349163406+2.12231025604134i" "3.5+2.5i", "-5.74262349163406+2.12231025604134i"
"3.5+i", "-1.44502817950166+0.412240867891067i" "3.5+i", "-1.44502817950166+0.412240867891067i"
"3.5", "-0.936456687290796" "3.5", "-0.936456687290796"
"3.5-i", "-1.44502817950166-0.412240867891067i" "3.5-i", "-1.44502817950166-0.412240867891067i"
"3.5-2.5i", "-5.74262349163406-2.12231025604134i" "3.5-2.5i", "-5.74262349163406-2.12231025604134i"
"1+2.5i", "3.31329014611322-5.0910715229497i" "1+2.5i", "3.31329014611322-5.0910715229497i"
"1+i", "0.833730025131149-0.988897705762865i" "1+i", "0.833730025131149-0.988897705762865i"
"1", "0.54030230586814" "1", "0.54030230586814"
"1-i", "0.833730025131149+0.988897705762865i" "1-i", "0.833730025131149+0.988897705762865i"
"1-2.5i", "3.31329014611322+5.0910715229497i" "1-2.5i", "3.31329014611322+5.0910715229497i"
"2.5i", "6.13228947966369" "2.5i", "6.13228947966369"
"i", "1.54308063481524" "i", "1.54308063481524"
"0", "1" "0", "1"
"-i", "1.54308063481524" "-i", "1.54308063481524"
"-2.5i", "6.13228947966369" "-2.5i", "6.13228947966369"
"-1+2.5i", "3.31329014611322+5.0910715229497i" "-1+2.5i", "3.31329014611322+5.0910715229497i"
"-1+i", "0.833730025131149+0.988897705762865i" "-1+i", "0.833730025131149+0.988897705762865i"
"-1", "0.54030230586814" "-1", "0.54030230586814"
"-1-i", "0.833730025131149-0.988897705762865i" "-1-i", "0.833730025131149-0.988897705762865i"
"-1-2.5i", "3.31329014611322-5.0910715229497i" "-1-2.5i", "3.31329014611322-5.0910715229497i"
"-3.5+2.5i", "-5.74262349163406-2.12231025604134i" "-3.5+2.5i", "-5.74262349163406-2.12231025604134i"
"-3.5+i", "-1.44502817950166-0.412240867891067i" "-3.5+i", "-1.44502817950166-0.412240867891067i"
"-3.5", "-0.936456687290796" "-3.5", "-0.936456687290796"
"-3.5-i", "-1.44502817950166+0.412240867891067i" "-3.5-i", "-1.44502817950166+0.412240867891067i"
"-3.5-2.5i", "-5.74262349163406+2.12231025604134i" "-3.5-2.5i", "-5.74262349163406+2.12231025604134i"
"3", "-0.989992496600445" "3", "-0.989992496600445"

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

@ -1,20 +1,20 @@
"12.34+5.67j", "123.45+67.89i", "#NUM!" "12.34+5.67j", "123.45+67.89i", "#NUM!"
"12.34+5.67j", "123.45+67.89j", "0.0961415519586104-0.00694248653276682j" "12.34+5.67j", "123.45+67.89j", "0.0961415519586104-0.00694248653276682j"
"-12.34+5.67i", "-123.45+67.89i", "0.0961415519586104+0.00694248653276682i" "-12.34+5.67i", "-123.45+67.89i", "0.0961415519586104+0.00694248653276682i"
"-12.34-5.67i", "-123.45+67.89i", "0.0573549954111941+0.0774712890924744i" "-12.34-5.67i", "-123.45+67.89i", "0.0573549954111941+0.0774712890924744i"
"-12.34+5.67i", "-123.45-67.89i", "0.0573549954111941-0.0774712890924744i" "-12.34+5.67i", "-123.45-67.89i", "0.0573549954111941-0.0774712890924744i"
"-12.34-5.67i", "-123.45-67.89i", "0.0961415519586104-0.00694248653276682i" "-12.34-5.67i", "-123.45-67.89i", "0.0961415519586104-0.00694248653276682i"
"12.34+5.67i", "-123.45+67.89i", "-0.0573549954111941-0.0774712890924744i" "12.34+5.67i", "-123.45+67.89i", "-0.0573549954111941-0.0774712890924744i"
"12.34-5.67i", "-123.45+67.89i", "-0.0961415519586104-0.00694248653276682i" "12.34-5.67i", "-123.45+67.89i", "-0.0961415519586104-0.00694248653276682i"
"12.34+5.67i", "-123.45-67.89i", "-0.0961415519586104+0.00694248653276682i" "12.34+5.67i", "-123.45-67.89i", "-0.0961415519586104+0.00694248653276682i"
"12.34-5.67i", "-123.45-67.89i", "-0.0573549954111941+0.0774712890924744i" "12.34-5.67i", "-123.45-67.89i", "-0.0573549954111941+0.0774712890924744i"
"-12.34+5.67i", "123.45+67.89i", "-0.0573549954111941+0.0774712890924744i" "-12.34+5.67i", "123.45+67.89i", "-0.0573549954111941+0.0774712890924744i"
"-12.34-5.67i", "123.45+67.89i", "-0.0961415519586104+0.00694248653276682i" "-12.34-5.67i", "123.45+67.89i", "-0.0961415519586104+0.00694248653276682i"
"-12.34+5.67i", "123.45-67.89i", "-0.0961415519586104-0.00694248653276682i" "-12.34+5.67i", "123.45-67.89i", "-0.0961415519586104-0.00694248653276682i"
"-12.34-5.67i", "123.45-67.89i", "-0.0573549954111941-0.0774712890924744i" "-12.34-5.67i", "123.45-67.89i", "-0.0573549954111941-0.0774712890924744i"
"-12.34-5.67i", "123.45-67.89", "#NUM!" "-12.34-5.67i", "123.45-67.89", "#NUM!"
"-12.34-5.67j", "123.45-67.89", "#NUM!" "-12.34-5.67j", "123.45-67.89", "#NUM!"
"-12.34-5.67", "123.45-67.89j", "#NUM!" "-12.34-5.67", "123.45-67.89j", "#NUM!"
"-12.34-5.67i", "-12.34-5.67i", "1" "-12.34-5.67i", "-12.34-5.67i", "1"
"-12.34", "123.45-67.89i", "-0.0767482736849023-0.0422068878126206i" "-12.34", "123.45-67.89i", "-0.0767482736849023-0.0422068878126206i"
"-12.34-5.67i", "-12.34", "1+0.459481361426256i" "-12.34-5.67i", "-12.34", "1+0.459481361426256i"

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

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

@ -1,27 +1,27 @@
"12.34+5.67j", "2.60862008281875+0.430710595550204j" "12.34+5.67j", "2.60862008281875+0.430710595550204j"
"-1.234E-5+6.78E9i", "22.6372429388987+1.5707963267949i" "-1.234E-5+6.78E9i", "22.6372429388987+1.5707963267949i"
"3.5+2.5i", "1.45888536604214+0.620249485982821i" "3.5+2.5i", "1.45888536604214+0.620249485982821i"
"3.5+i", "1.29199877621612+0.278299659005111i" "3.5+i", "1.29199877621612+0.278299659005111i"
"3.5", "1.25276296849537" "3.5", "1.25276296849537"
"3.5-i", "1.29199877621612-0.278299659005111i" "3.5-i", "1.29199877621612-0.278299659005111i"
"3.5-2.5i", "1.45888536604214-0.620249485982821i" "3.5-2.5i", "1.45888536604214-0.620249485982821i"
"1+2.5i", "0.990500734433292+1.19028994968253i" "1+2.5i", "0.990500734433292+1.19028994968253i"
"1+i", "0.346573590279973+0.785398163397448i" "1+i", "0.346573590279973+0.785398163397448i"
"1", "0" "1", "0"
"1-i", "0.346573590279973-0.785398163397448i" "1-i", "0.346573590279973-0.785398163397448i"
"1-2.5i", "0.990500734433292-1.19028994968253i" "1-2.5i", "0.990500734433292-1.19028994968253i"
"2.5i", "0.916290731874155+1.5707963267949i" "2.5i", "0.916290731874155+1.5707963267949i"
"i", "1.5707963267949i" "i", "1.5707963267949i"
"0", "#NUM!" "0", "#NUM!"
"-i", "-1.5707963267949i" "-i", "-1.5707963267949i"
"-2.5i", "0.916290731874155-1.5707963267949i" "-2.5i", "0.916290731874155-1.5707963267949i"
"-1+2.5i", "0.990500734433292+1.95130270390726i" "-1+2.5i", "0.990500734433292+1.95130270390726i"
"-1+i", "0.346573590279973+2.35619449019234i" "-1+i", "0.346573590279973+2.35619449019234i"
"-1", "3.14159265358979i" "-1", "3.14159265358979i"
"-1-i", "0.346573590279973-2.35619449019234i" "-1-i", "0.346573590279973-2.35619449019234i"
"-1-2.5i", "0.990500734433292-1.95130270390726i" "-1-2.5i", "0.990500734433292-1.95130270390726i"
"-3.5+2.5i", "1.45888536604214+2.52134316760697i" "-3.5+2.5i", "1.45888536604214+2.52134316760697i"
"-3.5+i", "1.29199877621612+2.86329299458468i" "-3.5+i", "1.29199877621612+2.86329299458468i"
"-3.5", "1.25276296849537+3.14159265358979i" "-3.5", "1.25276296849537+3.14159265358979i"
"-3.5-i", "1.29199877621612-2.86329299458468i" "-3.5-i", "1.29199877621612-2.86329299458468i"
"-3.5-2.5i", "1.45888536604214-2.52134316760697i" "-3.5-2.5i", "1.45888536604214-2.52134316760697i"

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

@ -1,27 +1,27 @@
"12.34+5.67j", "1.13290930735019+0.187055234944717j" "12.34+5.67j", "1.13290930735019+0.187055234944717j"
"-12.34E-5+6.78E9i", "9.83122969386706+0.682188176920927i" "-12.34E-5+6.78E9i", "9.83122969386706+0.682188176920927i"
"3.5+2.5i", "0.633585864201507+0.269370929165668i" "3.5+2.5i", "0.633585864201507+0.269370929165668i"
"3.5+i", "0.561107939136413+0.120864006221476i" "3.5+i", "0.561107939136413+0.120864006221476i"
"3.5", "0.544068044350276" "3.5", "0.544068044350276"
"3.5-i", "0.561107939136413-0.120864006221476i" "3.5-i", "0.561107939136413-0.120864006221476i"
"3.5-2.5i", "0.633585864201507-0.269370929165668i" "3.5-2.5i", "0.633585864201507-0.269370929165668i"
"1+2.5i", "0.430169003285497+0.516936357012023i" "1+2.5i", "0.430169003285497+0.516936357012023i"
"1+i", "0.150514997831991+0.34109408846046i" "1+i", "0.150514997831991+0.34109408846046i"
"1", "0" "1", "0"
"1-i", "0.150514997831991-0.34109408846046i" "1-i", "0.150514997831991-0.34109408846046i"
"1-2.5i", "0.430169003285497-0.516936357012023i" "1-2.5i", "0.430169003285497-0.516936357012023i"
"2.5i", "0.397940008672038+0.68218817692092i" "2.5i", "0.397940008672038+0.68218817692092i"
"i", "0.68218817692092i" "i", "0.68218817692092i"
"0", "#NUM!" "0", "#NUM!"
"-i", "-0.68218817692092i" "-i", "-0.68218817692092i"
"-2.5i", "0.397940008672038-0.68218817692092i" "-2.5i", "0.397940008672038-0.68218817692092i"
"-1+2.5i", "0.430169003285497+0.847439996829817i" "-1+2.5i", "0.430169003285497+0.847439996829817i"
"-1+i", "0.150514997831991+1.02328226538138i" "-1+i", "0.150514997831991+1.02328226538138i"
"-1", "1.36437635384184i" "-1", "1.36437635384184i"
"-1-i", "0.150514997831991-1.02328226538138i" "-1-i", "0.150514997831991-1.02328226538138i"
"-1-2.5i", "0.430169003285497-0.847439996829817i" "-1-2.5i", "0.430169003285497-0.847439996829817i"
"-3.5+2.5i", "0.633585864201507+1.09500542467617i" "-3.5+2.5i", "0.633585864201507+1.09500542467617i"
"-3.5+i", "0.561107939136413+1.24351234762036i" "-3.5+i", "0.561107939136413+1.24351234762036i"
"-3.5", "0.544068044350276+1.36437635384184i" "-3.5", "0.544068044350276+1.36437635384184i"
"-3.5-i", "0.561107939136413-1.24351234762036i" "-3.5-i", "0.561107939136413-1.24351234762036i"
"-3.5-2.5i", "0.633585864201507-1.09500542467617i" "-3.5-2.5i", "0.633585864201507-1.09500542467617i"

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

@ -1,27 +1,27 @@
"12.34+5.67j", "3.76344325733562+0.621384040306436j" "12.34+5.67j", "3.76344325733562+0.621384040306436j"
"-12.34E-5+6.78E9i", "32.6586381298614+2.26618007108803i" "-12.34E-5+6.78E9i", "32.6586381298614+2.26618007108803i"
"3.5+2.5i", "2.10472668297646+0.894830857610216i" "3.5+2.5i", "2.10472668297646+0.894830857610216i"
"3.5+i", "1.86396022742506+0.401501537958665i" "3.5+i", "1.86396022742506+0.401501537958665i"
"3.5", "1.80735492219671" "3.5", "1.80735492219671"
"3.5-i", "1.86396022742506-0.401501537958665i" "3.5-i", "1.86396022742506-0.401501537958665i"
"3.5-2.5i", "2.10472668297646-0.894830857610216i" "3.5-2.5i", "2.10472668297646-0.894830857610216i"
"1+2.5i", "1.42899049767377+1.71722540775913i" "1+2.5i", "1.42899049767377+1.71722540775913i"
"1+i", "0.500000000038482+1.13309003554401i" "1+i", "0.500000000038482+1.13309003554401i"
"1", "0" "1", "0"
"1-i", "0.500000000038482-1.13309003554401i" "1-i", "0.500000000038482-1.13309003554401i"
"1-2.5i", "1.42899049767377-1.71722540775913i" "1-2.5i", "1.42899049767377-1.71722540775913i"
"2.5i", "1.3219280949891+2.26618007108801i" "2.5i", "1.3219280949891+2.26618007108801i"
"i", "2.26618007108801i" "i", "2.26618007108801i"
"0", "#NUM!" "0", "#NUM!"
"-i", "-2.26618007108801i" "-i", "-2.26618007108801i"
"-2.5i", "1.3219280949891-2.26618007108801i" "-2.5i", "1.3219280949891-2.26618007108801i"
"-1+2.5i", "1.42899049767377+2.81513473441689i" "-1+2.5i", "1.42899049767377+2.81513473441689i"
"-1+i", "0.500000000038482+3.39927010663201i" "-1+i", "0.500000000038482+3.39927010663201i"
"-1", "4.53236014217602i" "-1", "4.53236014217602i"
"-1-i", "0.500000000038482-3.39927010663201i" "-1-i", "0.500000000038482-3.39927010663201i"
"-1-2.5i", "1.42899049767377-2.81513473441689i" "-1-2.5i", "1.42899049767377-2.81513473441689i"
"-3.5+2.5i", "2.10472668297646+3.63752928456581i" "-3.5+2.5i", "2.10472668297646+3.63752928456581i"
"-3.5+i", "1.86396022742506+4.13085860421736i" "-3.5+i", "1.86396022742506+4.13085860421736i"
"-3.5", "1.80735492219671+4.53236014217602i" "-3.5", "1.80735492219671+4.53236014217602i"
"-3.5-i", "1.86396022742506-4.13085860421736i" "-3.5-i", "1.86396022742506-4.13085860421736i"
"-3.5-2.5i", "2.10472668297646-3.63752928456581i" "-3.5-2.5i", "2.10472668297646-3.63752928456581i"

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