charValue('a').split("a") should return ["", ""]

community/values/src/main/java/org/neo4j/values/storable/CharValue.java

@@ -22,7 +22,6 @@
 import org.neo4j.values.virtual.ListValue;
 
 import static java.lang.String.format;
-import static org.neo4j.values.virtual.VirtualValues.EMPTY_LIST;
 import static org.neo4j.values.virtual.VirtualValues.list;
 
 public final class CharValue extends TextValue
@@ -154,7 +153,7 @@ public ListValue split( String separator )
     {
         if ( separator.equals( stringValue() ) )
         {
-            return EMPTY_LIST;
+            return EMPTY_SPLIT;
         }
         else
         {

community/values/src/main/java/org/neo4j/values/storable/StringValue.java

@@ -27,8 +27,6 @@
 
 public abstract class StringValue extends TextValue
 {
-    private static final ListValue EMPTY_SPLIT = fromArray( stringArray( "", "" ) );
-
     abstract String value();
 
     @Override

community/values/src/main/java/org/neo4j/values/storable/TextValue.java

@@ -21,8 +21,13 @@
 
 import org.neo4j.values.virtual.ListValue;
 
+import static org.neo4j.values.storable.Values.stringArray;
+import static org.neo4j.values.virtual.VirtualValues.fromArray;
+
 public abstract class TextValue extends ScalarValue
 {
+    protected static final ListValue EMPTY_SPLIT = fromArray( stringArray( "", "" ) );
+
     TextValue()
     {
     }

community/values/src/main/java/org/neo4j/values/storable/UTF8StringValue.java

@@ -107,6 +107,8 @@ public int length()
             if ( b >= 0 )
             {
                 i++;
+                count++;
+                continue;
             }
 
             //The number of high bits tells us how many bytes we use to store the value

community/values/src/test/java/org/neo4j/values/storable/CharValueTest.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2002-2017 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.values.storable;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.neo4j.values.storable.Values.EMPTY_STRING;
+import static org.neo4j.values.storable.Values.charValue;
+import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.list;
+
+public class CharValueTest
+{
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    private char[] chars = {' ', '楡', 'a', '7', 'Ö'};
+
+    @Test
+    public void shouldHandleDifferentTypesOfChars()
+    {
+        for ( char c : chars )
+        {
+            TextValue charValue = charValue( c );
+            TextValue stringValue = stringValue( Character.toString( c ) );
+
+            assertThat( charValue, equalTo( stringValue ) );
+            assertThat( charValue.length(), equalTo( stringValue.length() ) );
+            assertThat( charValue.hashCode(), equalTo( stringValue.hashCode() ) );
+            assertThat( charValue.split( Character.toString( c ) ),
+                    equalTo( stringValue.split( Character.toString( c ) ) ) );
+            assertThat( charValue.toUpper(), equalTo( stringValue.toUpper() ) );
+            assertThat( charValue.toLower(), equalTo( stringValue.toLower() ) );
+        }
+    }
+
+    @Test
+    public void shouldSplit()
+    {
+        CharValue charValue = charValue( 'a' );
+        assertThat( charValue.split( "a" ), equalTo( list( EMPTY_STRING, EMPTY_STRING ) ) );
+        assertThat( charValue.split( "A" ), equalTo( list( charValue ) ) );
+    }
+
+    @Test
+    public void shouldTrim()
+    {
+        assertThat( charValue( 'a' ).trim(), equalTo( charValue( 'a' ) ) );
+        assertThat( charValue( ' ' ).trim(), equalTo( EMPTY_STRING ) );
+    }
+
+    @Test
+    public void shouldLTrim()
+    {
+        assertThat( charValue( 'a' ).ltrim(), equalTo( charValue( 'a' ) ) );
+        assertThat( charValue( ' ' ).ltrim(), equalTo( EMPTY_STRING ) );
+    }
+
+    @Test
+    public void shouldRTrim()
+    {
+        assertThat( charValue( 'a' ).rtrim(), equalTo( charValue( 'a' ) ) );
+        assertThat( charValue( ' ' ).rtrim(), equalTo( EMPTY_STRING ) );
+    }
+
+    @Test
+    public void shouldReverse()
+    {
+        for ( char c : chars )
+        {
+            CharValue charValue = charValue( c );
+            assertThat( charValue.reverse(), equalTo( charValue ) );
+        }
+    }
+
+    @Test
+    public void shouldReplace()
+    {
+        assertThat( charValue( 'a' ).replace( "a", "a long string" ), equalTo( stringValue( "a long string" ) ) );
+        assertThat( charValue( 'a' ).replace( "b", "a long string" ), equalTo( charValue( 'a' ) ) );
+    }
+
+    @Test
+    public void shouldSubstring()
+    {
+        assertThat( charValue( 'a' ).substring( 0, 1 ), equalTo( charValue( 'a' ) ) );
+        assertThat( charValue( 'a' ).substring( 1, 3 ), equalTo( EMPTY_STRING ) );
+    }
+}