Merge pull request #104 from zhenlineo/1.0-pack-unpack-path

Bug fix in packing/unpacking Path

Author: Zhen Li

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

@@ -283,7 +283,7 @@ public int hashCode()
     public String toString()
     {
 
-        return "path[" + segments + ']';
+        return "path" + segments;
     }
 
     private void buildSegments()

driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java

@@ -318,7 +318,9 @@ private void packValue( Value value ) throws IOException
                     for ( Path.Segment seg : path )
                     {
                         Relationship rel = seg.relationship();
-                        packer.pack( rel.end().equals( seg.end() ) ? relIdx.get( rel ) : -relIdx.get( rel ) );
+                        Identity relEndId = rel.end();
+                        Identity segEndId = seg.end().identity();
+                        packer.pack( relEndId.equals( segEndId ) ? relIdx.get( rel ) : -relIdx.get( rel ) );
                         packer.pack( nodeIdx.get( seg.end() ) );
                     }
                     break;

driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java

@@ -18,6 +18,10 @@
  */
 package org.neo4j.driver.internal.messaging;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,10 +31,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import org.neo4j.driver.internal.InternalNode;
 import org.neo4j.driver.internal.InternalPath;
 import org.neo4j.driver.internal.InternalRelationship;
@@ -41,11 +41,9 @@
 import org.neo4j.driver.v1.util.DumpMessage;
 
 import static java.util.Arrays.asList;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-
 import static org.neo4j.driver.v1.Values.parameters;
 import static org.neo4j.driver.v1.Values.value;
 
@@ -91,12 +89,12 @@ public void shouldUnpackAllValues() throws Throwable
         assertSerializesValue( value(
                 new InternalPath(
                         new InternalNode( 1 ),
-                        new InternalRelationship( 1, 1, 1,
+                        new InternalRelationship( 2, 1, 3,
                                 "KNOWS", parameters() ),
-                        new InternalNode( 1 ),
-                        new InternalRelationship( 2, 1, 1,
+                        new InternalNode( 3 ),
+                        new InternalRelationship( 4, 3, 5,
                                 "LIKES", parameters() ),
-                        new InternalNode( 1 )
+                        new InternalNode( 5 )
                 ) ) );
         assertSerializesValue( value( new InternalPath( new InternalNode( 1 ) ) ) );
     }
@@ -141,7 +139,8 @@ private void assertSerializes( Message... messages ) throws IOException
         writer.flush();
 
         // Unpack
-        assertThat( unpack( format, out.toByteArray() ), equalTo( asList( messages ) ) );
+        ArrayList<Message> unpackedMessages = unpack( format, out.toByteArray() );
+        assertThat( unpackedMessages.toString(), equalTo( asList( messages ).toString() ) );
     }
 
     private ArrayList<Message> unpack( MessageFormat format, byte[] bytes ) throws IOException

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)] :: PATH", pathValue().toString());
     }
 
     @Test