From 94ec357df5ccaebfd1a305a54528f943f2024c98 Mon Sep 17 00:00:00 2001 From: Elango Cheran Date: Tue, 31 Dec 2024 14:43:31 -0800 Subject: [PATCH] ICU-22789 Make followup adjustments to Segment field accessors after refactor --- .../com/ibm/icu/text/segmenter/Segments.java | 2 +- .../dev/test/text/segmenter/SegmentsTest.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/Segments.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/Segments.java index 388aa5e4292..66897108252 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/Segments.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/Segments.java @@ -84,7 +84,7 @@ public interface Segments { } default Function rangeToSequenceFn() { - return segment -> getSourceSequence().subSequence(segment.start(), segment.limit()); + return segment -> getSourceSequence().subSequence(segment.start, segment.limit); } default IntStream boundaries() { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/segmenter/SegmentsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/segmenter/SegmentsTest.java index 24d1e6c2f4c..74581e787b5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/segmenter/SegmentsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/segmenter/SegmentsTest.java @@ -34,11 +34,11 @@ public class SegmentsTest extends CoreTestFmwk { List segments = segments1.ranges().collect(Collectors.toList()); - assertEquals("first range start", 0, segments.get(0).start()); - assertEquals("first range limit", 3, segments.get(0).limit()); + assertEquals("first range start", 0, segments.get(0).start); + assertEquals("first range limit", 3, segments.get(0).limit); - assertEquals("second range start", 3, segments.get(1).start()); - assertEquals("second range limit", 4, segments.get(1).limit()); + assertEquals("second range start", 3, segments.get(1).start); + assertEquals("second range limit", 4, segments.get(1).limit); } @Test @@ -104,11 +104,11 @@ public class SegmentsTest extends CoreTestFmwk { List segments = segments1.rangesAfterIndex(startIdx).collect(Collectors.toList()); - assertEquals("first range start", 3, segments.get(0).start()); - assertEquals("first range limit", 4, segments.get(0).limit()); + assertEquals("first range start", 3, segments.get(0).start); + assertEquals("first range limit", 4, segments.get(0).limit); - assertEquals("second range start", 4, segments.get(1).start()); - assertEquals("second range limit", 9, segments.get(1).limit()); + assertEquals("second range start", 4, segments.get(1).start); + assertEquals("second range limit", 9, segments.get(1).limit); } @Test @@ -127,11 +127,11 @@ public class SegmentsTest extends CoreTestFmwk { List segments = segments1.rangesBeforeIndex(startIdx).collect(Collectors.toList()); - assertEquals("first range start", 4, segments.get(0).start()); - assertEquals("first range limit", 9, segments.get(0).limit()); + assertEquals("first range start", 4, segments.get(0).start); + assertEquals("first range limit", 9, segments.get(0).limit); - assertEquals("second range start", 3, segments.get(1).start()); - assertEquals("second range limit", 4, segments.get(1).limit()); + assertEquals("second range start", 3, segments.get(1).start); + assertEquals("second range limit", 4, segments.get(1).limit); } @Test @@ -190,8 +190,8 @@ public class SegmentsTest extends CoreTestFmwk { assert expLimit == null; assertThat("Out of bounds range should be null", segment == null); } else { - assertEquals(desc + ", start", (long) expStart.intValue(), segment.start()); - assertEquals(desc + ", limit", (long) expLimit.intValue(), segment.limit()); + assertEquals(desc + ", start", (long) expStart.intValue(), segment.start); + assertEquals(desc + ", limit", (long) expLimit.intValue(), segment.limit); } } } @@ -235,8 +235,8 @@ public class SegmentsTest extends CoreTestFmwk { assert expLimit == null; assertThat("Out of bounds range should be null", segment == null); } else { - assertEquals(desc + ", start", (long) expStart.intValue(), (long) segment.start()); - assertEquals(desc + ", limit", (long) expLimit.intValue(), (long) segment.limit()); + assertEquals(desc + ", start", (long) expStart.intValue(), (long) segment.start); + assertEquals(desc + ", limit", (long) expLimit.intValue(), (long) segment.limit); } } }