Simplfied values method and added tests

Author: RagnarW

driver/src/main/java/org/neo4j/driver/internal/InternalRecord.java

@@ -25,16 +25,16 @@
 
 import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.internal.value.InternalValue;
-import org.neo4j.driver.v1.util.Function;
-import org.neo4j.driver.v1.util.Pair;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
+import org.neo4j.driver.v1.util.Function;
+import org.neo4j.driver.v1.util.Pair;
 
 import static java.lang.String.format;
 import static org.neo4j.driver.internal.util.Format.formatPairs;
-import static org.neo4j.driver.v1.Values.ofValue;
 import static org.neo4j.driver.v1.Values.ofObject;
+import static org.neo4j.driver.v1.Values.ofValue;
 
 public class InternalRecord implements Record
 {
@@ -57,7 +57,7 @@ public List<String> keys()
     @Override
     public List<Value> values()
     {
-        return Values.value( asMap().values()).asList(ofValue());
+        return Arrays.asList( values );
     }
 
     @Override

driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java

@@ -21,6 +21,7 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -183,6 +184,64 @@ public void testToString()
         assertThat( record.toString(), equalTo( "Record<{k1: 0, k2: 1}>" ) );
     }
 
+    @Test
+    public void shouldHaveMethodToGetKeys()
+    {
+        //GIVEN
+        List<String> keys = Arrays.asList( "k2", "k1" );
+        InternalRecord record =  new InternalRecord( keys, new Value[]{value( 0 ), value( 1 )} );
+
+        //WHEN
+        List<String> appendedKeys = record.keys();
+
+        //THEN
+        assertThat( appendedKeys, equalTo( keys ) );
+    }
+
+    @Test
+    public void emptyKeysShouldGiveEmptyList()
+    {
+        //GIVEN
+        List<String> keys = Collections.emptyList();
+        InternalRecord record =  new InternalRecord( keys, new Value[]{} );
+
+        //WHEN
+        List<String> appendedKeys = record.keys();
+
+        //THEN
+        assertThat( appendedKeys, equalTo( keys ) );
+    }
+
+
+    @Test
+    public void shouldHaveMethodToGetValues()
+    {
+        //GIVEN
+        List<String> keys = Arrays.asList( "k2", "k1" );
+        Value[] values = new Value[]{value( 0 ), value( 1 )};
+        InternalRecord record =  new InternalRecord( keys, values );
+
+        //WHEN
+        List<Value> appendedValues = record.values();
+
+        //THEN
+        assertThat( appendedValues, equalTo( Arrays.asList( values ) ) );
+    }
+
+    @Test
+    public void emptyValuesShouldGiveEmptyList()
+    {
+        //GIVEN
+        List<String> keys = Collections.emptyList();
+        Value[] values = new Value[]{};
+        InternalRecord record =  new InternalRecord( keys, values );
+
+        //WHEN
+        List<Value> appendedValues = record.values();
+
+        //THEN
+        assertThat( appendedValues, equalTo( Arrays.asList( values ) ) );
+    }
 
     private InternalRecord createRecord()
     {