adds server version check to new tests

Author: mustafaiman

src/BuildMetadata.ts

@@ -20,7 +20,7 @@ export class BuildMetadata {
     private static readonly MAJOR_VERSION_MULTIPLIER = 10000;
     private static readonly MINOR_VERSION_MULTIPLIER = 100;
 
-    private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?$/;
+    private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?(-BETA-.)?$/;
 
     public static calculateVersion(versionString: string): number {
         if (versionString == null) {

test/Util.js

@@ -77,7 +77,13 @@ exports.markEnterprise = function (_this) {
 };
 
 exports.markServerVersionAtLeast = function (_this, client, expectedVersion) {
-    var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion();
+    if (process.env['SERVER_VERSION']) {
+        var actNumber = BuildMetadata.calculateVersion(process.env['SERVER_VERSION']);
+    } else if (client != null) {
+        var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion();
+    } else {
+        return;
+    }
     var expNumber = BuildMetadata.calculateVersion(expectedVersion);
     if (actNumber === BuildMetadata.UNKNOWN_VERSION_ID || actNumber < expNumber) {
         _this.skip();

test/flakeid/FlakeIdGeneratorOutOfRangeTest.js

@@ -30,6 +30,10 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () {
     var client;
     var flakeIdGenerator;
 
+    before(function () {
+        Util.markServerVersionAtLeast(this, null, '3.10');
+    });
+
     afterEach(function () {
         return flakeIdGenerator.destroy().then(function () {
             client.shutdown();

test/flakeid/FlakeIdGeneratorProxyTest.js

@@ -50,6 +50,10 @@ describe("FlakeIdGeneratorProxyTest", function () {
         });
     });
 
+    beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.10');
+    });
+
     afterEach(function () {
         return flakeIdGenerator.destroy();
     });

test/map/MapAggregatorsDoubleTest.js

@@ -20,6 +20,7 @@ var Aggregators = require('../../').Aggregators;
 var Predicates = require('../../').Predicates;
 var _fillMap = require('../Util').fillMap;
 var expect = require('chai').expect;
+var Util = require('../Util');
 
 describe('MapAggregatorsDoubleTest', function () {
     var cluster;
@@ -44,6 +45,7 @@ describe('MapAggregatorsDoubleTest', function () {
     });
 
     beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.8');
         return _fillMap(map, 50, 'key', 0);
     });
 

test/map/MapAggregatorsIntTest.js

@@ -21,6 +21,7 @@ var Aggregators = require('../../').Aggregators;
 var Predicates = require('../../').Predicates;
 var _fillMap = require('../Util').fillMap;
 var expect = require('chai').expect;
+var Util = require('../Util');
 
 describe('MapAggregatorsIntTest', function () {
     var cluster;
@@ -47,6 +48,7 @@ describe('MapAggregatorsIntTest', function () {
     });
 
     beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.8');
         return _fillMap(map, 50, 'key', 0);
     });
 

test/map/MapAggregatorsLongTest.js

@@ -21,6 +21,7 @@ var Aggregators = require('../../').Aggregators;
 var Predicates = require('../../').Predicates;
 var Long = require('long');
 var expect = require('chai').expect;
+var Util = require('../Util');
 
 describe('MapAggregatorsLongTest', function () {
     var cluster;
@@ -48,6 +49,7 @@ describe('MapAggregatorsLongTest', function () {
     });
 
     beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.8');
         var entries = [];
         for (var i = 0; i < entryCount; i++) {
             entries.push(['key' + i, Long.fromNumber(i)]);

test/pncounter/PNCounterBasicTest.js

@@ -17,6 +17,7 @@
 var expect = require('chai').expect;
 var RC = require('../RC');
 var Client = require('../../').Client;
+var Util = require('../Util');
 
 describe('PNCounterBasicTest', function () {
 
@@ -41,6 +42,7 @@ describe('PNCounterBasicTest', function () {
     });
 
     beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.10');
         pncounter = client.getPNCounter('pncounter')
     });
 

test/pncounter/PNCounterConsistencyTest.js

@@ -30,6 +30,10 @@ describe('PNCounterConsistencyTest', function () {
     var member1;
     var client;
 
+    before(function () {
+        Util.markServerVersionAtLeast(this, null, '3.10');
+    });
+
     beforeEach(function () {
         this.timeout(10000);
         return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')).then(function (cl) {
@@ -52,6 +56,7 @@ describe('PNCounterConsistencyTest', function () {
     });
 
     it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () {
+        Util.markServerVersionAtLeast(this, client, '3.10');
         var pncounter = client.getPNCounter('pncounter');
         return pncounter.getAndAdd(3).then(function () {
             var currentReplicaAddress = pncounter.currentTargetReplicaAddress;
@@ -63,6 +68,7 @@ describe('PNCounterConsistencyTest', function () {
     });
 
     it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () {
+        Util.markServerVersionAtLeast(this, client, '3.10');
         var pncounter = client.getPNCounter('pncounter');
         return pncounter.getAndAdd(3).then(function () {
             var currentReplicaAddress = pncounter.currentTargetReplicaAddress;

test/pncounter/PNCounterWithLiteMembersTest.js

@@ -22,6 +22,7 @@ var Client = require('../..').Client;
 var Errors = require('../..').HazelcastErrors;
 var fs = require('fs');
 var path = require('path');
+var Util = require('../Util');
 
 describe('PNCounterWithLiteMembersTest', function () {
 
@@ -46,6 +47,7 @@ describe('PNCounterWithLiteMembersTest', function () {
     });
 
     beforeEach(function () {
+        Util.markServerVersionAtLeast(this, client, '3.10');
         pncounter = client.getPNCounter('pncounter');
     });