Merge pull request #31 from pontusmelke/1.0-path-bug

Properly treat single node paths

Author: jakewins

gulpfile.js

@@ -205,7 +205,7 @@ gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
     return gulp.src(featureHome + "/*").pipe(cucumber({
         'steps': 'test/v1/tck/steps/*.js',
         'format': 'pretty',
-        'tags' : ['~@in_dev', '~@db','~@match_acceptance']
+        'tags' : ['~@in_dev', '~@db']
     }));
 });
 

src/v1/graph-types.js

@@ -146,7 +146,7 @@ class PathSegment {
    * @param {Relationship} rel - Relationship segment
    * @param {string} end - Identity of end Node
    */
-  constructor( start, rel, end ) {
+  constructor(start, rel, end) {
     this.start = start;
     this.relationship = rel;
     this.end = end;
@@ -159,12 +159,14 @@ class PathSegment {
 class Path {
   /**
    * @constructor
+   * @param {Node} start  - start node
+   * @param {Node} end - end node
    * @param {Array} segments - Array of Segments
    */
-  constructor(segments) {
+  constructor(start, end, segments) {
+    this.start = start;
+    this.end = end;
     this.segments = segments;
-    this.start = segments[0].start;
-    this.end = segments[segments.length - 1].end;
     this.length = segments.length;
   }
 }

src/v1/internal/connector.js

@@ -114,6 +114,7 @@ let _mappers = {
         sequence = unpacker.unpack(buf);
     let prevNode = nodes[0],
         segments = [];
+
     for (let i = 0; i < sequence.length; i += 2) {
         let relIndex = sequence[i],
             nextNode = nodes[sequence[i + 1]],
@@ -138,9 +139,9 @@ let _mappers = {
         segments.push( new GraphType.PathSegment( prevNode, rel, nextNode ) );
         prevNode = nextNode;
     }
-    return new GraphType.Path( segments );
+    return new GraphType.Path(nodes[0], nodes[nodes.length - 1],  segments );
   }
-}
+};
 
 /**
  * A connection manages sending and recieving messages over a channel. A

test/v1/tck/steps/matchacceptencesteps.js

@@ -24,19 +24,17 @@ module.exports = function () {
     var successCallback = function(res) {
       var givenResults = [];
       var expectedPrint = printable(self.expectedResults);
-      for (var i = 0 ; i < res.records.length; i++)
-      {
+      for (var i = 0 ; i < res.records.length; i++)  {
           givenResults.push(getTestObject(res.records[i]));
       }
-      if ( givenResults.length != self.expectedResults.length)
-      {
+      if ( givenResults.length != self.expectedResults.length) {
         callback(new Error("Given and expected length of result array does not match. Give: " + givenResults.length + " Expected " + self.expectedResults.length));
       }
       if (!comapareResults(givenResults, self.expectedResults) ) {
         callback(new Error("Given and expected results does not match: " + printable(givenResults) + " Expected " + expectedPrint));
       }
       callback();
-    }
+    };
     this.rc.then(successCallback).catch(errorCallback);
   });
 
@@ -135,12 +133,12 @@ module.exports = function () {
     var id = 0;
     var startid = neo4j.int(path.start.identity.toString());
     var segments = path.segments;
-    for (var i in segments) {
+    for (var i = 0; i < segments.length; i++) {
       var segment = segments[i];
-      var relationship = segment.relationship;
       if (startid.notEquals(segment.start.identity)) {
         throw new Error("Path segment does not make sense")
       }
+      var relationship = segment.relationship;
       var endId = neo4j.int(segment.end.identity.toString());
       relationship.identity = neo4j.int(0);
       segment.start.identity = neo4j.int(id++);