toString should not show type

Author: pontusmelke

driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java

@@ -40,6 +40,7 @@
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 
+import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_ONLY;
 import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_WITH_TYPE;
 import static org.neo4j.driver.v1.Values.valueAsIs;
 
@@ -315,7 +316,7 @@ public <V> Iterable<Pair<String, V>> properties( final Function<Value, V> mapFun
 
     public String toString()
     {
-        return toString( VALUE_WITH_TYPE );
+        return toString( VALUE_ONLY );
     }
 
     protected String maybeWithType( boolean includeType, String text )

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

@@ -157,7 +157,7 @@ public void shouldMapDriverMapsToJavaMaps() throws Throwable
 
         // Then
         assertThat( result.size(), equalTo( 2 ) );
-        assertThat( result.get( "Dog" ), equalTo( "2 :: INTEGER" ) );
-        assertThat( result.get( "Cat" ), equalTo( "1 :: INTEGER" ) );
+        assertThat( result.get( "Dog" ), equalTo( "2" ) );
+        assertThat( result.get( "Cat" ), equalTo( "1" ) );
     }
 }

driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java

@@ -72,7 +72,7 @@ public void shouldLogRunMessage() throws Throwable
         handler.handleRunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) );
 
         // Then
-        assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"] :: LIST OF ANY?}]", log );
+        assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"]}]", log );
         assertEquals( format( new RunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) ) ),
                 log );
     }

driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java

@@ -34,7 +34,7 @@ public class ListValueTest
     public void shouldHaveSensibleToString() throws Throwable
     {
         ListValue listValue = listValue( value( 1 ), value( 2 ), value( 3 ) );
-        assertThat( listValue.toString(), equalTo( "[1, 2, 3] :: LIST OF ANY?" ) );
+        assertThat( listValue.toString(), equalTo( "[1, 2, 3]" ) );
     }
 
     @Test

driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java

@@ -37,7 +37,7 @@ public class MapValueTest
     public void shouldHaveSensibleToString() throws Throwable
     {
         MapValue mapValue = mapValue();
-        assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42} :: MAP" ) );
+        assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42}" ) );
     }
 
     @Test

driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java

@@ -42,8 +42,8 @@ public class NodeValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals( "node<#1234> :: NODE", emptyNodeValue().toString() );
-        assertEquals( "node<#1234> :: NODE", filledNodeValue().toString() );
+        assertEquals( "node<#1234>", emptyNodeValue().toString() );
+        assertEquals( "node<#1234>", filledNodeValue().toString() );
     }
 
     @Test

driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java

@@ -36,7 +36,7 @@ public class PathValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals("path[(#42)-[#43:T]->(#44)] :: PATH", pathValue().toString());
+        assertEquals("path[(#42)-[#43:T]->(#44)]", pathValue().toString());
     }
 
     @Test

driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java

@@ -38,8 +38,8 @@ public class RelationshipValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals( "relationship<#1234> :: RELATIONSHIP", emptyRelationshipValue().toString() );
-        assertEquals( "relationship<#1234> :: RELATIONSHIP", filledRelationshipValue().toString() );
+        assertEquals( "relationship<#1234>", emptyRelationshipValue().toString() );
+        assertEquals( "relationship<#1234>", filledRelationshipValue().toString() );
     }
 
     @Test

driver/src/test/java/org/neo4j/driver/v1/integration/ExamplesIT.java

@@ -182,7 +182,7 @@ public void resultCursor() throws Throwable
         }
 
         // Then
-        assertThat( stdIO.stdout(), equalTo( asList("Record: 0","  p.age = 23 :: INTEGER") ) );
+        assertThat( stdIO.stdout(), equalTo( asList("Record: 0","  p.age = 23") ) );
     }
 
     @Test
@@ -244,7 +244,7 @@ public void retainResultsForNestedQuerying() throws Throwable
         }
 
         // Then
-        assertThat( stdIO.stdout(), equalTo( asList("p.age = 23 :: INTEGER") ) );
+        assertThat( stdIO.stdout(), equalTo( asList("p.age = 23") ) );
     }