From e1f81f0fe08076775b948b0b1eea77fa22d28631 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Tue, 16 Aug 2016 21:00:19 +0900 Subject: [PATCH] Refactor tests data from custom format to PHP FIX #14 --- .../Calculation/DateTimeTest.php | 39 +- .../Calculation/EngineeringTest.php | 78 +- .../Calculation/FinancialTest.php | 62 +- .../Calculation/FunctionsTest.php | 26 +- .../Calculation/LogicalTest.php | 10 +- .../Calculation/LookupRefTest.php | 4 +- .../Calculation/MathTrigTest.php | 58 +- .../Calculation/TextDataTest.php | 42 +- tests/PhpSpreadsheet/CalculationTest.php | 2 +- .../Cell/DefaultValueBinderTest.php | 2 +- tests/PhpSpreadsheet/CellTest.php | 22 +- .../Reader/XEEValidatorTest.php | 4 +- tests/PhpSpreadsheet/Shared/CodePageTest.php | 2 +- tests/PhpSpreadsheet/Shared/DateTest.php | 16 +- tests/PhpSpreadsheet/Shared/FontTest.php | 6 +- .../Shared/PasswordHasherTest.php | 2 +- tests/PhpSpreadsheet/Style/ColorTest.php | 8 +- .../Style/NumberFormatDateTest.php | 2 +- .../PhpSpreadsheet/Style/NumberFormatTest.php | 2 +- tests/PhpSpreadsheet/TestDataFileIterator.php | 138 - .../TestDataFileIteratorJson.php | 65 - tests/data/Calculation/DateTime/DATE.php | 489 +++ tests/data/Calculation/DateTime/DATEDIF.php | 580 ++++ tests/data/Calculation/DateTime/DATEVALUE.php | 293 ++ tests/data/Calculation/DateTime/DAY.php | 34 + tests/data/Calculation/DateTime/DAYS360.php | 208 ++ tests/data/Calculation/DateTime/EDATE.php | 79 + tests/data/Calculation/DateTime/EOMONTH.php | 89 + tests/data/Calculation/DateTime/HOUR.php | 52 + tests/data/Calculation/DateTime/MINUTE.php | 52 + tests/data/Calculation/DateTime/MONTH.php | 52 + .../data/Calculation/DateTime/NETWORKDAYS.php | 103 + tests/data/Calculation/DateTime/SECOND.php | 52 + tests/data/Calculation/DateTime/TIME.php | 136 + tests/data/Calculation/DateTime/TIMEVALUE.php | 56 + tests/data/Calculation/DateTime/WEEKDAY.php | 130 + tests/data/Calculation/DateTime/WEEKNUM.php | 37 + tests/data/Calculation/DateTime/WORKDAY.php | 92 + tests/data/Calculation/DateTime/YEAR.php | 48 + tests/data/Calculation/DateTime/YEARFRAC.php | 394 +++ .../data/Calculation/Engineering/BESSELI.php | 279 ++ .../data/Calculation/Engineering/BESSELJ.php | 169 + .../data/Calculation/Engineering/BESSELK.php | 194 ++ .../data/Calculation/Engineering/BESSELY.php | 119 + .../data/Calculation/Engineering/BIN2DEC.php | 49 + .../data/Calculation/Engineering/BIN2HEX.php | 73 + .../data/Calculation/Engineering/BIN2OCT.php | 77 + .../data/Calculation/Engineering/COMPLEX.php | 3085 +++++++++++++++++ .../Calculation/Engineering/CONVERTUOM.php | 148 + .../data/Calculation/Engineering/DEC2BIN.php | 91 + .../data/Calculation/Engineering/DEC2HEX.php | 75 + .../data/Calculation/Engineering/DEC2OCT.php | 57 + tests/data/Calculation/Engineering/DELTA.php | 129 + tests/data/Calculation/Engineering/ERF.php | 581 ++++ tests/data/Calculation/Engineering/ERFC.php | 166 + tests/data/Calculation/Engineering/GESTEP.php | 409 +++ .../data/Calculation/Engineering/HEX2BIN.php | 71 + .../data/Calculation/Engineering/HEX2DEC.php | 67 + .../data/Calculation/Engineering/HEX2OCT.php | 58 + tests/data/Calculation/Engineering/IMABS.php | 112 + .../Calculation/Engineering/IMAGINARY.php | 124 + .../Calculation/Engineering/IMARGUMENT.php | 108 + .../Calculation/Engineering/IMCONJUGATE.php | 108 + tests/data/Calculation/Engineering/IMCOS.php | 112 + tests/data/Calculation/Engineering/IMDIV.php | 104 + tests/data/Calculation/Engineering/IMEXP.php | 112 + tests/data/Calculation/Engineering/IMLN.php | 112 + .../data/Calculation/Engineering/IMLOG10.php | 112 + tests/data/Calculation/Engineering/IMLOG2.php | 112 + .../data/Calculation/Engineering/IMPOWER.php | 94 + .../Calculation/Engineering/IMPRODUCT.php | 80 + tests/data/Calculation/Engineering/IMREAL.php | 124 + tests/data/Calculation/Engineering/IMSIN.php | 112 + tests/data/Calculation/Engineering/IMSQRT.php | 116 + tests/data/Calculation/Engineering/IMSUB.php | 55 + tests/data/Calculation/Engineering/IMSUM.php | 56 + .../data/Calculation/Engineering/OCT2BIN.php | 61 + .../data/Calculation/Engineering/OCT2DEC.php | 41 + .../data/Calculation/Engineering/OCT2HEX.php | 42 + tests/data/Calculation/Financial/ACCRINT.php | 75 + tests/data/Calculation/Financial/ACCRINTM.php | 45 + .../data/Calculation/Financial/AMORDEGRC.php | 26 + tests/data/Calculation/Financial/AMORLINC.php | 26 + .../data/Calculation/Financial/COUPDAYBS.php | 40 + tests/data/Calculation/Financial/COUPDAYS.php | 40 + .../data/Calculation/Financial/COUPDAYSNC.php | 40 + tests/data/Calculation/Financial/COUPNCD.php | 40 + tests/data/Calculation/Financial/COUPNUM.php | 48 + tests/data/Calculation/Financial/COUPPCD.php | 40 + tests/data/Calculation/Financial/CUMIPMT.php | 87 + tests/data/Calculation/Financial/CUMPRINC.php | 87 + tests/data/Calculation/Financial/DB.php | 134 + tests/data/Calculation/Financial/DDB.php | 115 + tests/data/Calculation/Financial/DISC.php | 43 + tests/data/Calculation/Financial/DOLLARDE.php | 51 + tests/data/Calculation/Financial/DOLLARFR.php | 51 + tests/data/Calculation/Financial/EFFECT.php | 31 + tests/data/Calculation/Financial/FV.php | 65 + .../data/Calculation/Financial/FVSCHEDULE.php | 39 + tests/data/Calculation/Financial/INTRATE.php | 45 + tests/data/Calculation/Financial/IPMT.php | 70 + tests/data/Calculation/Financial/IRR.php | 61 + tests/data/Calculation/Financial/ISPMT.php | 34 + tests/data/Calculation/Financial/MIRR.php | 77 + tests/data/Calculation/Financial/NOMINAL.php | 31 + tests/data/Calculation/Financial/NPER.php | 73 + tests/data/Calculation/Financial/NPV.php | 42 + tests/data/Calculation/Financial/PRICE.php | 96 + tests/data/Calculation/Financial/RATE.php | 72 + tests/data/Calculation/Financial/XIRR.php | 71 + .../data/Calculation/Functions/ERROR_TYPE.php | 59 + tests/data/Calculation/Functions/IS_BLANK.php | 67 + tests/data/Calculation/Functions/IS_ERR.php | 67 + tests/data/Calculation/Functions/IS_ERROR.php | 67 + tests/data/Calculation/Functions/IS_EVEN.php | 83 + .../data/Calculation/Functions/IS_LOGICAL.php | 67 + tests/data/Calculation/Functions/IS_NA.php | 67 + .../data/Calculation/Functions/IS_NONTEXT.php | 67 + .../data/Calculation/Functions/IS_NUMBER.php | 67 + tests/data/Calculation/Functions/IS_ODD.php | 83 + tests/data/Calculation/Functions/IS_TEXT.php | 67 + tests/data/Calculation/Functions/N.php | 138 + tests/data/Calculation/Functions/TYPE.php | 100 + tests/data/Calculation/Logical/AND.php | 124 + tests/data/Calculation/Logical/IF.php | 37 + tests/data/Calculation/Logical/IFERROR.php | 44 + tests/data/Calculation/Logical/NOT.php | 83 + tests/data/Calculation/Logical/OR.php | 119 + tests/data/Calculation/LookupRef/HLOOKUP.php | 278 ++ tests/data/Calculation/LookupRef/VLOOKUP.php | 294 ++ tests/data/Calculation/MathTrig/ATAN2.php | 86 + tests/data/Calculation/MathTrig/CEILING.php | 104 + tests/data/Calculation/MathTrig/COMBIN.php | 126 + tests/data/Calculation/MathTrig/EVEN.php | 72 + tests/data/Calculation/MathTrig/FACT.php | 44 + .../data/Calculation/MathTrig/FACTDOUBLE.php | 36 + tests/data/Calculation/MathTrig/FLOOR.php | 57 + tests/data/Calculation/MathTrig/GCD.php | 116 + tests/data/Calculation/MathTrig/INT.php | 80 + tests/data/Calculation/MathTrig/LCM.php | 68 + tests/data/Calculation/MathTrig/LOG.php | 344 ++ tests/data/Calculation/MathTrig/MDETERM.php | 262 ++ tests/data/Calculation/MathTrig/MINVERSE.php | 411 +++ tests/data/Calculation/MathTrig/MMULT.php | 305 ++ tests/data/Calculation/MathTrig/MOD.php | 49 + tests/data/Calculation/MathTrig/MROUND.php | 59 + .../data/Calculation/MathTrig/MULTINOMIAL.php | 17 + tests/data/Calculation/MathTrig/ODD.php | 56 + tests/data/Calculation/MathTrig/POWER.php | 409 +++ tests/data/Calculation/MathTrig/PRODUCT.php | 51 + tests/data/Calculation/MathTrig/QUOTIENT.php | 34 + tests/data/Calculation/MathTrig/ROMAN.php | 24 + tests/data/Calculation/MathTrig/ROUNDDOWN.php | 74 + tests/data/Calculation/MathTrig/ROUNDUP.php | 74 + tests/data/Calculation/MathTrig/SERIESSUM.php | 34 + tests/data/Calculation/MathTrig/SIGN.php | 56 + tests/data/Calculation/MathTrig/SQRTPI.php | 64 + tests/data/Calculation/MathTrig/SUMSQ.php | 47 + tests/data/Calculation/MathTrig/TRUNC.php | 99 + tests/data/Calculation/TextData/CHAR.php | 24 + tests/data/Calculation/TextData/CLEAN.php | 24 + tests/data/Calculation/TextData/CODE.php | 48 + .../data/Calculation/TextData/CONCATENATE.php | 21 + tests/data/Calculation/TextData/DOLLAR.php | 34 + tests/data/Calculation/TextData/FIND.php | 74 + tests/data/Calculation/TextData/FIXED.php | 34 + tests/data/Calculation/TextData/LEFT.php | 34 + tests/data/Calculation/TextData/LEN.php | 28 + tests/data/Calculation/TextData/LOWER.php | 20 + tests/data/Calculation/TextData/MID.php | 57 + tests/data/Calculation/TextData/PROPER.php | 16 + tests/data/Calculation/TextData/REPLACE.php | 32 + tests/data/Calculation/TextData/RIGHT.php | 34 + tests/data/Calculation/TextData/SEARCH.php | 62 + .../data/Calculation/TextData/SUBSTITUTE.php | 30 + tests/data/Calculation/TextData/T.php | 24 + tests/data/Calculation/TextData/TEXT.php | 69 + tests/data/Calculation/TextData/TRIM.php | 32 + tests/data/Calculation/TextData/UPPER.php | 20 + tests/data/Calculation/TextData/VALUE.php | 44 + .../CalculationBinaryComparisonOperation.php | 267 ++ tests/data/Cell/DefaultValueBinder.php | 22 + tests/data/CellAbsoluteCoordinate.php | 52 + tests/data/CellAbsoluteReference.php | 68 + tests/data/CellBuildRange.php | 26 + tests/data/CellCoordinates.php | 46 + .../CellExtractAllCellReferencesInRange.php | 143 + tests/data/CellGetRangeBoundaries.php | 30 + tests/data/CellRangeBoundaries.php | 30 + tests/data/CellRangeDimension.php | 18 + tests/data/CellSplitRange.php | 32 + tests/data/ColumnIndex.php | 52 + tests/data/ColumnString.php | 52 + .../Reader/XEETestInvalidUTF-16.xml | Bin .../Reader/XEETestInvalidUTF-16BE.xml | Bin .../Reader/XEETestInvalidUTF-16LE.xml | Bin .../Reader/XEETestInvalidUTF-8.xml | 0 .../Reader/XEETestValidUTF-16.xml | Bin .../Reader/XEETestValidUTF-16BE.xml | Bin .../Reader/XEETestValidUTF-16LE.xml | Bin .../Reader/XEETestValidUTF-8.xml | 0 tests/data/Shared/CentimeterSizeToPixels.php | 24 + tests/data/Shared/CodePage.php | 219 ++ .../Shared/Date/DateTimeToExcel.php | 0 .../Shared/Date/ExcelToTimestamp1900.php | 0 .../Date/ExcelToTimestamp1900Timezone.php | 0 .../Shared/Date/ExcelToTimestamp1904.php | 0 .../Shared/Date/FormatCodes.php | 0 .../Shared/Date/FormattedPHPToExcel1900.php | 0 .../Shared/Date/TimestampToExcel1900.php | 0 .../Shared/Date/TimestampToExcel1904.php | 0 tests/data/Shared/FontSizeToPixels.php | 68 + tests/data/Shared/InchSizeToPixels.php | 24 + tests/data/Shared/PasswordHashes.php | 28 + tests/data/Style/ColorChangeBrightness.php | 18 + tests/data/Style/ColorGetBlue.php | 35 + tests/data/Style/ColorGetGreen.php | 35 + tests/data/Style/ColorGetRed.php | 35 + tests/data/Style/NumberFormat.php | 189 + tests/data/Style/NumberFormatDates.php | 39 + .../Calculation/DateTime/DATE.data | 79 - .../Calculation/DateTime/DATEDIF.data | 96 - .../Calculation/DateTime/DATEVALUE.data | 66 - .../rawTestData/Calculation/DateTime/DAY.data | 8 - .../Calculation/DateTime/DAYS360.data | 34 - .../Calculation/DateTime/EDATE.data | 15 - .../Calculation/DateTime/EOMONTH.data | 17 - .../Calculation/DateTime/HOUR.data | 12 - .../Calculation/DateTime/MINUTE.data | 12 - .../Calculation/DateTime/MONTH.data | 12 - .../Calculation/DateTime/NETWORKDAYS.data | 18 - .../Calculation/DateTime/SECOND.data | 12 - .../Calculation/DateTime/TIME.data | 22 - .../Calculation/DateTime/TIMEVALUE.data | 13 - .../Calculation/DateTime/WEEKDAY.data | 27 - .../Calculation/DateTime/WEEKNUM.data | 7 - .../Calculation/DateTime/WORKDAY.data | 13 - .../Calculation/DateTime/YEAR.data | 11 - .../Calculation/DateTime/YEARFRAC.data | 65 - .../Calculation/Engineering/BESSELI.data | 55 - .../Calculation/Engineering/BESSELJ.data | 33 - .../Calculation/Engineering/BESSELK.data | 38 - .../Calculation/Engineering/BESSELY.data | 23 - .../Calculation/Engineering/BIN2DEC.data | 10 - .../Calculation/Engineering/BIN2HEX.data | 14 - .../Calculation/Engineering/BIN2OCT.data | 15 - .../Calculation/Engineering/COMPLEX.data | 547 --- .../Calculation/Engineering/CONVERTUOM.data | 24 - .../Calculation/Engineering/DEC2BIN.data | 18 - .../Calculation/Engineering/DEC2HEX.data | 15 - .../Calculation/Engineering/DEC2OCT.data | 12 - .../Calculation/Engineering/DELTA.data | 25 - .../Calculation/Engineering/ERF.data | 124 - .../Calculation/Engineering/ERFC.data | 41 - .../Calculation/Engineering/GESTEP.data | 81 - .../Calculation/Engineering/HEX2BIN.data | 17 - .../Calculation/Engineering/HEX2DEC.data | 15 - .../Calculation/Engineering/HEX2OCT.data | 13 - .../Calculation/Engineering/IMABS.data | 27 - .../Calculation/Engineering/IMAGINARY.data | 30 - .../Calculation/Engineering/IMARGUMENT.data | 26 - .../Calculation/Engineering/IMCONJUGATE.data | 26 - .../Calculation/Engineering/IMCOS.data | 27 - .../Calculation/Engineering/IMDIV.data | 20 - .../Calculation/Engineering/IMEXP.data | 27 - .../Calculation/Engineering/IMLN.data | 27 - .../Calculation/Engineering/IMLOG10.data | 27 - .../Calculation/Engineering/IMLOG2.data | 27 - .../Calculation/Engineering/IMPOWER.data | 18 - .../Calculation/Engineering/IMPRODUCT.data | 15 - .../Calculation/Engineering/IMREAL.data | 30 - .../Calculation/Engineering/IMSIN.data | 27 - .../Calculation/Engineering/IMSQRT.data | 28 - .../Calculation/Engineering/IMSUB.data | 10 - .../Calculation/Engineering/IMSUM.data | 10 - .../Calculation/Engineering/OCT2BIN.data | 13 - .../Calculation/Engineering/OCT2DEC.data | 9 - .../Calculation/Engineering/OCT2HEX.data | 9 - .../Calculation/Financial/ACCRINT.data | 8 - .../Calculation/Financial/ACCRINTM.data | 6 - .../Calculation/Financial/AMORDEGRC.data | 3 - .../Calculation/Financial/AMORLINC.data | 3 - .../Calculation/Financial/COUPDAYBS.data | 6 - .../Calculation/Financial/COUPDAYS.data | 6 - .../Calculation/Financial/COUPDAYSNC.data | 6 - .../Calculation/Financial/COUPNCD.data | 6 - .../Calculation/Financial/COUPNUM.data | 7 - .../Calculation/Financial/COUPPCD.data | 6 - .../Calculation/Financial/CUMIPMT.data | 10 - .../Calculation/Financial/CUMPRINC.data | 10 - .../rawTestData/Calculation/Financial/DB.data | 17 - .../Calculation/Financial/DDB.data | 16 - .../Calculation/Financial/DISC.data | 6 - .../Calculation/Financial/DOLLARDE.data | 10 - .../Calculation/Financial/DOLLARFR.data | 10 - .../Calculation/Financial/EFFECT.data | 6 - .../rawTestData/Calculation/Financial/FV.data | 9 - .../Calculation/Financial/FVSCHEDULE.data | 4 - .../Calculation/Financial/INTRATE.data | 6 - .../Calculation/Financial/IPMT.data | 9 - .../Calculation/Financial/IRR.data | 6 - .../Calculation/Financial/ISPMT.data | 5 - .../Calculation/Financial/MIRR.data | 6 - .../Calculation/Financial/NOMINAL.data | 6 - .../Calculation/Financial/NPER.data | 10 - .../Calculation/Financial/NPV.data | 5 - .../Calculation/Financial/PRICE.data | 10 - .../Calculation/Financial/RATE.data | 11 - .../Calculation/Financial/XIRR.data | 4 - .../Calculation/Functions/ERROR_TYPE.data | 14 - .../Calculation/Functions/IS_BLANK.data | 16 - .../Calculation/Functions/IS_ERR.data | 16 - .../Calculation/Functions/IS_ERROR.data | 16 - .../Calculation/Functions/IS_EVEN.data | 20 - .../Calculation/Functions/IS_LOGICAL.data | 16 - .../Calculation/Functions/IS_NA.data | 16 - .../Calculation/Functions/IS_NONTEXT.data | 16 - .../Calculation/Functions/IS_NUMBER.data | 16 - .../Calculation/Functions/IS_ODD.data | 20 - .../Calculation/Functions/IS_TEXT.data | 16 - .../rawTestData/Calculation/Functions/N.data | 20 - .../Calculation/Functions/TYPE.data | 16 - .../rawTestData/Calculation/Logical/AND.data | 21 - tests/rawTestData/Calculation/Logical/IF.data | 7 - .../Calculation/Logical/IFERROR.data | 8 - .../rawTestData/Calculation/Logical/NOT.data | 20 - tests/rawTestData/Calculation/Logical/OR.data | 20 - .../Calculation/LookupRef/HLOOKUP.data | 9 - .../Calculation/LookupRef/VLOOKUP.data | 5 - .../Calculation/MathTrig/ATAN2.data | 17 - .../Calculation/MathTrig/CEILING.data | 21 - .../Calculation/MathTrig/COMBIN.data | 25 - .../Calculation/MathTrig/EVEN.data | 17 - .../Calculation/MathTrig/FACT.data | 10 - .../Calculation/MathTrig/FACTDOUBLE.data | 8 - .../Calculation/MathTrig/FLOOR.data | 11 - .../rawTestData/Calculation/MathTrig/GCD.data | 20 - .../rawTestData/Calculation/MathTrig/INT.data | 19 - .../rawTestData/Calculation/MathTrig/LCM.data | 12 - .../rawTestData/Calculation/MathTrig/LOG.data | 70 - .../Calculation/MathTrig/MDETERM.data | 14 - .../Calculation/MathTrig/MINVERSE.data | 15 - .../Calculation/MathTrig/MMULT.data | 12 - .../rawTestData/Calculation/MathTrig/MOD.data | 9 - .../Calculation/MathTrig/MROUND.data | 11 - .../Calculation/MathTrig/MULTINOMIAL.data | 2 - .../rawTestData/Calculation/MathTrig/ODD.data | 13 - .../Calculation/MathTrig/POWER.data | 81 - .../Calculation/MathTrig/PRODUCT.data | 7 - .../Calculation/MathTrig/QUOTIENT.data | 6 - .../Calculation/MathTrig/ROMAN.data | 5 - .../Calculation/MathTrig/ROUNDDOWN.data | 14 - .../Calculation/MathTrig/ROUNDUP.data | 14 - .../Calculation/MathTrig/SERIESSUM.data | 2 - .../Calculation/MathTrig/SIGN.data | 13 - .../Calculation/MathTrig/SQRTPI.data | 15 - .../Calculation/MathTrig/SUMSQ.data | 7 - .../Calculation/MathTrig/TRUNC.data | 19 - .../Calculation/TextData/CHAR.data | 5 - .../Calculation/TextData/CLEAN.data | 5 - .../Calculation/TextData/CODE.data | 12 - .../Calculation/TextData/CONCATENATE.data | 3 - .../Calculation/TextData/DOLLAR.data | 6 - .../Calculation/TextData/FIND.data | 13 - .../Calculation/TextData/FIXED.data | 5 - .../Calculation/TextData/LEFT.data | 6 - .../rawTestData/Calculation/TextData/LEN.data | 6 - .../Calculation/TextData/LOWER.data | 4 - .../rawTestData/Calculation/TextData/MID.data | 9 - .../Calculation/TextData/PROPER.data | 3 - .../Calculation/TextData/REPLACE.data | 4 - .../Calculation/TextData/RIGHT.data | 6 - .../Calculation/TextData/SEARCH.data | 11 - .../Calculation/TextData/SUBSTITUTE.data | 4 - tests/rawTestData/Calculation/TextData/T.data | 5 - .../Calculation/TextData/TEXT.data | 13 - .../Calculation/TextData/TRIM.data | 7 - .../Calculation/TextData/UPPER.data | 4 - .../Calculation/TextData/VALUE.data | 10 - .../CalculationBinaryComparisonOperation.data | 53 - .../rawTestData/Cell/DefaultValueBinder.json | 18 - tests/rawTestData/CellAbsoluteCoordinate.data | 12 - tests/rawTestData/CellAbsoluteReference.data | 16 - tests/rawTestData/CellBuildRange.data | 2 - tests/rawTestData/CellCoordinates.data | 6 - .../CellExtractAllCellReferencesInRange.data | 9 - tests/rawTestData/CellGetRangeBoundaries.data | 2 - tests/rawTestData/CellRangeBoundaries.data | 2 - tests/rawTestData/CellRangeDimension.data | 2 - tests/rawTestData/CellSplitRange.data | 3 - tests/rawTestData/ColumnIndex.data | 12 - tests/rawTestData/ColumnString.data | 12 - .../Shared/CentimeterSizeToPixels.data | 5 - tests/rawTestData/Shared/CodePage.data | 43 - .../rawTestData/Shared/FontSizeToPixels.data | 16 - .../rawTestData/Shared/InchSizeToPixels.data | 5 - tests/rawTestData/Shared/PasswordHashes.data | 6 - .../Style/ColorChangeBrightness.json | 14 - tests/rawTestData/Style/ColorGetBlue.data | 6 - tests/rawTestData/Style/ColorGetGreen.data | 6 - tests/rawTestData/Style/ColorGetRed.data | 6 - tests/rawTestData/Style/NumberFormat.data | 37 - .../rawTestData/Style/NumberFormatDates.data | 6 - 403 files changed, 20307 insertions(+), 3959 deletions(-) delete mode 100644 tests/PhpSpreadsheet/TestDataFileIterator.php delete mode 100644 tests/PhpSpreadsheet/TestDataFileIteratorJson.php create mode 100644 tests/data/Calculation/DateTime/DATE.php create mode 100644 tests/data/Calculation/DateTime/DATEDIF.php create mode 100644 tests/data/Calculation/DateTime/DATEVALUE.php create mode 100644 tests/data/Calculation/DateTime/DAY.php create mode 100644 tests/data/Calculation/DateTime/DAYS360.php create mode 100644 tests/data/Calculation/DateTime/EDATE.php create mode 100644 tests/data/Calculation/DateTime/EOMONTH.php create mode 100644 tests/data/Calculation/DateTime/HOUR.php create mode 100644 tests/data/Calculation/DateTime/MINUTE.php create mode 100644 tests/data/Calculation/DateTime/MONTH.php create mode 100644 tests/data/Calculation/DateTime/NETWORKDAYS.php create mode 100644 tests/data/Calculation/DateTime/SECOND.php create mode 100644 tests/data/Calculation/DateTime/TIME.php create mode 100644 tests/data/Calculation/DateTime/TIMEVALUE.php create mode 100644 tests/data/Calculation/DateTime/WEEKDAY.php create mode 100644 tests/data/Calculation/DateTime/WEEKNUM.php create mode 100644 tests/data/Calculation/DateTime/WORKDAY.php create mode 100644 tests/data/Calculation/DateTime/YEAR.php create mode 100644 tests/data/Calculation/DateTime/YEARFRAC.php create mode 100644 tests/data/Calculation/Engineering/BESSELI.php create mode 100644 tests/data/Calculation/Engineering/BESSELJ.php create mode 100644 tests/data/Calculation/Engineering/BESSELK.php create mode 100644 tests/data/Calculation/Engineering/BESSELY.php create mode 100644 tests/data/Calculation/Engineering/BIN2DEC.php create mode 100644 tests/data/Calculation/Engineering/BIN2HEX.php create mode 100644 tests/data/Calculation/Engineering/BIN2OCT.php create mode 100644 tests/data/Calculation/Engineering/COMPLEX.php create mode 100644 tests/data/Calculation/Engineering/CONVERTUOM.php create mode 100644 tests/data/Calculation/Engineering/DEC2BIN.php create mode 100644 tests/data/Calculation/Engineering/DEC2HEX.php create mode 100644 tests/data/Calculation/Engineering/DEC2OCT.php create mode 100644 tests/data/Calculation/Engineering/DELTA.php create mode 100644 tests/data/Calculation/Engineering/ERF.php create mode 100644 tests/data/Calculation/Engineering/ERFC.php create mode 100644 tests/data/Calculation/Engineering/GESTEP.php create mode 100644 tests/data/Calculation/Engineering/HEX2BIN.php create mode 100644 tests/data/Calculation/Engineering/HEX2DEC.php create mode 100644 tests/data/Calculation/Engineering/HEX2OCT.php create mode 100644 tests/data/Calculation/Engineering/IMABS.php create mode 100644 tests/data/Calculation/Engineering/IMAGINARY.php create mode 100644 tests/data/Calculation/Engineering/IMARGUMENT.php create mode 100644 tests/data/Calculation/Engineering/IMCONJUGATE.php create mode 100644 tests/data/Calculation/Engineering/IMCOS.php create mode 100644 tests/data/Calculation/Engineering/IMDIV.php create mode 100644 tests/data/Calculation/Engineering/IMEXP.php create mode 100644 tests/data/Calculation/Engineering/IMLN.php create mode 100644 tests/data/Calculation/Engineering/IMLOG10.php create mode 100644 tests/data/Calculation/Engineering/IMLOG2.php create mode 100644 tests/data/Calculation/Engineering/IMPOWER.php create mode 100644 tests/data/Calculation/Engineering/IMPRODUCT.php create mode 100644 tests/data/Calculation/Engineering/IMREAL.php create mode 100644 tests/data/Calculation/Engineering/IMSIN.php create mode 100644 tests/data/Calculation/Engineering/IMSQRT.php create mode 100644 tests/data/Calculation/Engineering/IMSUB.php create mode 100644 tests/data/Calculation/Engineering/IMSUM.php create mode 100644 tests/data/Calculation/Engineering/OCT2BIN.php create mode 100644 tests/data/Calculation/Engineering/OCT2DEC.php create mode 100644 tests/data/Calculation/Engineering/OCT2HEX.php create mode 100644 tests/data/Calculation/Financial/ACCRINT.php create mode 100644 tests/data/Calculation/Financial/ACCRINTM.php create mode 100644 tests/data/Calculation/Financial/AMORDEGRC.php create mode 100644 tests/data/Calculation/Financial/AMORLINC.php create mode 100644 tests/data/Calculation/Financial/COUPDAYBS.php create mode 100644 tests/data/Calculation/Financial/COUPDAYS.php create mode 100644 tests/data/Calculation/Financial/COUPDAYSNC.php create mode 100644 tests/data/Calculation/Financial/COUPNCD.php create mode 100644 tests/data/Calculation/Financial/COUPNUM.php create mode 100644 tests/data/Calculation/Financial/COUPPCD.php create mode 100644 tests/data/Calculation/Financial/CUMIPMT.php create mode 100644 tests/data/Calculation/Financial/CUMPRINC.php create mode 100644 tests/data/Calculation/Financial/DB.php create mode 100644 tests/data/Calculation/Financial/DDB.php create mode 100644 tests/data/Calculation/Financial/DISC.php create mode 100644 tests/data/Calculation/Financial/DOLLARDE.php create mode 100644 tests/data/Calculation/Financial/DOLLARFR.php create mode 100644 tests/data/Calculation/Financial/EFFECT.php create mode 100644 tests/data/Calculation/Financial/FV.php create mode 100644 tests/data/Calculation/Financial/FVSCHEDULE.php create mode 100644 tests/data/Calculation/Financial/INTRATE.php create mode 100644 tests/data/Calculation/Financial/IPMT.php create mode 100644 tests/data/Calculation/Financial/IRR.php create mode 100644 tests/data/Calculation/Financial/ISPMT.php create mode 100644 tests/data/Calculation/Financial/MIRR.php create mode 100644 tests/data/Calculation/Financial/NOMINAL.php create mode 100644 tests/data/Calculation/Financial/NPER.php create mode 100644 tests/data/Calculation/Financial/NPV.php create mode 100644 tests/data/Calculation/Financial/PRICE.php create mode 100644 tests/data/Calculation/Financial/RATE.php create mode 100644 tests/data/Calculation/Financial/XIRR.php create mode 100644 tests/data/Calculation/Functions/ERROR_TYPE.php create mode 100644 tests/data/Calculation/Functions/IS_BLANK.php create mode 100644 tests/data/Calculation/Functions/IS_ERR.php create mode 100644 tests/data/Calculation/Functions/IS_ERROR.php create mode 100644 tests/data/Calculation/Functions/IS_EVEN.php create mode 100644 tests/data/Calculation/Functions/IS_LOGICAL.php create mode 100644 tests/data/Calculation/Functions/IS_NA.php create mode 100644 tests/data/Calculation/Functions/IS_NONTEXT.php create mode 100644 tests/data/Calculation/Functions/IS_NUMBER.php create mode 100644 tests/data/Calculation/Functions/IS_ODD.php create mode 100644 tests/data/Calculation/Functions/IS_TEXT.php create mode 100644 tests/data/Calculation/Functions/N.php create mode 100644 tests/data/Calculation/Functions/TYPE.php create mode 100644 tests/data/Calculation/Logical/AND.php create mode 100644 tests/data/Calculation/Logical/IF.php create mode 100644 tests/data/Calculation/Logical/IFERROR.php create mode 100644 tests/data/Calculation/Logical/NOT.php create mode 100644 tests/data/Calculation/Logical/OR.php create mode 100644 tests/data/Calculation/LookupRef/HLOOKUP.php create mode 100644 tests/data/Calculation/LookupRef/VLOOKUP.php create mode 100644 tests/data/Calculation/MathTrig/ATAN2.php create mode 100644 tests/data/Calculation/MathTrig/CEILING.php create mode 100644 tests/data/Calculation/MathTrig/COMBIN.php create mode 100644 tests/data/Calculation/MathTrig/EVEN.php create mode 100644 tests/data/Calculation/MathTrig/FACT.php create mode 100644 tests/data/Calculation/MathTrig/FACTDOUBLE.php create mode 100644 tests/data/Calculation/MathTrig/FLOOR.php create mode 100644 tests/data/Calculation/MathTrig/GCD.php create mode 100644 tests/data/Calculation/MathTrig/INT.php create mode 100644 tests/data/Calculation/MathTrig/LCM.php create mode 100644 tests/data/Calculation/MathTrig/LOG.php create mode 100644 tests/data/Calculation/MathTrig/MDETERM.php create mode 100644 tests/data/Calculation/MathTrig/MINVERSE.php create mode 100644 tests/data/Calculation/MathTrig/MMULT.php create mode 100644 tests/data/Calculation/MathTrig/MOD.php create mode 100644 tests/data/Calculation/MathTrig/MROUND.php create mode 100644 tests/data/Calculation/MathTrig/MULTINOMIAL.php create mode 100644 tests/data/Calculation/MathTrig/ODD.php create mode 100644 tests/data/Calculation/MathTrig/POWER.php create mode 100644 tests/data/Calculation/MathTrig/PRODUCT.php create mode 100644 tests/data/Calculation/MathTrig/QUOTIENT.php create mode 100644 tests/data/Calculation/MathTrig/ROMAN.php create mode 100644 tests/data/Calculation/MathTrig/ROUNDDOWN.php create mode 100644 tests/data/Calculation/MathTrig/ROUNDUP.php create mode 100644 tests/data/Calculation/MathTrig/SERIESSUM.php create mode 100644 tests/data/Calculation/MathTrig/SIGN.php create mode 100644 tests/data/Calculation/MathTrig/SQRTPI.php create mode 100644 tests/data/Calculation/MathTrig/SUMSQ.php create mode 100644 tests/data/Calculation/MathTrig/TRUNC.php create mode 100644 tests/data/Calculation/TextData/CHAR.php create mode 100644 tests/data/Calculation/TextData/CLEAN.php create mode 100644 tests/data/Calculation/TextData/CODE.php create mode 100644 tests/data/Calculation/TextData/CONCATENATE.php create mode 100644 tests/data/Calculation/TextData/DOLLAR.php create mode 100644 tests/data/Calculation/TextData/FIND.php create mode 100644 tests/data/Calculation/TextData/FIXED.php create mode 100644 tests/data/Calculation/TextData/LEFT.php create mode 100644 tests/data/Calculation/TextData/LEN.php create mode 100644 tests/data/Calculation/TextData/LOWER.php create mode 100644 tests/data/Calculation/TextData/MID.php create mode 100644 tests/data/Calculation/TextData/PROPER.php create mode 100644 tests/data/Calculation/TextData/REPLACE.php create mode 100644 tests/data/Calculation/TextData/RIGHT.php create mode 100644 tests/data/Calculation/TextData/SEARCH.php create mode 100644 tests/data/Calculation/TextData/SUBSTITUTE.php create mode 100644 tests/data/Calculation/TextData/T.php create mode 100644 tests/data/Calculation/TextData/TEXT.php create mode 100644 tests/data/Calculation/TextData/TRIM.php create mode 100644 tests/data/Calculation/TextData/UPPER.php create mode 100644 tests/data/Calculation/TextData/VALUE.php create mode 100644 tests/data/CalculationBinaryComparisonOperation.php create mode 100644 tests/data/Cell/DefaultValueBinder.php create mode 100644 tests/data/CellAbsoluteCoordinate.php create mode 100644 tests/data/CellAbsoluteReference.php create mode 100644 tests/data/CellBuildRange.php create mode 100644 tests/data/CellCoordinates.php create mode 100644 tests/data/CellExtractAllCellReferencesInRange.php create mode 100644 tests/data/CellGetRangeBoundaries.php create mode 100644 tests/data/CellRangeBoundaries.php create mode 100644 tests/data/CellRangeDimension.php create mode 100644 tests/data/CellSplitRange.php create mode 100644 tests/data/ColumnIndex.php create mode 100644 tests/data/ColumnString.php rename tests/{rawTestData => data}/Reader/XEETestInvalidUTF-16.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestInvalidUTF-16BE.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestInvalidUTF-16LE.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestInvalidUTF-8.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestValidUTF-16.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestValidUTF-16BE.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestValidUTF-16LE.xml (100%) rename tests/{rawTestData => data}/Reader/XEETestValidUTF-8.xml (100%) create mode 100644 tests/data/Shared/CentimeterSizeToPixels.php create mode 100644 tests/data/Shared/CodePage.php rename tests/{rawTestData => data}/Shared/Date/DateTimeToExcel.php (100%) rename tests/{rawTestData => data}/Shared/Date/ExcelToTimestamp1900.php (100%) rename tests/{rawTestData => data}/Shared/Date/ExcelToTimestamp1900Timezone.php (100%) rename tests/{rawTestData => data}/Shared/Date/ExcelToTimestamp1904.php (100%) rename tests/{rawTestData => data}/Shared/Date/FormatCodes.php (100%) rename tests/{rawTestData => data}/Shared/Date/FormattedPHPToExcel1900.php (100%) rename tests/{rawTestData => data}/Shared/Date/TimestampToExcel1900.php (100%) rename tests/{rawTestData => data}/Shared/Date/TimestampToExcel1904.php (100%) create mode 100644 tests/data/Shared/FontSizeToPixels.php create mode 100644 tests/data/Shared/InchSizeToPixels.php create mode 100644 tests/data/Shared/PasswordHashes.php create mode 100644 tests/data/Style/ColorChangeBrightness.php create mode 100644 tests/data/Style/ColorGetBlue.php create mode 100644 tests/data/Style/ColorGetGreen.php create mode 100644 tests/data/Style/ColorGetRed.php create mode 100644 tests/data/Style/NumberFormat.php create mode 100644 tests/data/Style/NumberFormatDates.php delete mode 100644 tests/rawTestData/Calculation/DateTime/DATE.data delete mode 100644 tests/rawTestData/Calculation/DateTime/DATEDIF.data delete mode 100644 tests/rawTestData/Calculation/DateTime/DATEVALUE.data delete mode 100644 tests/rawTestData/Calculation/DateTime/DAY.data delete mode 100644 tests/rawTestData/Calculation/DateTime/DAYS360.data delete mode 100644 tests/rawTestData/Calculation/DateTime/EDATE.data delete mode 100644 tests/rawTestData/Calculation/DateTime/EOMONTH.data delete mode 100644 tests/rawTestData/Calculation/DateTime/HOUR.data delete mode 100644 tests/rawTestData/Calculation/DateTime/MINUTE.data delete mode 100644 tests/rawTestData/Calculation/DateTime/MONTH.data delete mode 100644 tests/rawTestData/Calculation/DateTime/NETWORKDAYS.data delete mode 100644 tests/rawTestData/Calculation/DateTime/SECOND.data delete mode 100644 tests/rawTestData/Calculation/DateTime/TIME.data delete mode 100644 tests/rawTestData/Calculation/DateTime/TIMEVALUE.data delete mode 100644 tests/rawTestData/Calculation/DateTime/WEEKDAY.data delete mode 100644 tests/rawTestData/Calculation/DateTime/WEEKNUM.data delete mode 100644 tests/rawTestData/Calculation/DateTime/WORKDAY.data delete mode 100644 tests/rawTestData/Calculation/DateTime/YEAR.data delete mode 100644 tests/rawTestData/Calculation/DateTime/YEARFRAC.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BESSELI.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BESSELJ.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BESSELK.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BESSELY.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BIN2DEC.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BIN2HEX.data delete mode 100644 tests/rawTestData/Calculation/Engineering/BIN2OCT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/COMPLEX.data delete mode 100644 tests/rawTestData/Calculation/Engineering/CONVERTUOM.data delete mode 100644 tests/rawTestData/Calculation/Engineering/DEC2BIN.data delete mode 100644 tests/rawTestData/Calculation/Engineering/DEC2HEX.data delete mode 100644 tests/rawTestData/Calculation/Engineering/DEC2OCT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/DELTA.data delete mode 100644 tests/rawTestData/Calculation/Engineering/ERF.data delete mode 100644 tests/rawTestData/Calculation/Engineering/ERFC.data delete mode 100644 tests/rawTestData/Calculation/Engineering/GESTEP.data delete mode 100644 tests/rawTestData/Calculation/Engineering/HEX2BIN.data delete mode 100644 tests/rawTestData/Calculation/Engineering/HEX2DEC.data delete mode 100644 tests/rawTestData/Calculation/Engineering/HEX2OCT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMABS.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMAGINARY.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMARGUMENT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMCONJUGATE.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMCOS.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMDIV.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMEXP.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMLN.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMLOG10.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMLOG2.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMPOWER.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMPRODUCT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMREAL.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMSIN.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMSQRT.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMSUB.data delete mode 100644 tests/rawTestData/Calculation/Engineering/IMSUM.data delete mode 100644 tests/rawTestData/Calculation/Engineering/OCT2BIN.data delete mode 100644 tests/rawTestData/Calculation/Engineering/OCT2DEC.data delete mode 100644 tests/rawTestData/Calculation/Engineering/OCT2HEX.data delete mode 100644 tests/rawTestData/Calculation/Financial/ACCRINT.data delete mode 100644 tests/rawTestData/Calculation/Financial/ACCRINTM.data delete mode 100644 tests/rawTestData/Calculation/Financial/AMORDEGRC.data delete mode 100644 tests/rawTestData/Calculation/Financial/AMORLINC.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPDAYBS.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPDAYS.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPDAYSNC.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPNCD.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPNUM.data delete mode 100644 tests/rawTestData/Calculation/Financial/COUPPCD.data delete mode 100644 tests/rawTestData/Calculation/Financial/CUMIPMT.data delete mode 100644 tests/rawTestData/Calculation/Financial/CUMPRINC.data delete mode 100644 tests/rawTestData/Calculation/Financial/DB.data delete mode 100644 tests/rawTestData/Calculation/Financial/DDB.data delete mode 100644 tests/rawTestData/Calculation/Financial/DISC.data delete mode 100644 tests/rawTestData/Calculation/Financial/DOLLARDE.data delete mode 100644 tests/rawTestData/Calculation/Financial/DOLLARFR.data delete mode 100644 tests/rawTestData/Calculation/Financial/EFFECT.data delete mode 100644 tests/rawTestData/Calculation/Financial/FV.data delete mode 100644 tests/rawTestData/Calculation/Financial/FVSCHEDULE.data delete mode 100644 tests/rawTestData/Calculation/Financial/INTRATE.data delete mode 100644 tests/rawTestData/Calculation/Financial/IPMT.data delete mode 100644 tests/rawTestData/Calculation/Financial/IRR.data delete mode 100644 tests/rawTestData/Calculation/Financial/ISPMT.data delete mode 100644 tests/rawTestData/Calculation/Financial/MIRR.data delete mode 100644 tests/rawTestData/Calculation/Financial/NOMINAL.data delete mode 100644 tests/rawTestData/Calculation/Financial/NPER.data delete mode 100644 tests/rawTestData/Calculation/Financial/NPV.data delete mode 100644 tests/rawTestData/Calculation/Financial/PRICE.data delete mode 100644 tests/rawTestData/Calculation/Financial/RATE.data delete mode 100644 tests/rawTestData/Calculation/Financial/XIRR.data delete mode 100644 tests/rawTestData/Calculation/Functions/ERROR_TYPE.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_BLANK.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_ERR.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_ERROR.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_EVEN.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_LOGICAL.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_NA.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_NONTEXT.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_NUMBER.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_ODD.data delete mode 100644 tests/rawTestData/Calculation/Functions/IS_TEXT.data delete mode 100644 tests/rawTestData/Calculation/Functions/N.data delete mode 100644 tests/rawTestData/Calculation/Functions/TYPE.data delete mode 100644 tests/rawTestData/Calculation/Logical/AND.data delete mode 100644 tests/rawTestData/Calculation/Logical/IF.data delete mode 100644 tests/rawTestData/Calculation/Logical/IFERROR.data delete mode 100644 tests/rawTestData/Calculation/Logical/NOT.data delete mode 100644 tests/rawTestData/Calculation/Logical/OR.data delete mode 100644 tests/rawTestData/Calculation/LookupRef/HLOOKUP.data delete mode 100644 tests/rawTestData/Calculation/LookupRef/VLOOKUP.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/ATAN2.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/CEILING.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/COMBIN.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/EVEN.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/FACT.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/FLOOR.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/GCD.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/INT.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/LCM.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/LOG.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MDETERM.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MINVERSE.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MMULT.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MOD.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MROUND.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/ODD.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/POWER.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/PRODUCT.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/QUOTIENT.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/ROMAN.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/ROUNDUP.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/SERIESSUM.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/SIGN.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/SQRTPI.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/SUMSQ.data delete mode 100644 tests/rawTestData/Calculation/MathTrig/TRUNC.data delete mode 100644 tests/rawTestData/Calculation/TextData/CHAR.data delete mode 100644 tests/rawTestData/Calculation/TextData/CLEAN.data delete mode 100644 tests/rawTestData/Calculation/TextData/CODE.data delete mode 100644 tests/rawTestData/Calculation/TextData/CONCATENATE.data delete mode 100644 tests/rawTestData/Calculation/TextData/DOLLAR.data delete mode 100644 tests/rawTestData/Calculation/TextData/FIND.data delete mode 100644 tests/rawTestData/Calculation/TextData/FIXED.data delete mode 100644 tests/rawTestData/Calculation/TextData/LEFT.data delete mode 100644 tests/rawTestData/Calculation/TextData/LEN.data delete mode 100644 tests/rawTestData/Calculation/TextData/LOWER.data delete mode 100644 tests/rawTestData/Calculation/TextData/MID.data delete mode 100644 tests/rawTestData/Calculation/TextData/PROPER.data delete mode 100644 tests/rawTestData/Calculation/TextData/REPLACE.data delete mode 100644 tests/rawTestData/Calculation/TextData/RIGHT.data delete mode 100644 tests/rawTestData/Calculation/TextData/SEARCH.data delete mode 100644 tests/rawTestData/Calculation/TextData/SUBSTITUTE.data delete mode 100644 tests/rawTestData/Calculation/TextData/T.data delete mode 100644 tests/rawTestData/Calculation/TextData/TEXT.data delete mode 100644 tests/rawTestData/Calculation/TextData/TRIM.data delete mode 100644 tests/rawTestData/Calculation/TextData/UPPER.data delete mode 100644 tests/rawTestData/Calculation/TextData/VALUE.data delete mode 100644 tests/rawTestData/CalculationBinaryComparisonOperation.data delete mode 100644 tests/rawTestData/Cell/DefaultValueBinder.json delete mode 100644 tests/rawTestData/CellAbsoluteCoordinate.data delete mode 100644 tests/rawTestData/CellAbsoluteReference.data delete mode 100644 tests/rawTestData/CellBuildRange.data delete mode 100644 tests/rawTestData/CellCoordinates.data delete mode 100644 tests/rawTestData/CellExtractAllCellReferencesInRange.data delete mode 100644 tests/rawTestData/CellGetRangeBoundaries.data delete mode 100644 tests/rawTestData/CellRangeBoundaries.data delete mode 100644 tests/rawTestData/CellRangeDimension.data delete mode 100644 tests/rawTestData/CellSplitRange.data delete mode 100644 tests/rawTestData/ColumnIndex.data delete mode 100644 tests/rawTestData/ColumnString.data delete mode 100644 tests/rawTestData/Shared/CentimeterSizeToPixels.data delete mode 100644 tests/rawTestData/Shared/CodePage.data delete mode 100644 tests/rawTestData/Shared/FontSizeToPixels.data delete mode 100644 tests/rawTestData/Shared/InchSizeToPixels.data delete mode 100644 tests/rawTestData/Shared/PasswordHashes.data delete mode 100644 tests/rawTestData/Style/ColorChangeBrightness.json delete mode 100644 tests/rawTestData/Style/ColorGetBlue.data delete mode 100644 tests/rawTestData/Style/ColorGetGreen.data delete mode 100644 tests/rawTestData/Style/ColorGetRed.data delete mode 100644 tests/rawTestData/Style/NumberFormat.data delete mode 100644 tests/rawTestData/Style/NumberFormatDates.data diff --git a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php index 8560fa1d..476cade4 100644 --- a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php +++ b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php @@ -2,7 +2,6 @@ namespace PhpSpreadsheet\Tests\Calculation; -use PhpSpreadsheet\Tests\TestDataFileIterator; use PHPExcel\Shared\Date; use PHPExcel\Calculation\Functions; use PHPExcel\Calculation\DateTime; @@ -32,7 +31,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATE() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/DATE.data'); + return require 'data/Calculation/DateTime/DATE.php'; } public function testDATEtoPHP() @@ -85,7 +84,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATEVALUE() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data'); + return require 'data/Calculation/DateTime/DATEVALUE.php'; } public function testDATEVALUEtoPHP() @@ -122,7 +121,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerYEAR() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/YEAR.data'); + return require 'data/Calculation/DateTime/YEAR.php'; } /** @@ -138,7 +137,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerMONTH() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/MONTH.data'); + return require 'data/Calculation/DateTime/MONTH.php'; } /** @@ -157,7 +156,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerWEEKNUM() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/WEEKNUM.data'); + return require 'data/Calculation/DateTime/WEEKNUM.php'; } /** @@ -176,7 +175,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerWEEKDAY() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/WEEKDAY.data'); + return require 'data/Calculation/DateTime/WEEKDAY.php'; } /** @@ -192,7 +191,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDAY() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/DAY.data'); + return require 'data/Calculation/DateTime/DAY.php'; } /** @@ -208,7 +207,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerTIME() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/TIME.data'); + return require 'data/Calculation/DateTime/TIME.php'; } public function testTIMEtoPHP() @@ -247,7 +246,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerTIMEVALUE() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data'); + return require 'data/Calculation/DateTime/TIMEVALUE.php'; } public function testTIMEVALUEtoPHP() @@ -286,7 +285,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerHOUR() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/HOUR.data'); + return require 'data/Calculation/DateTime/HOUR.php'; } /** @@ -304,7 +303,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerMINUTE() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/MINUTE.data'); + return require 'data/Calculation/DateTime/MINUTE.php'; } /** @@ -322,7 +321,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerSECOND() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/SECOND.data'); + return require 'data/Calculation/DateTime/SECOND.php'; } /** @@ -338,7 +337,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerNETWORKDAYS() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/NETWORKDAYS.data'); + return require 'data/Calculation/DateTime/NETWORKDAYS.php'; } /** @@ -354,7 +353,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerWORKDAY() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/WORKDAY.data'); + return require 'data/Calculation/DateTime/WORKDAY.php'; } /** @@ -370,7 +369,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerEDATE() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data'); + return require 'data/Calculation/DateTime/EDATE.php'; } public function testEDATEtoPHP() @@ -407,7 +406,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerEOMONTH() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data'); + return require 'data/Calculation/DateTime/EOMONTH.php'; } public function testEOMONTHtoPHP() @@ -447,7 +446,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATEDIF() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/DATEDIF.data'); + return require 'data/Calculation/DateTime/DATEDIF.php'; } /** @@ -463,7 +462,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDAYS360() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/DAYS360.data'); + return require 'data/Calculation/DateTime/DAYS360.php'; } /** @@ -482,6 +481,6 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerYEARFRAC() { - return new TestDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data'); + return require 'data/Calculation/DateTime/YEARFRAC.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php index eec964ba..a8a58bb2 100644 --- a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php +++ b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php @@ -37,7 +37,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELI() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data'); + return require 'data/Calculation/Engineering/BESSELI.php'; } /** @@ -53,7 +53,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELJ() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data'); + return require 'data/Calculation/Engineering/BESSELJ.php'; } /** @@ -69,7 +69,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELK() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data'); + return require 'data/Calculation/Engineering/BESSELK.php'; } /** @@ -85,7 +85,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELY() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data'); + return require 'data/Calculation/Engineering/BESSELY.php'; } /** @@ -101,7 +101,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerCOMPLEX() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data'); + return require 'data/Calculation/Engineering/COMPLEX.php'; } /** @@ -117,7 +117,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMAGINARY() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data'); + return require 'data/Calculation/Engineering/IMAGINARY.php'; } /** @@ -133,7 +133,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMREAL() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data'); + return require 'data/Calculation/Engineering/IMREAL.php'; } /** @@ -149,7 +149,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMABS() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data'); + return require 'data/Calculation/Engineering/IMABS.php'; } /** @@ -166,7 +166,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMARGUMENT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data'); + return require 'data/Calculation/Engineering/IMARGUMENT.php'; } /** @@ -182,7 +182,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMCONJUGATE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data'); + return require 'data/Calculation/Engineering/IMCONJUGATE.php'; } /** @@ -198,7 +198,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMCOS() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data'); + return require 'data/Calculation/Engineering/IMCOS.php'; } /** @@ -217,7 +217,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMDIV() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data'); + return require 'data/Calculation/Engineering/IMDIV.php'; } /** @@ -233,7 +233,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMEXP() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data'); + return require 'data/Calculation/Engineering/IMEXP.php'; } /** @@ -249,7 +249,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMLN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data'); + return require 'data/Calculation/Engineering/IMLN.php'; } /** @@ -265,7 +265,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMLOG2() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data'); + return require 'data/Calculation/Engineering/IMLOG2.php'; } /** @@ -281,7 +281,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMLOG10() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data'); + return require 'data/Calculation/Engineering/IMLOG10.php'; } /** @@ -300,7 +300,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMPOWER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data'); + return require 'data/Calculation/Engineering/IMPOWER.php'; } /** @@ -316,7 +316,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMPRODUCT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data'); + return require 'data/Calculation/Engineering/IMPRODUCT.php'; } /** @@ -332,7 +332,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMSIN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data'); + return require 'data/Calculation/Engineering/IMSIN.php'; } /** @@ -348,7 +348,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMSQRT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data'); + return require 'data/Calculation/Engineering/IMSQRT.php'; } /** @@ -367,7 +367,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMSUB() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data'); + return require 'data/Calculation/Engineering/IMSUB.php'; } /** @@ -384,7 +384,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMSUM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data'); + return require 'data/Calculation/Engineering/IMSUM.php'; } /** @@ -400,7 +400,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerERF() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data'); + return require 'data/Calculation/Engineering/ERF.php'; } /** @@ -416,7 +416,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerERFC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data'); + return require 'data/Calculation/Engineering/ERFC.php'; } /** @@ -432,7 +432,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2DEC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data'); + return require 'data/Calculation/Engineering/BIN2DEC.php'; } /** @@ -448,7 +448,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2HEX() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data'); + return require 'data/Calculation/Engineering/BIN2HEX.php'; } /** @@ -464,7 +464,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2OCT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data'); + return require 'data/Calculation/Engineering/BIN2OCT.php'; } /** @@ -480,7 +480,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2BIN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data'); + return require 'data/Calculation/Engineering/DEC2BIN.php'; } /** @@ -496,7 +496,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2HEX() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data'); + return require 'data/Calculation/Engineering/DEC2HEX.php'; } /** @@ -512,7 +512,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2OCT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data'); + return require 'data/Calculation/Engineering/DEC2OCT.php'; } /** @@ -528,7 +528,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2BIN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data'); + return require 'data/Calculation/Engineering/HEX2BIN.php'; } /** @@ -544,7 +544,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2DEC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data'); + return require 'data/Calculation/Engineering/HEX2DEC.php'; } /** @@ -560,7 +560,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2OCT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data'); + return require 'data/Calculation/Engineering/HEX2OCT.php'; } /** @@ -576,7 +576,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2BIN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data'); + return require 'data/Calculation/Engineering/OCT2BIN.php'; } /** @@ -592,7 +592,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2DEC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data'); + return require 'data/Calculation/Engineering/OCT2DEC.php'; } /** @@ -608,7 +608,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2HEX() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data'); + return require 'data/Calculation/Engineering/OCT2HEX.php'; } /** @@ -624,7 +624,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDELTA() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data'); + return require 'data/Calculation/Engineering/DELTA.php'; } /** @@ -640,7 +640,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerGESTEP() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data'); + return require 'data/Calculation/Engineering/GESTEP.php'; } public function testGetConversionGroups() @@ -680,6 +680,6 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerCONVERTUOM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data'); + return require 'data/Calculation/Engineering/CONVERTUOM.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/FinancialTest.php b/tests/PhpSpreadsheet/Calculation/FinancialTest.php index 449d0d02..c879f84a 100644 --- a/tests/PhpSpreadsheet/Calculation/FinancialTest.php +++ b/tests/PhpSpreadsheet/Calculation/FinancialTest.php @@ -27,7 +27,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerACCRINT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data'); + return require 'data/Calculation/Financial/ACCRINT.php'; } /** @@ -43,7 +43,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerACCRINTM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data'); + return require 'data/Calculation/Financial/ACCRINTM.php'; } /** @@ -59,7 +59,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerAMORDEGRC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data'); + return require 'data/Calculation/Financial/AMORDEGRC.php'; } /** @@ -75,7 +75,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerAMORLINC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data'); + return require 'data/Calculation/Financial/AMORLINC.php'; } /** @@ -91,7 +91,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPDAYBS() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data'); + return require 'data/Calculation/Financial/COUPDAYBS.php'; } /** @@ -107,7 +107,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPDAYS() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data'); + return require 'data/Calculation/Financial/COUPDAYS.php'; } /** @@ -123,7 +123,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPDAYSNC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data'); + return require 'data/Calculation/Financial/COUPDAYSNC.php'; } /** @@ -139,7 +139,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPNCD() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data'); + return require 'data/Calculation/Financial/COUPNCD.php'; } /** @@ -155,7 +155,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPNUM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data'); + return require 'data/Calculation/Financial/COUPNUM.php'; } /** @@ -171,7 +171,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCOUPPCD() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data'); + return require 'data/Calculation/Financial/COUPPCD.php'; } /** @@ -187,7 +187,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCUMIPMT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data'); + return require 'data/Calculation/Financial/CUMIPMT.php'; } /** @@ -203,7 +203,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerCUMPRINC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data'); + return require 'data/Calculation/Financial/CUMPRINC.php'; } /** @@ -219,7 +219,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerDB() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data'); + return require 'data/Calculation/Financial/DB.php'; } /** @@ -235,7 +235,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerDDB() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data'); + return require 'data/Calculation/Financial/DDB.php'; } /** @@ -251,7 +251,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerDISC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data'); + return require 'data/Calculation/Financial/DISC.php'; } /** @@ -267,7 +267,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerDOLLARDE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data'); + return require 'data/Calculation/Financial/DOLLARDE.php'; } /** @@ -283,7 +283,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerDOLLARFR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data'); + return require 'data/Calculation/Financial/DOLLARFR.php'; } /** @@ -299,7 +299,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerEFFECT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data'); + return require 'data/Calculation/Financial/EFFECT.php'; } /** @@ -315,7 +315,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerFV() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data'); + return require 'data/Calculation/Financial/FV.php'; } /** @@ -331,7 +331,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerFVSCHEDULE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data'); + return require 'data/Calculation/Financial/FVSCHEDULE.php'; } /** @@ -347,7 +347,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerINTRATE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data'); + return require 'data/Calculation/Financial/INTRATE.php'; } /** @@ -363,7 +363,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerIPMT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data'); + return require 'data/Calculation/Financial/IPMT.php'; } /** @@ -379,7 +379,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerIRR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data'); + return require 'data/Calculation/Financial/IRR.php'; } /** @@ -395,7 +395,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerISPMT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data'); + return require 'data/Calculation/Financial/ISPMT.php'; } /** @@ -411,7 +411,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerMIRR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data'); + return require 'data/Calculation/Financial/MIRR.php'; } /** @@ -427,7 +427,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerNOMINAL() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data'); + return require 'data/Calculation/Financial/NOMINAL.php'; } /** @@ -443,7 +443,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerNPER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data'); + return require 'data/Calculation/Financial/NPER.php'; } /** @@ -459,7 +459,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerNPV() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data'); + return require 'data/Calculation/Financial/NPV.php'; } /** @@ -478,7 +478,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerPRICE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data'); + return require 'data/Calculation/Financial/PRICE.php'; } /** @@ -497,7 +497,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerRATE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data'); + return require 'data/Calculation/Financial/RATE.php'; } /** @@ -516,6 +516,6 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerXIRR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data'); + return require 'data/Calculation/Financial/XIRR.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php index 801f76a0..87206562 100644 --- a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php +++ b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php @@ -73,7 +73,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsBlank() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data'); + return require 'data/Calculation/Functions/IS_BLANK.php'; } /** @@ -89,7 +89,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsErr() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data'); + return require 'data/Calculation/Functions/IS_ERR.php'; } /** @@ -105,7 +105,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsError() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data'); + return require 'data/Calculation/Functions/IS_ERROR.php'; } /** @@ -121,7 +121,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerErrorType() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data'); + return require 'data/Calculation/Functions/ERROR_TYPE.php'; } /** @@ -137,7 +137,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsLogical() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data'); + return require 'data/Calculation/Functions/IS_LOGICAL.php'; } /** @@ -153,7 +153,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsNa() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data'); + return require 'data/Calculation/Functions/IS_NA.php'; } /** @@ -169,7 +169,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsNumber() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data'); + return require 'data/Calculation/Functions/IS_NUMBER.php'; } /** @@ -185,7 +185,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsText() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data'); + return require 'data/Calculation/Functions/IS_TEXT.php'; } /** @@ -201,7 +201,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsNonText() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data'); + return require 'data/Calculation/Functions/IS_NONTEXT.php'; } /** @@ -217,7 +217,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsEven() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data'); + return require 'data/Calculation/Functions/IS_EVEN.php'; } /** @@ -233,7 +233,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerIsOdd() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data'); + return require 'data/Calculation/Functions/IS_ODD.php'; } /** @@ -249,7 +249,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerTYPE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data'); + return require 'data/Calculation/Functions/TYPE.php'; } /** @@ -265,6 +265,6 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase public function providerN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data'); + return require 'data/Calculation/Functions/N.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/LogicalTest.php b/tests/PhpSpreadsheet/Calculation/LogicalTest.php index 9a0f7854..7cd35e93 100644 --- a/tests/PhpSpreadsheet/Calculation/LogicalTest.php +++ b/tests/PhpSpreadsheet/Calculation/LogicalTest.php @@ -38,7 +38,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerAND() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data'); + return require 'data/Calculation/Logical/AND.php'; } /** @@ -54,7 +54,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerOR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data'); + return require 'data/Calculation/Logical/OR.php'; } /** @@ -70,7 +70,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerNOT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data'); + return require 'data/Calculation/Logical/NOT.php'; } /** @@ -86,7 +86,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerIF() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data'); + return require 'data/Calculation/Logical/IF.php'; } /** @@ -102,6 +102,6 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerIFERROR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data'); + return require 'data/Calculation/Logical/IFERROR.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php index 077f2ca2..93f087d4 100644 --- a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php +++ b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php @@ -31,7 +31,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase public function providerHLOOKUP() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data'); + return require 'data/Calculation/LookupRef/HLOOKUP.php'; } /** @@ -48,6 +48,6 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase public function providerVLOOKUP() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data'); + return require 'data/Calculation/LookupRef/VLOOKUP.php'; } } diff --git a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php index 71536944..c1a701fe 100644 --- a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php +++ b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php @@ -27,7 +27,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerATAN2() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data'); + return require 'data/Calculation/MathTrig/ATAN2.php'; } /** @@ -43,7 +43,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerCEILING() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data'); + return require 'data/Calculation/MathTrig/CEILING.php'; } /** @@ -59,7 +59,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerCOMBIN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data'); + return require 'data/Calculation/MathTrig/COMBIN.php'; } /** @@ -75,7 +75,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerEVEN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data'); + return require 'data/Calculation/MathTrig/EVEN.php'; } /** @@ -91,7 +91,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerODD() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data'); + return require 'data/Calculation/MathTrig/ODD.php'; } /** @@ -107,7 +107,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerFACT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data'); + return require 'data/Calculation/MathTrig/FACT.php'; } /** @@ -123,7 +123,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerFACTDOUBLE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data'); + return require 'data/Calculation/MathTrig/FACTDOUBLE.php'; } /** @@ -139,7 +139,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerFLOOR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data'); + return require 'data/Calculation/MathTrig/FLOOR.php'; } /** @@ -155,7 +155,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerGCD() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data'); + return require 'data/Calculation/MathTrig/GCD.php'; } /** @@ -171,7 +171,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerLCM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data'); + return require 'data/Calculation/MathTrig/LCM.php'; } /** @@ -187,7 +187,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerINT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data'); + return require 'data/Calculation/MathTrig/INT.php'; } /** @@ -203,7 +203,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerSIGN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data'); + return require 'data/Calculation/MathTrig/SIGN.php'; } /** @@ -219,7 +219,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerPOWER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data'); + return require 'data/Calculation/MathTrig/POWER.php'; } /** @@ -235,7 +235,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerLOG() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data'); + return require 'data/Calculation/MathTrig/LOG.php'; } /** @@ -251,7 +251,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMOD() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data'); + return require 'data/Calculation/MathTrig/MOD.php'; } /** @@ -270,7 +270,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMDETERM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data'); + return require 'data/Calculation/MathTrig/MDETERM.php'; } /** @@ -289,7 +289,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMINVERSE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data'); + return require 'data/Calculation/MathTrig/MINVERSE.php'; } /** @@ -308,7 +308,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMMULT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data'); + return require 'data/Calculation/MathTrig/MMULT.php'; } /** @@ -324,7 +324,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMULTINOMIAL() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data'); + return require 'data/Calculation/MathTrig/MULTINOMIAL.php'; } /** @@ -342,7 +342,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerMROUND() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data'); + return require 'data/Calculation/MathTrig/MROUND.php'; } /** @@ -358,7 +358,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerPRODUCT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data'); + return require 'data/Calculation/MathTrig/PRODUCT.php'; } /** @@ -374,7 +374,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerQUOTIENT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data'); + return require 'data/Calculation/MathTrig/QUOTIENT.php'; } /** @@ -390,7 +390,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerROUNDUP() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data'); + return require 'data/Calculation/MathTrig/ROUNDUP.php'; } /** @@ -406,7 +406,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerROUNDDOWN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data'); + return require 'data/Calculation/MathTrig/ROUNDDOWN.php'; } /** @@ -422,7 +422,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerSERIESSUM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data'); + return require 'data/Calculation/MathTrig/SERIESSUM.php'; } /** @@ -438,7 +438,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerSUMSQ() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data'); + return require 'data/Calculation/MathTrig/SUMSQ.php'; } /** @@ -454,7 +454,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerTRUNC() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data'); + return require 'data/Calculation/MathTrig/TRUNC.php'; } /** @@ -470,7 +470,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerROMAN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data'); + return require 'data/Calculation/MathTrig/ROMAN.php'; } /** @@ -486,7 +486,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerSQRTPI() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data'); + return require 'data/Calculation/MathTrig/SQRTPI.php'; } /** diff --git a/tests/PhpSpreadsheet/Calculation/TextDataTest.php b/tests/PhpSpreadsheet/Calculation/TextDataTest.php index f438865d..4052c7d1 100644 --- a/tests/PhpSpreadsheet/Calculation/TextDataTest.php +++ b/tests/PhpSpreadsheet/Calculation/TextDataTest.php @@ -27,7 +27,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerCHAR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data'); + return require 'data/Calculation/TextData/CHAR.php'; } /** @@ -43,7 +43,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerCODE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data'); + return require 'data/Calculation/TextData/CODE.php'; } /** @@ -59,7 +59,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerCONCATENATE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data'); + return require 'data/Calculation/TextData/CONCATENATE.php'; } /** @@ -75,7 +75,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerLEFT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data'); + return require 'data/Calculation/TextData/LEFT.php'; } /** @@ -91,7 +91,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerMID() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data'); + return require 'data/Calculation/TextData/MID.php'; } /** @@ -107,7 +107,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerRIGHT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data'); + return require 'data/Calculation/TextData/RIGHT.php'; } /** @@ -123,7 +123,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerLOWER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data'); + return require 'data/Calculation/TextData/LOWER.php'; } /** @@ -139,7 +139,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerUPPER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data'); + return require 'data/Calculation/TextData/UPPER.php'; } /** @@ -155,7 +155,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerPROPER() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data'); + return require 'data/Calculation/TextData/PROPER.php'; } /** @@ -171,7 +171,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerLEN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data'); + return require 'data/Calculation/TextData/LEN.php'; } /** @@ -187,7 +187,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerSEARCH() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data'); + return require 'data/Calculation/TextData/SEARCH.php'; } /** @@ -203,7 +203,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerFIND() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data'); + return require 'data/Calculation/TextData/FIND.php'; } /** @@ -219,7 +219,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerREPLACE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data'); + return require 'data/Calculation/TextData/REPLACE.php'; } /** @@ -235,7 +235,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerSUBSTITUTE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data'); + return require 'data/Calculation/TextData/SUBSTITUTE.php'; } /** @@ -251,7 +251,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerTRIM() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data'); + return require 'data/Calculation/TextData/TRIM.php'; } /** @@ -267,7 +267,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerCLEAN() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data'); + return require 'data/Calculation/TextData/CLEAN.php'; } /** @@ -283,7 +283,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerDOLLAR() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data'); + return require 'data/Calculation/TextData/DOLLAR.php'; } /** @@ -299,7 +299,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerFIXED() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data'); + return require 'data/Calculation/TextData/FIXED.php'; } /** @@ -315,7 +315,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data'); + return require 'data/Calculation/TextData/T.php'; } /** @@ -336,7 +336,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerTEXT() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data'); + return require 'data/Calculation/TextData/TEXT.php'; } /** @@ -356,6 +356,6 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerVALUE() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); + return require 'data/Calculation/TextData/VALUE.php'; } } diff --git a/tests/PhpSpreadsheet/CalculationTest.php b/tests/PhpSpreadsheet/CalculationTest.php index 4c33fee4..b25498bb 100644 --- a/tests/PhpSpreadsheet/CalculationTest.php +++ b/tests/PhpSpreadsheet/CalculationTest.php @@ -28,6 +28,6 @@ class CalculationTest extends \PHPUnit_Framework_TestCase public function providerBinaryComparisonOperation() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data'); + return require 'data/CalculationBinaryComparisonOperation.php'; } } diff --git a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php index 88003c79..a9806b44 100644 --- a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php +++ b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php @@ -72,7 +72,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function providerDataTypeForValue() { - return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json'); + return require 'data/Cell/DefaultValueBinder.php'; } public function testDataTypeForRichTextObject() diff --git a/tests/PhpSpreadsheet/CellTest.php b/tests/PhpSpreadsheet/CellTest.php index 0ab07f33..fbcd4886 100644 --- a/tests/PhpSpreadsheet/CellTest.php +++ b/tests/PhpSpreadsheet/CellTest.php @@ -20,7 +20,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerColumnString() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnString.data'); + return require 'data/ColumnString.php'; } public function testColumnIndexFromStringTooLong() @@ -62,7 +62,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerColumnIndex() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnIndex.data'); + return require 'data/ColumnIndex.php'; } /** @@ -78,7 +78,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerCoordinates() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellCoordinates.data'); + return require 'data/CellCoordinates.php'; } public function testCoordinateFromStringWithRangeAddress() @@ -133,7 +133,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerAbsoluteCoordinates() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data'); + return require 'data/CellAbsoluteCoordinate.php'; } public function testAbsoluteCoordinateFromStringWithRangeAddress() @@ -162,7 +162,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerAbsoluteReferences() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data'); + return require 'data/CellAbsoluteReference.php'; } public function testAbsoluteReferenceFromStringWithRangeAddress() @@ -197,7 +197,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerSplitRange() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellSplitRange.data'); + return require 'data/CellSplitRange.php'; } /** @@ -213,7 +213,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerBuildRange() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellBuildRange.data'); + return require 'data/CellBuildRange.php'; } public function testBuildRangeInvalid() @@ -242,7 +242,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerRangeBoundaries() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data'); + return require 'data/CellRangeBoundaries.php'; } /** @@ -258,7 +258,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerRangeDimension() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeDimension.data'); + return require 'data/CellRangeDimension.php'; } /** @@ -274,7 +274,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerGetRangeBoundaries() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data'); + return require 'data/CellGetRangeBoundaries.php'; } /** @@ -290,6 +290,6 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerExtractAllCellReferencesInRange() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data'); + return require 'data/CellExtractAllCellReferencesInRange.php'; } } diff --git a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php index 4694ecea..19d65360 100644 --- a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php +++ b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php @@ -21,7 +21,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerInvalidXML() { $tests = []; - foreach (glob('rawTestData/Reader/XEETestInvalid*.xml') as $file) { + foreach (glob('data/Reader/XEETestInvalid*.xml') as $file) { $tests[] = [realpath($file), true]; } return $tests; @@ -40,7 +40,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerValidXML() { $tests = array(); - foreach (glob('rawTestData/Reader/XEETestValid*.xml') as $file) { + foreach (glob('data/Reader/XEETestValid*.xml') as $file) { $tests[] = [realpath($file), file_get_contents($file)]; } return $tests; diff --git a/tests/PhpSpreadsheet/Shared/CodePageTest.php b/tests/PhpSpreadsheet/Shared/CodePageTest.php index e2a3009b..18833ff4 100644 --- a/tests/PhpSpreadsheet/Shared/CodePageTest.php +++ b/tests/PhpSpreadsheet/Shared/CodePageTest.php @@ -20,7 +20,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase public function providerCodePage() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CodePage.data'); + return require 'data/Shared/CodePage.php'; } public function testNumberToNameWithInvalidCodePage() diff --git a/tests/PhpSpreadsheet/Shared/DateTest.php b/tests/PhpSpreadsheet/Shared/DateTest.php index eb86cf24..66ef4be9 100644 --- a/tests/PhpSpreadsheet/Shared/DateTest.php +++ b/tests/PhpSpreadsheet/Shared/DateTest.php @@ -44,7 +44,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeExcelToTimestamp1900() { - return include 'rawTestData/Shared/Date/ExcelToTimestamp1900.php'; + return require 'data/Shared/Date/ExcelToTimestamp1900.php'; } /** @@ -65,7 +65,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeTimestampToExcel1900() { - return include 'rawTestData/Shared/Date/TimestampToExcel1900.php'; + return require 'data/Shared/Date/TimestampToExcel1900.php'; } /** @@ -86,7 +86,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeDateTimeToExcel() { - return include 'rawTestData/Shared/Date/DateTimeToExcel.php'; + return require 'data/Shared/Date/DateTimeToExcel.php'; } /** @@ -107,7 +107,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeFormattedPHPToExcel1900() { - return include 'rawTestData/Shared/Date/FormattedPHPToExcel1900.php'; + return require 'data/Shared/Date/FormattedPHPToExcel1900.php'; } /** @@ -128,7 +128,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeExcelToTimestamp1904() { - return include 'rawTestData/Shared/Date/ExcelToTimestamp1904.php'; + return require 'data/Shared/Date/ExcelToTimestamp1904.php'; } /** @@ -149,7 +149,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeTimestampToExcel1904() { - return include 'rawTestData/Shared/Date/TimestampToExcel1904.php'; + return require 'data/Shared/Date/TimestampToExcel1904.php'; } /** @@ -165,7 +165,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerIsDateTimeFormatCode() { - return include 'rawTestData/Shared/Date/FormatCodes.php'; + return require 'data/Shared/Date/FormatCodes.php'; } /** @@ -186,6 +186,6 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeExcelToTimestamp1900Timezone() { - return include 'rawTestData/Shared/Date/ExcelToTimestamp1900Timezone.php'; + return require 'data/Shared/Date/ExcelToTimestamp1900Timezone.php'; } } diff --git a/tests/PhpSpreadsheet/Shared/FontTest.php b/tests/PhpSpreadsheet/Shared/FontTest.php index a91516cd..76d61a01 100644 --- a/tests/PhpSpreadsheet/Shared/FontTest.php +++ b/tests/PhpSpreadsheet/Shared/FontTest.php @@ -48,7 +48,7 @@ class FontTest extends \PHPUnit_Framework_TestCase public function providerFontSizeToPixels() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data'); + return require 'data/Shared/FontSizeToPixels.php'; } /** @@ -64,7 +64,7 @@ class FontTest extends \PHPUnit_Framework_TestCase public function providerInchSizeToPixels() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data'); + return require 'data/Shared/InchSizeToPixels.php'; } /** @@ -80,6 +80,6 @@ class FontTest extends \PHPUnit_Framework_TestCase public function providerCentimeterSizeToPixels() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data'); + return require 'data/Shared/CentimeterSizeToPixels.php'; } } diff --git a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php index 21f4a34e..3be3759d 100644 --- a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php +++ b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php @@ -20,6 +20,6 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase public function providerHashPassword() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data'); + return require 'data/Shared/PasswordHashes.php'; } } diff --git a/tests/PhpSpreadsheet/Style/ColorTest.php b/tests/PhpSpreadsheet/Style/ColorTest.php index 4cf17949..58b2404c 100644 --- a/tests/PhpSpreadsheet/Style/ColorTest.php +++ b/tests/PhpSpreadsheet/Style/ColorTest.php @@ -19,7 +19,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function providerColorGetRed() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data'); + return require 'data/Style/ColorGetRed.php'; } /** @@ -35,7 +35,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function providerColorGetGreen() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data'); + return require 'data/Style/ColorGetGreen.php'; } /** @@ -51,7 +51,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function providerColorGetBlue() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data'); + return require 'data/Style/ColorGetBlue.php'; } /** @@ -66,6 +66,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function providerColorChangeBrightness() { - return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json'); + return require 'data/Style/ColorChangeBrightness.php'; } } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php index 2fe83748..1b79d654 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php @@ -29,6 +29,6 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase public function providerNumberFormat() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data'); + return require 'data/Style/NumberFormatDates.php'; } } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatTest.php b/tests/PhpSpreadsheet/Style/NumberFormatTest.php index a33e1f65..f0360d81 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatTest.php @@ -27,6 +27,6 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase public function providerNumberFormat() { - return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormat.data'); + return require 'data/Style/NumberFormat.php'; } } diff --git a/tests/PhpSpreadsheet/TestDataFileIterator.php b/tests/PhpSpreadsheet/TestDataFileIterator.php deleted file mode 100644 index 13d1ad05..00000000 --- a/tests/PhpSpreadsheet/TestDataFileIterator.php +++ /dev/null @@ -1,138 +0,0 @@ -file = fopen($file, 'r'); - } - - public function __destruct() - { - fclose($this->file); - } - - public function rewind() - { - rewind($this->file); - $this->current = $this->_parseNextDataset(); - $this->key = 0; - } - - public function valid() - { - return !feof($this->file); - } - - public function key() - { - return $this->key; - } - - public function current() - { - return $this->current; - } - - public function next() - { - $this->current = $this->_parseNextDataset(); - $this->key++; - } - - private function _parseNextDataset() - { - // Read a line of test data from the file - do { - // Only take lines that contain test data and that aren't commented out - $testDataRow = trim(fgets($this->file)); - } while (($testDataRow > '') && ($testDataRow{0} === '#')); - - // Discard any comments at the end of the line - list($testData) = explode('//', $testDataRow); - - // Split data into an array of individual values and a result - $dataSet = $this->_getcsv($testData, ',', "'"); - foreach ($dataSet as &$dataValue) { - $dataValue = $this->_parseDataValue($dataValue); - } - unset($dataValue); - - return $dataSet; - } - - private function _getcsv($input, $delimiter, $enclosure) - { - if (function_exists('str_getcsv')) { - return str_getcsv($input, $delimiter, $enclosure); - } - - $temp = fopen('php://memory', 'rw'); - fwrite($temp, $input); - rewind($temp); - $data = fgetcsv($temp, strlen($input), $delimiter, $enclosure); - fclose($temp); - - if ($data === false) { - $data = array(null); - } - - return $data; - } - - private function _parseDataValue($dataValue) - { - // discard any white space - $dataValue = trim($dataValue); - // test for the required datatype and convert accordingly - if (!is_numeric($dataValue)) { - if ($dataValue == '') { - $dataValue = null; - } elseif ($dataValue == '""') { - $dataValue = ''; - } elseif (($dataValue[0] == '"') && ($dataValue[strlen($dataValue)-1] == '"')) { - $dataValue = substr($dataValue, 1, -1); - } elseif (($dataValue[0] == '{') && ($dataValue[strlen($dataValue)-1] == '}')) { - $dataValue = explode(';', substr($dataValue, 1, -1)); - foreach ($dataValue as &$dataRow) { - if (strpos($dataRow, '|') !== false) { - $dataRow = explode('|', $dataRow); - foreach ($dataRow as &$dataCell) { - $dataCell = $this->_parseDataValue($dataCell); - } - unset($dataCell); - } else { - $dataRow = $this->_parseDataValue($dataRow); - } - } - unset($dataRow); - } else { - switch (strtoupper($dataValue)) { - case 'NULL': - $dataValue = null; - break; - case 'TRUE': - $dataValue = true; - break; - case 'FALSE': - $dataValue = false; - break; - } - } - } else { - if (strpos($dataValue, '.') !== false) { - $dataValue = (float) $dataValue; - } else { - $dataValue = (int) $dataValue; - } - } - - return $dataValue; - } -} diff --git a/tests/PhpSpreadsheet/TestDataFileIteratorJson.php b/tests/PhpSpreadsheet/TestDataFileIteratorJson.php deleted file mode 100644 index 7119e9a0..00000000 --- a/tests/PhpSpreadsheet/TestDataFileIteratorJson.php +++ /dev/null @@ -1,65 +0,0 @@ -file = fopen($file, 'r'); - } - - public function __destruct() - { - fclose($this->file); - } - - public function rewind() - { - rewind($this->file); - $this->current = $this->_parseNextDataset(); - $this->key = 0; - } - - public function valid() - { - return !feof($this->file); - } - - public function key() - { - return $this->key; - } - - public function current() - { - return $this->current; - } - - public function next() - { - $this->current = $this->_parseNextDataset(); - $this->key++; - } - - private function _parseNextDataset() - { - // Read a line of test data from the file - do { - // Only take lines that contain test data and that aren't commented out - $testDataRow = trim(fgets($this->file)); - } while (($testDataRow > '') && ($testDataRow{0} === '#')); - - // Discard any comments at the end of the line - list($testData) = explode('//', $testDataRow); - - // Split data into an array of individual values and a result - $dataSet = json_decode(trim($testData)); - - return $dataSet; - } -} diff --git a/tests/data/Calculation/DateTime/DATE.php b/tests/data/Calculation/DateTime/DATE.php new file mode 100644 index 00000000..786d5c4c --- /dev/null +++ b/tests/data/Calculation/DateTime/DATE.php @@ -0,0 +1,489 @@ + 1', + true, + true, + ], + [ + '=3 > 3', + false, + false, + ], + [ + '=1 > 3', + false, + false, + ], + [ + '=3 < 1', + false, + false, + ], + [ + '=3 < 3', + false, + false, + ], + [ + '=1 < 3', + true, + true, + ], + [ + '=3 = 1', + false, + false, + ], + [ + '=3 = 3', + true, + true, + ], + [ + '=1 = 1.0', + true, + true, + ], + [ + '=3 >= 1', + true, + true, + ], + [ + '=3 >= 3', + true, + true, + ], + [ + '=1 >= 3', + false, + false, + ], + [ + '=3 <= 1', + false, + false, + ], + [ + '=3 <= 3', + true, + true, + ], + [ + '=1 <= 3', + true, + true, + ], + [ + '=3 <> 1', + true, + true, + ], + [ + '=3 <> 3', + false, + false, + ], + [ + '=1 <> 1.0', + false, + false, + ], + [ + '="a" > "a"', + false, + false, + ], + [ + '="A" > "A"', + false, + false, + ], + [ + '="A" > "a"', + false, + true, + ], + [ + '="a" > "A"', + false, + false, + ], + [ + '="a" < "a"', + false, + false, + ], + [ + '="A" < "A"', + false, + false, + ], + [ + '="A" < "a"', + false, + false, + ], + [ + '="a" < "A"', + false, + true, + ], + [ + '="a" = "a"', + true, + true, + ], + [ + '="A" = "A"', + true, + true, + ], + [ + '="A" = "a"', + true, + false, + ], + [ + '="a" = "A"', + true, + false, + ], + [ + '="a" <= "a"', + true, + true, + ], + [ + '="A" <= "A"', + true, + true, + ], + [ + '="A" <= "a"', + true, + false, + ], + [ + '="a" <= "A"', + true, + true, + ], + [ + '="a" >= "a"', + true, + true, + ], + [ + '="A" >= "A"', + true, + true, + ], + [ + '="A" >= "a"', + true, + true, + ], + [ + '="a" >= "A"', + true, + false, + ], + [ + '="a" <> "a"', + false, + false, + ], + [ + '="A" <> "A"', + false, + false, + ], + [ + '="A" <> "a"', + false, + true, + ], + [ + '="a" <> "A"', + false, + true, + ], + [ + '="A" > "b"', + false, + true, + ], + [ + '="a" > "b"', + false, + false, + ], + [ + '="b" > "a"', + true, + true, + ], + [ + '="b" > "A"', + true, + false, + ], + // Test natural sorting is not used + [ + '="a2" > "a10"', + true, + true, + ], +]; diff --git a/tests/data/Cell/DefaultValueBinder.php b/tests/data/Cell/DefaultValueBinder.php new file mode 100644 index 00000000..242da403 --- /dev/null +++ b/tests/data/Cell/DefaultValueBinder.php @@ -0,0 +1,22 @@ + 1', TRUE, TRUE -'=3 > 3', FALSE, FALSE -'=1 > 3', FALSE, FALSE -'=3 < 1', FALSE, FALSE -'=3 < 3', FALSE, FALSE -'=1 < 3', TRUE, TRUE -'=3 = 1', FALSE, FALSE -'=3 = 3', TRUE, TRUE -'=1 = 1.0', TRUE, TRUE -'=3 >= 1', TRUE, TRUE -'=3 >= 3', TRUE, TRUE -'=1 >= 3', FALSE, FALSE -'=3 <= 1', FALSE, FALSE -'=3 <= 3', TRUE, TRUE -'=1 <= 3', TRUE, TRUE -'=3 <> 1', TRUE, TRUE -'=3 <> 3', FALSE, FALSE -'=1 <> 1.0', FALSE, FALSE -'="a" > "a"', FALSE, FALSE -'="A" > "A"', FALSE, FALSE -'="A" > "a"', FALSE, TRUE -'="a" > "A"', FALSE, FALSE -'="a" < "a"', FALSE, FALSE -'="A" < "A"', FALSE, FALSE -'="A" < "a"', FALSE, FALSE -'="a" < "A"', FALSE, TRUE -'="a" = "a"', TRUE, TRUE -'="A" = "A"', TRUE, TRUE -'="A" = "a"', TRUE, FALSE -'="a" = "A"', TRUE, FALSE -'="a" <= "a"', TRUE, TRUE -'="A" <= "A"', TRUE, TRUE -'="A" <= "a"', TRUE, FALSE -'="a" <= "A"', TRUE, TRUE -'="a" >= "a"', TRUE, TRUE -'="A" >= "A"', TRUE, TRUE -'="A" >= "a"', TRUE, TRUE -'="a" >= "A"', TRUE, FALSE -'="a" <> "a"', FALSE, FALSE -'="A" <> "A"', FALSE, FALSE -'="A" <> "a"', FALSE, TRUE -'="a" <> "A"', FALSE, TRUE -'="A" > "b"', FALSE, TRUE -'="a" > "b"', FALSE, FALSE -'="b" > "a"', TRUE, TRUE -'="b" > "A"', TRUE, FALSE -'="a2" > "a10"', TRUE, TRUE // Test natural sorting is not used diff --git a/tests/rawTestData/Cell/DefaultValueBinder.json b/tests/rawTestData/Cell/DefaultValueBinder.json deleted file mode 100644 index cda669a6..00000000 --- a/tests/rawTestData/Cell/DefaultValueBinder.json +++ /dev/null @@ -1,18 +0,0 @@ -[[null],"null"] -[["#NULL!"],"e"] -[[false],"b"] -[[true],"b"] -[["FALSE"],"s"] -[["TRUE"],"s"] -[[""],"s"] -[["ABC"],"s"] -[["123"],"n"] -[[123],"n"] -[[0.123],"n"] -[["-123"],"n"] -[["1.23E4"],"n"] -[["-1.23E4"],"n"] -[["1.23E-4"],"n"] -[["000123"],"s"] -[["=123"],"f"] -[["#DIV\/0!"],"e"] diff --git a/tests/rawTestData/CellAbsoluteCoordinate.data b/tests/rawTestData/CellAbsoluteCoordinate.data deleted file mode 100644 index ad642947..00000000 --- a/tests/rawTestData/CellAbsoluteCoordinate.data +++ /dev/null @@ -1,12 +0,0 @@ -"A1", "$A$1" -"A12", "$A$12" -"J1", "$J$1" -"J20", "$J$20" -"AI1", "$AI$1" -"AI2012", "$AI$2012" -"'Worksheet1'!AI256", "'Worksheet1'!$AI$256" -"Worksheet1!AI256", "Worksheet1!$AI$256" -"'Data Worksheet'!AI256", "'Data Worksheet'!$AI$256" -"'Worksheet1'!$AI256", "'Worksheet1'!$AI$256" -"'Worksheet1'!AI$256", "'Worksheet1'!$AI$256" -"'Worksheet1'!$AI$256", "'Worksheet1'!$AI$256" diff --git a/tests/rawTestData/CellAbsoluteReference.data b/tests/rawTestData/CellAbsoluteReference.data deleted file mode 100644 index 8aa314a2..00000000 --- a/tests/rawTestData/CellAbsoluteReference.data +++ /dev/null @@ -1,16 +0,0 @@ -"A1", "$A$1" -"A12", "$A$12" -"J1", "$J$1" -"J20", "$J$20" -"AI1", "$AI$1" -"AI2012", "$AI$2012" -"'Worksheet1'!AI256", "'Worksheet1'!$AI$256" -"Worksheet1!AI256", "Worksheet1!$AI$256" -"'Data Worksheet'!AI256", "'Data Worksheet'!$AI$256" -"AI", "$AI" -2012, "$2012" -"Worksheet1!AI", "Worksheet1!$AI" -"Worksheet1!256", "Worksheet1!$256" -"'Worksheet1'!$AI256", "'Worksheet1'!$AI$256" -"'Worksheet1'!AI$256", "'Worksheet1'!$AI$256" -"'Worksheet1'!$AI$256", "'Worksheet1'!$AI$256" diff --git a/tests/rawTestData/CellBuildRange.data b/tests/rawTestData/CellBuildRange.data deleted file mode 100644 index 8d6efbff..00000000 --- a/tests/rawTestData/CellBuildRange.data +++ /dev/null @@ -1,2 +0,0 @@ -{"B4"|"E9"}, "B4:E9" -{"B4"|"E9";"H2"|"O11"}, '"B4:E9,H2:O11"' diff --git a/tests/rawTestData/CellCoordinates.data b/tests/rawTestData/CellCoordinates.data deleted file mode 100644 index e64ce559..00000000 --- a/tests/rawTestData/CellCoordinates.data +++ /dev/null @@ -1,6 +0,0 @@ -"A1", {"A";1} -"A12", {"A";12} -"J1", {"J";1} -"J20", {"J";20} -"AI1", {"AI";1} -"AI2012", {"AI";2012} diff --git a/tests/rawTestData/CellExtractAllCellReferencesInRange.data b/tests/rawTestData/CellExtractAllCellReferencesInRange.data deleted file mode 100644 index 4b44a83a..00000000 --- a/tests/rawTestData/CellExtractAllCellReferencesInRange.data +++ /dev/null @@ -1,9 +0,0 @@ -"B4:B6", {"B4";"B5";"B6"} -'"B4:B6,D4:D6"', {"B4";"B5";"B6";"D4";"D5";"D6"} -'"B4:B6 D4:D6"', {"B4";"B5";"B6";"D4";"D5";"D6"} -"B4:D6", {"B4";"B5";"B6";"C4";"C5";"C6";"D4";"D5";"D6"} -'"B4:D6,C5:E7"', {"B4";"B5";"B6";"C4";"C5";"C6";"C7";"D4";"D5";"D6";"D7";"E5";"E6";"E7"} -'"B4:D6 C5:E7"', {"B4";"B5";"B6";"C4";"C5";"C6";"C7";"D4";"D5";"D6";"D7";"E5";"E6";"E7"} -"B2:D4 C5:D5 E3:E5 D6:E6 F4:F6", {"B2";"B3";"B4";"C2";"C3";"C4";"C5";"D2";"D3";"D4";"D5";"D6";"E3";"E4";"E5";"E6";"F4";"F5";"F6"} -"B2:D4 C3:E5 D4:F6", {"B2";"B3";"B4";"C2";"C3";"C4";"C5";"D2";"D3";"D4";"D5";"D6";"E3";"E4";"E5";"E6";"F4";"F5";"F6"} -"B4:B6 B8", {"B4";"B5";"B6";"B8"} diff --git a/tests/rawTestData/CellGetRangeBoundaries.data b/tests/rawTestData/CellGetRangeBoundaries.data deleted file mode 100644 index f01a5fd9..00000000 --- a/tests/rawTestData/CellGetRangeBoundaries.data +++ /dev/null @@ -1,2 +0,0 @@ -"B4:E9", {"B"|4;"E"|9} -"B4", {"B"|4;"B"|4} diff --git a/tests/rawTestData/CellRangeBoundaries.data b/tests/rawTestData/CellRangeBoundaries.data deleted file mode 100644 index 2fca6dc2..00000000 --- a/tests/rawTestData/CellRangeBoundaries.data +++ /dev/null @@ -1,2 +0,0 @@ -"B4:E9", {2|4;5|9} -"B4", {2|4;2|4} diff --git a/tests/rawTestData/CellRangeDimension.data b/tests/rawTestData/CellRangeDimension.data deleted file mode 100644 index 1718f121..00000000 --- a/tests/rawTestData/CellRangeDimension.data +++ /dev/null @@ -1,2 +0,0 @@ -"B4:E9", {4;6} -"B4", {1;1} diff --git a/tests/rawTestData/CellSplitRange.data b/tests/rawTestData/CellSplitRange.data deleted file mode 100644 index 215fce25..00000000 --- a/tests/rawTestData/CellSplitRange.data +++ /dev/null @@ -1,3 +0,0 @@ -"B4:E9", {"B4"|"E9"} -"B4", {"B4"} -'"B4:E9,H2:O11"', {"B4"|"E9";"H2"|"O11"} diff --git a/tests/rawTestData/ColumnIndex.data b/tests/rawTestData/ColumnIndex.data deleted file mode 100644 index 44e49d5a..00000000 --- a/tests/rawTestData/ColumnIndex.data +++ /dev/null @@ -1,12 +0,0 @@ -0, "A" -25, "Z" -26, "AA" -27, "AB" -51, "AZ" -52, "BA" -77, "BZ" -78, "CA" -255, "IV" -701, "ZZ" -702, "AAA" -1378, "BAA" diff --git a/tests/rawTestData/ColumnString.data b/tests/rawTestData/ColumnString.data deleted file mode 100644 index 792deaa4..00000000 --- a/tests/rawTestData/ColumnString.data +++ /dev/null @@ -1,12 +0,0 @@ -"A", 1 -"Z", 26 -"AA", 27 -"AB", 28 -"AZ", 52 -"BA", 53 -"BZ", 78 -"CA", 79 -"IV", 256 -"ZZ", 702 -"AAA", 703 -"BAA", 1379 diff --git a/tests/rawTestData/Shared/CentimeterSizeToPixels.data b/tests/rawTestData/Shared/CentimeterSizeToPixels.data deleted file mode 100644 index fc48f21a..00000000 --- a/tests/rawTestData/Shared/CentimeterSizeToPixels.data +++ /dev/null @@ -1,5 +0,0 @@ -0.1, 3.7795275591 -0.2, 7.5590551182 -0.5, 18.8976377955 -1.0, 37.795275591 -2.0, 75.590551182 diff --git a/tests/rawTestData/Shared/CodePage.data b/tests/rawTestData/Shared/CodePage.data deleted file mode 100644 index 68ceda1f..00000000 --- a/tests/rawTestData/Shared/CodePage.data +++ /dev/null @@ -1,43 +0,0 @@ -367, "ASCII" // ASCII -437, "CP437" // OEM US -737, "CP737" // OEM Greek -775, "CP775" // OEM Baltic -850, "CP850" // OEM Latin I -852, "CP852" // OEM Latin II (Central European) -855, "CP855" // OEM Cyrillic -857, "CP857" // OEM Turkish -858, "CP858" // OEM Multilingual Latin I with Euro -860, "CP860" // OEM Portugese -861, "CP861" // OEM Icelandic -862, "CP862" // OEM Hebrew -863, "CP863" // OEM Canadian (French) -864, "CP864" // OEM Arabic -865, "CP865" // OEM Nordic -866, "CP866" // OEM Cyrillic (Russian) -869, "CP869" // OEM Greek (Modern) -874, "CP874" // ANSI Thai -932, "CP932" // ANSI Japanese Shift-JIS -936, "CP936" // ANSI Chinese Simplified GBK -949, "CP949" // ANSI Korean (Wansung) -950, "CP950" // ANSI Chinese Traditional BIG5 -1200, "UTF-16LE" // UTF-16 (BIFF8) -1250, "CP1250" // ANSI Latin II (Central European) -1251, "CP1251" // ANSI Cyrillic -0, "CP1252" // ANSI Latin I (BIFF4-BIFF7) -1252, "CP1252" // ANSI Latin I (BIFF4-BIFF7) -1253, "CP1253" // ANSI Greek -1254, "CP1254" // ANSI Turkish -1255, "CP1255" // ANSI Hebrew -1256, "CP1256" // ANSI Arabic -1257, "CP1257" // ANSI Baltic -1258, "CP1258" // ANSI Vietnamese -1361, "CP1361" // ANSI Korean (Johab) -10000, "MAC" // Apple Roman -10006, "MACGREEK" // Macintosh Greek -10007, "MACCYRILLIC" // Macintosh Cyrillic -10029, "MACCENTRALEUROPE" // Macintosh Central Europe -10079, "MACICELAND" // Macintosh Icelandic -10081, "MACTURKISH" // Macintosh Turkish -32768, "MAC" // Apple Roman -65000, "UTF-7" // Unicode (UTF-7) -65001, "UTF-8" // Unicode (UTF-8) diff --git a/tests/rawTestData/Shared/FontSizeToPixels.data b/tests/rawTestData/Shared/FontSizeToPixels.data deleted file mode 100644 index af89196d..00000000 --- a/tests/rawTestData/Shared/FontSizeToPixels.data +++ /dev/null @@ -1,16 +0,0 @@ -6, 8 -7, 9 -8, 10 -9, 12 -10, 13 -11, 14 -12, 16 -14, 18 -16, 21 -18, 24 -20, 26 -22, 29 -24, 32 -36, 48 -48, 64 -60, 80 diff --git a/tests/rawTestData/Shared/InchSizeToPixels.data b/tests/rawTestData/Shared/InchSizeToPixels.data deleted file mode 100644 index 147eaa98..00000000 --- a/tests/rawTestData/Shared/InchSizeToPixels.data +++ /dev/null @@ -1,5 +0,0 @@ -0.1, 9.6 -0.2, 19.2 -0.5, 48.0 -1.0, 96.0 -2.0, 192.0 diff --git a/tests/rawTestData/Shared/PasswordHashes.data b/tests/rawTestData/Shared/PasswordHashes.data deleted file mode 100644 index 0504eaad..00000000 --- a/tests/rawTestData/Shared/PasswordHashes.data +++ /dev/null @@ -1,6 +0,0 @@ -"PHPExcel", "8053" -"Mark Baker", "877D" -"!+&=()~§±æþ", "C0EA" -"秘密口令", "C07E" -"leyndarmál lykilorð", "99E8" -"", "CE4B" diff --git a/tests/rawTestData/Style/ColorChangeBrightness.json b/tests/rawTestData/Style/ColorChangeBrightness.json deleted file mode 100644 index d61d9b5a..00000000 --- a/tests/rawTestData/Style/ColorChangeBrightness.json +++ /dev/null @@ -1,14 +0,0 @@ -[["FFAABBCC",0.1],"FFB2C1D1"] // RGBA -[["FFAABBCC",-0.1],"FF99A8B7"] // RGBA -[["AABBCC",0.1],"B2C1D1"] // RGB -[["AABBCC",-0.1],"99A8B7"] -[["FF0000",0.1],"FF1919"] -[["FF0000",-0.1],"E50000"] -[["FF8080",0.1],"FF8C8C"] -[["FF8080",-0.1],"E57373"] -[["FF0000",0.15],"FF2626"] -[["FF0000",-0.15],"D80000"] -[["FF8080",0.15],"FF9393"] -[["FF8080",-0.15],"D86C6C"] -[["FFF008",0.5],"FFF783"] -[["FFF008",-0.5],"7F7804"] diff --git a/tests/rawTestData/Style/ColorGetBlue.data b/tests/rawTestData/Style/ColorGetBlue.data deleted file mode 100644 index 4e01d1c7..00000000 --- a/tests/rawTestData/Style/ColorGetBlue.data +++ /dev/null @@ -1,6 +0,0 @@ -"FFAABBCC", "CC" // RGBA (hex) -"FFAABBCC", FALSE, 204 // RGBA (decimal) -"AABBCC", "CC" // RGB (hex) -"AABBCC", FALSE, 204 // RGB (decimal) -"FFFF00", "00" -"FFFF00", FALSE, 0 diff --git a/tests/rawTestData/Style/ColorGetGreen.data b/tests/rawTestData/Style/ColorGetGreen.data deleted file mode 100644 index 0ace6103..00000000 --- a/tests/rawTestData/Style/ColorGetGreen.data +++ /dev/null @@ -1,6 +0,0 @@ -"FFAABBCC", "BB" // RGBA (hex) -"FFAABBCC", FALSE, 187 // RGBA (decimal) -"AABBCC", "BB" // RGB (hex) -"AABBCC", FALSE, 187 // RGB (decimal) -"FF00FF", "00" -"FF00FF", FALSE, 0 diff --git a/tests/rawTestData/Style/ColorGetRed.data b/tests/rawTestData/Style/ColorGetRed.data deleted file mode 100644 index 1692a6ad..00000000 --- a/tests/rawTestData/Style/ColorGetRed.data +++ /dev/null @@ -1,6 +0,0 @@ -"FFAABBCC", "AA" // RGBA (hex) -"FFAABBCC", FALSE, 170 // RGBA (decimal) -"AABBCC", "AA" // RGB (hex) -"AABBCC", FALSE, 170 // RGB (decimal) -"00FFFF", "00" -"00FFFF", FALSE, 0 diff --git a/tests/rawTestData/Style/NumberFormat.data b/tests/rawTestData/Style/NumberFormat.data deleted file mode 100644 index 49acaccf..00000000 --- a/tests/rawTestData/Style/NumberFormat.data +++ /dev/null @@ -1,37 +0,0 @@ -# value format result -0.0, "0.0", "0.0" -0.0, "0", "0" -0, "0.0", "0.0" -0, "0", "0" -0, "##0", "000" -12, "#.0#", "12.0" -0.1, "0.0", "0.1" -0.1, "0", "0" -5.5555, "0.###", "5.556" -5.5555, "0.0##", "5.556" -5.5555, "0.00#", "5.556" -5.5555, "0.000", "5.556" -5.5555, "0.0000", "5.5555" -12345.6789, '"#,##0.00"', '"12,345.68"' -12345.6789, '"#,##0.000"', '"12,345.679"' -12345.6789, '"£ #,##0.00"', '"£ 12,345.68"' -12345.6789, '"$ #,##0.000"', '"$ 12,345.679"' -5.6789, '"#,##0.00"', '"5.68"' -12000, '"#,###"', '"12,000"' -12000, '"#,"', '12' -12200000, '"0.0,,"', '12.2' // Scaling test -0.08, "0%", "8%" -0.8, "0%", "80%" -2.8, "0%", "280%" -125.74, '$0.00" Surplus";$-0.00" Shortage"', "$125.74 Surplus" --125.74, '$0.00" Surplus";$-0.00" Shortage"', "$-125.74 Shortage" --125.74, '$0.00" Surplus";$0.00" Shortage"', "$125.74 Shortage" -5.25, '# ???/???', "5 1/4" // Fraction -5.3, '# ???/???', "5 3/10" // Vulgar Fraction -5.25, '???/???', "21/4" -123456789, '(000) 0-0000-000', "(001) 2-3456-789" -123456789, '0 (+00) 0000 00 00 00', "0 (+00) 0123 45 67 89" -123456789, '0000:00:00', "12345:67:89" --123456789, '0000:00:00', "-12345:67:89" -1234567.89, '0000:00.00', "12345:67.89" --1234567.89,'0000:00.00', "-12345:67.89" diff --git a/tests/rawTestData/Style/NumberFormatDates.data b/tests/rawTestData/Style/NumberFormatDates.data deleted file mode 100644 index 7c7754cd..00000000 --- a/tests/rawTestData/Style/NumberFormatDates.data +++ /dev/null @@ -1,6 +0,0 @@ -22269.0625, 'dd-mm-yyyy hh:mm:ss', "19-12-1960 01:30:00" -22269.0625, 'MM/DD/YYYY HH:MM:SS', "12/19/1960 01:30:00" // Oasis uses upper-case -22269.0625, 'yyyy-mm-dd\Thh:mm:ss', "1960-12-19T01:30:00" // Date with plaintext escaped with a \ -22269.0625, 'yyyy-mm-dd"T"hh:mm:ss \Z', "1960-12-19T01:30:00 Z" // Date with plaintext in quotes -22269.0625, '"y-m-d" yyyy-mm-dd "h:m:s" hh:mm:ss', "y-m-d 1960-12-19 h:m:s 01:30:00" // Date with quoted formatting characters -22269.0625, '"y-m-d "yyyy-mm-dd" h:m:s "hh:mm:ss', "y-m-d 1960-12-19 h:m:s 01:30:00" // Date with quoted formatting characters