Skip to content

Commit dcf475e

Browse files
oleibmanoleibman
authored
Merge pull request #4713 from oleibman/calcvalue
Use `calculateFormula` Rather Than `_calculateFormulaValue` in Tests
2 parents 827121e + 70b4ecd commit dcf475e

File tree

168 files changed

+301
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+301
-282
lines changed

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateDifTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testDATEDIFAsFormula(mixed $expectedResult, mixed ...$args): voi
3333
$calculation = Calculation::getInstance();
3434
$formula = "=DATEDIF({$arguments})";
3535

36-
$result = $calculation->_calculateFormulaValue($formula);
36+
$result = $calculation->calculateFormula($formula);
3737
self::assertSame($expectedResult, $result);
3838
}
3939

@@ -104,7 +104,7 @@ public function testDateDifArray(array $expectedResult, string $startDate, strin
104104
} else {
105105
$formula = "=DATEDIF({$startDate}, {$endDate}, {$methods})";
106106
}
107-
$result = $calculation->_calculateFormulaValue($formula);
107+
$result = $calculation->calculateFormula($formula);
108108
self::assertSame($expectedResult, $result);
109109
}
110110

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testDATEAsFormula(mixed $expectedResult, mixed ...$args): void
5353
$calculation = Calculation::getInstance();
5454
$formula = "=DATE({$arguments})";
5555

56-
$result = $calculation->_calculateFormulaValue($formula);
56+
$result = $calculation->calculateFormula($formula);
5757
self::assertSame($expectedResult, $result);
5858
}
5959

@@ -144,7 +144,7 @@ public function testDateArray(array $expectedResult, string $year, string $month
144144
$calculation = Calculation::getInstance();
145145

146146
$formula = "=DATE({$year}, {$month}, {$day})";
147-
$result = $calculation->_calculateFormulaValue($formula);
147+
$result = $calculation->calculateFormula($formula);
148148
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
149149
}
150150

@@ -211,7 +211,7 @@ public function testDateArrayException(string $year, string $month, string $day)
211211
$this->expectExceptionMessage('Formulae with more than two array arguments are not supported');
212212

213213
$formula = "=DATE({$year}, {$month}, {$day})";
214-
$calculation->_calculateFormulaValue($formula);
214+
$calculation->calculateFormula($formula);
215215
}
216216

217217
public static function providerDateArrayException(): array

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testDATEVALUEAsFormula(float|int|string $expectedResult, mixed .
7878
$calculation = Calculation::getInstance();
7979
$formula = "=DATEVALUE({$arguments})";
8080

81-
$result = $calculation->_calculateFormulaValue($formula);
81+
$result = $calculation->calculateFormula($formula);
8282
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-8);
8383
}
8484

@@ -182,7 +182,7 @@ public function testDateValueArray(array $expectedResult, string $array): void
182182
$calculation = Calculation::getInstance();
183183

184184
$formula = "=DATEVALUE({$array})";
185-
$result = $calculation->_calculateFormulaValue($formula);
185+
$result = $calculation->calculateFormula($formula);
186186
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
187187
}
188188

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testDAYAsFormula(mixed $expectedResultExcel, mixed ...$args): vo
4646
$calculation = Calculation::getInstance();
4747
$formula = "=DAY({$arguments})";
4848

49-
$result = $calculation->_calculateFormulaValue($formula);
49+
$result = $calculation->calculateFormula($formula);
5050
self::assertSame($expectedResultExcel, $result);
5151
}
5252

@@ -92,7 +92,7 @@ public function testDAYAsFormulaOpenOffice(mixed $expectedResultOpenOffice, mixe
9292
$calculation = Calculation::getInstance();
9393
$formula = "=DAY({$arguments})";
9494

95-
$result = $calculation->_calculateFormulaValue($formula);
95+
$result = $calculation->calculateFormula($formula);
9696
self::assertSame($expectedResultOpenOffice, $result);
9797
}
9898

@@ -140,7 +140,7 @@ public function testDayArray(array $expectedResult, string $array): void
140140
$calculation = Calculation::getInstance();
141141

142142
$formula = "=DAY({$array})";
143-
$result = $calculation->_calculateFormulaValue($formula);
143+
$result = $calculation->calculateFormula($formula);
144144
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
145145
}
146146

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/Days360Test.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testDAYS360AsFormula(mixed $expectedResult, mixed ...$args): voi
3232
$calculation = Calculation::getInstance();
3333
$formula = "=DAYS360({$arguments})";
3434

35-
$result = $calculation->_calculateFormulaValue($formula);
35+
$result = $calculation->calculateFormula($formula);
3636
self::assertSame($expectedResult, $result);
3737
}
3838

@@ -103,7 +103,7 @@ public function testDays360Array(array $expectedResult, string $startDate, strin
103103
} else {
104104
$formula = "=DAYS360({$startDate}, {$endDate}, {$methods})";
105105
}
106-
$result = $calculation->_calculateFormulaValue($formula);
106+
$result = $calculation->calculateFormula($formula);
107107
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
108108
}
109109

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DaysTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testDAYSAsFormula(mixed $expectedResult, mixed ...$args): void
3131
$calculation = Calculation::getInstance();
3232
$formula = "=DAYS({$arguments})";
3333

34-
$result = $calculation->_calculateFormulaValue($formula);
34+
$result = $calculation->calculateFormula($formula);
3535
self::assertSame($expectedResult, $result);
3636
}
3737

@@ -98,7 +98,7 @@ public function testDaysArray(array $expectedResult, string $startDate, string $
9898
$calculation = Calculation::getInstance();
9999

100100
$formula = "=DAYS({$startDate}, {$endDate})";
101-
$result = $calculation->_calculateFormulaValue($formula);
101+
$result = $calculation->calculateFormula($formula);
102102
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
103103
}
104104

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testEDATEAsFormula(mixed $expectedResult, mixed ...$args): void
4747
$calculation = Calculation::getInstance();
4848
$formula = "=EDATE({$arguments})";
4949

50-
$result = $calculation->_calculateFormulaValue($formula);
50+
$result = $calculation->calculateFormula($formula);
5151
self::assertSame($expectedResult, $result);
5252
}
5353

@@ -129,7 +129,7 @@ public function testEDateArray(array $expectedResult, string $dateValues, string
129129
$calculation = Calculation::getInstance();
130130

131131
$formula = "=EDATE({$dateValues}, {$methods})";
132-
$result = $calculation->_calculateFormulaValue($formula);
132+
$result = $calculation->calculateFormula($formula);
133133
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
134134
}
135135

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testEOMONTHAsFormula(mixed $expectedResult, mixed ...$args): voi
4747
$calculation = Calculation::getInstance();
4848
$formula = "=EOMONTH({$arguments})";
4949

50-
$result = $calculation->_calculateFormulaValue($formula);
50+
$result = $calculation->calculateFormula($formula);
5151
self::assertSame($expectedResult, $result);
5252
}
5353

@@ -128,7 +128,7 @@ public function testEoMonthArray(array $expectedResult, string $dateValues, stri
128128
$calculation = Calculation::getInstance();
129129

130130
$formula = "=EOMONTH({$dateValues}, {$methods})";
131-
$result = $calculation->_calculateFormulaValue($formula);
131+
$result = $calculation->calculateFormula($formula);
132132
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
133133
}
134134

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/HourTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testHOURAsFormula(mixed $expectedResult, mixed ...$args): void
2929
$calculation = Calculation::getInstance();
3030
$formula = "=HOUR({$arguments})";
3131

32-
$result = $calculation->_calculateFormulaValue($formula);
32+
$result = $calculation->calculateFormula($formula);
3333
self::assertSame($expectedResult, $result);
3434
}
3535

@@ -89,7 +89,7 @@ public function testHourArray(array $expectedResult, string $array): void
8989
$calculation = Calculation::getInstance();
9090

9191
$formula = "=HOUR({$array})";
92-
$result = $calculation->_calculateFormulaValue($formula);
92+
$result = $calculation->calculateFormula($formula);
9393
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
9494
}
9595

‎tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testISOWEEKNUMAsFormula(mixed $expectedResult, mixed ...$args):
4646
$calculation = Calculation::getInstance();
4747
$formula = "=ISOWEEKNUM({$arguments})";
4848

49-
$result = $calculation->_calculateFormulaValue($formula);
49+
$result = $calculation->calculateFormula($formula);
5050
self::assertSame($expectedResult, $result);
5151
}
5252

@@ -120,7 +120,7 @@ public function testIsoWeekNumArray(array $expectedResult, string $array): void
120120
$calculation = Calculation::getInstance();
121121

122122
$formula = "=ISOWEEKNUM({$array})";
123-
$result = $calculation->_calculateFormulaValue($formula);
123+
$result = $calculation->calculateFormula($formula);
124124
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
125125
}
126126

0 commit comments

Comments
 (0)