From 03ba547f5a50222e79aa3ccafd89bbb92112b9c0 Mon Sep 17 00:00:00 2001
From: Nathan Dench <ndenc2@gmail.com>
Date: Mon, 10 May 2021 17:04:04 +1000
Subject: [PATCH] Test convertFormulaToA1FromR1C1

---
 .../Cell/AddressHelperTest.php                | 36 +++++++++++++++++--
 .../ConvertFormulaToA1FromR1C1Absolute.php    |  8 +++++
 .../ConvertFormulaToA1FromR1C1Relative.php    |  7 ++++
 ... ConvertFormulaToA1FromSpreadsheetXml.php} |  0
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 tests/data/Cell/ConvertFormulaToA1FromR1C1Absolute.php
 create mode 100644 tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php
 rename tests/data/Cell/{ConvertFormulaToA1SpreadsheetXml.php => ConvertFormulaToA1FromSpreadsheetXml.php} (100%)

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 @@
+<?php
+
+return [
+    ['=B4+C4', '=R4C2+R4C3'],
+    ['=B3+C3', '=R[2]C[1]+R[2]C[2]'],
+    ['=SUM(B1:B4)', '=SUM(R1C2:R4C2)'],
+    ['=CONCAT("Result of formula expression =R1C1+R1C2 is: ", A1+B1)', '=CONCAT("Result of formula expression =R1C1+R1C2 is: ", R1C1+R1C2)'],
+];
diff --git a/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php b/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php
new file mode 100644
index 00000000..4686cc5a
--- /dev/null
+++ b/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    ['=N18+O18', '=R[2]C[1]+R[2]C[2]', 16, 13],
+    ['=SUM(E1:E5)', '=SUM(R[-4]C:RC)', 5, 5],
+    ['=CONCAT("Result of formula expression =R[-2]C[-2]+R[-1]C[-2] is: ", C3+C4)', '=CONCAT("Result of formula expression =R[-2]C[-2]+R[-1]C[-2] is: ", R[-2]C[-2]+R[-1]C[-2])', 5, 5],
+];
diff --git a/tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php b/tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php
similarity index 100%
rename from tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php
rename to tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php