From: PJ Fanning Date: Tue, 1 Feb 2022 19:56:54 +0000 (+0000) Subject: add R1C1 test X-Git-Tag: REL_5_2_1~128 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d7e72c91fd71145c2b9afcee53186138129a9500;p=poi.git add R1C1 test git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897668 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java b/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java index 197cc0e5c2..06add8711e 100644 --- a/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java +++ b/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java @@ -171,4 +171,13 @@ public class CellAddress implements Comparable { public String formatAsString() { return CellReference.convertNumToColString(this._col)+(this._row+1); } + + /** + * @return R1C1-style cell address string representation + * @see #formatAsString() + * @since POI 5.2.1 + */ + public String formatAsR1C1String() { + return new CellReference(_row, _col).formatAsR1C1String(); + } } diff --git a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java index 25bd602c51..4dde615f64 100644 --- a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java +++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java @@ -410,11 +410,13 @@ public abstract class BaseTestCellComment { assertEquals(CellAddress.A1, comment.getAddress()); CellAddress C2 = new CellAddress("C2"); assertEquals("C2", C2.formatAsString()); + assertEquals("R2C3", C2.formatAsR1C1String()); comment.setAddress(C2); assertEquals(C2, comment.getAddress()); CellAddress E10 = new CellAddress(9, 4); assertEquals("E10", E10.formatAsString()); + assertEquals("R10C5", E10.formatAsR1C1String()); comment.setAddress(9, 4); assertEquals(E10, comment.getAddress()); } diff --git a/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java index 044203f3c2..14013d4304 100644 --- a/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java +++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java @@ -51,6 +51,7 @@ final class TestCellAddress { @Test void testFormatAsString() { assertEquals("A1", CellAddress.A1.formatAsString()); + assertEquals("R1C1", CellAddress.A1.formatAsR1C1String()); } @Test