admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added complete support for Map also for IE11.

Browse Source 
Fixes 1472
This commit is contained in:
Volonterio Riccardo
2018-01-11 18:13:24 +01:00
parent cb6de64e58
commit 085a1f8a16
7 changed files with 173 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spec/core/PrettyPrintSpec.js
View File

@@ -35,8 +35,10 @@ describe("jasmineUnderTest.pp", function () {
describe('stringify maps', function() { describe('stringify maps', function() {
it("should stringify maps properly", function() { it("should stringify maps properly", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
expect(jasmineUnderTest.pp(new Map([[1, 2]]))).toEqual("Map( [ 1, 2 ] )"); var map = new Map();
map.set(1,2);
expect(jasmineUnderTest.pp(map)).toEqual("Map( [ 1, 2 ] )");
}); });
it("should truncate maps with more elments than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() { it("should truncate maps with more elments than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
@@ -44,8 +46,12 @@ describe("jasmineUnderTest.pp", function () {
var originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH; var originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
try { try {
jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2; jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
expect(jasmineUnderTest.pp(new Map([["a", 1], ["b", 2], ["c", 3]]))).toEqual("Map( [ 'a', 1 ], [ 'b', 2 ], ... )"); var map = new Map();
map.set("a",1);
map.set("b",2);
map.set("c",3);
expect(jasmineUnderTest.pp(map)).toEqual("Map( [ 'a', 1 ], [ 'b', 2 ], ... )");
} finally { } finally {
jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize; jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize;
} }

27
spec/core/matchers/matchersUtilSpec.js
View File

@@ -445,7 +445,8 @@ describe("matchersUtil", function() {
it("passes when comparing identical maps", function() { it("passes when comparing identical maps", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var mapA = new Map([[6, 5]]); var mapA = new Map();
mapA.set(6, 5);
var mapB = new Map(); var mapB = new Map();
mapB.set(6, 5); mapB.set(6, 5);
expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(true); expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(true);
@@ -453,22 +454,34 @@ describe("matchersUtil", function() {
it("passes when comparing identical maps with different insertion order", function() { it("passes when comparing identical maps with different insertion order", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var mapA = new Map([['a', 3], [6, 1]]); var mapA = new Map();
var mapB = new Map([[6, 1], ['a', 3]]); mapA.set("a", 3);
mapA.set(6, 1);
var mapB = new Map();
mapB.set(6, 1);
mapB.set("a", 3);
expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(true); expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(true);
}); });
it("fails for maps with different elements", function() { it("fails for maps with different elements", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var mapA = new Map([[6, 3], [5, 1]]); var mapA = new Map();
var mapB = new Map([[6, 4], [5, 1]]); mapA.set(6, 3);
mapA.set(5, 1);
var mapB = new Map();
mapB.set(6, 4);
mapB.set(5, 1);
expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false); expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false);
}); });
it("fails for maps of different size", function() { it("fails for maps of different size", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var mapA = new Map([[6, 3]]); var mapA = new Map();
var mapB = new Map([[6, 4], [5, 1]]); mapA.set(6, 3);
var mapB = new Map();
mapB.set(6, 4);
mapB.set(5, 1);
expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false); expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false);
}); });

91
spec/core/matchers/toEqualSpec.js
View File

@@ -436,11 +436,13 @@ describe("toEqual", function() {
// == Maps == // == Maps ==
it("does not report mismatches between deep equal Maps", function() { it("does not report mismatches between deep equal Maps", function() {
jasmine.getEnv().requireFunctioningSets(); jasmine.getEnv().requireFunctioningMaps();
// values are the same but with different object identity // values are the same but with different object identity
var actual = new Map([['a', {x: 1}]]), var actual = new Map();
expected = new Map([['a', {x: 1}]]); actual.set('a',{x:1});
var expected = new Map();
expected.set('a',{x:1});
expect(compareEquals(actual, expected).pass).toBe(true); expect(compareEquals(actual, expected).pass).toBe(true);
}); });
@@ -448,9 +450,11 @@ describe("toEqual", function() {
it("reports deep mismatches within Maps", function() { it("reports deep mismatches within Maps", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = new Map([['a', {x: 1}]]), var actual = new Map();
expected = new Map([['a', {x: 2}]]), actual.set('a',{x:1});
message = "Expected Map( [ 'a', Object({ x: 1 }) ] ) to equal Map( [ 'a', Object({ x: 2 }) ] )."; var expected = new Map();
expected.set('a',{x:2});
var message = "Expected Map( [ 'a', Object({ x: 1 }) ] ) to equal Map( [ 'a', Object({ x: 2 }) ] ).";
expect(compareEquals(actual, expected).message).toEqual(message); expect(compareEquals(actual, expected).message).toEqual(message);
}); });
@@ -458,9 +462,14 @@ describe("toEqual", function() {
it("reports mismatches between Maps nested in objects", function() { it("reports mismatches between Maps nested in objects", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = {Maps: [new Map([['a', 1]])]}, var actual = {Maps:[new Map()]};
expected = {Maps: [new Map([['a', 2]])]}, actual.Maps[0].set('a',1);
message = "Expected $.Maps[0] = Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ] )."; var expected = {Maps:[new Map()]};
expected.Maps[0].set('a',2);
// var actual = {Maps: [new Map([['a', 1]])]},
// expected = {Maps: [new Map([['a', 2]])]},
var message = "Expected $.Maps[0] = Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ] ).";
expect(compareEquals(actual, expected).message).toEqual(message); expect(compareEquals(actual, expected).message).toEqual(message);
}); });
@@ -468,9 +477,12 @@ describe("toEqual", function() {
it("reports mismatches between Maps of different lengths", function() { it("reports mismatches between Maps of different lengths", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = new Map([['a', 1]]), var actual = new Map();
expected = new Map([['a', 2], ['b', 1]]), actual.set('a',1);
message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ], [ 'b', 1 ] )."; var expected = new Map();
expected.set('a',2);
expected.set('b',1);
var message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ], [ 'b', 1 ] ).";
expect(compareEquals(actual, expected).message).toEqual(message); expect(compareEquals(actual, expected).message).toEqual(message);
}); });
@@ -478,18 +490,22 @@ describe("toEqual", function() {
it("reports mismatches between Maps with equal values but differing keys", function() { it("reports mismatches between Maps with equal values but differing keys", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = new Map([['a', 1]]), var actual = new Map();
expected = new Map([['b', 1]]), actual.set('a',1);
message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'b', 1 ] )."; var expected = new Map();
expected.set('b',1);
var message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'b', 1 ] ).";
expect(compareEquals(actual, expected).message).toEqual(message); expect(compareEquals(actual, expected).message).toEqual(message);
}); });
it("does not report mismatches between Maps with keys with same object identity", function() { it("does not report mismatches between Maps with keys with same object identity", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var key = {x: 1}, var key = {x: 1};
actual = new Map([[key, 2]]), var actual = new Map();
expected = new Map([[key, 2]]); actual.set(key,2);
var expected = new Map();
expected.set(key,2);
expect(compareEquals(actual, expected).pass).toBe(true); expect(compareEquals(actual, expected).pass).toBe(true);
}); });
@@ -497,9 +513,11 @@ describe("toEqual", function() {
it("reports mismatches between Maps with identical keys with different object identity", function() { it("reports mismatches between Maps with identical keys with different object identity", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = new Map([[{x: 1}, 2]]), var actual = new Map();
expected = new Map([[{x: 1}, 2]]), actual.set({x:1},2);
message = "Expected Map( [ Object({ x: 1 }), 2 ] ) to equal Map( [ Object({ x: 1 }), 2 ] )."; var expected = new Map();
expected.set({x:1},2);
var message = "Expected Map( [ Object({ x: 1 }), 2 ] ) to equal Map( [ Object({ x: 1 }), 2 ] ).";
expect(compareEquals(actual, expected).message).toEqual(message); expect(compareEquals(actual, expected).message).toEqual(message);
}); });
@@ -507,8 +525,11 @@ describe("toEqual", function() {
it("does not report mismatches when comparing Map key to jasmine.anything()", function() { it("does not report mismatches when comparing Map key to jasmine.anything()", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
var actual = new Map([['a', 1]]), var actual = new Map();
expected = new Map([[jasmineUnderTest.anything(), 1]]); actual.set('a',1);
var expected = new Map();
expected.set(jasmineUnderTest.anything(),1);
expect(compareEquals(actual, expected).pass).toBe(true); expect(compareEquals(actual, expected).pass).toBe(true);
}); });
@@ -516,9 +537,12 @@ describe("toEqual", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
jasmine.getEnv().requireFunctioningSymbols(); jasmine.getEnv().requireFunctioningSymbols();
var key = Symbol(), var key = Symbol();
actual = new Map([[key, 1]]), var actual = new Map();
expected = new Map([[key, 1]]); actual.set(key,1);
var expected = new Map();
expected.set(key,1);
expect(compareEquals(actual, expected).pass).toBe(true); expect(compareEquals(actual, expected).pass).toBe(true);
}); });
@@ -526,9 +550,11 @@ describe("toEqual", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
jasmine.getEnv().requireFunctioningSymbols(); jasmine.getEnv().requireFunctioningSymbols();
var actual = new Map([[Symbol(), 1]]), var actual = new Map();
expected = new Map([[Symbol(), 1]]), actual.set(Symbol(),1);
message = "Expected Map( [ Symbol(), 1 ] ) to equal Map( [ Symbol(), 1 ] )."; var expected = new Map();
expected.set(Symbol(),1);
var message = "Expected Map( [ Symbol(), 1 ] ) to equal Map( [ Symbol(), 1 ] ).";
expect(compareEquals(actual, expected).message).toBe(message); expect(compareEquals(actual, expected).message).toBe(message);
}); });
@@ -537,8 +563,11 @@ describe("toEqual", function() {
jasmine.getEnv().requireFunctioningMaps(); jasmine.getEnv().requireFunctioningMaps();
jasmine.getEnv().requireFunctioningSymbols(); jasmine.getEnv().requireFunctioningSymbols();
var actual = new Map([[Symbol(), 1]]), var actual = new Map();
expected = new Map([[jasmineUnderTest.anything(), 1]]); actual.set(Symbol(),1);
var expected = new Map();
expected.set(jasmineUnderTest.anything(),1);
expect(compareEquals(actual, expected).pass).toBe(true); expect(compareEquals(actual, expected).pass).toBe(true);
}); });

34
spec/helpers/checkForMap.js
View File

@@ -3,10 +3,36 @@
if (typeof Map === 'undefined') { return false; } if (typeof Map === 'undefined') { return false; }
try { try {
var s = new Map([['a', 4]]); var s = new Map();
if (s.size !== 1) { return false; } s.set('a',1);
if (s.keys().next().value !== 'a') { return false; } s.set('b',2);
if (s.values().next().value !== 4) { return false; }
// Check for `size`
if (s.size !== 2) { return false; }
// Check for `has`
if (s.has('a') !== true) { return false; }
// Check for `delete`
if (s.delete('b') !== true) { return false; }
// Check for `forEach`
var iterations = 0;
var ifForEachWorking = true;
s.forEach( function( value, key, map ) {
ifForEachWorking = ifForEachWorking && map === s;
if( key==='a') {
ifForEachWorking = ifForEachWorking && value===1;
}
iterations++;
} );
if (iterations !== 1) { return false; }
if (ifForEachWorking !== true) { return false; }
// Check for `clear`
s.clear()
if (s.size !== 0) { return false; }
return true; return true;
} catch(e) { } catch(e) {
return false; return false;

19
src/core/PrettyPrinter.js
View File

@@ -40,7 +40,7 @@ getJasmineRequireObj().pp = function(j$) {
this.emitScalar('Date(' + value + ')'); this.emitScalar('Date(' + value + ')');
} else if (j$.getType_(value) == '[object Set]') { } else if (j$.getType_(value) == '[object Set]') {
this.emitSet(value); this.emitSet(value);
} else if (j$.getType_(value) == '[object Map]') { } else if (j$.isMap(value)) {
this.emitMap(value); this.emitMap(value);
} else if (j$.isTypedArray_(value)) { } else if (j$.isTypedArray_(value)) {
this.emitTypedArray(value); this.emitTypedArray(value);
@@ -157,13 +157,18 @@ getJasmineRequireObj().pp = function(j$) {
} }
this.append('Map( '); this.append('Map( ');
var size = Math.min(map.size, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH); var size = Math.min(map.size, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
var iter = map.entries(); var i = 0;
for (var i = 0; i < size; i++) { map.forEach( function( value, key ) {
if (i > 0) { if (i >= size) {
return;
}
if (i > 0) {
this.append(', '); this.append(', ');
} }
this.format(iter.next().value); this.format([key,value]);
}
i++;
}, this );
if (map.size > size){ if (map.size > size){
this.append(', ...'); this.append(', ...');
} }

4
src/core/base.js
View File

@@ -93,6 +93,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
return obj.nodeType > 0; return obj.nodeType > 0;
}; };
j$.isMap = function(obj) {
return typeof jasmineGlobal.Map !== 'undefined' && obj.constructor === jasmineGlobal.Map;
};
j$.isPromise = function(obj) { j$.isPromise = function(obj) {
return typeof jasmineGlobal.Promise !== 'undefined' && obj.constructor === jasmineGlobal.Promise; return typeof jasmineGlobal.Promise !== 'undefined' && obj.constructor === jasmineGlobal.Promise;
}; };

68
src/core/matchers/matchersUtil.js
View File

@@ -253,42 +253,48 @@ getJasmineRequireObj().matchersUtil = function(j$) {
if (!result) { if (!result) {
return false; return false;
} }
} else if (className == '[object Map]') { } else if (j$.isMap(a) && j$.isMap(b)) {
if (a.size != b.size) { if (a.size != b.size) {
diffBuilder.record(a, b); diffBuilder.record(a, b);
return false; return false;
} }
var keysA = [];
var keysB = [];
a.forEach( function( valueA, keyA ) {
keysA.push( keyA );
});
b.forEach( function( valueB, keyB ) {
keysB.push( keyB );
});
// For both sets of keys, check they map to equal values in both maps. // For both sets of keys, check they map to equal values in both maps.
// Keep track of corresponding keys (in insertion order) in order to handle asymmetric obj keys. // Keep track of corresponding keys (in insertion order) in order to handle asymmetric obj keys.
var mapKeys = [a.keys(), b.keys()]; var mapKeys = [keysA, keysB];
var cmpKeys = [b.keys(), a.keys()]; var cmpKeys = [keysB, keysA];
var mapIter, mapKeyIt, mapKey, mapValueA, mapValueB; var mapIter, mapKey, mapValueA, mapValueB;
var cmpIter, cmpKeyIt, cmpKey; var cmpIter, cmpKey;
for (i = 0; result && i < mapKeys.length; i++) { for (i = 0; result && i < mapKeys.length; i++) {
mapIter = mapKeys[i]; mapIter = mapKeys[i];
cmpIter = cmpKeys[i]; cmpIter = cmpKeys[i];
mapKeyIt = mapIter.next();
cmpKeyIt = cmpIter.next(); for (var j = 0; result && j < mapIter.length; j++) {
while (result && !mapKeyIt.done) { mapKey = mapIter[j];
mapKey = mapKeyIt.value; cmpKey = cmpIter[j];
cmpKey = cmpKeyIt.value; mapValueA = a.get(mapKey);
mapValueA = a.get(mapKey);
// Only use the cmpKey when one of the keys is asymmetric and the corresponding key matches, // Only use the cmpKey when one of the keys is asymmetric and the corresponding key matches,
// otherwise explicitly look up the mapKey in the other Map since we want keys with unique // otherwise explicitly look up the mapKey in the other Map since we want keys with unique
// obj identity (that are otherwise equal) to not match. // obj identity (that are otherwise equal) to not match.
if (isAsymmetric(mapKey) || isAsymmetric(cmpKey) && if (isAsymmetric(mapKey) || isAsymmetric(cmpKey) &&
eq(mapKey, cmpKey, aStack, bStack, customTesters, j$.NullDiffBuilder())) { eq(mapKey, cmpKey, aStack, bStack, customTesters, j$.NullDiffBuilder())) {
mapValueB = b.get(cmpKey); mapValueB = b.get(cmpKey);
} else { } else {
mapValueB = b.get(mapKey); mapValueB = b.get(mapKey);
} }
result = eq(mapValueA, mapValueB, aStack, bStack, customTesters, j$.NullDiffBuilder()); result = eq(mapValueA, mapValueB, aStack, bStack, customTesters, j$.NullDiffBuilder());
mapKeyIt = mapIter.next(); }
cmpKeyIt = cmpIter.next(); }
}
}
if (!result) { if (!result) {
diffBuilder.record(a, b); diffBuilder.record(a, b);