Add test case

Author: dafeng.xdf

lib/BinaryHeap.js

@@ -219,7 +219,6 @@
   proto.percolateUp = function(index) {
     // last element
     var current = this.list[index];
-    var score = current;
 
     while (index > 0) {
       /**
@@ -229,7 +228,7 @@
       var parentIndex = Math.floor((index + 1) / 2) - 1,
       parentNode = this.list[parentIndex];
 
-      if (score >= parentNode) break;
+      if (current >= parentNode) break;
       // swap the parent node with the current
       this.list[parentIndex] = current;
       this.list[index] = parentNode;
@@ -244,23 +243,22 @@
   proto.percolateDown = function(index) {
     var length = this.size();
     var current = this.list[index];
-    var score = current;
 
     while(true) {
       var childRightIndex = (index + 1) * 2;
       var childLeftIndex = childRightIndex - 1;
       var swap = null;
 
       if (childLeftIndex < length) {
-        var child1 = this.list[childLeftIndex],
-        child1Score = child1;
-        if (child1Score < score) swap = childLeftIndex;
+        var childLeft = this.list[childLeftIndex];
+
+        if (childLeft < current) swap = childLeftIndex;
       }
 
       if (childRightIndex < length) {
-        var child2 = this.list[childRightIndex];
-        var child2Score = child2;
-        if (child2Score < (swap == null ? score : child1Score)) swap = childRightIndex;
+        var childRight = this.list[childRightIndex];
+
+        if (childRight < (swap === null ? current : childLeft)) swap = childRightIndex;
       }
       if (swap == null) break;
       this.list[index] = this.list[swap];

test/BinaryHeap.test.js

@@ -55,8 +55,7 @@ describe('add or insert to heap', function(){
       binaryHeap.insert(1);
       binaryHeap.insert(1);
       binaryHeap.insert(1);
-    }catch (e){
-    }
+    }catch (e){}
     binaryHeap.size().should.equal(3);
   });
 });
@@ -93,14 +92,13 @@ describe('clear method, isEmpty method, isFull method', function() {
     binaryHeap.isFull().should.be.true;
   });
 });
-/*
 describe('pop method', function() {
   it('should success', function() {
     var binaryHeap = new BinaryHeap(3);
     binaryHeap.add(1);
     binaryHeap.add(2);
     binaryHeap.add(3);
-    binaryHeap.pop().should.equal(3);
+    binaryHeap.pop().should.equal(1);
     binaryHeap.size().should.equal(2);
   });
 });
@@ -109,11 +107,11 @@ describe('size method, toString method and contains method', function() {
   it('should be a number', function() {
     var binaryHeap = new BinaryHeap(3);
     binaryHeap.size().should.equal(0);
-    binaryHeap.add(true);
-    binaryHeap.add('xdf');
+    binaryHeap.add(1);
+    binaryHeap.add(2);
     binaryHeap.add(3);
-    binaryHeap.toString().should.equal('[true,"xdf",3]');
-    binaryHeap.contains(true).should.be.true;
+    binaryHeap.toString().should.equal('[1,2,3]');
+    binaryHeap.contains(1).should.be.true;
     binaryHeap.contains(0).should.be.false;
   });
 });
@@ -135,16 +133,27 @@ describe('grow method', function() {
       binaryHeap.add(2);
       binaryHeap.add(3);
       binaryHeap.add(4);
-    }catch(e) {
-    }
+    }catch(e) {}
     binaryHeap.size().should.equal(3);
     binaryHeap.grow();
     try {
       binaryHeap.add(4);
       binaryHeap.add(5);
-    }catch(e) {
-    }
+    }catch(e) {}
     binaryHeap.size().should.equal(4);
   });
 });
-*/
+
+describe('main function', function() {
+  it('pop should success', function() {
+    var binaryHeap = new BinaryHeap();
+    var arr = [5, 4, 3, 2, 1];
+    arr.forEach(function(i) {
+      binaryHeap.add(i);
+    });
+    binaryHeap.list.toString().should.equal('1,2,4,5,3');
+    var result = [];
+    while (binaryHeap.size() > 0) result.push(binaryHeap.pop());
+    result.toString().should.equal(arr.reverse().toString());
+  });
+});