diff --git a/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php index 136a729d..26e0a14b 100644 --- a/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php +++ b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php @@ -111,7 +111,7 @@ class AddressHelperTest extends TestCase } /** - * @dataProvider providerConvertFormulaToA1SpreadsheetXml + * @dataProvider providerConvertFormulaToA1FromSpreadsheetXml */ public function testConvertFormulaToA1SpreadsheetXml(string $expectedValue, string $formula): void { @@ -120,8 +120,38 @@ class AddressHelperTest extends TestCase self::assertSame($expectedValue, $actualValue); } - public function providerConvertFormulaToA1SpreadsheetXml(): array + public function providerConvertFormulaToA1FromSpreadsheetXml(): array { - return require 'tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php'; + return require 'tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php'; + } + + /** + * @dataProvider providerConvertFormulaToA1FromR1C1Absolute + */ + public function testConvertFormulaToA1R1C1Absolute(string $expectedValue, string $formula): void + { + $actualValue = AddressHelper::convertFormulaToA1($formula); + + self::assertSame($expectedValue, $actualValue); + } + + public function providerConvertFormulaToA1FromR1C1Absolute(): array + { + return require 'tests/data/Cell/ConvertFormulaToA1FromR1C1Absolute.php'; + } + + /** + * @dataProvider providerConvertFormulaToA1FromR1C1Relative + */ + public function testConvertFormulaToA1R1C1Relative(string $expectedValue, string $formula, int $row, int $column): void + { + $actualValue = AddressHelper::convertFormulaToA1($formula, $row, $column); + + self::assertSame($expectedValue, $actualValue); + } + + public function providerConvertFormulaToA1FromR1C1Relative(): array + { + return require 'tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php'; } } diff --git a/tests/data/Cell/ConvertFormulaToA1FromR1C1Absolute.php b/tests/data/Cell/ConvertFormulaToA1FromR1C1Absolute.php new file mode 100644 index 00000000..cc67d308 --- /dev/null +++ b/tests/data/Cell/ConvertFormulaToA1FromR1C1Absolute.php @@ -0,0 +1,8 @@ +