(#1489) Return character-length instead of byte-length

yegor256 · Nov 5, 2020 · e55c217 · e55c217
1 parent 9f3fa11
commit e55c217
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/org/cactoos/scalar/LengthOf.java b/src/main/java/org/cactoos/scalar/LengthOf.java
@@ -65,12 +65,12 @@ public <T> LengthOf(final Iterable<T> items) {
 
     /**
      * Ctor.
-     * Byte-length of Text.
-     * 
+     * Character-length of Text.
+     *
      * @param text The input
      */
     public LengthOf(final Text text) {
-        this(new InputOf(text));
+        this(() -> (double) text.asString().length());
     }
 
     /**

diff --git a/src/test/java/org/cactoos/scalar/LengthOfTest.java b/src/test/java/org/cactoos/scalar/LengthOfTest.java
@@ -199,10 +199,19 @@ public void lengthOfEmptyText() {
     }
 
     @Test
-    public void lengthOfUnicode() {
+    public void lengthOfUnicodeAsText() {
         new Assertion<>(
-            "Must calculate length of empty string",
+            "Must calculate character-length of unicode text",
             new LengthOf(new TextOf("привет")).intValue(),
+            new IsEqual<>(6)
+        ).affirm();
+    }
+
+    @Test
+    public void lengthOfUnicodeAsInput() {
+        new Assertion<>(
+            "Must calculate character-length of unicode input",
+            new LengthOf(new InputOf("Привет")).intValue(),
             new IsEqual<>(12)
         ).affirm();
     }