Merge pull request #172 from mustafaiman/fixHeartbeatTest

Fix heartbeat test

Author: asimarslan

src/Util.ts

@@ -2,6 +2,7 @@ import Long = require('long');
 import {PagingPredicate} from './serialization/DefaultPredicates';
 import {IterationType} from './core/Predicate';
 import * as assert from 'assert';
+import {Comparator} from './core/Comparator';
 export function assertNotNull(v: any) {
     assert.notEqual(v, null, 'Non null value expected.');
 }
@@ -48,9 +49,10 @@ export function getSortedQueryResultSet(list: Array<any>, predicate: PagingPredi
         return list;
     }
     var comparatorObject = predicate.getComparator();
-    if (comparatorObject != null) {
-        list.sort(comparatorObject.sort.bind(comparatorObject));
+    if (comparatorObject == null) {
+        comparatorObject = createComparator(predicate.getIterationType());
     }
+    list.sort(comparatorObject.sort.bind(comparatorObject));
     var nearestAnchorEntry = (predicate == null) ? null : predicate.getNearestAnchorEntry();
     var nearestPage = nearestAnchorEntry[0];
     var page = predicate.getPage();
@@ -76,6 +78,23 @@ export function getSortedQueryResultSet(list: Array<any>, predicate: PagingPredi
     });
 }
 
+function createComparator(iterationType: IterationType): Comparator  {
+    var object: Comparator = {
+        sort: function(a: [any, any], b: [any, any]): number {
+            return 0;
+        }
+    };
+    switch (iterationType) {
+        case IterationType.KEY:
+            object.sort = (e1: [any, any], e2: [any, any]) => {return e1[0] < e2[0] ? -1 : +(e1[0] > e2[0]); }; break;
+        case IterationType.ENTRY:
+            object.sort = (e1: [any, any], e2: [any, any]) => {return e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); }; break;
+        case IterationType.VALUE:
+            object.sort = (e1: [any, any], e2: [any, any]) => {return e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); }; break;
+    }
+    return object;
+}
+
 function setAnchor(list: Array<any>, predicate: PagingPredicate, nearestPage: number) {
     assert(list.length > 0);
     var size = list.length;

src/invocation/ClusterService.ts

@@ -158,7 +158,7 @@ class ClusterService extends EventEmitter {
                         deferred.resolve();
                     });
                 }).catch((e) => {
-                    this.logger.warn('ClusterService', e);
+                    this.logger.warn('ClusterService', e.className, e);
                     this.tryAddressIndex(index + 1, attemptLimit, attemptPeriod, deferred);
                 });
             }

src/invocation/InvocationService.ts

@@ -67,7 +67,7 @@ export class Invocation {
  * Sends requests to appropriate nodes. Resolves waiting promises with responses.
  */
 export class InvocationService {
-    private correlationCounter = 0;
+    private correlationCounter = 1;
     private eventHandlers: {[id: number]: Invocation} = {};
     private pending: {[id: number]: Invocation} = {};
     private client: HazelcastClient;
@@ -231,7 +231,7 @@ export class InvocationService {
                     this.invoke(pendingInvocation);
                 }, INVOCATION_RETRY_DELAY);
             } else {
-                this.logger.error('InvocationService', 'Received exception as response', remoteException);
+                this.logger.trace('InvocationService', 'Received exception as response', remoteException);
                 deferred.reject(remoteException);
             }
         } else {

test/HeartbeatTest.js

@@ -45,7 +45,7 @@ describe('Heartbeat', function() {
         }).then(function() {
             return RC.startMember(cluster.id);
         }).then(function(member2) {
-            RC.terminateMember(cluster.id, member2.uuid);
+            simulateHeartbeatLost(client, member2.host + ':' + member2.port, 2000);
         }).catch(done);
     });